diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2006-12-27 20:56:45 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-01-28 01:24:18 +0200 |
| commit | d350860e29f043e98bfb1da74b26280f1755ab6f (patch) | |
| tree | f62d6c4ee07751521fbdf49409828afcea1a5dd2 /src/atimach64io.h | |
| parent | 5fa77f2d122e7267911a15235338d8d3f9eece2e (diff) | |
Keep PCI mach64 only (atipreinit.c, atimode.c), drop:
- Chip < ATI_CHIP_88800GXC
- Chipset != ATI_CHIPSET_ATI
- Adapter != ATI_ADAPTER_MACH64
- depth < 8
atimode.c only:
- NewHW.crtc != ATI_CRTC_MACH64
This allows to drop VGACalculate(), VGAWonderCalculate() cruft early.
Diffstat (limited to 'src/atimach64io.h')
| -rw-r--r-- | src/atimach64io.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/atimach64io.h b/src/atimach64io.h index 15a92ad6..d1b14d24 100644 --- a/src/atimach64io.h +++ b/src/atimach64io.h @@ -33,17 +33,17 @@ #define ___ATIMACH64IO_H___ 1 -#include "atiio.h" +#include "atiregs.h" #include "atistruct.h" +#include "compiler.h" + /* * A few important notes on some of the I/O statements provided: * * inl/outl 32-bit R/W through PIO space. The register is specified as the * actual PIO address. These are actually defined in compiler.h. * - * inw/outw 16-bit counterparts to inl/outl. Not used for Mach64 support. - * * inb/outb 8-bit counterparts to inl/outl. * * inm/outm 32-bit R/W through MMIO space. The register is specified as @@ -88,6 +88,13 @@ * accessed (nor by what). */ +/* I/O decoding definitions */ +typedef enum +{ + SPARSE_IO, + BLOCK_IO +} ATIIODecodingType; + #define inm(_Register) \ MMIO_IN32(pATI->pBlock[GetBits(_Register, BLOCK_SELECT)], \ (_Register) & MM_IO_SELECT) @@ -111,17 +118,13 @@ /* Cause a cpp syntax error if any of these are used */ #undef inb -#undef inw #undef inl #undef outb -#undef outw #undef outl #define inb() /* Nothing */ -#define inw() /* Nothing */ #define inl() /* Nothing */ #define outb() /* Nothing */ -#define outw() /* Nothing */ #define outl() /* Nothing */ #else /* AVOID_CPIO */ |