frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate pciControlBridge, pciGetBridgeBuses, and pciGetBridgeResources.

This commit is contained in:
Ian Romanick 2007-01-22 09:58:33 -08:00
parent a232e4ae93
commit 637b19b3ee
3 changed files with 1 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
hw/xfree86/common/xf86pciBus.c
View File

@ -353,38 +353,6 @@ pciBusAccessDisable(BusAccPtr ptr)
} }
#undef MASKBITS #undef MASKBITS
/* move to OS layer */
static void
pciDrvBusAccessEnable(BusAccPtr ptr)
{
#if 0
int bus = ptr->busdep.pci.bus;
#ifdef DEBUG
ErrorF("pciDrvBusAccessEnable: bus=%d\n", bus);
#endif
(*pciBusInfo[bus]->funcs->pciControlBridge)(bus,
PCI_PCI_BRIDGE_VGA_EN,
PCI_PCI_BRIDGE_VGA_EN);
#endif
}
/* move to OS layer */
static void
pciDrvBusAccessDisable(BusAccPtr ptr)
{
#if 0
int bus = ptr->busdep.pci.bus;
#ifdef DEBUG
ErrorF("pciDrvBusAccessDisable: bus=%d\n", bus);
#endif
(*pciBusInfo[bus]->funcs->pciControlBridge)(bus,
PCI_PCI_BRIDGE_VGA_EN, 0);
#endif
}
static void static void
pciSetBusAccess(BusAccPtr ptr) pciSetBusAccess(BusAccPtr ptr)
{ {
@ -494,34 +462,6 @@ restorePciBusState(BusAccPtr ptr)
} }
#undef MASKBITS #undef MASKBITS
/* move to OS layer */
static void
savePciDrvBusState(BusAccPtr ptr)
{
#if 0
int bus = ptr->busdep.pci.bus;
ptr->busdep.pci.save.control =
(*pciBusInfo[bus]->funcs->pciControlBridge)(bus, 0, 0);
/* Allow master aborts to complete normally on this bus */
(*pciBusInfo[bus]->funcs->pciControlBridge)(bus,
PCI_PCI_BRIDGE_MASTER_ABORT_EN,
0);
#endif
}
/* move to OS layer */
static void
restorePciDrvBusState(BusAccPtr ptr)
{
#if 0
int bus = ptr->busdep.pci.bus;
(*pciBusInfo[bus]->funcs->pciControlBridge)(bus, (CARD16)(-1),
ptr->busdep.pci.save.control);
#endif
}
/* /*
* xf86Bus.c interface * xf86Bus.c interface
@ -619,16 +559,7 @@ initPciBusState(void)
pbap->set_f = pciSetBusAccess; pbap->set_f = pciSetBusAccess;
if ((secondary >= 0) && (secondary < pciNumBuses) && switch (subclass) {
(pBusInfo = pciBusInfo[secondary]) &&
pBusInfo->funcs->pciControlBridge) {
pbap->type = BUS_PCI;
pbap->save_f = savePciDrvBusState;
pbap->restore_f = restorePciDrvBusState;
pbap->enable_f = pciDrvBusAccessEnable;
pbap->disable_f = pciDrvBusAccessDisable;
savePciDrvBusState(pbap);
} else switch (subclass) {
case PCI_SUBCLASS_BRIDGE_HOST: case PCI_SUBCLASS_BRIDGE_HOST:
pbap->type = BUS_PCI; pbap->type = BUS_PCI;
break; break;

8
hw/xfree86/os-support/bus/Pci.h
View File

@ -301,14 +301,6 @@ extern void XF86SCANPCI_WRAPPER(scanpciWrapperOpt flags);
*/ */
typedef struct pci_bus_funcs { typedef struct pci_bus_funcs {
ADDRESS (*pciAddrBusToHost)(PCITAG, PciAddrType, ADDRESS); ADDRESS (*pciAddrBusToHost)(PCITAG, PciAddrType, ADDRESS);
/*
* The next three are optional. If NULL, the corresponding function is
* to be performed generically.
*/
CARD16 (*pciControlBridge)(int, CARD16, CARD16);
void (*pciGetBridgeBuses)(int, int *, int *, int *);
/* Use pointer's to avoid #include recursion */
void (*pciGetBridgeResources)(int, pointer *, pointer *, pointer *);
} pciBusFuncs_t, *pciBusFuncs_p; } pciBusFuncs_t, *pciBusFuncs_p;
/* /*

4
hw/xfree86/os-support/bus/linuxPci.c
View File

@ -77,10 +77,6 @@ static pciBusFuncs_t linuxFuncs0 = {
/* pciAddrBusToHost */ linuxTransAddrBusToHost, /* pciAddrBusToHost */ linuxTransAddrBusToHost,
#endif /* __sparc64__ */ #endif /* __sparc64__ */
#endif #endif
/* pciControlBridge */ NULL,
/* pciGetBridgeBuses */ NULL,
/* pciGetBridgeResources */ NULL,
}; };
static pciBusInfo_t linuxPci0 = { static pciBusInfo_t linuxPci0 = {