Changeset 48fe0c9 in mainline for uspace/drv/ohci/root_hub.c

Timestamp:

2011-03-21T13:43:27Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

361e61b, 5971dd3, 8a951ca

Parents:

0e45e7f (diff), 925e099 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

OHCI hc driver software side implementation

File:

• uspace/drv/ohci/root_hub.c (moved) (moved from uspace/drv/ohci/ohci_rh.c ) (2 diffs)

uspace/drv/ohci/root_hub.c

@@ -38 +38 @@
 #include <usb/debug.h>
 
-#include "ohci_rh.h"
+#include "root_hub.h"
 
 /** Root hub initialization
  * @return Error code.
  */
-int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs)
+int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs)
 {
         assert(instance);
-        instance->address = 0;
+        instance->address = -1;
         instance->registers = regs;
+        instance->device = dev;
 
         usb_log_info("OHCI root hub with %d ports.\n", regs->rh_desc_a & 0xff);
@@ -55 +56 @@
 }
 /*----------------------------------------------------------------------------*/
-void ohci_rh_request(ohci_rh_t *instance, batch_t *request)
+int rh_request(rh_t *instance, batch_t *request)
 {
+        assert(instance);
+        assert(request);
         /* TODO: implement */
+        if (request->setup_buffer) {
+                usb_log_info("Root hub got SETUP packet: %s.\n",
+                    usb_debug_str_buffer((const uint8_t *)request->setup_buffer, 8, 8));
+        }
+        usb_log_error("Root hub request processing not implemented.\n");
+        batch_finish(request, ENOTSUP);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
-void ohci_rh_interrupt(ohci_rh_t *instance)
+void rh_interrupt(rh_t *instance)
 {
-        usb_log_info("Interrupt!!.\n");
+        usb_log_error("Root hub interrupt not implemented.\n");
         /* TODO: implement */
 }