1 files changed, 53 insertions, 15 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86str.h b/xc/programs/Xserver/hw/xfree86/common/xf86str.h
index 3cee2acfe..f1c6dbb0b 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86str.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86str.h
@@ -1,7 +1,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.58 1999/12/13 01:39:47 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.66 2000/02/12 23:59:10 eich Exp $ */
 
 /*
- * Copyright (c) 1997 by The XFree86 Project, Inc.
+ * Copyright (c) 1997-2000 by The XFree86 Project, Inc.
  */
 
 /*
@@ -15,7 +15,9 @@
 #include "misc.h"
 #include "input.h"
 #include "scrnintstr.h"
+#include "pixmapstr.h"
 #include "xf86Module.h"
+#include "xf86Opt.h"
 
 /*
  * memType is of the size of the addressable memory (machine size)
@@ -212,6 +214,7 @@ typedef struct _DriverRec {
     char *		driverName;
     void		(*Identify)(int flags);
     Bool		(*Probe)(struct _DriverRec *drv, int flags);
+    OptionInfoPtr	(*AvailableOptions)(int chipid, int bustype);
     pointer		module;
     int			refCount;
 } DriverRec, *DriverPtr;
@@ -312,6 +315,7 @@ typedef struct {
     pointer		thisCard;
     Bool                validSize;
     Bool                validate;
+    CARD32              listed_class;
 } pciVideoRec, *pciVideoPtr;
 
 typedef struct {
@@ -433,12 +437,31 @@ typedef enum {
     Pix24Use32
 } Pix24Flags;
 
-/* flags for SaveRestoreImage */
+/* Power management events: so far we only support APM */
+
+typedef enum {
+    XF86_APM_UNKNOWN = -1,
+    XF86_APM_SYS_STANDBY,
+    XF86_APM_SYS_SUSPEND,
+    XF86_APM_CRITICAL_SUSPEND,
+    XF86_APM_USER_STANDBY,
+    XF86_APM_USER_SUSPEND,
+    XF86_APM_STANDBY_RESUME,
+    XF86_APM_NORMAL_RESUME,
+    XF86_APM_CRITICAL_RESUME,
+    XF86_APM_LOW_BATTERY,
+    XF86_APM_POWER_STATUS_CHANGE,
+    XF86_APM_UPDATE_TIME,
+    XF86_APM_CAPABILITY_CHANGED,
+    XF86_APM_STANDBY_FAILED,
+    XF86_APM_SUSPEND_FAILED
+} pmEvent;
+
 typedef enum {
-    SaveImage,
-    RestoreImage,
-    FreeImage
-} SaveRestoreFlags;
+    PM_WAIT,
+    PM_CONTINUE,
+    PM_NONE
+} pmWait;
 
 /*
  * The IO access enabler struct. This contains the address for 
@@ -500,6 +523,8 @@ typedef struct _CurrAccRec {
 #define ResBios		0x4000
 #define ResMiscMask	0xF000
 
+#define ResBus          0x10000
+
 #define ResEnd		ResNone
 
 #define ResExcMemBlock		(ResMem | ResExclusive | ResBlock)
@@ -592,6 +617,17 @@ typedef enum {
     OPERATING
 } xf86State;
 
+typedef enum {
+    NOTIFY_SETUP_TRANSITION,
+    NOTIFY_SETUP,
+    NOTIFY_OPERATING,
+    NOTIFY_OPERATING_TRANSITION,
+    NOTIFY_ENABLE,
+    NOTIFY_ENTER,
+    NOTIFY_LEAVE
+} xf86NotifyState;
+
+typedef void (*xf86StateChangeNotificationCallbackFunc)(xf86NotifyState state,pointer);
 
 /* DGA */
 
@@ -632,9 +668,11 @@ typedef struct {
 /*
  * Flags for driver Probe() functions.
  */
-#define PROBE_DEFAULT	0x00
-#define PROBE_DETECT	0x01
-#define PROBE_TRYHARD	0x02
+#define PROBE_DEFAULT	  0x00
+#define PROBE_DETECTPCI	  0x01
+#define PROBE_DETECTISA	  0x02
+#define PROBE_DETECTFBDEV 0x04
+#define PROBE_DETECT	(PROBE_DETECTPCI | PROBE_DETECTISA | PROBE_DETECTFBDEV)
 
 /*
  * ScrnInfoRec
@@ -747,8 +785,8 @@ typedef struct _ScrnInfoRec {
 
     /* Allow screens to be enabled/disabled individually */
     Bool		vtSema;
-    PixmapPtr		ppix;			/* Previous screen root pixmap
-						 * while switched out */
+    DevUnion		pixmapPrivate;		/* saved devPrivate from pixmap */
+    
     /* hw cursor moves at SIGIO time */
     Bool		silkenMouse;
 
@@ -781,12 +819,13 @@ typedef struct _ScrnInfoRec {
     void		(*FreeScreen)(int scrnIndex, int flags);
     int			(*ValidMode)(int scrnIndex, DisplayModePtr mode,
 				     Bool verbose, int flags);
-    Bool		(*SaveRestoreImage)(int scrnIndex,
-					    SaveRestoreFlags what);
+    void		(*EnableDisableFBAccess)(int scrnIndex, Bool enable);
     int			(*SetDGAMode)(int scrnIndex, int num, 
 					DGADevicePtr devRet);
     int			(*ChangeGamma)(int scrnIndex, Gamma gamma);
     void		(*PointerMoved)(int scrnIndex, int x, int y);
+    Bool                (*PMEvent)(int scrnIndex, pmEvent event);
+    
     /*
      * This can be used when the minor ABI version is incremented.
      * The NUM_* parameter must be reduced appropriately to keep the
@@ -836,7 +875,6 @@ typedef struct {
     const char *	name;		/* token name */
 } SymTabRec, *SymTabPtr;
 
-
 /* flags for xf86LookupMode */
 typedef enum {
     LOOKUP_DEFAULT		= 0,	/* Use default mode lookup method */