Changeset a6d1bc1 in mainline

Timestamp:

2011-03-21T11:52:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8627377

Parents:

b0beee82

Message:

Add infrastructure for rh registration.

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (3 diffs)
• hc.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• root_hub.c (modified) (2 diffs)
• root_hub.h (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -39 +39 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
+#include <usb/hub.h>
+#include <usb/usbdevice.h>
 #include <usb/ddfiface.h>
-#include <usb_iface.h>
 
 #include "hc.h"
 
-int hc_init(hc_t *instance, ddf_fun_t *fun,
+/*----------------------------------------------------------------------------*/
+int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
     uintptr_t regs, size_t reg_size, bool interrupts)
 {
@@ -56 +58 @@
 
 
-        rh_init(&instance->rh, instance->registers);
+        rh_init(&instance->rh, dev, instance->registers);
         /* TODO: implement */
         /* TODO: register root hub */
         return EOK;
+}
+/*----------------------------------------------------------------------------*/
+int hc_register_hub(hc_t *instance, ddf_dev_t *dev)
+{
+        assert(instance);
+        return rh_register(&instance->rh, dev);
 }
 /*----------------------------------------------------------------------------*/
@@ -71 +79 @@
         }
         /* TODO: implement */
-        return EOK;
+        return ENOTSUP;
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hc.h

@@ -51 +51 @@
         ohci_regs_t *registers;
         usb_address_t rh_address;
-        ohci_rh_t rh;
+        rh_t rh;
         ddf_fun_t *ddf_instance;
         device_keeper_t manager;
 } hc_t;
 
-int hc_init(hc_t *instance, ddf_fun_t *fun,
+int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
      uintptr_t regs, size_t reg_size, bool interrupts);
+
+int hc_register_hub(hc_t *instance, ddf_dev_t *dev);
 
 int hc_schedule(hc_t *instance, batch_t *batch);

uspace/drv/ohci/main.c

@@ -129 +129 @@
         }
 
-        ret = hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size, interrupts);
+        ret = hc_init(hcd, hc_fun, device, mem_reg_base, mem_reg_size, interrupts);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize OHCI driver.\n");
@@ -148 +148 @@
         hc_fun->driver_data = hcd;
 
-        /* TODO: register interrupt handler */
+        hc_register_hub(hcd, device);
 
         usb_log_info("Controlling new OHCI device `%s' (handle %llu).\n",

uspace/drv/ohci/root_hub.c

@@ -43 +43 @@
  * @return Error code.
  */
-int 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->registers = regs;
+        instance->device = dev;
 
         usb_log_info("OHCI root hub with %d ports.\n", regs->rh_desc_a & 0xff);
@@ -55 +56 @@
 }
 /*----------------------------------------------------------------------------*/
-void rh_request(ohci_rh_t *instance, batch_t *request)
+void rh_request(rh_t *instance, batch_t *request)
 {
+        usb_log_error("Request processing not implemented.\n");
         /* TODO: implement */
 }
 /*----------------------------------------------------------------------------*/
-void 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 */
+}
+/*----------------------------------------------------------------------------*/
+int rh_register(rh_t *instance, ddf_dev_t *dev)
+{
+        return EOK;
 }
 /**

uspace/drv/ohci/root_hub.h

@@ -41 +41 @@
 #include "batch.h"
 
-typedef struct ohci_rh {
+typedef struct rh {
         ohci_regs_t *registers;
         usb_address_t address;
-} ohci_rh_t;
+        ddf_dev_t *device;
+} rh_t;
 
-int rh_init(ohci_rh_t *instance, ohci_regs_t *regs);
+int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs);
 
-void rh_request(ohci_rh_t *instance, batch_t *request);
+void rh_request(rh_t *instance, batch_t *request);
 
-void rh_interrupt(ohci_rh_t *instance);
+void rh_interrupt(rh_t *instance);
+
+int rh_register(rh_t *instance, ddf_dev_t *dev);
 #endif
 /**