X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fusb.c;h=cc3b2012c0fb62cb6c66598c04409f3c73464f1a;hb=7149fc813139cf564a4456815461c18a8b208e89;hp=1ed3c80a3b853558e069554274b34914f48a3c45;hpb=3c160dde75b9920f048d4276026d680d0f582dc9;p=seabios.git

diff --git a/src/usb.c b/src/usb.c
index 1ed3c80..cc3b201 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -13,6 +13,7 @@
 #include "usb-ohci.h" // ohci_init
 #include "usb-hid.h" // usb_keyboard_setup
 #include "usb-hub.h" // usb_hub_init
+#include "usb-msc.h" // usb_msc_init
 #include "usb.h" // struct usb_s
 #include "biosvar.h" // GET_GLOBAL
 
@@ -38,6 +39,33 @@ send_control(u32 endp, int dir, const void *cmd, int cmdsize
     }
 }
 
+struct usb_pipe *
+alloc_bulk_pipe(u32 endp)
+{
+    struct usb_s *cntl = endp2cntl(endp);
+    switch (cntl->type) {
+    default:
+    case USB_TYPE_UHCI:
+        return uhci_alloc_bulk_pipe(endp);
+    case USB_TYPE_OHCI:
+        return NULL;
+    }
+}
+
+int
+usb_send_bulk(struct usb_pipe *pipe, int dir, void *data, int datasize)
+{
+    u32 endp = GET_FLATPTR(pipe->endp);
+    struct usb_s *cntl = endp2cntl(endp);
+    switch (cntl->type) {
+    default:
+    case USB_TYPE_UHCI:
+        return uhci_send_bulk(pipe, dir, data, datasize);
+    case USB_TYPE_OHCI:
+        return -1;
+    }
+}
+
 struct usb_pipe *
 alloc_intr_pipe(u32 endp, int period)
 {
@@ -220,6 +248,7 @@ configure_usb_device(struct usb_s *cntl, int lowspeed)
     if ((iface->bInterfaceClass != USB_CLASS_HID
          || iface->bInterfaceSubClass != USB_INTERFACE_SUBCLASS_BOOT
          || iface->bInterfaceProtocol != USB_INTERFACE_PROTOCOL_KEYBOARD)
+        && (iface->bInterfaceClass != USB_CLASS_MASS_STORAGE)
         && (iface->bInterfaceClass != USB_CLASS_HUB))
         // Not a supported device.
         goto fail;
@@ -237,8 +266,11 @@ configure_usb_device(struct usb_s *cntl, int lowspeed)
         free(config);
         return usb_hub_init(endp);
     }
-    ret = usb_keyboard_init(endp, iface, ((void*)config + config->wTotalLength
-                                          - (void*)iface));
+    int imax = (void*)config + config->wTotalLength - (void*)iface;
+    if (iface->bInterfaceClass == USB_CLASS_MASS_STORAGE)
+        ret = usb_msc_init(endp, iface, imax);
+    else
+        ret = usb_keyboard_init(endp, iface, imax);
     if (ret)
         goto fail;