From 38b317d508a2a3a4cc6d700ebca80c3b06c913e2 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Tue, 14 Dec 2004 09:11:52 +0000 Subject: uint*t -> u_int*t changes --- src/mesa/drivers/dri/r128/r128_context.h | 6 +- src/mesa/drivers/dri/r128/r128_ioctl.c | 2 +- src/mesa/drivers/dri/r128/r128_ioctl.h | 6 +- src/mesa/drivers/dri/r128/r128_screen.c | 4 +- src/mesa/drivers/dri/r128/r128_tex.c | 6 +- src/mesa/drivers/dri/r128/r128_tex.h | 2 +- src/mesa/drivers/dri/r128/r128_texmem.c | 6 +- src/mesa/drivers/dri/r128/r128_texobj.h | 4 +- src/mesa/drivers/dri/r128/server/r128.h | 128 ++++++++++++++-------------- src/mesa/drivers/dri/r128/server/r128_dri.c | 2 +- 10 files changed, 83 insertions(+), 83 deletions(-) (limited to 'src/mesa/drivers/dri/r128') diff --git a/src/mesa/drivers/dri/r128/r128_context.h b/src/mesa/drivers/dri/r128/r128_context.h index 0b4eaa2d741..4574f298bf8 100644 --- a/src/mesa/drivers/dri/r128/r128_context.h +++ b/src/mesa/drivers/dri/r128/r128_context.h @@ -140,9 +140,9 @@ struct r128_context { GLfloat hw_viewport[16]; GLfloat depth_scale; - 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 */ + u_int32_t ClearColor; /* Color used to clear color buffer */ + u_int32_t ClearDepth; /* Value used to clear depth buffer */ + u_int32_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 1eb887f67ca..2ae0f6fa6b8 100644 --- a/src/mesa/drivers/dri/r128/r128_ioctl.c +++ b/src/mesa/drivers/dri/r128/r128_ioctl.c @@ -230,7 +230,7 @@ static int r128WaitForFrameCompletion( r128ContextPtr rmesa ) int wait = 0; while ( 1 ) { - uint32_t frame = read_MMIO_LE32( R128MMIO, R128_LAST_FRAME_REG ); + u_int32_t frame = read_MMIO_LE32( R128MMIO, R128_LAST_FRAME_REG ); if ( rmesa->sarea->last_frame - frame <= R128_MAX_OUTSTANDING ) { break; diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.h b/src/mesa/drivers/dri/r128/r128_ioctl.h index c17d3ca8cb6..1ee17cf7c62 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(uint32_t)) +#define R128_BUFFER_MAX_DWORDS (R128_BUFFER_SIZE / sizeof(u_int32_t)) extern drmBufPtr r128GetBufferLocked( r128ContextPtr rmesa ); @@ -50,7 +50,7 @@ extern void r128FlushVerticesLocked( r128ContextPtr rmesa ); static __inline void *r128AllocDmaLow( r128ContextPtr rmesa, int count, int vert_size ) { - uint32_t *head; + u_int32_t *head; int bytes = count * vert_size; if ( !rmesa->vert_buf ) { @@ -64,7 +64,7 @@ static __inline void *r128AllocDmaLow( r128ContextPtr rmesa, int count, UNLOCK_HARDWARE( rmesa ); } - head = (uint32_t *)((char *)rmesa->vert_buf->address + rmesa->vert_buf->used); + head = (u_int32_t *)((char *)rmesa->vert_buf->address + rmesa->vert_buf->used); rmesa->vert_buf->used += bytes; rmesa->num_verts += count; diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c index f4d069d1391..b9a92128bbb 100644 --- a/src/mesa/drivers/dri/r128/r128_screen.c +++ b/src/mesa/drivers/dri/r128/r128_screen.c @@ -381,8 +381,8 @@ r128FillInModes( unsigned pixel_bits, unsigned depth_bits, GLX_NONE, GLX_SWAP_UNDEFINED_OML /*, GLX_SWAP_COPY_OML */ }; - uint8_t depth_bits_array[2]; - uint8_t stencil_bits_array[2]; + u_int8_t depth_bits_array[2]; + u_int8_t stencil_bits_array[2]; depth_bits_array[0] = depth_bits; diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c index 29fa901c055..3b2d017c1f2 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: { - uint32_t t = rmesa->setup.tex_cntl_c; + u_int32_t t = rmesa->setup.tex_cntl_c; GLint bias; - uint32_t b; + u_int32_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 = (uint32_t)bias & 0xff; + b = (u_int32_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 ddfdf683781..d6d2aeff954 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__ uint32_t r128PackColor( GLuint cpp, +static __inline__ u_int32_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 f7413cf5e35..d011a756719 100644 --- a/src/mesa/drivers/dri/r128/r128_texmem.c +++ b/src/mesa/drivers/dri/r128/r128_texmem.c @@ -85,7 +85,7 @@ static void uploadSubImage( r128ContextPtr rmesa, r128TexObjPtr t, int imageWidth, imageHeight; int remaining, rows; int format, dwords; - uint32_t pitch, offset; + u_int32_t pitch, offset; int i; /* Ensure we have a valid texture to upload */ @@ -201,7 +201,7 @@ static void uploadSubImage( r128ContextPtr rmesa, r128TexObjPtr t, remaining > 0 ; remaining -= rows, y += rows, i++ ) { - uint32_t *dst; + u_int32_t *dst; drmBufPtr buffer; assert(image->Data); @@ -212,7 +212,7 @@ static void uploadSubImage( r128ContextPtr rmesa, r128TexObjPtr t, LOCK_HARDWARE( rmesa ); buffer = r128GetBufferLocked( rmesa ); - dst = (uint32_t *)((char *)buffer->address + R128_HOSTDATA_BLIT_OFFSET); + dst = (u_int32_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 5ead8ca9f14..282e8871499 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; - uint32_t bufAddr; /* Offset to start of locally + u_int32_t bufAddr; /* Offset to start of locally shared texture block */ GLuint age; r128TexImage image[R128_MAX_TEXTURE_LEVELS]; /* Image data for all mipmap levels */ - uint32_t textureFormat; /* Actual hardware format */ + u_int32_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 15e25285b6a..ce98b1b915c 100644 --- a/src/mesa/drivers/dri/r128/server/r128.h +++ b/src/mesa/drivers/dri/r128/server/r128.h @@ -87,74 +87,74 @@ typedef struct { /* All values in XCLKS */ typedef struct { /* Common registers */ - 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; + u_int32_t ovr_clr; + u_int32_t ovr_wid_left_right; + u_int32_t ovr_wid_top_bottom; + u_int32_t ov0_scale_cntl; + u_int32_t mpp_tb_config; + u_int32_t mpp_gp_config; + u_int32_t subpic_cntl; + u_int32_t viph_control; + u_int32_t i2c_cntl_1; + u_int32_t gen_int_cntl; + u_int32_t cap0_trig_cntl; + u_int32_t cap1_trig_cntl; + u_int32_t bus_cntl; + u_int32_t config_cntl; /* Other registers to save for VT switches */ - uint32_t dp_datatype; - uint32_t gen_reset_cntl; - uint32_t clock_cntl_index; - uint32_t amcgpio_en_reg; - uint32_t amcgpio_mask; + u_int32_t dp_datatype; + u_int32_t gen_reset_cntl; + u_int32_t clock_cntl_index; + u_int32_t amcgpio_en_reg; + u_int32_t amcgpio_mask; /* CRTC registers */ - 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; + u_int32_t crtc_gen_cntl; + u_int32_t crtc_ext_cntl; + u_int32_t dac_cntl; + u_int32_t crtc_h_total_disp; + u_int32_t crtc_h_sync_strt_wid; + u_int32_t crtc_v_total_disp; + u_int32_t crtc_v_sync_strt_wid; + u_int32_t crtc_offset; + u_int32_t crtc_offset_cntl; + u_int32_t crtc_pitch; /* CRTC2 registers */ - uint32_t crtc2_gen_cntl; + u_int32_t crtc2_gen_cntl; /* Flat panel registers */ - 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; + u_int32_t fp_crtc_h_total_disp; + u_int32_t fp_crtc_v_total_disp; + u_int32_t fp_gen_cntl; + u_int32_t fp_h_sync_strt_wid; + u_int32_t fp_horz_stretch; + u_int32_t fp_panel_cntl; + u_int32_t fp_v_sync_strt_wid; + u_int32_t fp_vert_stretch; + u_int32_t lvds_gen_cntl; + u_int32_t tmds_crc; + u_int32_t tmds_transmitter_cntl; /* Computed values for PLL */ - uint32_t dot_clock_freq; - uint32_t pll_output_freq; + u_int32_t dot_clock_freq; + u_int32_t pll_output_freq; int feedback_div; int post_div; /* PLL registers */ - uint32_t ppll_ref_div; - uint32_t ppll_div_3; - uint32_t htotal_cntl; + u_int32_t ppll_ref_div; + u_int32_t ppll_div_3; + u_int32_t htotal_cntl; /* DDA register */ - uint32_t dda_config; - uint32_t dda_on_off; + u_int32_t dda_config; + u_int32_t dda_on_off; /* Pallet */ GLboolean palette_valid; - uint32_t palette[256]; + u_int32_t palette[256]; } R128SaveRec, *R128SavePtr; typedef struct { @@ -169,8 +169,8 @@ typedef struct { unsigned char *MMIO; /* Map of MMIO region */ unsigned char *FB; /* Map of frame buffer */ - uint32_t MemCntl; - uint32_t BusCntl; + u_int32_t MemCntl; + u_int32_t BusCntl; unsigned long FbMapSize; /* Size of frame buffer, in bytes */ int Flags; /* Saved copy of mode flags */ @@ -201,7 +201,7 @@ typedef struct { /* Computed values for Rage 128 */ int pitch; int datatype; - uint32_t dp_gui_master_cntl; + u_int32_t dp_gui_master_cntl; /* Saved values for ScreenToScreenCopy */ int xdir; @@ -306,18 +306,18 @@ typedef struct { int log2TexGran; /* Saved scissor values */ - uint32_t sc_left; - uint32_t sc_right; - uint32_t sc_top; - uint32_t sc_bottom; + u_int32_t sc_left; + u_int32_t sc_right; + u_int32_t sc_top; + u_int32_t sc_bottom; - uint32_t re_top_left; - uint32_t re_width_height; + u_int32_t re_top_left; + u_int32_t re_width_height; - uint32_t aux_sc_cntl; + u_int32_t aux_sc_cntl; int irq; - uint32_t gen_int_cntl; + u_int32_t gen_int_cntl; GLboolean DMAForXv; @@ -388,7 +388,7 @@ do { \ #define R128_VERBOSE 0 -#define RING_LOCALS uint32_t *__head; int __count; +#define RING_LOCALS u_int32_t *__head; int __count; #define R128CCE_REFRESH(pScrn, info) \ do { \ @@ -429,12 +429,12 @@ do { \ fprintf(stderr, \ "ADVANCE_RING() used: %d+%d=%d/%d\n", \ info->indirectBuffer->used - info->indirectStart, \ - __count * sizeof(uint32_t), \ + __count * sizeof(u_int32_t), \ info->indirectBuffer->used - info->indirectStart + \ - __count * sizeof(uint32_t), \ + __count * sizeof(u_int32_t), \ info->indirectBuffer->total - info->indirectStart ); \ } \ - info->indirectBuffer->used += __count * (int)sizeof(uint32_t); \ + info->indirectBuffer->used += __count * (int)sizeof(u_int32_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 61587617a63..a2b717b0ea3 100644 --- a/src/mesa/drivers/dri/r128/server/r128_dri.c +++ b/src/mesa/drivers/dri/r128/server/r128_dri.c @@ -271,7 +271,7 @@ static GLboolean R128DRIPciInit(const DRIDriverContext *ctx) { R128InfoPtr info = ctx->driverPrivate; unsigned char *R128MMIO = ctx->MMIOAddress; - uint32_t chunk; + u_int32_t chunk; int ret; int flags; -- cgit v1.2.3