new X apiprime2

2 files changed, 16 insertions, 16 deletions

diff --git a/src/intel_driver.c b/src/intel_driver.c
index ec6b0458..800e5580 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -132,9 +132,9 @@ static OptionInfoRec I830Options[] = {
 };
 /* *INDENT-ON* */
 
-static void i830AdjustFrame(ScrnInfoPtr scrn, int x, int y, int flags);
+static void i830AdjustFrame(ScrnInfoPtr scrn, int x, int y);
 static Bool I830CloseScreen(ScreenPtr screen);
-static Bool I830EnterVT(ScrnInfoPtr scrn, int flags);
+static Bool I830EnterVT(ScrnInfoPtr scrn);
 
 /* temporary */
 extern void xf86SetCursor(ScreenPtr screen, CursorPtr pCurs, int x, int y);
@@ -1219,14 +1219,14 @@ I830ScreenInit(ScreenPtr screen, int argc, char **argv)
 	 * later memory should be bound when allocating, e.g rotate_mem */
 	scrn->vtSema = TRUE;
 
-	return I830EnterVT(scrn, 0);
+	return I830EnterVT(scrn);
 }
 
-static void i830AdjustFrame(ScrnInfoPtr scrn, int x, int y, int flags)
+static void i830AdjustFrame(ScrnInfoPtr scrn, int x, int y)
 {
 }
 
-static void I830FreeScreen(ScrnInfoPtr scrn, int flags)
+static void I830FreeScreen(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
@@ -1240,7 +1240,7 @@ static void I830FreeScreen(ScrnInfoPtr scrn, int flags)
 	}
 }
 
-static void I830LeaveVT(ScrnInfoPtr scrn, int flags)
+static void I830LeaveVT(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	int ret;
@@ -1258,7 +1258,7 @@ static void I830LeaveVT(ScrnInfoPtr scrn, int flags)
 /*
  * This gets called when gaining control of the VT, and from ScreenInit().
  */
-static Bool I830EnterVT(ScrnInfoPtr scrn, int flags)
+static Bool I830EnterVT(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	int ret;
@@ -1276,7 +1276,7 @@ static Bool I830EnterVT(ScrnInfoPtr scrn, int flags)
 	return TRUE;
 }
 
-static Bool I830SwitchMode(ScrnInfoPtr scrn, DisplayModePtr mode, int flags)
+static Bool I830SwitchMode(ScrnInfoPtr scrn, DisplayModePtr mode)
 {
 	return xf86SetSingleMode(scrn, mode, RR_Rotate_0);
 }
@@ -1291,7 +1291,7 @@ static Bool I830CloseScreen(ScreenPtr screen)
 #endif
 
 	if (scrn->vtSema == TRUE) {
-		I830LeaveVT(scrn, 0);
+		I830LeaveVT(scrn);
 	}
 
 	DeleteCallback(&FlushCallback, intel_flush_callback, scrn);
@@ -1399,12 +1399,12 @@ static Bool I830PMEvent(ScrnInfoPtr scrn, pmEvent event, Bool undo)
 	case XF86_APM_SYS_STANDBY:
 	case XF86_APM_USER_STANDBY:
 		if (!undo && !intel->suspended) {
-			scrn->LeaveVT(scrn, 0);
+			scrn->LeaveVT(scrn);
 			intel->suspended = TRUE;
 			sleep(SUSPEND_SLEEP);
 		} else if (undo && intel->suspended) {
 			sleep(RESUME_SLEEP);
-			scrn->EnterVT(scrn, 0);
+			scrn->EnterVT(scrn);
 			intel->suspended = FALSE;
 		}
 		break;
@@ -1413,7 +1413,7 @@ static Bool I830PMEvent(ScrnInfoPtr scrn, pmEvent event, Bool undo)
 	case XF86_APM_CRITICAL_RESUME:
 		if (intel->suspended) {
 			sleep(RESUME_SLEEP);
-			scrn->EnterVT(scrn, 0);
+			scrn->EnterVT(scrn);
 			intel->suspended = FALSE;
 			/*
 			 * Turn the screen saver off when resuming.  This seems to be
diff --git a/src/legacy/i810/i810_dga.c b/src/legacy/i810/i810_dga.c
index 44181c65..bb2a3e83 100644
--- a/src/legacy/i810/i810_dga.c
+++ b/src/legacy/i810/i810_dga.c
@@ -148,8 +148,8 @@ I810_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode)
    if (!pMode) {			/* restore the original mode */
       if (pI810->DGAactive) {
 	 pScrn->currentMode = I810SavedDGAModes[index];
-	 pScrn->SwitchMode(index, pScrn->currentMode, 0);
-	 pScrn->AdjustFrame(index, 0, 0, 0);
+	 pScrn->SwitchMode(pScrn, pScrn->currentMode);
+	 pScrn->AdjustFrame(pScrn, 0, 0);
 	 pI810->DGAactive = FALSE;
       }
    } else {
@@ -158,7 +158,7 @@ I810_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode)
 	 pI810->DGAactive = TRUE;
       }
 
-      pScrn->SwitchMode(index, pMode->mode, 0);
+      pScrn->SwitchMode(pScrn, pMode->mode);
    }
 
    return TRUE;
@@ -178,7 +178,7 @@ I810_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
    I810Ptr pI810 = I810PTR(pScrn);
    vgaHWPtr hwp = VGAHWPTR(pScrn);
 
-   pScrn->AdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+   pScrn->AdjustFrame(pScrn, x, y);
 
    /* wait for retrace */
    while ((hwp->readST01(hwp) & 0x08)) ;