[PATCH 11/19] xf86: migrate PMEvent to a ScrnInfoPtr (ABI/API)

[Dave Airlie]

This migrates the PMEvent from index to ScrnInfoPtr.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 hw/xfree86/common/xf86PM.c  |    6 +++---
 hw/xfree86/common/xf86str.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index c8fd8c8..7ee6b23 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -112,7 +112,7 @@ suspend(pmEvent event, Bool undo)
     sigio_blocked_for_suspend = xf86BlockSIGIO();
     for (i = 0; i < xf86NumScreens; i++) {
         if (xf86Screens[i]->PMEvent)
-            xf86Screens[i]->PMEvent(i, event, undo);
+            xf86Screens[i]->PMEvent(xf86Screens[i], event, undo);
         else {
             xf86Screens[i]->LeaveVT(xf86Screens[i], 0);
             xf86Screens[i]->vtSema = FALSE;
@@ -131,7 +131,7 @@ resume(pmEvent event, Bool undo)
     xf86AccessEnter();
     for (i = 0; i < xf86NumScreens; i++) {
         if (xf86Screens[i]->PMEvent)
-            xf86Screens[i]->PMEvent(i, event, undo);
+            xf86Screens[i]->PMEvent(xf86Screens[i], event, undo);
         else {
             xf86Screens[i]->vtSema = TRUE;
             xf86Screens[i]->EnterVT(xf86Screens[i], 0);
@@ -187,7 +187,7 @@ DoApmEvent(pmEvent event, Bool undo)
         was_blocked = xf86BlockSIGIO();
         for (i = 0; i < xf86NumScreens; i++) {
             if (xf86Screens[i]->PMEvent) {
-                xf86Screens[i]->PMEvent(i, event, undo);
+                xf86Screens[i]->PMEvent(xf86Screens[i], event, undo);
             }
         }
         xf86UnblockSIGIO(was_blocked);
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index f9217b6..9a4467e 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -656,7 +656,7 @@ typedef void xf86EnableDisableFBAccessProc(ScrnInfoPtr, Bool);
 typedef int xf86SetDGAModeProc(ScrnInfoPtr, int, DGADevicePtr);
 typedef int xf86ChangeGammaProc(ScrnInfoPtr, Gamma);
 typedef void xf86PointerMovedProc(int, int, int);
-typedef Bool xf86PMEventProc(int, pmEvent, Bool);
+typedef Bool xf86PMEventProc(ScrnInfoPtr, pmEvent, Bool);
 typedef void xf86DPMSSetProc(ScrnInfoPtr, int, int);
 typedef void xf86LoadPaletteProc(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
 typedef void xf86SetOverscanProc(ScrnInfoPtr, int);
-- 
1.7.6