summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile.am3
-rw-r--r--src/atiaccel.c7
-rw-r--r--src/atiadapter.c38
-rw-r--r--src/atiadapter.h40
-rw-r--r--src/atibus.c6
-rw-r--r--src/aticlock.c5
-rw-r--r--src/aticonfig.c8
-rw-r--r--src/aticonsole.c15
-rw-r--r--src/aticursor.c9
-rw-r--r--src/atii2c.c9
-rw-r--r--src/atilock.c5
-rw-r--r--src/atimode.c9
-rw-r--r--src/atipreinit.c40
-rw-r--r--src/atiprint.c3
-rw-r--r--src/atiprobe.c17
-rw-r--r--src/atistruct.h5
-rw-r--r--src/ativalid.c1
-rw-r--r--src/ativga.c55
-rw-r--r--src/ativga.h1
-rw-r--r--src/atividmem.c5
-rw-r--r--src/atixv.c16
21 files changed, 36 insertions, 261 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 4dcd708..ee4911b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,7 @@ ati_drv_la_LTLIBRARIES = ati_drv.la
ati_drv_la_LDFLAGS = -module -avoid-version
ati_drv_ladir = @moduledir@/drivers
ati_drv_la_SOURCES = \
- ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \
+ ati.c atibus.c atichip.c atiident.c atioption.c \
atiprobe.c atividmem.c atimodule.c $(ATI_CPIO_SOURCES) \
radeon_probe.c r128_probe.c
@@ -109,7 +109,6 @@ EXTRA_DIST = \
radeon_accelfuncs.c \
\
atiaccel.h \
- atiadapter.h \
atiadjust.h \
atiaudio.h \
atibank.h \
diff --git a/src/atiaccel.c b/src/atiaccel.c
index 61cb864..11c39c7 100644
--- a/src/atiaccel.c
+++ b/src/atiaccel.c
@@ -28,7 +28,6 @@
#endif
#include "atiaccel.h"
-#include "atiadapter.h"
#include "atimach64accel.h"
#include "atistruct.h"
@@ -52,14 +51,8 @@ ATIInitializeAcceleration
if (!(pATI->pXAAInfo = XAACreateInfoRec()))
return FALSE;
- switch (pATI->Adapter)
{
- case ATI_ADAPTER_MACH64:
ATIMach64AccelInit(pATI, pATI->pXAAInfo);
- break;
-
- default:
- break;
}
}
diff --git a/src/atiadapter.c b/src/atiadapter.c
deleted file mode 100644
index 8a597ef..0000000
--- a/src/atiadapter.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atiadapter.h"
-
-/*
- * Adapter-related definitions.
- */
-const char *ATIAdapterNames[] =
-{
- "Unknown",
- "ATI Mach64",
- "ATI Rage128",
- "ATI Radeon"
-};
diff --git a/src/atiadapter.h b/src/atiadapter.h
deleted file mode 100644
index 3ecd7bc..0000000
--- a/src/atiadapter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIADAPTER_H___
-#define ___ATIADAPTER_H___ 1
-
-/*
- * Adapter-related definitions.
- */
-typedef enum
-{
- ATI_ADAPTER_NONE = 0,
- ATI_ADAPTER_MACH64,
- ATI_ADAPTER_RAGE128,
- ATI_ADAPTER_RADEON,
- ATI_ADAPTER_MAX /* Must be last */
-} ATIAdapterType;
-
-extern const char *ATIAdapterNames[];
-
-#endif /* ___ATIADAPTER_H___ */
diff --git a/src/atibus.c b/src/atibus.c
index a371dc4..fd34c89 100644
--- a/src/atibus.c
+++ b/src/atibus.c
@@ -27,7 +27,6 @@
#include <string.h>
#include "ati.h"
-#include "atiadapter.h"
#include "atibus.h"
#include "atichip.h"
#include "atimach64io.h"
@@ -66,7 +65,7 @@ ATIClaimResources
resRange Resources[2] = {{0, 0, 0}, _END};
/* Claim VGA and VGAWonder resources */
- if ((pATI->VGAAdapter != ATI_ADAPTER_NONE) && (Active))
+ if ((pATI->VGAAdapter) && (Active))
{
/*
* 18800-x's are the only ATI controllers that decode all ISA aliases
@@ -93,8 +92,7 @@ ATIClaimResources
return;
/* Claim Mach64 sparse I/O resources */
- if ((pATI->Adapter == ATI_ADAPTER_MACH64) &&
- (pATI->CPIODecoding == SPARSE_IO))
+ if ((pATI->CPIODecoding == SPARSE_IO))
{
Resources[0].type = ResShrIoSparse | ResBus;
Resources[0].rBase = pATI->CPIOBase;
diff --git a/src/aticlock.c b/src/aticlock.c
index 727f80f..f5bfbba 100644
--- a/src/aticlock.c
+++ b/src/aticlock.c
@@ -197,7 +197,6 @@
#include <stdlib.h>
#include "ati.h"
-#include "atiadapter.h"
#include "atichip.h"
#include "atidac.h"
#include "atidsp.h"
@@ -711,7 +710,7 @@ ProbeClocks:
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
/*
* The current video state needs to be saved before the clock
@@ -909,7 +908,7 @@ ProbeClocks:
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
/* Restore video state */
ATIModeSet(pScreenInfo, pATI, &pATI->OldHW);
diff --git a/src/aticonfig.c b/src/aticonfig.c
index feb5b95..46f3d87 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -30,7 +30,6 @@
#include <string.h>
#include "ati.h"
-#include "atiadapter.h"
#include "atichip.h"
#include "aticonfig.h"
#include "aticursor.h"
@@ -163,13 +162,6 @@ ATIProcessOptions
xf86CollectOptions(pScreenInfo, NULL);
/* Set non-zero defaults */
-
-#ifndef AVOID_CPIO
-
- if (pATI->Adapter >= ATI_ADAPTER_MACH64)
-
-#endif /* AVOID_CPIO */
-
{
Accel = CacheMMIO = HWCursor = TRUE;
diff --git a/src/aticonsole.c b/src/aticonsole.c
index 4a7ed1d..033b1e7 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -29,7 +29,6 @@
#endif
#include "ati.h"
-#include "atiadapter.h"
#include "aticonsole.h"
#include "aticrtc.h"
#include "atii2c.h"
@@ -129,22 +128,8 @@ ATISetDPMSMode
pATI = ATIPTR(pScreenInfo);
- switch (pATI->Adapter)
{
- case ATI_ADAPTER_MACH64:
ATIMach64SetDPMSMode(pScreenInfo, pATI, DPMSMode);
- break;
-
- default:
-
-#ifndef AVOID_CPIO
-
- /* Assume EGA/VGA */
- ATIVGASetDPMSMode(pATI, DPMSMode);
-
-#endif /* AVOID_CPIO */
-
- break;
}
}
diff --git a/src/aticursor.c b/src/aticursor.c
index a7c98ac..e2da78c 100644
--- a/src/aticursor.c
+++ b/src/aticursor.c
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#include "atiadapter.h"
#include "aticursor.h"
#include "atimach64cursor.h"
#include "atistruct.h"
@@ -53,14 +52,8 @@ ATIInitializeCursor
if (!(pATI->pCursorInfo = xf86CreateCursorInfoRec()))
return FALSE;
- switch (pATI->Adapter)
+ if (!ATIMach64CursorInit(pATI->pCursorInfo))
{
- case ATI_ADAPTER_MACH64:
- if (ATIMach64CursorInit(pATI->pCursorInfo))
- break;
- /* Fall through */
-
- default:
xf86DestroyCursorInfoRec(pATI->pCursorInfo);
pATI->pCursorInfo = NULL;
return FALSE;
diff --git a/src/atii2c.c b/src/atii2c.c
index a32ea5e..73febf7 100644
--- a/src/atii2c.c
+++ b/src/atii2c.c
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#include "atiadapter.h"
#include "atii2c.h"
#include "atiload.h"
#include "atimach64i2c.h"
@@ -366,18 +365,10 @@ ATII2CPreInit
ATIPtr pATI
)
{
- switch (pATI->Adapter)
- {
- case ATI_ADAPTER_MACH64:
if (!ATILoadModule(pScreenInfo, "i2c", ATIi2cSymbols))
return;
ATIMach64I2CPreInit(pScreenInfo, pATI);
- break;
-
- default:
- break;
- }
}
/*
diff --git a/src/atilock.c b/src/atilock.c
index b4babb1..ba70087 100644
--- a/src/atilock.c
+++ b/src/atilock.c
@@ -25,7 +25,6 @@
#endif
#include "ati.h"
-#include "atiadapter.h"
#include "atichip.h"
#include "atilock.h"
#include "atimach64io.h"
@@ -180,7 +179,7 @@ ATIUnlock
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
if (pATI->CPIO_VGAWonder)
{
@@ -401,7 +400,7 @@ ATILock
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
if (pATI->LCDPanelID >= 0)
{
diff --git a/src/atimode.c b/src/atimode.c
index 3ac46d9..36d548f 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -27,7 +27,6 @@
#include <string.h>
#include "ati.h"
-#include "atiadapter.h"
#include "atichip.h"
#include "atidac.h"
#include "atidsp.h"
@@ -263,7 +262,7 @@ ATIModePreInit
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
/* Fill in VGA data */
ATIVGAPreInit(pATI, pATIHW);
@@ -435,7 +434,7 @@ ATIModeSave
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
/* Save VGA data */
ATIVGASave(pATI, pATIHW);
@@ -525,7 +524,7 @@ ATIModeSave
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
ATIVGASaveScreen(pATI, SCREEN_SAVER_OFF); /* Turn on screen */
#endif /* AVOID_CPIO */
@@ -1139,7 +1138,7 @@ ATIModeSet
/* Restore video memory */
ATISwap(pScreenInfo->scrnIndex, pATI, pATIHW, TRUE);
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
ATIVGASaveScreen(pATI, SCREEN_SAVER_OFF); /* Turn on screen */
#endif /* AVOID_CPIO */
diff --git a/src/atipreinit.c b/src/atipreinit.c
index bfdd56d..66ac44c 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include "ati.h"
-#include "atiadapter.h"
#include "atiadjust.h"
#include "atiaudio.h"
#include "atibus.h"
@@ -490,9 +489,7 @@ ATIPreInit
pATI->Audio = ATI_AUDIO_NONE;
/* Finish probing the adapter */
- switch (pATI->Adapter)
{
- case ATI_ADAPTER_MACH64:
do
{
/*
@@ -671,11 +668,6 @@ ATIPreInit
*/
if (pATI->DAC < ATI_DAC_ATI68875)
pATI->DAC += ATI_DAC_INTERNAL;
-
- break;
-
- default:
- break;
}
/*
@@ -1105,7 +1097,7 @@ ATIPreInit
#endif /* AVOID_CPIO */
xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED,
- "%s adapter detected.\n", ATIAdapterNames[pATI->Adapter]);
+ "ATI Mach64 adapter detected.\n");
if (pATI->Chip >= ATI_CHIP_264GT)
xf86DrvMsg(pScreenInfo->scrnIndex, X_NOTICE,
@@ -1242,7 +1234,7 @@ ATIPreInit
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
/*
* No need for VGA I/O resources during operating state (but they
@@ -1281,7 +1273,7 @@ ATIPreInit
if ((pATI->NewHW.crtc == ATI_CRTC_VGA) || !pATI->OptionLinear)
{
/* VGA is required at this point */
- if (pATI->VGAAdapter == ATI_ADAPTER_NONE)
+ if (!pATI->VGAAdapter)
{
xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
"VGA is not available through this adapter.\n");
@@ -2129,8 +2121,7 @@ ATIPreInit
#ifndef AVOID_CPIO
- /* Set up for a banked aperture */
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
pATI->UseSmallApertures = TRUE;
@@ -2166,7 +2157,7 @@ ATIPreInit
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter == ATI_ADAPTER_NONE)
+ if (!pATI->VGAAdapter)
#endif /* AVOID_CPIO */
@@ -2246,7 +2237,7 @@ ATIPreInit
"Linear aperture not supported in this configuration.\n");
pATI->OptionLinear = FALSE;
}
- else if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ else if (pATI->VGAAdapter)
{
/*
* Free VGA memory aperture during operating state (but it is still
@@ -2326,24 +2317,13 @@ ATIPreInit
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter == ATI_ADAPTER_NONE)
-
-#endif /* AVOID_CPIO */
-
+ if (!pATI->VGAAdapter)
{
pATIHW->crtc = pATI->NewHW.crtc;
-#ifndef AVOID_CPIO
-
pATIHW->SetBank = (ATIBankProcPtr)NoopDDA;
pATI->BankInfo.BankSize = 0; /* No banking */
-
-#endif /* AVOID_CPIO */
-
}
-
-#ifndef AVOID_CPIO
-
else
{
pATIHW->crtc = ATI_CRTC_VGA;
@@ -2391,6 +2371,12 @@ ATIPreInit
pATI->BankInfo.BankSize = 0; /* No banking */
}
+#else /* AVOID_CPIO */
+
+ {
+ pATIHW->crtc = pATI->NewHW.crtc;
+ }
+
#endif /* AVOID_CPIO */
if (pATI->OptionShadowFB)
diff --git a/src/atiprint.c b/src/atiprint.c
index 1fc629d..243dcf5 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -28,7 +28,6 @@
#include <ctype.h>
#include "ati.h"
-#include "atiadapter.h"
#include "atichip.h"
#include "atidac.h"
#include "atimach64io.h"
@@ -369,7 +368,7 @@ ATIPrintRegisters
crtc = ATI_CRTC_VGA;
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
xf86ErrorFVerb(4, "\n Miscellaneous output register value: 0x%02X.\n",
genmo = inb(R_GENMO));
diff --git a/src/atiprobe.c b/src/atiprobe.c
index dcd46cd..a3724bd 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include "ati.h"
-#include "atiadapter.h"
#include "atiadjust.h"
#include "atibus.h"
#include "atichip.h"
@@ -281,6 +280,7 @@ ATIMach64Detect
)
{
CARD32 IOValue, bus_cntl, gen_test_cntl;
+ Bool DetectSuccess = FALSE;
(void)ATIMapApertures(-1, pATI); /* Ignore errors */
@@ -330,7 +330,7 @@ ATIMach64Detect
ATIMach64ChipID(pATI, ChipType);
if ((pATI->Chip != ATI_CHIP_Mach64) ||
(pATI->CPIODecoding == BLOCK_IO))
- pATI->Adapter = ATI_ADAPTER_MACH64;
+ DetectSuccess = TRUE;
}
}
@@ -338,7 +338,7 @@ ATIMach64Detect
outr(SCRATCH_REG0, IOValue);
/* If no Mach64 was detected, return now */
- if (pATI->Adapter != ATI_ADAPTER_MACH64)
+ if (!DetectSuccess)
{
outr(GEN_TEST_CNTL, gen_test_cntl);
outr(BUS_CNTL, bus_cntl);
@@ -479,7 +479,7 @@ ATIMach64Probe
*/
if (pATI->Chip >= ATI_CHIP_264CT)
{
- pATI->VGAAdapter = ATI_ADAPTER_MACH64;
+ pATI->VGAAdapter = TRUE;
}
else
{
@@ -490,7 +490,7 @@ ATIMach64Probe
IOValue |= CFG_VGA_EN;
if (IOValue == (CFG_VGA_EN | CFG_CHIP_EN))
{
- pATI->VGAAdapter = ATI_ADAPTER_MACH64;
+ pATI->VGAAdapter = TRUE;
pATI->CPIO_VGAWonder = 0x01CEU;
}
}
@@ -835,7 +835,7 @@ ATIProbe
AddAdapter(pATI);
pATI->PCIInfo = pVideo;
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
ATIFindVGA(pVideo, pATI, ProbeFlags);
}
@@ -951,7 +951,7 @@ ATIProbe
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
ATIFindVGA(pVideo, pATI, ProbeFlags);
#endif /* AVOID_CPIO */
@@ -1071,8 +1071,7 @@ ATIProbe
if ((pATI->ChipType != pGDev->chipID) &&
(!pVideo || (pGDev->chipID != pVideo->chipType)))
{
- if ((pATI->Adapter != ATI_ADAPTER_MACH64) ||
- (pATI->Chip != ATI_CHIP_Mach64))
+ if ((pATI->Chip != ATI_CHIP_Mach64))
continue;
Chip = ATIChipID(pGDev->chipID, 0);
diff --git a/src/atistruct.h b/src/atistruct.h
index 0476f04..ea9d08c 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -219,11 +219,6 @@ typedef struct _ATIRec
*/
CARD8 Chipset;
- /*
- * Adapter-related definitions.
- */
- CARD8 Adapter;
-
#ifndef AVOID_CPIO
CARD8 VGAAdapter;
diff --git a/src/ativalid.c b/src/ativalid.c
index 25ad718..74ffe05 100644
--- a/src/ativalid.c
+++ b/src/ativalid.c
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#include "atiadapter.h"
#include "atichip.h"
#include "aticrtc.h"
#include "atistruct.h"
diff --git a/src/ativga.c b/src/ativga.c
index fc50d02..905df98 100644
--- a/src/ativga.c
+++ b/src/ativga.c
@@ -25,17 +25,11 @@
#endif
#include "ati.h"
-#include "atiadapter.h"
#include "atichip.h"
#include "atistruct.h"
#include "ativga.h"
#include "ativgaio.h"
-#ifndef DPMS_SERVER
-# define DPMS_SERVER
-#endif
-#include <X11/extensions/dpms.h>
-
#ifndef AVOID_CPIO
/*
@@ -199,53 +193,4 @@ ATIVGASaveScreen
}
}
-/*
- * ATIVGASetDPMSMode --
- *
- * This function sets a VGA's VESA Display Power Management Signaling mode.
- */
-void
-ATIVGASetDPMSMode
-(
- ATIPtr pATI,
- int DPMSMode
-)
-{
- CARD8 seq1, crt17;
-
- switch (DPMSMode)
- {
- case DPMSModeOn: /* HSync on, VSync on */
- seq1 = 0x00U;
- crt17 = 0x80U;
- break;
-
- case DPMSModeStandby: /* HSync off, VSync on -- unsupported */
- seq1 = 0x20U;
- crt17 = 0x80U;
- break;
-
- case DPMSModeSuspend: /* HSync on, VSync off -- unsupported */
- seq1 = 0x20U;
- crt17 = 0x80U;
- break;
-
- case DPMSModeOff: /* HSync off, VSync off */
- seq1 = 0x20U;
- crt17 = 0x00U;
- break;
-
- default: /* Muffle compiler */
- return;
- }
-
- PutReg(SEQX, 0x00U, 0x01U); /* Start synchonous reset */
- seq1 |= GetReg(SEQX, 0x01U) & ~0x20U;
- PutReg(SEQX, 0x01U, seq1);
- crt17 |= GetReg(CRTX(pATI->CPIO_VGABase), 0x17U) & ~0x80U;
- usleep(10000);
- PutReg(CRTX(pATI->CPIO_VGABase), 0x17U, crt17);
- PutReg(SEQX, 0x01U, 0x03U); /* End synchonous reset */
-}
-
#endif /* AVOID_CPIO */
diff --git a/src/ativga.h b/src/ativga.h
index a02a2d0..3dd6f0e 100644
--- a/src/ativga.h
+++ b/src/ativga.h
@@ -34,7 +34,6 @@ extern void ATIVGASave(ATIPtr, ATIHWPtr);
extern void ATIVGASet(ATIPtr, ATIHWPtr);
extern void ATIVGASaveScreen(ATIPtr, int);
-extern void ATIVGASetDPMSMode(ATIPtr, int);
#endif /* AVOID_CPIO */
diff --git a/src/atividmem.c b/src/atividmem.c
index d06ca7c..e7c44cc 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -25,7 +25,6 @@
#endif
#include "ati.h"
-#include "atiadapter.h"
#include "atistruct.h"
#include "atividmem.h"
@@ -188,7 +187,7 @@ ATIMapApertures
#ifndef AVOID_CPIO
- if (pATI->VGAAdapter == ATI_ADAPTER_NONE)
+ if (!pATI->VGAAdapter)
#endif /* AVOID_CPIO */
@@ -207,7 +206,7 @@ ATIMapApertures
#ifndef AVOID_CPIO
/* Map VGA aperture */
- if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+ if (pATI->VGAAdapter)
{
/*
* No relocation, resizing, caching or write-combining of this
diff --git a/src/atixv.c b/src/atixv.c
index 35223ec..a3c0480 100644
--- a/src/atixv.c
+++ b/src/atixv.c
@@ -24,7 +24,6 @@
#include "config.h"
#endif
-#include "atiadapter.h"
#include "atimach64xv.h"
#include "atistruct.h"
#include "atixv.h"
@@ -68,16 +67,9 @@ ATIXVInitializeAdaptor
XF86VideoAdaptorPtr *ppAdaptor = NULL;
int nAdaptor;
- switch (pATI->Adapter)
{
- case ATI_ADAPTER_MACH64:
nAdaptor = ATIMach64XVInitialiseAdaptor(pScreen, pScreenInfo, pATI,
&ppAdaptor);
- break;
-
- default:
- nAdaptor = 0;
- break;
}
if (pppAdaptor)
@@ -156,13 +148,5 @@ ATICloseXVideo
ATIPtr pATI
)
{
- switch (pATI->Adapter)
- {
- case ATI_ADAPTER_MACH64:
ATIMach64CloseXVideo(pScreen, pScreenInfo, pATI);
- break;
-
- default:
- break;
- }
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 09:40:44 +0000