diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:56 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:56 +0000 |
| commit | 6cbb5bbff43d65a762d432659793333868837f0b (patch) | |
| tree | 3a81f83b12ee7774bea68e1c0d9cfd444deef207 /src/r128.h | |
| parent | 3586c3c7955365a2af0b8a286ea0d0488ddfd137 (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src/r128.h')
| -rw-r--r-- | src/r128.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h,v 1.26 2003/11/06 18:37:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h,v 1.24 2002/12/16 16:19:10 dawes Exp $ */ /* * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, * Precision Insight, Inc., Cedar Park, Texas, and @@ -172,8 +172,8 @@ typedef struct { typedef struct { CARD16 reference_freq; CARD16 reference_div; - unsigned min_pll_freq; - unsigned max_pll_freq; + CARD32 min_pll_freq; + CARD32 max_pll_freq; CARD16 xclk; } R128PLLRec, *R128PLLPtr; @@ -491,7 +491,7 @@ do { \ !info->CCEInUse , __FUNCTION__ ); \ } \ if ( !info->CCEInUse ) { \ - R128CCEWaitForIdle(pScrn); \ + R128CCEWaitForIdle(pScrn); \ BEGIN_RING( 6 ); \ OUT_RING_REG( R128_RE_TOP_LEFT, info->re_top_left ); \ OUT_RING_REG( R128_RE_WIDTH_HEIGHT, info->re_width_height ); \ @@ -523,9 +523,9 @@ do { \ xf86DrvMsg( pScrn->scrnIndex, X_INFO, \ "ADVANCE_RING() used: %d+%d=%d/%d\n", \ info->indirectBuffer->used - info->indirectStart, \ - __count * (int)sizeof(CARD32), \ + __count * sizeof(CARD32), \ info->indirectBuffer->used - info->indirectStart + \ - __count * (int)sizeof(CARD32), \ + __count * sizeof(CARD32), \ info->indirectBuffer->total - info->indirectStart ); \ } \ info->indirectBuffer->used += __count * (int)sizeof(CARD32); \ |