diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-12-07 16:06:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-12-07 16:06:04 +0000 |
| commit | 1fb5773d887b21fa6e5ea657bd212e217ba836f1 (patch) | |
| tree | a4af4b5437a59261209fc45c717805460fc4932c | |
| parent | 2128649ca655a7ccd7a1db6c8ee1efbecd8aa09f (diff) | |
| download | ldetect-1fb5773d887b21fa6e5ea657bd212e217ba836f1.tar ldetect-1fb5773d887b21fa6e5ea657bd212e217ba836f1.tar.gz ldetect-1fb5773d887b21fa6e5ea657bd212e217ba836f1.tar.bz2 ldetect-1fb5773d887b21fa6e5ea657bd212e217ba836f1.tar.xz ldetect-1fb5773d887b21fa6e5ea657bd212e217ba836f1.zip | |
all PCI_CLASS_BRIDGE_CARDBUS cards are yenta_socket (says kudzu)
| -rw-r--r-- | ldetect.spec | 5 | ||||
| -rw-r--r-- | pci.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ldetect.spec b/ldetect.spec index 7cd165b..5b32c1e 100644 --- a/ldetect.spec +++ b/ldetect.spec @@ -1,5 +1,5 @@ Name: ldetect -Version: 0.5.3 +Version: 0.5.4 Release: 1mdk Summary: Light hardware detection library Source: %name.tar.bz2 @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %_libdir/* %changelog +* Tue Dec 7 2004 Pixel <pixel@mandrakesoft.com> 0.5.4-1mdk +- all PCI_CLASS_BRIDGE_CARDBUS cards are yenta_socket (says kudzu) + * Thu Oct 28 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 0.5.3-1mdk - keep existing description string if already reported by USB devices when usbtable description is empty (eg: freebox) @@ -63,6 +63,9 @@ extern struct pciusb_entries pci_probe(void) { e->subdevice = 0xffff; } class_prog = buf[0x9]; + + /* special rules below must be in sync with gi/mdk-stage1/probing.c */ + if (e->class_ == PCI_CLASS_SERIAL_USB) { /* taken from kudzu's pci.c */ char *module = @@ -70,10 +73,13 @@ extern struct pciusb_entries pci_probe(void) { class_prog == 0x10 ? "usb-ohci" : class_prog == 0x20 ? "ehci-hcd" : NULL; if (module) e->module = strdup(module); - } - if (e->class_ == PCI_CLASS_SERIAL_FIREWIRE) { + + } else if (e->class_ == PCI_CLASS_SERIAL_FIREWIRE) { /* taken from kudzu's pci.c */ if (class_prog == 0x10) e->module = strdup("ohci1394"); + + } else if (e->class_ == PCI_CLASS_BRIDGE_CARDBUS) { + e->module = strdup("yenta_socket"); } close(devf); |