chips: use new scrn/screen conversion APIs.

Generated by util/modular/x-driver-screen-scrn-conv.sh

Signed-off-by: Dave Airlie <airlied@redhat.com>

6 files changed, 38 insertions, 38 deletions

diff --git a/src/ct_accel.c b/src/ct_accel.c
index 4b5776a..c369362 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -174,7 +174,7 @@ Bool
 CTNAME(AccelInit)(ScreenPtr pScreen)
 {
     XAAInfoRecPtr infoPtr;
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     CHIPSPtr cPtr = CHIPSPTR(pScrn);
     CHIPSACLPtr cAcl = CHIPSACLPTR(pScrn);
 
diff --git a/src/ct_bank.c b/src/ct_bank.c
index d79e2f4..3bd9c5d 100644
--- a/src/ct_bank.c
+++ b/src/ct_bank.c
@@ -63,13 +63,13 @@
 #define arm32_drain_writebuf()
 #endif
 
-#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank
+#define ChipsBank(pScreen) CHIPSPTR(xf86ScreenToScrn(pScreen))->Bank
 
 #ifdef DIRECT_REGISTER_ACCESS
 int
 CHIPSSetRead(ScreenPtr pScreen, int bank)
 { 
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x10));
 
@@ -88,7 +88,7 @@ CHIPSSetRead(ScreenPtr pScreen, int bank)
 int
 CHIPSSetWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x11));
 
@@ -107,7 +107,7 @@ CHIPSSetWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSSetReadWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x10));
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x11));
@@ -126,7 +126,7 @@ CHIPSSetReadWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSSetReadPlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 5) & 0xFF) << 8) | 0x10));
 
@@ -144,7 +144,7 @@ CHIPSSetReadPlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSSetWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 5) & 0xFF) << 8) | 0x11));
 
@@ -162,7 +162,7 @@ CHIPSSetWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSSetReadWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 5) & 0xFF) << 8) | 0x10));
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 5) & 0xFF) << 8) | 0x11));
@@ -181,7 +181,7 @@ CHIPSSetReadWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetRead(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x10));
@@ -204,7 +204,7 @@ CHIPSWINSetRead(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x11));
@@ -226,7 +226,7 @@ CHIPSWINSetWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetReadWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x10));
@@ -250,7 +250,7 @@ CHIPSWINSetReadWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetReadPlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 5) & 0xFF) << 8) | 0x10));
@@ -272,7 +272,7 @@ CHIPSWINSetReadPlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 5) & 0xFF) << 8) | 0x11));
@@ -294,7 +294,7 @@ CHIPSWINSetWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetReadWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 5) & 0xFF) << 8) | 0x10));
@@ -318,7 +318,7 @@ CHIPSWINSetReadWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSHiQVSetReadWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, (((bank & 0x7F) << 8) | 0x0E));
 
@@ -336,7 +336,7 @@ CHIPSHiQVSetReadWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSHiQVSetReadWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     outw(cPtr->PIOBase + 0x3D6, ((((bank << 2) & 0x7F) << 8) | 0x0E));
 
@@ -356,7 +356,7 @@ CHIPSHiQVSetReadWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSSetRead(ScreenPtr pScreen, int bank)
 { 
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
   
     cPtr->writeXR(cPtr, 0x10, ((bank << 3) & 0xFF));
 
@@ -375,7 +375,7 @@ CHIPSSetRead(ScreenPtr pScreen, int bank)
 int
 CHIPSSetWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
   
     cPtr->writeXR(cPtr, 0x11, ((bank << 3) & 0xFF));
 
@@ -394,7 +394,7 @@ CHIPSSetWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSSetReadWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
   
     cPtr->writeXR(cPtr, 0x10, ((bank << 3) & 0xFF));
     cPtr->writeXR(cPtr, 0x11, ((bank << 3) & 0xFF));
@@ -413,7 +413,7 @@ CHIPSSetReadWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSSetReadPlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
   
     cPtr->writeXR(cPtr, 0x10, ((bank << 5) & 0xFF));
 
@@ -431,7 +431,7 @@ CHIPSSetReadPlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSSetWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
   
     cPtr->writeXR(cPtr, 0x11, ((bank << 5) & 0xFF));
 
@@ -449,7 +449,7 @@ CHIPSSetWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSSetReadWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
   
     cPtr->writeXR(cPtr, 0x10, ((bank << 5) & 0xFF));
     cPtr->writeXR(cPtr, 0x11, ((bank << 5) & 0xFF));
@@ -468,7 +468,7 @@ CHIPSSetReadWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetRead(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
   
     cPtr->writeXR(cPtr, 0x10, ((bank << 3) & 0xFF));
@@ -490,7 +490,7 @@ CHIPSWINSetRead(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     cPtr->writeXR(cPtr, 0x11, ((bank << 3) & 0xFF));
@@ -511,7 +511,7 @@ CHIPSWINSetWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetReadWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     cPtr->writeXR(cPtr, 0x10, ((bank << 3) & 0xFF));
@@ -533,7 +533,7 @@ CHIPSWINSetReadWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetReadPlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     cPtr->writeXR(cPtr, 0x10, ((bank << 5) & 0xFF));
@@ -554,7 +554,7 @@ CHIPSWINSetReadPlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     cPtr->writeXR(cPtr, 0x11, ((bank << 5) & 0xFF));
@@ -575,7 +575,7 @@ CHIPSWINSetWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSWINSetReadWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
     register unsigned char tmp;
 
     cPtr->writeXR(cPtr, 0x10, ((bank << 5) & 0xFF));
@@ -597,7 +597,7 @@ CHIPSWINSetReadWritePlanar(ScreenPtr pScreen, int bank)
 int
 CHIPSHiQVSetReadWrite(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     cPtr->writeXR(cPtr, 0x0E, bank & 0x7F);
 
@@ -615,7 +615,7 @@ CHIPSHiQVSetReadWrite(ScreenPtr pScreen, int bank)
 int
 CHIPSHiQVSetReadWritePlanar(ScreenPtr pScreen, int bank)
 {
-    CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScreen->myNum]);
+    CHIPSPtr cPtr = CHIPSPTR(xf86ScreenToScrn(pScreen));
 
     cPtr->writeXR(cPtr, 0x0E, (bank << 2) & 0x7F);
 
diff --git a/src/ct_cursor.c b/src/ct_cursor.c
index cc352d3..6f5ebf0 100644
--- a/src/ct_cursor.c
+++ b/src/ct_cursor.c
@@ -434,7 +434,7 @@ CHIPSLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
 static Bool
 CHIPSUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     CHIPSPtr cPtr = CHIPSPTR(pScrn);
     
     return (((cPtr->Flags & ChipsHWCursor) != 0)
@@ -444,7 +444,7 @@ CHIPSUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 Bool
 CHIPSCursorInit(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     CHIPSPtr cPtr = CHIPSPTR(pScrn);
     xf86CursorInfoPtr infoPtr;
 
diff --git a/src/ct_dga.c b/src/ct_dga.c
index 32f3aa3..47a0871 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -80,7 +80,7 @@ DGAFunctionRec CHIPS_HiQVDGAFuncs = {
 Bool
 CHIPSDGAInit(ScreenPtr pScreen)
 {   
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
    CHIPSPtr cPtr = CHIPSPTR(pScrn);
    DGAModePtr modes = NULL, newmodes = NULL, currentMode;
    DisplayModePtr pMode, firstMode;
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 08ccd72..af80221 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -3850,7 +3850,7 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
 static Bool
 CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     vgaHWPtr hwp;
     CHIPSPtr cPtr;
     CHIPSACLPtr cAcl;
@@ -4659,7 +4659,7 @@ CHIPSSaveScreen(ScreenPtr pScreen, int mode)
     unblank = xf86IsUnblank(mode);
 
     if (pScreen != NULL)
-	pScrn = xf86Screens[pScreen->myNum];
+	pScrn = xf86ScreenToScrn(pScreen);
 
     if (unblank)
 	SetTimeSinceLastInputEvent();
diff --git a/src/ct_video.c b/src/ct_video.c
index c9e5bb4..61a90ef 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -50,7 +50,7 @@ static Atom xvColorKey;
 void 
 CHIPSInitVideo(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
     XF86VideoAdaptorPtr newAdaptor = NULL;
     CHIPSPtr cPtr = CHIPSPTR(pScrn);
@@ -229,7 +229,7 @@ CHIPSResetVideo(ScrnInfoPtr pScrn)
 static XF86VideoAdaptorPtr 
 CHIPSSetupImageVideo(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     CHIPSPtr cPtr = CHIPSPTR(pScrn);
     XF86VideoAdaptorPtr adapt;
     CHIPSPortPrivPtr pPriv;
@@ -463,7 +463,7 @@ CHIPSAllocateMemory(
 	xf86FreeOffscreenLinear(linear);
    }
 
-   pScreen = screenInfo.screens[pScrn->scrnIndex];
+   pScreen = xf86ScrnToScreen(pScrn);
 
    new_linear = xf86AllocateOffscreenLinear(pScreen, size, 8, 
    						NULL, NULL, NULL);