diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-06-15 20:34:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-06-15 20:34:56 +1000 |
| commit | f46c3bebe821ee0031770d98d04bd406d1abb9ed (patch) | |
| tree | 73ae0aefe077341ce9171e5e27a403d9eb79e402 | |
| parent | 6c3f81683abab8ff6b8f2fcaf01a2a1a63af5ef6 (diff) | |
fix some more unused variables and bad parameter passing
| -rw-r--r-- | src/aticonsole.c | 3 | ||||
| -rw-r--r-- | src/radeon_accel.c | 4 | ||||
| -rw-r--r-- | src/radeon_cursor.c | 7 | ||||
| -rw-r--r-- | src/radeon_mergedfb.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/aticonsole.c b/src/aticonsole.c index 346bf441..53b1ed82 100644 --- a/src/aticonsole.c +++ b/src/aticonsole.c @@ -177,8 +177,7 @@ ATIProbeAndSetActiveDisplays xf86LoaderRefSymLists(vbeSymbols, NULL); if (xf86GetVerbosity() > 3) { - xf86ErrorFVerb(4, "\n Before TV-Out queries\n\n", - pScreenInfo->currentMode->name); + xf86ErrorFVerb(4, "\n Before TV-Out queries\n\n"); ATIPrintRegisters(pATI); } diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 9068b7d6..19f7bf1b 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -785,7 +785,9 @@ RADEONHostDataBlitCopyPass( unsigned int srcPitch ){ +#if X_BYTE_ORDER == X_BIG_ENDIAN RADEONInfoPtr info = RADEONPTR( pScrn ); +#endif /* RADEONHostDataBlitCopy can return NULL ! */ if( (dst==NULL) || (src==NULL)) return; @@ -828,7 +830,9 @@ RADEONHostDataBlitCopyPass( } #endif memcpy( dst, src, minPitch ); +#if X_BYTE_ORDER == X_BIG_ENDIAN next: +#endif src += srcPitch; dst += dstPitch; } diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index 3c748a87..d7a38917 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -134,8 +134,8 @@ RADEONCursorAllocEXA(ScreenPtr pScreen) info->cursor_offset = 0; } else { xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Using hardware cursor\n", - info->cursor_offset = info->cursorArea->offset); + "Using hardware cursor\n"); + info->cursor_offset = info->cursorArea->offset; RADEONCTRACE(("%s (0x%08x-0x%08x)\n", __func__, info->cursor_offset, @@ -357,9 +357,6 @@ static Bool RADEONUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) static Bool RADEONUseHWCursorARGB (ScreenPtr pScreen, CursorPtr pCurs) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - if (RADEONUseHWCursor(pScreen, pCurs) && pCurs->bits->height <= CURSOR_HEIGHT && pCurs->bits->width <= CURSOR_WIDTH) return TRUE; diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index 70846d90..bbedac9c 100644 --- a/src/radeon_mergedfb.c +++ b/src/radeon_mergedfb.c @@ -347,8 +347,6 @@ RADEONGenerateModeListFromLargestModes(ScrnInfoPtr pScrn, DisplayModePtr mode3 = NULL; DisplayModePtr mode4 = NULL; DisplayModePtr result = NULL; - int p = 0; - int count = 0; info->AtLeastOneNonClone = FALSE; |