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

Diff for /xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h between version 1.9 and 1.10

version 1.9, 2000/08/22 21:54:30 version 1.10, 2000/10/11 22:52:56
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h,v 1.8 2000/08/04 21:07:14 tsi Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h,v 1.9 2000/08/22 21:54:30 tsi Exp $ */
 /* /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *  *
Line 30 
Line 30 
  
 #define ___ATIIO_H___ 1 #define ___ATIIO_H___ 1
  
 #include "atistruct.h"  #include "atiregs.h"
  
 #ifndef NO_COMPILER_H_EXTRAS #ifndef NO_COMPILER_H_EXTRAS
 # define NO_COMPILER_H_EXTRAS # define NO_COMPILER_H_EXTRAS
Line 46 
Line 46 
  
 #ifndef AVOID_CPIO #ifndef AVOID_CPIO
  
 extern void ATISetVGAIOBase FunctionPrototype((ATIPtr, const CARD8));  
 extern void ATIModifyExtReg FunctionPrototype((ATIPtr, const CARD8, int,  
                                                const CARD8, CARD8));  
   
 #endif /* AVOID_CPIO */  
   
 /* Odds and ends to ease reading and writting of registers */  
 #define GetReg(_Register, _Index) \  
     (                             \  
         outb(_Register, _Index),  \  
         inb((_Register) + 1)      \  
     )  
 #define PutReg(_Register, _Index, _Value) \  
     do                                    \  
     {                                     \  
         outb(_Register, _Index);          \  
         outb((_Register) + 1, _Value);    \  
     } while(0)  
   
 #define ATIGetExtReg(_Index)                    \  
     GetReg(pATI->CPIO_VGAWonder, _Index)  
 #define ATIPutExtReg(_Index, _Value)            \  
     PutReg(pATI->CPIO_VGAWonder, _Index, _Value)  
   
 /* Wait until "n" queue entries are free */ /* Wait until "n" queue entries are free */
 #define ibm8514WaitQueue(_n)                      \ #define ibm8514WaitQueue(_n)                      \
     {                                             \     {                                             \
Line 104 
Line 80 
     {                                      \     {                                      \
         while (!(inw(GP_STAT) & DATARDY)); \         while (!(inw(GP_STAT) & DATARDY)); \
     }     }
   
   #endif /* AVOID_CPIO */
  
 #endif /* ___ATIIO_H___ */ #endif /* ___ATIIO_H___ */


Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

Powered by
ViewCVS 0.9.2