diff options
Diffstat (limited to 'src/mesa/drivers/dri/r128')
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_context.h | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_ioctl.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_ioctl.h | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_tex.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_tex.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_texmem.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_texobj.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_vb.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/server/r128.h | 138 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/server/r128_dri.c | 2 |
10 files changed, 87 insertions, 87 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_context.h b/src/mesa/drivers/dri/r128/r128_context.h index de258da3f5..e7600d775c 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; - CARD32 ClearColor; /* Color used to clear color buffer */ - CARD32 ClearDepth; /* Value used to clear depth buffer */ - CARD32 ClearStencil; /* Value used to clear stencil */ + 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 */ /* 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 e34173725c..dcd024154a 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; - CARD32 frame; + int32_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 db1c4986ee..4e08676452 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(CARD32)) +#define R128_BUFFER_MAX_DWORDS (R128_BUFFER_SIZE / sizeof(int32_t)) extern drmBufPtr r128GetBufferLocked( r128ContextPtr rmesa ); @@ -49,7 +49,7 @@ extern void r128FlushVerticesLocked( r128ContextPtr rmesa ); static __inline void *r128AllocDmaLow( r128ContextPtr rmesa, int bytes ) { - CARD32 *head; + int32_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 = (CARD32 *)((char *)rmesa->vert_buf->address + rmesa->vert_buf->used); + head = (int32_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 1fd12456e1..44a6a415b5 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: { - CARD32 t = rmesa->setup.tex_cntl_c; + int32_t t = rmesa->setup.tex_cntl_c; GLint bias; - CARD32 b; + 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 = (CARD32)bias & 0xff; + b = (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 00012c5104..58daa3336d 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__ CARD32 r128PackColor( GLuint cpp, +static __inline__ 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 595d8d7513..5c030e892f 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; - CARD32 pitch, offset; + int32_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++ ) { - CARD32 *dst; + int32_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 = (CARD32 *)((char *)buffer->address + R128_HOSTDATA_BLIT_OFFSET); + dst = (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 057602d0a0..68e34b2682 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; - CARD32 bufAddr; /* Offset to start of locally + 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 */ - CARD32 textureFormat; /* Actual hardware format */ + int32_t textureFormat; /* Actual hardware format */ drm_r128_texture_regs_t setup; /* Setup regs for texture */ }; diff --git a/src/mesa/drivers/dri/r128/r128_vb.c b/src/mesa/drivers/dri/r128/r128_vb.c index e09bedacea..541d7ecd02 100644 --- a/src/mesa/drivers/dri/r128/r128_vb.c +++ b/src/mesa/drivers/dri/r128/r128_vb.c @@ -462,7 +462,7 @@ void r128_emit_indexed_verts( GLcontext *ctx, GLuint start, GLuint count ) r128ContextPtr rmesa = R128_CONTEXT(ctx); GLuint vertex_size = rmesa->vertex_size * 4; GLuint bufsz = (count-start) * vertex_size; - CARD32 *dest; + int32_t *dest; rmesa->vertex_low = (rmesa->vertex_low + 63) & ~63; /* alignment */ rmesa->vertex_last_prim = rmesa->vertex_low; diff --git a/src/mesa/drivers/dri/r128/server/r128.h b/src/mesa/drivers/dri/r128/server/r128.h index fba01d6d60..0e3588c3f3 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 */ - CARD32 ovr_clr; - CARD32 ovr_wid_left_right; - CARD32 ovr_wid_top_bottom; - CARD32 ov0_scale_cntl; - CARD32 mpp_tb_config; - CARD32 mpp_gp_config; - CARD32 subpic_cntl; - CARD32 viph_control; - CARD32 i2c_cntl_1; - CARD32 gen_int_cntl; - CARD32 cap0_trig_cntl; - CARD32 cap1_trig_cntl; - CARD32 bus_cntl; - CARD32 config_cntl; + 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; /* Other registers to save for VT switches */ - CARD32 dp_datatype; - CARD32 gen_reset_cntl; - CARD32 clock_cntl_index; - CARD32 amcgpio_en_reg; - CARD32 amcgpio_mask; + int32_t dp_datatype; + int32_t gen_reset_cntl; + int32_t clock_cntl_index; + int32_t amcgpio_en_reg; + int32_t amcgpio_mask; /* CRTC registers */ - CARD32 crtc_gen_cntl; - CARD32 crtc_ext_cntl; - CARD32 dac_cntl; - CARD32 crtc_h_total_disp; - CARD32 crtc_h_sync_strt_wid; - CARD32 crtc_v_total_disp; - CARD32 crtc_v_sync_strt_wid; - CARD32 crtc_offset; - CARD32 crtc_offset_cntl; - CARD32 crtc_pitch; + 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; /* CRTC2 registers */ - CARD32 crtc2_gen_cntl; + int32_t crtc2_gen_cntl; /* Flat panel registers */ - CARD32 fp_crtc_h_total_disp; - CARD32 fp_crtc_v_total_disp; - CARD32 fp_gen_cntl; - CARD32 fp_h_sync_strt_wid; - CARD32 fp_horz_stretch; - CARD32 fp_panel_cntl; - CARD32 fp_v_sync_strt_wid; - CARD32 fp_vert_stretch; - CARD32 lvds_gen_cntl; - CARD32 tmds_crc; - CARD32 tmds_transmitter_cntl; + 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; /* Computed values for PLL */ - CARD32 dot_clock_freq; - CARD32 pll_output_freq; + int32_t dot_clock_freq; + int32_t pll_output_freq; int feedback_div; int post_div; /* PLL registers */ - CARD32 ppll_ref_div; - CARD32 ppll_div_3; - CARD32 htotal_cntl; + int32_t ppll_ref_div; + int32_t ppll_div_3; + int32_t htotal_cntl; /* DDA register */ - CARD32 dda_config; - CARD32 dda_on_off; + int32_t dda_config; + int32_t dda_on_off; /* Pallet */ GLboolean palette_valid; - CARD32 palette[256]; + int32_t palette[256]; } R128SaveRec, *R128SavePtr; #ifndef _SOLO typedef struct { CARD16 reference_freq; CARD16 reference_div; - CARD32 min_pll_freq; - CARD32 max_pll_freq; + int32_t min_pll_freq; + int32_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 */ - CARD32 MemCntl; - CARD32 BusCntl; + int32_t MemCntl; + int32_t BusCntl; unsigned long FbMapSize; /* Size of frame buffer, in bytes */ int Flags; /* Saved copy of mode flags */ #ifndef _SOLO - CARD8 BIOSDisplay; /* Device the BIOS is set to display to */ + int8_t BIOSDisplay; /* Device the BIOS is set to display to */ GLboolean HasPanelRegs; /* Current chip can connect to a FP */ - CARD8 *VBIOS; /* Video BIOS for mode validation on FPs */ + int8_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; - CARD32 dp_gui_master_cntl; + int32_t dp_gui_master_cntl; /* Saved values for ScreenToScreenCopy */ int xdir; @@ -394,18 +394,18 @@ typedef struct { int log2TexGran; /* Saved scissor values */ - CARD32 sc_left; - CARD32 sc_right; - CARD32 sc_top; - CARD32 sc_bottom; + int32_t sc_left; + int32_t sc_right; + int32_t sc_top; + int32_t sc_bottom; - CARD32 re_top_left; - CARD32 re_width_height; + int32_t re_top_left; + int32_t re_width_height; - CARD32 aux_sc_cntl; + int32_t aux_sc_cntl; int irq; - CARD32 gen_int_cntl; + int32_t gen_int_cntl; GLboolean DMAForXv; #endif @@ -420,7 +420,7 @@ typedef struct { GLboolean isDFP; GLboolean isPro2; I2CBusPtr pI2CBus; - CARD32 DDCReg; + int32_t DDCReg; #endif } R128InfoRec, *R128InfoPtr; @@ -489,7 +489,7 @@ do { \ #define R128_VERBOSE 0 -#define RING_LOCALS CARD32 *__head; int __count; +#define RING_LOCALS int32_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(CARD32), \ + __count * sizeof(int32_t), \ info->indirectBuffer->used - info->indirectStart + \ - __count * sizeof(CARD32), \ + __count * sizeof(int32_t), \ info->indirectBuffer->total - info->indirectStart ); \ } \ - info->indirectBuffer->used += __count * (int)sizeof(CARD32); \ + info->indirectBuffer->used += __count * (int)sizeof(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 b62f375966..f065bbd8ec 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; - CARD32 chunk; + int32_t chunk; int ret; int flags; |