Am Mit, den 11.02.2004 schrieb Harald Dunkel um 20:27:
Gaudenz Steinlin wrote:
discover-data does not currently support kernel 2.6 module names.
discover now supports multiple entries for different kernel versions.
Patches to add 2.6 support to discover-data are very welcome.
I am not sure about the xml syntax for the special 2.6.x kernel modules. Is there some documentation?
http://platform.progeny.com/discover/guide.html#ex-using_version_attribute_of_data_element and http://platform.progeny.com/discover/guide.html#sc-linux_kernel_modules
Attached you can find a patch to fix the usb device names for kernel 2.6, and to support some new devices.
Regards
Harri
--- pci-device.xml.orig 2004-02-10 17:20:22.000000000 +0100 +++ pci-device.xml 2004-02-13 22:56:27.000000000 +0100 @@ -80,6 +80,9 @@ </device> <device busclass="0c03" vendor="0e11" model="7020" model_name="USB Controller"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -100,6 +103,9 @@ </device> <device busclass="0c03" vendor="0e11" model="a0f8" model_name="USB Open Host Controller"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -2765,6 +2771,9 @@ </device> <device busclass="0c03" vendor="1022" model="7404" model_name="AMD 755 [Cobra] OHCI USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -2786,6 +2795,9 @@ </device> <device busclass="0c03" vendor="1022" model="740c" model_name="AMD 756 OHCI USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -2807,6 +2819,9 @@ </device> <device busclass="0c03" vendor="1022" model="7414" model_name="AMD 765 [Viper] USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -4148,6 +4163,9 @@ </device> <device busclass="0c03" vendor="1033" model="0035" model_name="USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -4410,6 +4428,9 @@ </device> <device busclass="0c03" vendor="1039" model="7001" model_name="7001"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -4563,6 +4584,9 @@ </device> <device busclass="0c03" vendor="1045" model="a0f8" model_name="82C750 [Vendetta] USB Controller"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -4647,6 +4671,9 @@ </device> <device busclass="0c03" vendor="1045" model="c861" model_name="82C861"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -5083,6 +5110,9 @@ </device> <device busclass="0c03" vendor="1055" model="9462" model_name="USB Universal Host Controller [OHCI]"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -5527,6 +5557,9 @@ </device> <device busclass="0c03" vendor="106b" model="0019" model_name="USB Interface"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -5583,6 +5616,9 @@ </device> <device busclass="0c03" vendor="106b" model="0026" model_name="KeyLargo/Pangea USB controller"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -6037,6 +6073,9 @@ </device> <device busclass="0c03" vendor="108e" model="1103" model_name="RIO USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -6274,6 +6313,9 @@ </device> <device busclass="0c03" vendor="1095" model="0670" model_name="USB0670"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -6281,6 +6323,9 @@ </device> <device busclass="0c03" vendor="1095" model="0673" model_name="USB0673"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -7099,6 +7144,9 @@ </device> <device busclass="0c03" vendor="10b9" model="5237" model_name="M5237 USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -8339,6 +8387,9 @@ </device> <device busclass="0c03" vendor="1106" model="3038" model_name="VT82C586B [UHCI USB]"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -8392,7 +8443,12 @@ </device> <device busclass="0000" vendor="1106" model="3103" model_name="VT8615 Host Bridge"> </device> - <device busclass="0000" vendor="1106" model="3104" model_name="USB 2.0"> + <device busclass="0c03" vendor="1106" model="3104" model_name="USB 2.0"> + <data class="linux"> + <data class="module"> + <data class="name">ehci_hcd</data> + </data> + </data> </device> <device busclass="0200" vendor="1106" model="3106" model_name="VT6105 [Rhine-III]"> <data class="linux"> @@ -9671,6 +9727,9 @@ </device> <device busclass="0c03" vendor="1166" model="0220" model_name="OSB4/CSB5 OHCI USB Controller"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">ohci_hcd</data> + </data> <data class="module"> <data class="name">usb-ohci</data> </data> @@ -10706,7 +10765,12 @@ </data> </data> </device> - <device busclass="0000" vendor="1260" model="3890" model_name="D-Links DWL-g650 A1"> + <device busclass="0200" vendor="1260" model="3890" model_name="D-Links DWL-g650 A1"> + <data class="linux"> + <data class="module"> + <data class="name">prism54</data> + </data> + </data> </device> <device busclass="0000" vendor="1260" model="8130" model_name="HMP8130 NTSC/PAL Video Decoder"> </device> @@ -14250,6 +14314,9 @@ </device> <device busclass="0c03" vendor="8086" model="2412" model_name="82801AA USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -14289,6 +14356,9 @@ </device> <device busclass="0c03" vendor="8086" model="2422" model_name="82801AB Chipset USB"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -14328,6 +14398,9 @@ </device> <device busclass="0c03" vendor="8086" model="2442" model_name="82815 Chipset USB (A)"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -14337,6 +14410,9 @@ </device> <device busclass="0c03" vendor="8086" model="2444" model_name="82815 Chipset USB (B)"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -14497,7 +14573,12 @@ </device> <device busclass="0000" vendor="8086" model="24cc" model_name="82801DBM LPC Interface Controller"> </device> - <device busclass="0000" vendor="8086" model="24cd" model_name="82801DB USB EHCI Controller"> + <device busclass="0c03" vendor="8086" model="24cd" model_name="82801DB USB EHCI Controller"> + <data class="linux"> + <data class="module"> + <data class="name">ehci_hcd</data> + </data> + </data> </device> <device busclass="0000" vendor="8086" model="24d0" model_name="82801EB LPC Interface Controller"> </device> @@ -14722,6 +14803,9 @@ </device> <device busclass="0c03" vendor="8086" model="7020" model_name="82371SB PIIX3 USB [Natoma/Triton II]"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -14747,6 +14831,9 @@ </device> <device busclass="0c03" vendor="8086" model="7112" model_name="82371AB PIIX4 USB controller"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -14876,6 +14963,9 @@ </device> <device busclass="0c03" vendor="8086" model="719a" model_name="82440MX USB Universal Host Controller"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data> @@ -14918,6 +15008,9 @@ </device> <device busclass="0c03" vendor="8086" model="7602" model_name="82372FB [PCI-to-USB UHCI]"> <data class="linux"> + <data class="module" version="[2.6,inf)"> + <data class="name">uhci_hcd</data> + </data> <data class="module"> <data class="name">usb-uhci</data> </data>