diff options
| author | kem <kem> | 2001-01-05 22:57:49 +0000 |
|---|---|---|
| committer | kem <kem> | 2001-01-05 22:57:49 +0000 |
| commit | 127c27897a98abacb29cfb2b5c238aab02bc043c (patch) | |
| tree | 9948684f8cf782e4cff4fe7ad7a45508ed583ebd /xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h | |
| parent | 92d46514fdba0c8d4f36117351ca282c875d7b38 (diff) | |
Merged ati-5-0-0ati-5-0-0-20010105-merge
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h index 42e742415..d05cdb19e 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.2 2000/12/02 15:30:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.3 2000/12/07 20:26:22 dawes Exp $ */ #ifndef SAVAGE_VGAHWMMIO_H #define SAVAGE_VGAHWMMIO_H @@ -23,13 +23,13 @@ #include "savage_regs.h" -#define VGAIN8(addr) inb(addr) -#define VGAIN16(addr) inw(addr) -#define VGAIN(addr) inl(addr) +#define VGAIN8(addr) MMIO_IN8(psav->MapBase+0x8000, addr) +#define VGAIN16(addr) MMIO_IN16(psav->MapBase+0x8000, addr) +#define VGAIN(addr) MMIO_IN32(psav->MapBase+0x8000, addr) -#define VGAOUT8(addr,val) outb(addr,val) -#define VGAOUT16(addr,val) outw(addr,val) -#define VGAOUT(addr,val) outl(addr,val) +#define VGAOUT8(addr,val) MMIO_OUT8(psav->MapBase+0x8000, addr, val) +#define VGAOUT16(addr,val) MMIO_OUT16(psav->MapBase+0x8000, addr, val) +#define VGAOUT(addr,val) MMIO_OUT32(psav->MapBase+0x8000, addr, val) #define INREG(addr) MMIO_IN32(psav->MapBase, addr) #define OUTREG(addr,val) MMIO_OUT32(psav->MapBase, addr, val) |