summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/r128
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2004-03-18 00:16:44 +0000
committerIan Romanick <[email protected]>2004-03-18 00:16:44 +0000
commit6af3dca18a2315ea431b5ea868913093d2111491 (patch)
tree733fc817b4d692e7566aba9d4daf0cb97d2a829a /src/mesa/drivers/dri/r128
parent16c704e8f7cd9b7d7c5d6667cb38e016e3b608d1 (diff)
Convert int(8|32)_t to uint(8|32)_t, like should have been done the first time.
Diffstat (limited to 'src/mesa/drivers/dri/r128')
-rw-r--r--src/mesa/drivers/dri/r128/r128_context.h6
-rw-r--r--src/mesa/drivers/dri/r128/r128_ioctl.c2
-rw-r--r--src/mesa/drivers/dri/r128/r128_ioctl.h6
-rw-r--r--src/mesa/drivers/dri/r128/r128_tex.c6
-rw-r--r--src/mesa/drivers/dri/r128/r128_tex.h2
-rw-r--r--src/mesa/drivers/dri/r128/r128_texmem.c6
-rw-r--r--src/mesa/drivers/dri/r128/r128_texobj.h4
-rw-r--r--src/mesa/drivers/dri/r128/server/r128.h138
-rw-r--r--src/mesa/drivers/dri/r128/server/r128_dri.c2
9 files changed, 86 insertions, 86 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_context.h b/src/mesa/drivers/dri/r128/r128_context.h
index e7600d775c2..4712f0be2ed 100644
--- a/src/mesa/drivers/dri/r128/r128_context.h
+++ b/src/mesa/drivers/dri/r128/r128_context.h
@@ -135,9 +135,9 @@ struct r128_context {
GLuint num_verts;
GLubyte *verts;
- int32_t ClearColor; /* Color used to clear color buffer */
- int32_t ClearDepth; /* Value used to clear depth buffer */
- int32_t ClearStencil; /* Value used to clear stencil */
+ uint32_t ClearColor; /* Color used to clear color buffer */
+ uint32_t ClearDepth; /* Value used to clear depth buffer */
+ uint32_t ClearStencil; /* Value used to clear stencil */
/* Map GL texture units onto hardware
*/
diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.c b/src/mesa/drivers/dri/r128/r128_ioctl.c
index dcd024154a6..b0073eb74ec 100644
--- a/src/mesa/drivers/dri/r128/r128_ioctl.c
+++ b/src/mesa/drivers/dri/r128/r128_ioctl.c
@@ -229,7 +229,7 @@ static void delay( void ) {
static int r128WaitForFrameCompletion( r128ContextPtr rmesa )
{
unsigned char *R128MMIO = rmesa->r128Screen->mmio.map;
- int32_t frame;
+ uint32_t frame;
int i;
int wait = 0;
diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.h b/src/mesa/drivers/dri/r128/r128_ioctl.h
index 4e086764522..ee41843da97 100644
--- a/src/mesa/drivers/dri/r128/r128_ioctl.h
+++ b/src/mesa/drivers/dri/r128/r128_ioctl.h
@@ -41,7 +41,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r128_reg.h"
#include "r128_lock.h"
-#define R128_BUFFER_MAX_DWORDS (R128_BUFFER_SIZE / sizeof(int32_t))
+#define R128_BUFFER_MAX_DWORDS (R128_BUFFER_SIZE / sizeof(uint32_t))
extern drmBufPtr r128GetBufferLocked( r128ContextPtr rmesa );
@@ -49,7 +49,7 @@ extern void r128FlushVerticesLocked( r128ContextPtr rmesa );
static __inline void *r128AllocDmaLow( r128ContextPtr rmesa, int bytes )
{
- int32_t *head;
+ uint32_t *head;
if ( !rmesa->vert_buf ) {
LOCK_HARDWARE( rmesa );
@@ -62,7 +62,7 @@ static __inline void *r128AllocDmaLow( r128ContextPtr rmesa, int bytes )
UNLOCK_HARDWARE( rmesa );
}
- head = (int32_t *)((char *)rmesa->vert_buf->address + rmesa->vert_buf->used);
+ head = (uint32_t *)((char *)rmesa->vert_buf->address + rmesa->vert_buf->used);
rmesa->vert_buf->used += bytes;
return head;
}
diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c
index 44a6a415b52..62933b040de 100644
--- a/src/mesa/drivers/dri/r128/r128_tex.c
+++ b/src/mesa/drivers/dri/r128/r128_tex.c
@@ -462,9 +462,9 @@ static void r128TexEnv( GLcontext *ctx, GLenum target,
case GL_TEXTURE_LOD_BIAS:
{
- int32_t t = rmesa->setup.tex_cntl_c;
+ uint32_t t = rmesa->setup.tex_cntl_c;
GLint bias;
- int32_t b;
+ uint32_t b;
/* GTH: This isn't exactly correct, but gives good results up to a
* certain point. It is better than completely ignoring the LOD
@@ -484,7 +484,7 @@ static void r128TexEnv( GLcontext *ctx, GLenum target,
bias = 127;
}
- b = (int32_t)bias & 0xff;
+ b = (uint32_t)bias & 0xff;
t &= ~R128_LOD_BIAS_MASK;
t |= (b << R128_LOD_BIAS_SHIFT);
diff --git a/src/mesa/drivers/dri/r128/r128_tex.h b/src/mesa/drivers/dri/r128/r128_tex.h
index 58daa3336d5..ddfdf683781 100644
--- a/src/mesa/drivers/dri/r128/r128_tex.h
+++ b/src/mesa/drivers/dri/r128/r128_tex.h
@@ -70,7 +70,7 @@ extern void r128InitTextureFuncs( struct dd_function_table *functions );
#define R128PACKCOLOR4444( r, g, b, a ) \
((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
-static __inline__ int32_t r128PackColor( GLuint cpp,
+static __inline__ uint32_t r128PackColor( GLuint cpp,
GLubyte r, GLubyte g,
GLubyte b, GLubyte a )
{
diff --git a/src/mesa/drivers/dri/r128/r128_texmem.c b/src/mesa/drivers/dri/r128/r128_texmem.c
index 5c030e892fc..0f131be6061 100644
--- a/src/mesa/drivers/dri/r128/r128_texmem.c
+++ b/src/mesa/drivers/dri/r128/r128_texmem.c
@@ -86,7 +86,7 @@ static void uploadSubImage( r128ContextPtr rmesa, r128TexObjPtr t,
int imageWidth, imageHeight;
int remaining, rows;
int format, dwords;
- int32_t pitch, offset;
+ uint32_t pitch, offset;
int i;
/* Ensure we have a valid texture to upload */
@@ -202,7 +202,7 @@ static void uploadSubImage( r128ContextPtr rmesa, r128TexObjPtr t,
remaining > 0 ;
remaining -= rows, y += rows, i++ )
{
- int32_t *dst;
+ uint32_t *dst;
drmBufPtr buffer;
assert(image->Data);
@@ -213,7 +213,7 @@ static void uploadSubImage( r128ContextPtr rmesa, r128TexObjPtr t,
LOCK_HARDWARE( rmesa );
buffer = r128GetBufferLocked( rmesa );
- dst = (int32_t *)((char *)buffer->address + R128_HOSTDATA_BLIT_OFFSET);
+ dst = (uint32_t *)((char *)buffer->address + R128_HOSTDATA_BLIT_OFFSET);
/* Copy the next chunck of the texture image into the blit buffer */
{
diff --git a/src/mesa/drivers/dri/r128/r128_texobj.h b/src/mesa/drivers/dri/r128/r128_texobj.h
index 68e34b26822..5ead8ca9f14 100644
--- a/src/mesa/drivers/dri/r128/r128_texobj.h
+++ b/src/mesa/drivers/dri/r128/r128_texobj.h
@@ -53,14 +53,14 @@ typedef struct r128_tex_obj r128TexObj, *r128TexObjPtr;
struct r128_tex_obj {
driTextureObject base;
- int32_t bufAddr; /* Offset to start of locally
+ uint32_t bufAddr; /* Offset to start of locally
shared texture block */
GLuint age;
r128TexImage image[R128_MAX_TEXTURE_LEVELS]; /* Image data for all
mipmap levels */
- int32_t textureFormat; /* Actual hardware format */
+ uint32_t textureFormat; /* Actual hardware format */
drm_r128_texture_regs_t setup; /* Setup regs for texture */
};
diff --git a/src/mesa/drivers/dri/r128/server/r128.h b/src/mesa/drivers/dri/r128/server/r128.h
index 0e3588c3f30..0078aab73a4 100644
--- a/src/mesa/drivers/dri/r128/server/r128.h
+++ b/src/mesa/drivers/dri/r128/server/r128.h
@@ -114,82 +114,82 @@ typedef struct { /* All values in XCLKS */
typedef struct {
/* Common registers */
- int32_t ovr_clr;
- int32_t ovr_wid_left_right;
- int32_t ovr_wid_top_bottom;
- int32_t ov0_scale_cntl;
- int32_t mpp_tb_config;
- int32_t mpp_gp_config;
- int32_t subpic_cntl;
- int32_t viph_control;
- int32_t i2c_cntl_1;
- int32_t gen_int_cntl;
- int32_t cap0_trig_cntl;
- int32_t cap1_trig_cntl;
- int32_t bus_cntl;
- int32_t config_cntl;
+ uint32_t ovr_clr;
+ uint32_t ovr_wid_left_right;
+ uint32_t ovr_wid_top_bottom;
+ uint32_t ov0_scale_cntl;
+ uint32_t mpp_tb_config;
+ uint32_t mpp_gp_config;
+ uint32_t subpic_cntl;
+ uint32_t viph_control;
+ uint32_t i2c_cntl_1;
+ uint32_t gen_int_cntl;
+ uint32_t cap0_trig_cntl;
+ uint32_t cap1_trig_cntl;
+ uint32_t bus_cntl;
+ uint32_t config_cntl;
/* Other registers to save for VT switches */
- int32_t dp_datatype;
- int32_t gen_reset_cntl;
- int32_t clock_cntl_index;
- int32_t amcgpio_en_reg;
- int32_t amcgpio_mask;
+ uint32_t dp_datatype;
+ uint32_t gen_reset_cntl;
+ uint32_t clock_cntl_index;
+ uint32_t amcgpio_en_reg;
+ uint32_t amcgpio_mask;
/* CRTC registers */
- int32_t crtc_gen_cntl;
- int32_t crtc_ext_cntl;
- int32_t dac_cntl;
- int32_t crtc_h_total_disp;
- int32_t crtc_h_sync_strt_wid;
- int32_t crtc_v_total_disp;
- int32_t crtc_v_sync_strt_wid;
- int32_t crtc_offset;
- int32_t crtc_offset_cntl;
- int32_t crtc_pitch;
+ uint32_t crtc_gen_cntl;
+ uint32_t crtc_ext_cntl;
+ uint32_t dac_cntl;
+ uint32_t crtc_h_total_disp;
+ uint32_t crtc_h_sync_strt_wid;
+ uint32_t crtc_v_total_disp;
+ uint32_t crtc_v_sync_strt_wid;
+ uint32_t crtc_offset;
+ uint32_t crtc_offset_cntl;
+ uint32_t crtc_pitch;
/* CRTC2 registers */
- int32_t crtc2_gen_cntl;
+ uint32_t crtc2_gen_cntl;
/* Flat panel registers */
- int32_t fp_crtc_h_total_disp;
- int32_t fp_crtc_v_total_disp;
- int32_t fp_gen_cntl;
- int32_t fp_h_sync_strt_wid;
- int32_t fp_horz_stretch;
- int32_t fp_panel_cntl;
- int32_t fp_v_sync_strt_wid;
- int32_t fp_vert_stretch;
- int32_t lvds_gen_cntl;
- int32_t tmds_crc;
- int32_t tmds_transmitter_cntl;
+ uint32_t fp_crtc_h_total_disp;
+ uint32_t fp_crtc_v_total_disp;
+ uint32_t fp_gen_cntl;
+ uint32_t fp_h_sync_strt_wid;
+ uint32_t fp_horz_stretch;
+ uint32_t fp_panel_cntl;
+ uint32_t fp_v_sync_strt_wid;
+ uint32_t fp_vert_stretch;
+ uint32_t lvds_gen_cntl;
+ uint32_t tmds_crc;
+ uint32_t tmds_transmitter_cntl;
/* Computed values for PLL */
- int32_t dot_clock_freq;
- int32_t pll_output_freq;
+ uint32_t dot_clock_freq;
+ uint32_t pll_output_freq;
int feedback_div;
int post_div;
/* PLL registers */
- int32_t ppll_ref_div;
- int32_t ppll_div_3;
- int32_t htotal_cntl;
+ uint32_t ppll_ref_div;
+ uint32_t ppll_div_3;
+ uint32_t htotal_cntl;
/* DDA register */
- int32_t dda_config;
- int32_t dda_on_off;
+ uint32_t dda_config;
+ uint32_t dda_on_off;
/* Pallet */
GLboolean palette_valid;
- int32_t palette[256];
+ uint32_t palette[256];
} R128SaveRec, *R128SavePtr;
#ifndef _SOLO
typedef struct {
CARD16 reference_freq;
CARD16 reference_div;
- int32_t min_pll_freq;
- int32_t max_pll_freq;
+ uint32_t min_pll_freq;
+ uint32_t max_pll_freq;
CARD16 xclk;
} R128PLLRec, *R128PLLPtr;
@@ -220,16 +220,16 @@ typedef struct {
unsigned char *MMIO; /* Map of MMIO region */
unsigned char *FB; /* Map of frame buffer */
- int32_t MemCntl;
- int32_t BusCntl;
+ uint32_t MemCntl;
+ uint32_t BusCntl;
unsigned long FbMapSize; /* Size of frame buffer, in bytes */
int Flags; /* Saved copy of mode flags */
#ifndef _SOLO
- int8_t BIOSDisplay; /* Device the BIOS is set to display to */
+ uint8_t BIOSDisplay; /* Device the BIOS is set to display to */
GLboolean HasPanelRegs; /* Current chip can connect to a FP */
- int8_t *VBIOS; /* Video BIOS for mode validation on FPs */
+ uint8_t *VBIOS; /* Video BIOS for mode validation on FPs */
int FPBIOSstart; /* Start of the flat panel info */
#endif
/* Computed values for FPs */
@@ -273,7 +273,7 @@ typedef struct {
/* Computed values for Rage 128 */
int pitch;
int datatype;
- int32_t dp_gui_master_cntl;
+ uint32_t dp_gui_master_cntl;
/* Saved values for ScreenToScreenCopy */
int xdir;
@@ -394,18 +394,18 @@ typedef struct {
int log2TexGran;
/* Saved scissor values */
- int32_t sc_left;
- int32_t sc_right;
- int32_t sc_top;
- int32_t sc_bottom;
+ uint32_t sc_left;
+ uint32_t sc_right;
+ uint32_t sc_top;
+ uint32_t sc_bottom;
- int32_t re_top_left;
- int32_t re_width_height;
+ uint32_t re_top_left;
+ uint32_t re_width_height;
- int32_t aux_sc_cntl;
+ uint32_t aux_sc_cntl;
int irq;
- int32_t gen_int_cntl;
+ uint32_t gen_int_cntl;
GLboolean DMAForXv;
#endif
@@ -420,7 +420,7 @@ typedef struct {
GLboolean isDFP;
GLboolean isPro2;
I2CBusPtr pI2CBus;
- int32_t DDCReg;
+ uint32_t DDCReg;
#endif
} R128InfoRec, *R128InfoPtr;
@@ -489,7 +489,7 @@ do { \
#define R128_VERBOSE 0
-#define RING_LOCALS int32_t *__head; int __count;
+#define RING_LOCALS uint32_t *__head; int __count;
#define R128CCE_REFRESH(pScrn, info) \
do { \
@@ -530,12 +530,12 @@ do { \
fprintf(stderr, \
"ADVANCE_RING() used: %d+%d=%d/%d\n", \
info->indirectBuffer->used - info->indirectStart, \
- __count * sizeof(int32_t), \
+ __count * sizeof(uint32_t), \
info->indirectBuffer->used - info->indirectStart + \
- __count * sizeof(int32_t), \
+ __count * sizeof(uint32_t), \
info->indirectBuffer->total - info->indirectStart ); \
} \
- info->indirectBuffer->used += __count * (int)sizeof(int32_t); \
+ info->indirectBuffer->used += __count * (int)sizeof(uint32_t); \
} while (0)
#define OUT_RING( x ) do { \
diff --git a/src/mesa/drivers/dri/r128/server/r128_dri.c b/src/mesa/drivers/dri/r128/server/r128_dri.c
index f065bbd8eca..3d7711e85a7 100644
--- a/src/mesa/drivers/dri/r128/server/r128_dri.c
+++ b/src/mesa/drivers/dri/r128/server/r128_dri.c
@@ -323,7 +323,7 @@ static GLboolean R128DRIPciInit(const DRIDriverContext *ctx)
{
R128InfoPtr info = ctx->driverPrivate;
unsigned char *R128MMIO = ctx->MMIOAddress;
- int32_t chunk;
+ uint32_t chunk;
int ret;
int flags;