(file) Return to xf86str.h CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver / hw / xfree86 / common

Diff for /xc/programs/Xserver/hw/xfree86/common/xf86str.h between version 1.1.2.9 and 1.1.2.10

version 1.1.2.9, 1997/07/18 05:31:29 version 1.1.2.10, 1997/07/18 06:25:36
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.1.2.8 1997/07/17 03:23:05 dawes Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.1.2.9 1997/07/18 05:31:29 dawes Exp $ */
  
 /* /*
  * Copyright (c) 1997 by The XFree86 Project, Inc.  * Copyright (c) 1997 by The XFree86 Project, Inc.
Line 16 
Line 16 
 #include "input.h" #include "input.h"
 #include "scrnintstr.h" #include "scrnintstr.h"
 #include "xf86Option.h" #include "xf86Option.h"
   #include "xf86Module.h"
  
  
 /* Video mode flags */ /* Video mode flags */
Line 217 
Line 218 
     int                 zoomLocked;             /* Disallow mode changes */     int                 zoomLocked;             /* Disallow mode changes */
     DisplayModePtr      modes;                  /* list of modes */     DisplayModePtr      modes;                  /* list of modes */
     DisplayModePtr      currentMode;            /* current mode     DisplayModePtr      currentMode;            /* current mode
                                                 /* This was previously                                                   * This was previously
                                                  * overloaded with the modes                                                  * overloaded with the modes
                                                  * field, which is a pointer                                                  * field, which is a pointer
                                                  * into a circular list */                                                  * into a circular list */
Line 230 
Line 231 
     pointer             driverPrivate;          /* Driver private area */     pointer             driverPrivate;          /* Driver private area */
     int                 numPrivates;            /* Number of privates */     int                 numPrivates;            /* Number of privates */
     DevUnion *          privates;               /* Other privates can hook in     DevUnion *          privates;               /* Other privates can hook in
                                                 /* here */                                                   * here */
  
     char **             requiredModules;        /* List of modules needed */     char **             requiredModules;        /* List of modules needed */
     int                 numRequiredModules;     int                 numRequiredModules;
Line 391 
Line 392 
  
 #define INTERLACE_REFRESH_WEIGHT        1.5 #define INTERLACE_REFRESH_WEIGHT        1.5
  
 /* These are the magic numbers that ModuleInit functions can return */  
 typedef enum {  
     MAGIC_DONE                  = 0,    /* no more init stuff */  
     MAGIC_LOAD                  = 1,    /* load that module */  
     MAGIC_ADD_VIDEO_CHIP_REC    = 2,    /* add this as vgaVideoChipPtr*/  
     MAGIC_CCD_DO_BITBLT         = 3,    /* cur.col.depth specific blit*/  
     MAGIC_CCD_SCREEN_PRIV_IDX   = 4,    /* cur.col.depth specific idx*/  
     MAGIC_CCD_XAA_SCREEN_INIT   = 5,    /* cur.col.depth specific init*/  
                   /* don't use these, use MAGIC_LOAD_EXTENSION instead */  
     MAGIC_PEX_INIT              = 6,    /* PEX init function */  
     MAGIC_XIE_INIT              = 7,    /* XIE init function */  
   
     MAGIC_LOAD_EXTENSION        = 8,  
     MAGIC_VERSION               = 9,    /* retrieve version info */  
                                         /* must be returned as */  
                                         /* first item from ModuleInit */  
     MAGIC_DONT_CHECK_UNRESOLVED = 10,   /* delay checking */  
     MAGIC_GLX_VISUALS_INIT      = 11,   /* GLX visuals init function */  
     MAGIC_ADD_XINPUT_DEVICE     = 12    /* register xinput device */  
 } MagicCallbackCodes;  
   
 #define LD_RESOLV_IFDONE                0       /* only check if no more #define LD_RESOLV_IFDONE                0       /* only check if no more
                                                    delays pending */                                                    delays pending */
 #define LD_RESOLV_NOW                   1       /* finish one delay step */ #define LD_RESOLV_NOW                   1       /* finish one delay step */
 #define LD_RESOLV_FORCE                 2       /* force checking... */ #define LD_RESOLV_FORCE                 2       /* force checking... */
   
 #define MODINFOSTRING1  0xef23fdc5  
 #define MODINFOSTRING2  0x10dc023a  
   
 #ifndef MODULEVENDORSTRING  
 #define MODULEVENDORSTRING      "The XFree86 Project"  
 #endif  
   
 /* this structure is expected to be returned by initfunc by MAGIC_VERSION */  
 typedef struct {  
     char *      modname;        /* name of module, e.g. "foo_drv.o" */  
     char *      vendor;         /* vendor specific string */  
     CARD32      _modinfo1_;     /* constanta MODINFOSTRING1/2 to find */  
     CARD32      _modinfo2_;     /* infoarea with a binary editor or sign tool */  
     CARD32      xf86version;    /* contains XF86_VERSION_CURRENT */  
     CARD32      modversion;     /* contains a module specific version id */  
     CARD32      checksum[4];    /* contains a digital signature of the */  
                                 /* version info structure */  
 } XF86ModuleVersionInfo;  
   
  
 #endif /* _XF86STR_H */ #endif /* _XF86STR_H */

Legend:
Removed from v.1.1.2.9  
changed lines
  Added in v.1.1.2.10
Powered by
ViewCVS 0.9.2