Fix additions of RandR support in kmode.c

3 files changed, 21 insertions, 18 deletions

diff --git a/hw/kdrive/pcmcia/pcmcia.c b/hw/kdrive/pcmcia/pcmcia.c
index 6cc2a87bb..d7317a2d1 100644
--- a/hw/kdrive/pcmcia/pcmcia.c
+++ b/hw/kdrive/pcmcia/pcmcia.c
@@ -27,7 +27,7 @@
  *
  * Tested running under a Compaq IPAQ Pocket PC running Linux
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.4 2001/06/21 00:58:51 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */
 
 #include "pcmcia.h"
 #define extern
@@ -387,11 +387,12 @@ Bool
 pcmciaRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
 {
     KdScreenPriv(pScreen);
+    pcmciaScreenInfo	*pcmcias = (pcmciaScreenInfo *) pScreenPriv->screen->driver;
     
     *rotations = (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270|
 		  RR_Reflect_X|RR_Reflect_Y);
     
-    return KdRandRGetInfo (pScreen, pcmciaRandRSupported);
+    return KdRandRGetInfo (pScreen, pcmcias->randr, pcmciaRandRSupported);
 }
  
 int
@@ -423,16 +424,16 @@ pcmciaRandRSetConfig (ScreenPtr		pScreen,
 		      RRScreenSizePtr	pSize)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	*screen = pScreenPriv->screen;
-    FbdevPriv		*priv = pScreenPriv->card->driver;
-    pcmciaScreenInfo	*pcmcias = (pcmciaScreenInfo *) pScreenPriv->screen->driver;
-    Bool		wasEnabled = pScreenPriv->enabled;
-    int			newwidth, newheight;
-    LayerPtr		pNewLayer;
-    int			kind;
-    int			oldrandr = pcmcias->randr;
-    PixmapPtr		pPixmap;
-    KdMonitorTiming	*t;
+    KdScreenInfo	    *screen = pScreenPriv->screen;
+    FbdevPriv		    *priv = pScreenPriv->card->driver;
+    pcmciaScreenInfo	    *pcmcias = (pcmciaScreenInfo *) pScreenPriv->screen->driver;
+    Bool		    wasEnabled = pScreenPriv->enabled;
+    int			    newwidth, newheight;
+    LayerPtr		    pNewLayer;
+    int			    kind;
+    int			    oldrandr = pcmcias->randr;
+    PixmapPtr		    pPixmap;
+    const KdMonitorTiming   *t;
     
     randr = KdAddRotation (screen->randr, randr);
     
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index aeed2c736..9ddfa76ce 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.25 2002/10/08 21:28:05 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.26 2002/10/14 18:01:40 keithp Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -709,10 +709,11 @@ KdTuneMode (KdScreenInfo    *screen,
 #ifdef RANDR
 Bool
 KdRandRGetInfo (ScreenPtr pScreen, 
+		int randr,
 		Bool (*supported) (ScreenPtr pScreen, 
 				   const KdMonitorTiming *));
 
-KdMonitorTiming *
+const KdMonitorTiming *
 KdRandRGetTiming (ScreenPtr	    pScreen,
 		  Bool		    (*supported) (ScreenPtr pScreen, 
 						  const KdMonitorTiming *),
diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c
index fca38fbc0..7006ca4b3 100644
--- a/hw/kdrive/src/kmode.c
+++ b/hw/kdrive/src/kmode.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.5 2000/05/24 23:57:56 keithp Exp $
+ * $XFree86: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.7 2002/10/14 18:01:40 keithp Exp $
  *
  * Copyright 1999 SuSE, Inc.
  *
@@ -324,7 +324,8 @@ KdTuneMode (KdScreenInfo    *screen,
 
 #ifdef RANDR
 Bool
-KdRandRGetInfo (ScreenPtr pScreen, 
+KdRandRGetInfo (ScreenPtr pScreen,
+		int randr,
 		Bool (*supported) (ScreenPtr pScreen, 
 				   const KdMonitorTiming *))
 {
@@ -335,7 +336,7 @@ KdRandRGetInfo (ScreenPtr pScreen,
     
     for (i = 0, t = kdMonitorTimings; i < NUM_MONITOR_TIMINGS; i++, t++)
     {
-	if ((*supported) (screen, t))
+	if ((*supported) (pScreen, t))
 	{
 	    RRScreenSizePtr pSize;
 
@@ -358,7 +359,7 @@ KdRandRGetInfo (ScreenPtr pScreen,
     return TRUE;
 }
 
-KdMonitorTiming *
+const KdMonitorTiming *
 KdRandRGetTiming (ScreenPtr	    pScreen,
 		  Bool		    (*supported) (ScreenPtr pScreen, 
 						  const KdMonitorTiming *),