Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up pci_find_device()

Browse Source
This commit is contained in:
Markus Fröschle
2013-11-07 06:00:30 +00:00
parent 6da3f7c1e6
commit 238678a359
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sources/pci.c
View File

@@ -207,19 +207,20 @@ int16_t pci_find_device(uint16_t device_id, uint16_t vendor_id, int index)
uint16_t pos = 0; uint16_t pos = 0;
int handle; int handle;
for (bus = 0; bus < 255; bus++) /* FireBee USB is on DEVSEL(17) ??? */ for (bus = 0; bus < 255; bus++)
{ {
for (device = 0; device < 32; device++) for (device = 0; device < 32; device++)
{ {
for (function = 0; function < 8; function++) uint32_t value;
{ uint8_t htr;
uint32_t value;
handle = PCI_HANDLE(bus, device, function); handle = PCI_HANDLE(bus, device, 0);
value = pci_read_config_longword(handle, 0); value = pci_read_config_longword(handle, PCIIDR);
if (value != 0xffffffff) /* we have a device at this position */ if (value != 0xffffffff) /* we have a device at this position */
{
if (vendor_id == 0xffff || (PCI_VENDOR_ID(value) == vendor_id && PCI_DEVICE_ID(value) == device_id))
{ {
if (vendor_id == 0xffff && pos == index) /* ignore device id */ if (pos == index)
{ {
return handle; return handle;
} }
@@ -229,13 +230,32 @@ int16_t pci_find_device(uint16_t device_id, uint16_t vendor_id, int index)
pos++; pos++;
continue; continue;
} }
if (PCI_VENDOR_ID(value) == vendor_id && PCI_DEVICE_ID(value) == device_id) }
/* check if we have a multi-function device at this position */
htr = pci_read_config_byte(handle, PCIHTR);
if (htr & 0x80) /* multi-function device found */
{
for (function = 1; function < 8; function++)
{ {
if (pos == index) handle = PCI_HANDLE(bus, device, function);
return handle; value = pci_read_config_longword(handle, PCIIDR);
if (value != 0xFFFFFFFF) /* device found */
{
if (vendor_id == 0xffff ||
(PCI_VENDOR_ID(value) == vendor_id && PCI_DEVICE_ID(value) == device_id))
{
return handle;
}
else
{
/* found a match, but at wrong position */
pos++;
continue;
}
}
} }
else
pos++;
} }
} }
} }
@@ -405,7 +425,7 @@ void pci_scan(void)
PCI_DEVICE_FROM_HANDLE(handle), PCI_DEVICE_FROM_HANDLE(handle),
PCI_FUNCTION_FROM_HANDLE(handle)); PCI_FUNCTION_FROM_HANDLE(handle));
} }
handle = pci_find_device(0x0, 0xFFF, ++index); handle = pci_find_device(0x0, 0xFFFF, ++index);
} }
xprintf("\r\n...finished\r\n"); xprintf("\r\n...finished\r\n");
} }