r746 - in cpu/x86/pc: biosload olpc

Author: wmb
Date: 2007-12-02 11:31:17 +0100 (Sun, 02 Dec 2007)
New Revision: 746

Modified:
   cpu/x86/pc/biosload/ofw.bth
   cpu/x86/pc/olpc/loaddropins.fth
Log:
USB - Load the usbkbd driver only for the keyboard subclass; don't load it
for the generic hid subclass.

Modified: cpu/x86/pc/biosload/ofw.bth
===================================================================
--- cpu/x86/pc/biosload/ofw.bth	2007-12-02 10:27:07 UTC (rev 745)
+++ cpu/x86/pc/biosload/ofw.bth	2007-12-02 10:31:17 UTC (rev 746)
@@ -80,9 +80,9 @@
    " ${BP}/dev/usb2/hcd/ohci/build/ohci.fc"	" class0c0310"     $add-deflated-dropin
    " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc"	" class0c0320"     $add-deflated-dropin

-   " ${BP}/dev/usb2/device/hub/build/hub.fc"            " usb,class9"  $add-dropin
-   " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc"    " usb,class3"  $add-dropin
-\  " ${BP}/dev/usb2/device/net/build/usbnet.fc"         " usbnet"      $add-deflated-dropin
+   " ${BP}/dev/usb2/device/hub/build/hub.fc"            " usb,class9"    $add-dropin
+   " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc"    " usb,class3,1"  $add-dropin
+   " ${BP}/dev/usb2/device/net/build/usbnet.fc"         " usbnet"      $add-deflated-dropin
    " ${BP}/dev/usb2/device/serial/build/usbserial.fc"   " usbserial"   $add-deflated-dropin
    " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage"  $add-deflated-dropin

Modified: cpu/x86/pc/olpc/loaddropins.fth
===================================================================
--- cpu/x86/pc/olpc/loaddropins.fth	2007-12-02 10:27:07 UTC (rev 745)
+++ cpu/x86/pc/olpc/loaddropins.fth	2007-12-02 10:31:17 UTC (rev 746)
@@ -8,7 +8,7 @@
    " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc"	" class0c0320"      $add-deflated-dropin
    " ${BP}/dev/usb2/device/hub/build/hub.fc"     " usb,class9"      $add-dropin
    " ${BP}/dev/usb2/device/net/build/usbnet.fc"       " usbnet"     $add-deflated-dropin
-   " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc"  " usb,class3" $add-dropin
+   " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc"  " usb,class3,1" $add-dropin
    " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial"  $add-deflated-dropin
    " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage"   $add-deflated-dropin
    " ${BP}/dev/usb2/device/wlan/build/usb8388.fc" " usb1286,2001"   $add-deflated-dropin