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.

1 files changed, 0 insertions, 107 deletions

diff --git a/src/atibank.c b/src/atibank.c
index 446c55ff..c53cc545 100644
--- a/src/atibank.c
+++ b/src/atibank.c
@@ -32,45 +32,6 @@
 #ifndef AVOID_CPIO
 
 /*
- * ATI VGA Wonder V3 adapters use an ATI 18800 chip and are single-banked.
- * Bank selection is done with bits 0x1E of ATI extended VGA register index
- * 0xB2.
- */
-
-/*
- * ATIV3SetBank --
- *
- * Set an ATI 18800's bank number.
- */
-void
-ATIV3SetBank
-(
-    ATIPtr       pATI,
-    unsigned int iBank
-)
-{
-    ATIModifyExtReg(pATI, 0xB2U, -1, (CARD8)(~0x1EU), SetBits(iBank, 0x1EU));
-}
-
-/*
- * ATIV3SetReadWrite --
- *
- * Set an ATI 18800's bank number.
- */
-int
-ATIV3SetReadWrite
-(
-    ScreenPtr    pScreen,
-    unsigned int iBank
-)
-{
-    ATIPtr pATI = ATIPTR(XF86SCRNINFO(pScreen));
-
-    ATIModifyExtReg(pATI, 0xB2U, -1, (CARD8)(~0x1EU), SetBits(iBank, 0x1EU));
-    return 0;
-}
-
-/*
  * ATI VGA Wonder V4 and V5 adapters use an ATI 18800-1 chip.  Bank selection
  * is done with ATI extended VGA register index 0xB2.  The format is:
  *
@@ -145,22 +106,6 @@ ATIV4V5SetWrite
 }
 
 /*
- * ATIV4V5SetReadWrite --
- *
- * Set an ATI 18800-1's read and write bank numbers.
- */
-int
-ATIV4V5SetReadWrite
-(
-    ScreenPtr    pScreen,
-    unsigned int iBank
-)
-{
-    ATIV4V5SetBank(ATIPTR(XF86SCRNINFO(pScreen)), iBank);
-    return 0;
-}
-
-/*
  * In addition to ATI extended register index 0xB2, 28800's, 68800's and
  * 88800's define banking bits in bits 0x0F of ATI extended VGA register index
  * 0xAE.  These are only needed for adapters with more than 1MB of video
@@ -357,56 +302,4 @@ ATIMach64SetBankPlanar
     outr(MEM_VGA_WP_SEL, tmp);
 }
 
-/*
- * ATIMach64SetReadPlanar --
- *
- * Set read bank number for small dual paged apertures.
- */
-int
-ATIMach64SetReadPlanar
-(
-    ScreenPtr    pScreen,
-    unsigned int iBank
-)
-{
-    ATIPtr pATI = ATIPTR(XF86SCRNINFO(pScreen));
-
-    outr(MEM_VGA_RP_SEL, ATIMach64MassagePlanarBankNumber(iBank));
-    return 0;
-}
-
-/*
- * ATIMach64SetWritePlanar --
- *
- * Set write bank number for small dual paged apertures.
- */
-int
-ATIMach64SetWritePlanar
-(
-    ScreenPtr    pScreen,
-    unsigned int iBank
-)
-{
-    ATIPtr pATI = ATIPTR(XF86SCRNINFO(pScreen));
-
-    outr(MEM_VGA_WP_SEL, ATIMach64MassagePlanarBankNumber(iBank));
-    return 0;
-}
-
-/*
- * ATIMach64SetReadWritePlanar --
- *
- * Set read and write bank numbers for small dual paged apertures.
- */
-int
-ATIMach64SetReadWritePlanar
-(
-    ScreenPtr    pScreen,
-    unsigned int iBank
-)
-{
-    ATIMach64SetBankPlanar(ATIPTR(XF86SCRNINFO(pScreen)), iBank);
-    return 0;
-}
-
 #endif /* AVOID_CPIO */