(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.2 and 1.1.2.3

version 1.1.2.2, 1997/07/15 13:59:35 version 1.1.2.3, 1997/07/16 03:57:54
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.1.2.1 1997/07/15 06:57:56 dawes Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.1.2.2 1997/07/15 13:59:35 dawes Exp $ */
  
 /* /*
  * Copyright (c) 1997 by The XFree86 Project, Inc.  * Copyright (c) 1997 by The XFree86 Project, Inc.
Line 109 
Line 109 
     Bool                doubleScanAllowed;     Bool                doubleScanAllowed;
 } ClockRange, *ClockRangePtr; } ClockRange, *ClockRangePtr;
  
 /* These are the bus types.  New types can be added here */  /* Public bus-related types */
 typedef enum {  
     BUS_NONE,  
     BUS_ISA,  
     BUS_PCI,  
 } BusType;  
  
 /* A crude attempt to characterise ISA/VLB types */ /* A crude attempt to characterise ISA/VLB types */
 typedef enum { typedef enum {
     ISA_COLOR,     ISA_COLOR,
     ISA_MONO,     ISA_MONO,
     ISA_OTHER     ISA_OTHER
 } IsaBusId;  } IsaBusType;
  
 /* Differnet PCI video cards */ /* Differnet PCI video cards */
 typedef enum { typedef enum {
     PCI_ONLY,     PCI_ONLY,
     PCI_VGA,     PCI_VGA,
     PCI_SHARED_VGA     PCI_SHARED_VGA
 } PciBusFlag;  } PciBusType;
   
 typedef struct {  
     int         bus;  
     int         device;  
     int         func;  
     PciBusFlag  flag;  
 } PciBusId;  
   
 /*  
  * The general Bus description record.  As new types are added, new fields  
  * should be added to the x_busId field.  
  */  
   
 typedef struct {  
    BusType                      busType;  
    union {  
         PciBusId x_pciBusId;  
         IsaBusId x_isaBusId;  
    }                            x_busId;  
 } BusRec, *BusPtr;  
  
 #define pciBusId        x_busId.x_pciBusId  
 #define isaBusId        x_busId.x_isaBusId  
   
 typedef struct {  
     int                 vendor;  
     int                 chipType;  
     int                 chipRev;  
     int                 bus;  
     int                 device;  
     int                 func;  
     pciConfigPtr        thisCard;  
     unsigned long       memBase[6];  
     unsigned long       ioBase[6];  
 } pciVideoRec, *pciVideoPtr;  
  
 #define MAXCLOCKS   128 #define MAXCLOCKS   128
 #define MAXDACSPEEDS  4  /* for <= 8, 16, 24, 32bpp */ #define MAXDACSPEEDS  4  /* for <= 8, 16, 24, 32bpp */
Line 228 
Line 189 
  
     char **             requiredModules;        /* List of modules needed */     char **             requiredModules;        /* List of modules needed */
     int                 numRequiredModules;     int                 numRequiredModules;
     BusPtr *            busSlots;               /* List of bus slots the  
                                                  * screen controls */  
     int                 numBusSlots;  
  
     /* Some of these may be moved out of here into the driver private area */     /* Some of these may be moved out of here into the driver private area */
  


Legend:
Removed from v.1.1.2.2  
changed lines
  Added in v.1.1.2.3

Powered by
ViewCVS 0.9.2