andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bus: Remove ISA support.

Browse Source 
No, really.  PCI is old enough to drive now.  If you want this, get the kernel
to expose a framebuffer device.
This commit is contained in:
Adam Jackson 2008-10-11 22:48:51 -04:00
parent a8bcab2d3b
commit df14682a31
12 changed files with 14 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/Makefile.am
View File

@ -14,7 +14,7 @@ XISOURCES = xf86Xinput.c xisb.c
XISDKINCS = xf86Xinput.h xisb.h
RANDRSOURCES = xf86RandR.c
BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
BUSSOURCES = xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes

25
hw/xfree86/common/xf86.h
View File

@ -66,7 +66,6 @@ extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */
extern const unsigned char byte_reversed[256];
extern ScrnInfoPtr xf86CurrentScreen;
extern Bool pciSlotClaimed;
extern Bool isaSlotClaimed;
extern Bool fbSlotClaimed;
#if defined(__sparc__) || defined(__sparc)
extern Bool sbusSlotClaimed;
@ -103,16 +102,12 @@ Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,
Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);
void xf86FormatPciBusNumber(int busnum, char *buffer);
resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex);
int xf86ClaimIsaSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
int xf86GetIsaInfoForScreen(int scrnIndex);
int xf86GetFbInfoForScreen(int scrnIndex);
Bool xf86ParseIsaBusString(const char *busID);
int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
void xf86EnableAccess(ScrnInfoPtr pScrn);
void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn);
Bool xf86IsPrimaryPci(struct pci_device * pPci);
Bool xf86IsPrimaryIsa(void);
/* new RAC */
resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex);
void xf86FreeResList(resPtr rlist);
@ -159,8 +154,6 @@ DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex);
/* xf86Configure.c */
GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,
void *busData, int chipset);
GDevPtr xf86AddDeviceToConfigure( const char *driver,
struct pci_device * pVideo, int chipset );
/* xf86Cursor.c */
@ -243,10 +236,6 @@ int xf86MatchPciInstances(const char *driverName, int vendorID,
SymTabPtr chipsets, PciChipsets *PCIchipsets,
GDevPtr *devList, int numDevs, DriverPtr drvp,
int **foundEntities);
int xf86MatchIsaInstances(const char *driverName, SymTabPtr chipsets,
IsaChipsets *ISAchipsets, DriverPtr drvp,
FindIsaDevProc FindIsaDevice, GDevPtr *devList,
int numDevs, int **foundEntities);
void xf86GetClocks(ScrnInfoPtr pScrn, int num,
Bool (*ClockFunc)(ScrnInfoPtr, int),
void (*ProtectRegs)(ScrnInfoPtr, Bool),
@ -297,11 +286,6 @@ ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag,
resList res, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
ScrnInfoPtr xf86ConfigIsaEntity(ScrnInfoPtr pScrn, int scrnFlag,
int entityIndex, IsaChipsets *i_chip,
resList res, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
int entityIndex, EntityProc init,
EntityProc enter, EntityProc leave,
@ -313,19 +297,10 @@ Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
EntityProc enter, EntityProc leave,
pointer private);
/* Obsolete! don't use */
Bool xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn,
int entityIndex, IsaChipsets *i_chip,
resList res, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,
resList res, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
void xf86ConfigIsaEntityInactive(EntityInfoPtr pEnt, IsaChipsets *i_chip,
resList res, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
void xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);

38
hw/xfree86/common/xf86Bus.c
View File

@ -135,8 +135,6 @@ StringToBusType(const char* busID, const char **retID)
}
if (!xf86NameCmp(p, "pci") || !xf86NameCmp(p, "agp"))
ret = BUS_PCI;
if (!xf86NameCmp(p, "isa"))
ret = BUS_ISA;
if (!xf86NameCmp(p, "sbus"))
ret = BUS_SBUS;
if (ret != BUS_NONE)
@ -226,8 +224,6 @@ xf86IsEntityPrimary(int entityIndex)
switch (pEnt->busType) {
case BUS_PCI:
return (pEnt->bus.id.pci == primaryBus.id.pci);
case BUS_ISA:
return TRUE;
case BUS_SBUS:
return (pEnt->sbusBusId.fbNum == primaryBus.id.sbus.fbNum);
default:
@ -1009,32 +1005,9 @@ needCheck(resPtr pRes, unsigned long type, int entityIndex, xf86State state)
if (pRes->entityIndex > -1)
r_loc = xf86Entities[pRes->entityIndex]->busType;
switch (type & ResAccMask) {
case ResExclusive:
switch (pRes->res_type & ResAccMask) {
case ResExclusive:
break;
case ResShared:
/* ISA buses are only locally exclusive on a PCI system */
if (loc == BUS_ISA && r_loc == BUS_PCI)
if ((type & ResAccMask == ResShared) &&
(pRes->res_type & ResAccMask) == ResShared)
return FALSE;
break;
}
break;
case ResShared:
switch (pRes->res_type & ResAccMask) {
case ResExclusive:
/* ISA buses are only locally exclusive on a PCI system */
if (loc == BUS_PCI && r_loc == BUS_ISA)
return FALSE;
break;
case ResShared:
return FALSE;
}
break;
case ResAny:
break;
}
if (pRes->entityIndex == entityIndex) return FALSE;
@ -1384,7 +1357,6 @@ busTypeSpecific(EntityPtr pEnt, xf86AccessPtr *acc_mem,
xf86AccessPtr *acc_io, xf86AccessPtr *acc_mem_io)
{
switch (pEnt->bus.type) {
case BUS_ISA:
case BUS_SBUS:
*acc_mem = *acc_io = *acc_mem_io = &AccessNULL;
break;
@ -1853,7 +1825,7 @@ xf86PostProbe(void)
resPtr resp, acc, tmp, resp_x;
if (fbSlotClaimed) {
if (pciSlotClaimed || isaSlotClaimed
if (pciSlotClaimed
#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
|| sbusSlotClaimed
#endif
@ -2409,10 +2381,6 @@ xf86FindPrimaryDevice()
primaryBus.id.pci->dev,
primaryBus.id.pci->func);
break;
case BUS_ISA:
bus = "ISA";
loc[0] = '\0';
break;
case BUS_SBUS:
bus = "SBUS";
snprintf(loc, sizeof(loc), " %2.2x", primaryBus.id.sbus.fbNum);

27
hw/xfree86/common/xf86Configure.c
View File

@ -115,18 +115,6 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int
return NULL;
isPrimary = xf86IsPrimaryPci(pVideo);
break;
case BUS_ISA:
/*
* This needs to be revisited as it doesn't allow for non-PCI
* multihead.
*/
if (!xf86IsPrimaryIsa())
return NULL;
isPrimary = TRUE;
for (i = 0; i < nDevToConfig; i++)
if (!DevToConfig[i].pVideo)
return NULL;
break;
#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
case BUS_SBUS:
for (i = 0; i < nDevToConfig; i++)
@ -202,10 +190,6 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int
chipset = (pVideo->vendor_id << 16) | pVideo->device_id;
}
break;
case BUS_ISA:
NewDevice.GDev.identifier = "ISA Adapter";
NewDevice.GDev.busID = "ISA";
break;
#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
case BUS_SBUS: {
char *promPath = NULL;
@ -241,17 +225,6 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int
# undef NewDevice
}
/*
* Backwards compatibility
*/
_X_EXPORT GDevPtr
xf86AddDeviceToConfigure(const char *driver, struct pci_device * pVideo,
int chipset)
{
return xf86AddBusDeviceToConfigure(driver, pVideo ? BUS_PCI : BUS_ISA,
pVideo, chipset);
}
static XF86ConfInputPtr
configureInputSection (void)
{

209
hw/xfree86/common/xf86Helper.c
View File

@ -1683,8 +1683,8 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if ( xf86DoConfigure && xf86DoConfigurePass1 ) {
if (xf86CheckPciSlot(pPci)) {
GDevPtr pGDev =
xf86AddDeviceToConfigure(drvp->driverName,
pPci, -1);
xf86AddBusDeviceToConfigure(drvp->driverName,
BUS_PCI, pPci, -1);
if (pGDev) {
/* After configure pass 1, chipID and chipRev
* are treated as over-rides, so clobber them
@ -1953,108 +1953,6 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
return numFound;
}
_X_EXPORT int
xf86MatchIsaInstances(const char *driverName, SymTabPtr chipsets,
IsaChipsets *ISAchipsets, DriverPtr drvp,
FindIsaDevProc FindIsaDevice, GDevPtr *devList,
int numDevs, int **foundEntities)
{
SymTabRec *c;
IsaChipsets *Chips;
int i;
int numFound = 0;
int foundChip = -1;
int *retEntities = NULL;
*foundEntities = NULL;
#if defined(__sparc__) || defined(__powerpc__)
FindIsaDevice = NULL; /* Temporary */
#endif
if (xf86DoProbe || (xf86DoConfigure && xf86DoConfigurePass1)) {
if (FindIsaDevice &&
((foundChip = (*FindIsaDevice)(NULL)) != -1)) {
xf86AddDeviceToConfigure(drvp->driverName, NULL, foundChip);
return 1;
}
return 0;
}
for (i = 0; i < numDevs; i++) {
MessageType from = X_CONFIG;
GDevPtr dev = NULL;
GDevPtr devBus = NULL;
if (devList[i]->busID && *devList[i]->busID) {
if (xf86ParseIsaBusString(devList[i]->busID)) {
if (devBus) xf86MsgVerb(X_WARNING,0,
"%s: More than one matching Device "
"section for ISA-Bus found: %s\n",
driverName,devList[i]->identifier);
else devBus = devList[i];
}
} else {
if (xf86IsPrimaryIsa()) {
if (dev) xf86MsgVerb(X_WARNING,0,
"%s: More than one matching "
"Device section found: %s\n",
driverName,devList[i]->identifier);
else dev = devList[i];
}
}
if (devBus) dev = devBus;
if (dev) {
if (dev->chipset) {
for (c = chipsets; c->token >= 0; c++) {
if (xf86NameCmp(c->name, dev->chipset) == 0)
break;
}
if (c->token == -1) {
xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
"section \"%s\" isn't valid for this driver\n",
driverName, dev->chipset,
dev->identifier);
} else
foundChip = c->token;
} else {
if (FindIsaDevice) foundChip = (*FindIsaDevice)(dev);
/* Probe it */
from = X_PROBED;
}
}
/* Check if the chip type is listed in the chipset table - for sanity*/
if (foundChip >= 0){
for (Chips = ISAchipsets; Chips->numChipset >= 0; Chips++) {
if (Chips->numChipset == foundChip)
break;
}
if (Chips->numChipset == -1){
foundChip = -1;
xf86MsgVerb(X_WARNING,0,
"%s: Driver detected unknown ISA-Bus Chipset\n",
driverName);
}
}
if (foundChip != -1) {
numFound++;
retEntities = xnfrealloc(retEntities,numFound * sizeof(int));
retEntities[numFound - 1] =
xf86ClaimIsaSlot(drvp,foundChip,dev, dev->active ? TRUE : FALSE);
for (c = chipsets; c->token >= 0; c++) {
if (c->token == foundChip)
break;
}
xf86Msg(from, "Chipset %s found\n", c->name);
}
}
*foundEntities = retEntities;
return numFound;
}
/*
* xf86GetClocks -- get the dot-clocks via a BIG BAD hack ...
*/
@ -2557,49 +2455,6 @@ xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name,
#include "loader/os.c"
/* new RAC */
/*
* xf86ConfigIsa/PciEntity() -- These helper functions assign an
* active entity to a screen, registers its fixed resources, assign
* special enter/leave functions and their private scratch area to
* this entity, take the dog for a walk...
*/
_X_EXPORT ScrnInfoPtr
xf86ConfigIsaEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
IsaChipsets *i_chip, resList res, EntityProc init,
EntityProc enter, EntityProc leave, pointer private)
{
IsaChipsets *i_id;
EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
if (!pEnt) return pScrn;
if (!(pEnt->location.type == BUS_ISA)) {
xfree(pEnt);
return pScrn;
}
if (!pEnt->active) {
xf86ConfigIsaEntityInactive(pEnt, i_chip, res, init, enter,
leave, private);
xfree(pEnt);
return pScrn;
}
if (!pScrn)
pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);
xf86AddEntityToScreen(pScrn,entityIndex);
if (i_chip) {
for (i_id = i_chip; i_id->numChipset != -1; i_id++) {
if (pEnt->chipset == i_id->numChipset) break;
}
xf86ClaimFixedResources(i_id->resList,entityIndex);
}
xfree(pEnt);
xf86ClaimFixedResources(res,entityIndex);
xf86SetEntityFuncs(entityIndex,init,enter,leave,private);
return pScrn;
}
_X_EXPORT ScrnInfoPtr
xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
@ -2675,39 +2530,9 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
/*
*
* OBSOLETE ! xf86ConfigActiveIsaEntity() and xf86ConfigActivePciEntity()
* are obsolete functions. They the are likely to be removed
* Don't use!
* OBSOLETE ! xf86ConfigActivePciEntity() is an obsolete functions.
* They the are likely to be removed. Don't use!
*/
_X_EXPORT Bool
xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex,
IsaChipsets *i_chip, resList res, EntityProc init,
EntityProc enter, EntityProc leave, pointer private)
{
IsaChipsets *i_id;
EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
if (!pEnt) return FALSE;
if (!pEnt->active || !(pEnt->location.type == BUS_ISA)) {
xfree(pEnt);
return FALSE;
}
xf86AddEntityToScreen(pScrn,entityIndex);
if (i_chip) {
for (i_id = i_chip; i_id->numChipset != -1; i_id++) {
if (pEnt->chipset == i_id->numChipset) break;
}
xf86ClaimFixedResources(i_id->resList,entityIndex);
}
xfree(pEnt);
xf86ClaimFixedResources(res,entityIndex);
if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private))
return FALSE;
return TRUE;
}
_X_EXPORT Bool
xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
@ -2740,10 +2565,10 @@ xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
}
/*
* xf86ConfigPci/IsaEntityInactive() -- These functions can be used
* xf86ConfigPciEntityInactive() -- This functions can be used
* to configure an inactive entity as well as to reconfigure an
* previously active entity inactive. If the entity has been
* assigned to a screen before it will be removed. If p_pci(p_isa) is
* assigned to a screen before it will be removed. If p_pci is
* non-NULL all static resources listed there will be registered.
*/
_X_EXPORT void
@ -2768,28 +2593,6 @@ xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,
xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);
}
_X_EXPORT void
xf86ConfigIsaEntityInactive(EntityInfoPtr pEnt, IsaChipsets *i_chip,
resList res, EntityProc init, EntityProc enter,
EntityProc leave, pointer private)
{
IsaChipsets *i_id;
ScrnInfoPtr pScrn;
if ((pScrn = xf86FindScreenForEntity(pEnt->index)))
xf86RemoveEntityFromScreen(pScrn,pEnt->index);
else if (i_chip) {
for (i_id = i_chip; i_id->numChipset != -1; i_id++) {
if (pEnt->chipset == i_id->numChipset) break;
}
xf86ClaimFixedResources(i_id->resList,pEnt->index);
}
xf86ClaimFixedResources(res,pEnt->index);
/* shared resources are only needed when entity is active: remove */
xf86DeallocateResourcesForEntity(pEnt->index, ResShared);
xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);
}
void
xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
EntityProc enter, EntityProc leave, pointer private)

4
hw/xfree86/common/xf86Init.c
View File

@ -548,8 +548,8 @@ add_matching_devices_to_configure_list(DriverPtr drvp)
&& ((devices[j].device_class_mask & pPci->device_class)
== devices[j].device_class) ) {
if (xf86CheckPciSlot(pPci)) {
GDevPtr pGDev =
xf86AddDeviceToConfigure(drvp->driverName, pPci, -1);
GDevPtr pGDev = xf86AddBusDeviceToConfigure(
drvp->driverName, BUS_PCI, pPci, -1);
if (pGDev != NULL) {
/* After configure pass 1, chipID and chipRev are
* treated as over-rides, so clobber them here.

135
hw/xfree86/common/xf86isaBus.c
View File

@ -1,135 +0,0 @@
/*
* Copyright (c) 1997-2000 by The XFree86 Project, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name of the copyright holder(s)
* and author(s) shall not be used in advertising or otherwise to promote
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
/*
* This file contains the interfaces to the bus-specific code
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86Resources.h"
#include "xf86Bus.h"
#define XF86_OS_PRIVS
#define NEED_OS_RAC_PROTOS
#include "xf86_OSproc.h"
#include "xf86RAC.h"
Bool isaSlotClaimed = FALSE;
/*
* If the slot requested is already in use, return FALSE.
* Otherwise, claim the slot for the screen requesting it.
*/
_X_EXPORT int
xf86ClaimIsaSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
{
EntityPtr p;
BusAccPtr pbap = xf86BusAccInfo;
int num;
num = xf86AllocateEntity();
p = xf86Entities[num];
p->driver = drvp;
p->chipset = chipset;
p->busType = BUS_ISA;
p->active = active;
p->inUse = FALSE;
xf86AddDevToEntity(num, dev);
p->access = xnfcalloc(1,sizeof(EntityAccessRec));
p->access->fallback = &AccessNULL;
p->access->pAccess = &AccessNULL;
p->busAcc = NULL;
while (pbap) {
if (pbap->type == BUS_ISA)
p->busAcc = pbap;
pbap = pbap->next;
}
isaSlotClaimed = TRUE;
return num;
}
/*
* Get the list of ISA "slots" claimed by a screen
*
* Note: The ISA implementation here assumes that only one ISA "slot" type
* can be claimed by any one screen. That means a return value other than
* 0 or 1 isn't useful.
*/
int
xf86GetIsaInfoForScreen(int scrnIndex)
{
int num = 0;
int i;
EntityPtr p;
for (i = 0; i < xf86Screens[scrnIndex]->numEntities; i++) {
p = xf86Entities[xf86Screens[scrnIndex]->entityList[i]];
if (p->busType == BUS_ISA) {
num++;
}
}
return num;
}
/*
* Parse a BUS ID string, and return True if it is a ISA bus id.
*/
_X_EXPORT Bool
xf86ParseIsaBusString(const char *busID)
{
/*
* The format assumed to be "isa" or "isa:"
*/
return (StringToBusType(busID,NULL) == BUS_ISA);
}
/*
* xf86IsPrimaryIsa() -- return TRUE if primary device
* is ISA.
*/
_X_EXPORT Bool
xf86IsPrimaryIsa(void)
{
return ( primaryBus.type == BUS_ISA );
}

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

@ -564,11 +564,6 @@ initPciBusState(void)
pbap->disable_f = pciBusAccessDisable;
savePciBusState(pbap);
break;
case PCI_SUBCLASS_BRIDGE_ISA:
case PCI_SUBCLASS_BRIDGE_EISA:
case PCI_SUBCLASS_BRIDGE_MC:
pbap->type = BUS_ISA;
break;
}
pbap->next = xf86BusAccInfo;
xf86BusAccInfo = pbap;

12
hw/xfree86/common/xf86str.h
View File

@ -382,10 +382,6 @@ typedef enum {
struct pci_device;
typedef struct {
unsigned int dummy;
} IsaBusId;
typedef struct {
int fbNum;
} SbusBusId;
@ -393,7 +389,6 @@ typedef struct {
typedef struct _bus {
BusType type;
union {
IsaBusId isa;
struct pci_device *pci;
SbusBusId sbus;
} id;
@ -436,8 +431,6 @@ typedef struct {
int screen; /* For multi-CRTC cards */
} GDevRec, *GDevPtr;
typedef int (*FindIsaDevProc)(GDevPtr dev);
typedef struct {
char * identifier;
char * driver;
@ -717,11 +710,6 @@ typedef struct _resRec {
#define block_end val.rEnd
#define res_type val.type
typedef struct {
int numChipset;
resRange *resList;
} IsaChipsets;
typedef struct _PciChipsets {
/**
* Key used to match this device with its name in an array of

13
hw/xfree86/int10/generic.c
View File

@ -220,19 +220,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
INTPriv(pInt)->highMemory = GET_HIGH_BASE(rom_device->rom_size);
break;
}
case BUS_ISA:
vbiosMem = (unsigned char *)sysMem + bios_location;
#if 0
memset(vbiosMem, 0, V_BIOS_SIZE);
if (xf86ReadBIOS(bios_location, 0, vbiosMem, V_BIOS_SIZE)
< V_BIOS_SIZE)
xf86DrvMsg(screen, X_WARNING,
"Unable to retrieve all of segment 0x%x.\n",bios_location);
#endif
if (!int10_check_bios(screen, bios_location >> 4, vbiosMem)) {
xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (4)\n");
goto error1;
}
default:
goto error1;
}

10
hw/xfree86/loader/xf86sym.c
View File

@ -296,17 +296,14 @@ _X_HIDDEN void *xfree86LookupTab[] = {
/* xf86Bus.c */
SYMFUNC(xf86CheckPciSlot)
SYMFUNC(xf86ClaimPciSlot)
SYMFUNC(xf86ClaimIsaSlot)
SYMFUNC(xf86ClaimFbSlot)
SYMFUNC(xf86ClaimNoSlot)
SYMFUNC(xf86ParsePciBusString)
SYMFUNC(xf86ComparePciBusString)
SYMFUNC(xf86FormatPciBusNumber)
SYMFUNC(xf86ParseIsaBusString)
SYMFUNC(xf86EnableAccess)
SYMFUNC(xf86SetCurrentAccess)
SYMFUNC(xf86IsPrimaryPci)
SYMFUNC(xf86IsPrimaryIsa)
SYMFUNC(xf86FreeResList)
SYMFUNC(xf86ClaimFixedResources)
SYMFUNC(xf86AddEntityToScreen)
@ -337,9 +334,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86AllocateEntityPrivateIndex)
SYMFUNC(xf86GetEntityPrivate)
/* xf86Configure.c */
SYMFUNC(xf86AddDeviceToConfigure)
/* xf86Cursor.c */
SYMFUNC(xf86GetPointerScreenFuncs)
@ -414,7 +408,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86PrintChipsets)
SYMFUNC(xf86MatchDevice)
SYMFUNC(xf86MatchPciInstances)
SYMFUNC(xf86MatchIsaInstances)
SYMFUNC(xf86GetVerbosity)
SYMFUNC(xf86GetVisualName)
SYMFUNC(xf86GetPix24)
@ -454,12 +447,9 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86FindXvOptions)
SYMFUNC(xf86GetOS)
SYMFUNC(xf86ConfigPciEntity)
SYMFUNC(xf86ConfigIsaEntity)
SYMFUNC(xf86ConfigFbEntity)
SYMFUNC(xf86ConfigActivePciEntity)
SYMFUNC(xf86ConfigActiveIsaEntity)
SYMFUNC(xf86ConfigPciEntityInactive)
SYMFUNC(xf86ConfigIsaEntityInactive)
SYMFUNC(xf86IsScreenPrimary)
SYMFUNC(xf86RegisterRootWindowProperty)
SYMFUNC(xf86IsUnblank)

4
hw/xfree86/os-support/linux/int10/linux.c
View File

@ -292,10 +292,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
pInt->BIOSseg = V_BIOS >> 4;
break;
}
case BUS_ISA:
if (!xf86int10GetBiosSegment(pInt, NULL))
goto error3;
break;
default:
goto error3;
}