Warn that ohci bulk is not supported.

Print a meaningful warning message when trying to use OHCI bulk.

diff --git a/src/usb-ohci.c b/src/usb-ohci.c
index 7b975d9f7d5e5a65e290a009dcf75b6ca539deba..7e91b9f0f1aebb6b9772e212c6e9c862d62d7dd0 100644 (file)
--- a/src/usb-ohci.c
+++ b/src/usb-ohci.c
@@ -411,6 +411,21 @@ ohci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
     return ret;
 }
 
+struct usb_pipe *
+ohci_alloc_bulk_pipe(struct usb_pipe *dummy)
+{
+    if (! CONFIG_USB_OHCI)
+        return NULL;
+    dprintf(1, "OHCI Bulk transfers not supported.\n");
+    return NULL;
+}
+
+int
+ohci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize)
+{
+    return -1;
+}
+
 struct usb_pipe *
 ohci_alloc_intr_pipe(struct usb_pipe *dummy, int frameexp)
 {

diff --git a/src/usb-ohci.h b/src/usb-ohci.h
index 0cadbd68d6b2fdaf76a16db2c1864eaa129839c0..7dd2f09d4cce173069b3027675ee17866b4cbac1 100644 (file)
--- a/src/usb-ohci.h
+++ b/src/usb-ohci.h
@@ -8,6 +8,8 @@ void ohci_free_pipe(struct usb_pipe *p);
 struct usb_pipe *ohci_alloc_control_pipe(struct usb_pipe *dummy);
 int ohci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
                  , void *data, int datasize);
+struct usb_pipe *ohci_alloc_bulk_pipe(struct usb_pipe *dummy);
+int ohci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize);
 struct usb_pipe *ohci_alloc_intr_pipe(struct usb_pipe *dummy, int frameexp);
 int ohci_poll_intr(struct usb_pipe *p, void *data);
 

diff --git a/src/usb.c b/src/usb.c
index 7e6a18bdb147f1ad2d8e165fea6adeef1054155c..cefc5f3f6837c749ac9f1278730db1cb966f3995 100644 (file)
--- a/src/usb.c
+++ b/src/usb.c
@@ -94,7 +94,7 @@ alloc_bulk_pipe(struct usb_pipe *pipe, struct usb_endpoint_descriptor *epdesc)
     case USB_TYPE_UHCI:
         return uhci_alloc_bulk_pipe(&dummy);
     case USB_TYPE_OHCI:
-        return NULL;
+        return ohci_alloc_bulk_pipe(&dummy);
     case USB_TYPE_EHCI:
         return ehci_alloc_bulk_pipe(&dummy);
     }
@@ -108,7 +108,7 @@ usb_send_bulk(struct usb_pipe *pipe_fl, int dir, void *data, int datasize)
     case USB_TYPE_UHCI:
         return uhci_send_bulk(pipe_fl, dir, data, datasize);
     case USB_TYPE_OHCI:
-        return -1;
+        return ohci_send_bulk(pipe_fl, dir, data, datasize);
     case USB_TYPE_EHCI:
         return ehci_send_bulk(pipe_fl, dir, data, datasize);
     }