xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon.h        |    2 --
 src/radeon_driver.c |   31 -------------------------------
 2 files changed, 33 deletions(-)

New commits:
commit 90669f6cb5ada9067d6fccc7f54c69b367862f42
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Sep 24 10:40:40 2009 -0400

    radeon: remove old pre-randr rotation cruft
    
    leftover from the randr 1.2 conversion.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon.h b/src/radeon.h
index fc9614e..fc21955 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -951,8 +951,6 @@ typedef struct {
     unsigned long FbFreeStart, FbFreeSize;
     unsigned char*      BIOSCopy;
 
-    Rotation rotation;
-    void (*PointerMoved)(int, int, int);
     CreateScreenResourcesProcPtr CreateScreenResources;
 
     /* if no devices are connected at server startup */
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 2de682f..a9aafd3 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3261,33 +3261,6 @@ static void RADEONBlockHandler(int i, pointer blockData,
 }
 
 static void
-RADEONPointerMoved(int index, int x, int y)
-{
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    RADEONInfoPtr  info  = RADEONPTR(pScrn);
-    int newX = x, newY = y;
-
-    switch (info->rotation) {
-    case RR_Rotate_0:
-	break;
-    case RR_Rotate_90:
-	newX = y;
-	newY = pScrn->pScreen->width - x - 1;
-	break;
-    case RR_Rotate_180:
-	newX = pScrn->pScreen->width - x - 1;
-	newY = pScrn->pScreen->height - y - 1;
-	break;
-    case RR_Rotate_270:
-	newX = pScrn->pScreen->height - y - 1;
-	newY = x;
-	break;
-    }
-
-    (*info->PointerMoved)(index, newX, newY);
-}
-
-static void
 RADEONInitBIOSRegisters(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info  = RADEONPTR(pScrn);
@@ -3790,10 +3763,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
    if (!xf86CrtcScreenInit (pScreen))
        return FALSE;
 
-    /* Wrap pointer motion to flip touch screen around */
-    info->PointerMoved = pScrn->PointerMoved;
-    pScrn->PointerMoved = RADEONPointerMoved;
-
     /* Colormap setup */
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
                    "Initializing color map\n");