git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Working on multiprocessing support
[tpg/acess2.git]
/
Kernel
/
drv
/
pci.c
diff --git
a/Kernel/drv/pci.c
b/Kernel/drv/pci.c
index
7ebab74
..
9260847
100644
(file)
--- a/
Kernel/drv/pci.c
+++ b/
Kernel/drv/pci.c
@@
-141,7
+141,6
@@
int PCI_ScanBus(int BusID)
{
\r
for( fcn = 0; fcn < 8; fcn++ ) // Max 8 functions per device
\r
{
\r
- Debug("%i:%i:%i", BusID, dev, fcn);
\r
// Check if the device/function exists
\r
if(!PCI_EnumDevice(BusID, dev, fcn, &devInfo))
\r
continue;
\r
@@
-178,7
+177,7
@@
int PCI_ScanBus(int BusID)
// Maybe bit 23 must be set for the device to be valid?
\r
// - Actually, maybe 23 means that there are sub-functions
\r
if(fcn == 0) {
\r
- if( !(devInfo.ConfigCache[3] & 0x800000) )
\r
+ if( !(devInfo.ConfigCache[3] & 0x
00
800000) )
\r
break;
\r
}
\r
}
\r
@@
-461,7
+460,6
@@
int PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
{
\r
Uint16 vendor;
\r
int i;
\r
- Uint32 addr;
\r
\r
vendor = PCI_CfgReadWord(bus, slot, fcn, 0x0|0);
\r
if(vendor == 0xFFFF) // Invalid Device
\r
@@
-476,16
+474,9
@@
int PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
info->oc = PCI_CfgReadWord(bus, slot, fcn, 0x8|2);
\r
\r
// Load Config Bytes
\r
- addr = 0x80000000 | ((Uint)bus<<16) | ((Uint)slot<<11) | ((Uint)fcn<<8);
\r
for(i=0;i<256/4;i++)
\r
{
\r
- #if 0
\r
- outd(0xCF8, addr);
\r
- info->ConfigCache[i] = ind(0xCFC);
\r
- addr += 4;
\r
- #else
\r
info->ConfigCache[i] = PCI_CfgReadDWord(bus, slot, fcn, i*4);
\r
- #endif
\r
}
\r
\r
//#if LIST_DEVICES
\r
UCC
git Repository :: git.ucc.asn.au