33 lines
1011 B
Diff
33 lines
1011 B
Diff
Index: src/core/pci.cc
|
|
===================================================================
|
|
--- src/core/pci.cc (revisjon 1933)
|
|
+++ src/core/pci.cc (revisjon 1934)
|
|
@@ -70,6 +70,7 @@
|
|
#define PCI_CAP_LIST_NEXT 1 /* Next capability in the list */
|
|
#define PCI_CAP_FLAGS 2 /* Capability defined flags (16 bits) */
|
|
#define PCI_CAP_SIZEOF 4
|
|
+#define PCI_FIND_CAP_TTL 48
|
|
|
|
#define PCI_SID_ESR 2 /* Expansion Slot Register */
|
|
#define PCI_SID_ESR_NSLOTS 0x1f /* Number of expansion slots available */
|
|
@@ -668,8 +669,9 @@
|
|
{
|
|
unsigned int where = get_conf_byte(d, PCI_CAPABILITY_LIST) & ~3;
|
|
string buffer;
|
|
+ unsigned int ttl = PCI_FIND_CAP_TTL;
|
|
|
|
- while(where)
|
|
+ while(where && ttl--)
|
|
{
|
|
unsigned int id, next, cap;
|
|
|
|
@@ -677,7 +679,7 @@
|
|
next = get_conf_byte(d, where + PCI_CAP_LIST_NEXT) & ~3;
|
|
cap = get_conf_word(d, where + PCI_CAP_FLAGS);
|
|
|
|
- if(!id)
|
|
+ if(!id || id == 0xff)
|
|
return false;
|
|
|
|
switch(id)
|