summaryrefslogtreecommitdiff
path: root/src/atilock.c
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2006-12-27 21:16:18 +0200
committerGeorge Sapountzis <gsap7@yahoo.gr>2007-01-28 01:24:18 +0200
commit817b4b5338dba4d8eb862f1f79ef0edb75aad7f4 (patch)
treea787118664483b774bf30a3dd54aa87a2379b80d /src/atilock.c
parentd350860e29f043e98bfb1da74b26280f1755ab6f (diff)
Keep PCI mach64 only, drop:
- Chip < ATI_CHIP_88800GXC - Chipset != ATI_CHIPSET_ATI - Adapter != ATI_ADAPTER_MACH64 - depth < 8
Diffstat (limited to 'src/atilock.c')
-rw-r--r--src/atilock.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/atilock.c b/src/atilock.c
index 92293af9..b4babb1c 100644
--- a/src/atilock.c
+++ b/src/atilock.c
@@ -55,12 +55,6 @@ ATIUnlock
return;
pATI->Unlocked = TRUE;
-#ifndef AVOID_CPIO
-
- if (pATI->Chip >= ATI_CHIP_88800GXC)
-
-#endif /* AVOID_CPIO */
-
{
/* Reset everything */
pATI->LockData.bus_cntl = inr(BUS_CNTL);
@@ -182,11 +176,10 @@ ATIUnlock
}
}
}
+ }
#ifndef AVOID_CPIO
- }
-
if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
{
if (pATI->CPIO_VGAWonder)
@@ -207,11 +200,9 @@ ATIUnlock
ATIModifyExtReg(pATI, 0xB8U, pATI->LockData.b8, 0xC0U, 0x00U);
pATI->LockData.b9 = ATIGetExtReg(0xB9U);
ATIModifyExtReg(pATI, 0xB9U, pATI->LockData.b9, 0x7FU, 0x00U);
- if (pATI->Chip > ATI_CHIP_18800)
{
pATI->LockData.be = ATIGetExtReg(0xBEU);
ATIModifyExtReg(pATI, 0xBEU, pATI->LockData.be, 0xFAU, 0x01U);
- if (pATI->Chip >= ATI_CHIP_28800_2)
{
pATI->LockData.a6 = ATIGetExtReg(0xA6U);
ATIModifyExtReg(pATI, 0xA6U, pATI->LockData.a6,
@@ -380,10 +371,10 @@ ATIUnlock
out8(LCD_INDEX, GetByte(pATI->LockData.lcd_index, 0));
}
}
+ }
#endif /* AVOID_CPIO */
- }
}
/*
@@ -482,10 +473,8 @@ ATILock
ATIModifyExtReg(pATI, 0xB6U, -1, 0xDDU, pATI->LockData.b6);
ATIModifyExtReg(pATI, 0xB8U, -1, 0xC0U, pATI->LockData.b8 & 0x03U);
ATIModifyExtReg(pATI, 0xB9U, -1, 0x7FU, pATI->LockData.b9);
- if (pATI->Chip > ATI_CHIP_18800)
{
ATIModifyExtReg(pATI, 0xBEU, -1, 0xFAU, pATI->LockData.be);
- if (pATI->Chip >= ATI_CHIP_28800_2)
{
ATIModifyExtReg(pATI, 0xA6U, -1, 0x7FU, pATI->LockData.a6);
ATIModifyExtReg(pATI, 0xABU, -1, 0xE7U, pATI->LockData.ab);
@@ -495,8 +484,6 @@ ATILock
}
}
- if (pATI->Chip >= ATI_CHIP_88800GXC)
-
#endif /* AVOID_CPIO */
{