diff options
| author | Eric Anholt <eric@anholt.net> | 2008-03-11 12:07:52 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-03-11 12:07:52 -0700 |
| commit | 9a62d3b598cca3c28fa8b6313bba82983cc29ecf (patch) | |
| tree | b0775977594e601cba20d8d9bf53913bfac5b662 /src/i830_cursor.c | |
| parent | 15f17aa682129c57d3864a355834edff06e91540 (diff) | |
Remove i830+ driver's use of CARD*/INT* types for great justice.
Several uses are actually left, which are determined by the X Server
interfaces we're implementing.
Diffstat (limited to 'src/i830_cursor.c')
| -rw-r--r-- | src/i830_cursor.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/i830_cursor.c b/src/i830_cursor.c index 52eb2661..43a65cb9 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -90,7 +90,7 @@ I830InitHWCursor(ScrnInfoPtr pScrn) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); I830Ptr pI830 = I830PTR(pScrn); - CARD32 temp; + uint32_t temp; int i; DPRINTF(PFX, "I830InitHWCursor\n"); @@ -141,7 +141,7 @@ i830_crtc_load_cursor_image (xf86CrtcPtr crtc, unsigned char *src) { I830Ptr pI830 = I830PTR(crtc->scrn); I830CrtcPrivatePtr intel_crtc = crtc->driver_private; - CARD8 *pcurs; + uint8_t *pcurs; pcurs = pI830->FbBase + intel_crtc->cursor_offset; @@ -155,9 +155,9 @@ i830_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image) { I830Ptr pI830 = I830PTR(crtc->scrn); I830CrtcPrivatePtr intel_crtc = crtc->driver_private; - CARD32 *pcurs; + uint32_t *pcurs; - pcurs = (CARD32 *) (pI830->FbBase + intel_crtc->cursor_argb_offset); + pcurs = (uint32_t *) (pI830->FbBase + intel_crtc->cursor_argb_offset); intel_crtc->cursor_is_argb = TRUE; memcpy (pcurs, image, I810_CURSOR_Y * I810_CURSOR_X * 4); @@ -170,7 +170,7 @@ i830_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y) ScrnInfoPtr scrn = crtc->scrn; I830Ptr pI830 = I830PTR(scrn); I830CrtcPrivatePtr intel_crtc = I830CrtcPrivate(crtc); - CARD32 temp; + uint32_t temp; temp = 0; if (x < 0) { @@ -204,7 +204,7 @@ i830_crtc_show_cursor (xf86CrtcPtr crtc) I830Ptr pI830 = I830PTR(scrn); I830CrtcPrivatePtr intel_crtc = I830CrtcPrivate(crtc); int pipe = intel_crtc->pipe; - CARD32 temp; + uint32_t temp; int cursor_control = (pipe == 0 ? CURSOR_A_CONTROL : CURSOR_B_CONTROL); @@ -242,7 +242,7 @@ i830_crtc_hide_cursor (xf86CrtcPtr crtc) I830Ptr pI830 = I830PTR(scrn); I830CrtcPrivatePtr intel_crtc = I830CrtcPrivate(crtc); int pipe = intel_crtc->pipe; - CARD32 temp; + uint32_t temp; int cursor_control = (pipe == 0 ? CURSOR_A_CONTROL : CURSOR_B_CONTROL); |