Bug#261235: discover1-data: fix Apple ohci1394 ids
Package: discover1-data
Version: 1.2004.07.18
Severity: normal
Tags: patch
Could you please apply the following patch to fix Apple FireWire
controllers? It records 106b0031 as an ohci1394 controller, and changes
the categories of some ohci1394 devices from "unknown" to "bridge".
You might want to set the category of a number of other ohci1394
controllers to bridge after applying this patch, too.
For some reason discover1 outside d-i detects and loads ohci1394 and
eth1394 on my system (with 106b0031) while discover1 inside d-i doesn't,
which leads to badness because Ethernet devices end up in a different
order pre- and post-reboot.
--- discover1-data-1.2004.07.18.orig/pci.lst 2004-07-18 22:57:19.000000000 +0100
+++ discover1-data-1.2004.07.18/pci.lst 2004-07-24 13:28:29.000000000 +0100
@@ -1325,7 +1325,7 @@
106b000e unknown ignore Hydra Mac I/O
106b0010 unknown ignore Heathrow Mac I/O
106b0017 unknown ignore Paddington Mac I/O
- 106b0018 unknown ohci1394 UniNorth FireWire
+ 106b0018 bridge ohci1394 UniNorth FireWire
106b0019 usb usb-ohci KeyLargo USB
106b001e bridge ignore UniNorth Internal PCI
106b001f bridge ignore UniNorth PCI
@@ -1341,8 +1341,8 @@
106b002d unknown unknown UniNorth 1.5 AGP
106b002e unknown unknown UniNorth 1.5 PCI
106b002f unknown unknown UniNorth 1.5 Internal PCI
- 106b0030 unknown ohci1394 UniNorth/Pangea FireWire
- 106b0031 unknown unknown UniNorth 2 FireWire
+ 106b0030 bridge ohci1394 UniNorth/Pangea FireWire
+ 106b0031 bridge ohci1394 UniNorth 2 FireWire
106b0032 ethernet sungem UniNorth 2 GMAC (Sun GEM)
106b0033 unknown unknown UniNorth 2 ATA/100
106b0034 unknown unknown UniNorth 2 AGP
Thanks,
--
Colin Watson [cjwatson@flatline.org.uk]
Reply to: