Changeset b5111c46 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2014-07-23T21:38:25Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ffa96c2

Parents:

87a3df7f

Message:

Convert OHCI and UHCI away from DDF_DATA_IMPLANT.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (3 diffs)
• hc.h (modified) (3 diffs)
• uhci.c (modified) (6 diffs)

uspace/drv/bus/usb/uhci/hc.c

@@ -230 +230 @@
  *
  * @param[in] instance Memory place to initialize.
+ * @param[in] HC function node
  * @param[in] regs Range of device's I/O control registers.
  * @param[in] interrupts True if hw interrupts should be used.
@@ -238 +239 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
+int hc_init(hc_t *instance, ddf_fun_t *fun, addr_range_t *regs, bool interrupts)
 {
         assert(regs->size >= sizeof(uhci_regs_t));
@@ -266 +267 @@
         }
 
-        hcd_init(&instance->generic, USB_SPEED_FULL,
+        instance->generic = ddf_fun_data_alloc(fun, sizeof(hcd_t));
+        if (instance->generic == NULL) {
+                usb_log_error("Out of memory.\n");
+                return ENOMEM;
+        }
+
+        hcd_init(instance->generic, USB_SPEED_FULL,
             BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
 
-        instance->generic.private_data = instance;
-        instance->generic.schedule = hc_schedule;
-        instance->generic.ep_add_hook = NULL;
+        instance->generic->private_data = instance;
+        instance->generic->schedule = hc_schedule;
+        instance->generic->ep_add_hook = NULL;
 
         hc_init_hw(instance);

uspace/drv/bus/usb/uhci/hc.h

@@ -36 +36 @@
 #define DRV_UHCI_HC_H
 
+#include <ddf/driver.h>
 #include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
@@ -93 +94 @@
 typedef struct hc {
         /** Generic HCD driver structure */
-        hcd_t generic;
+        hcd_t *generic;
 
         /** Addresses of I/O registers */
@@ -126 +127 @@
     addr_range_t *);
 void hc_interrupt(hc_t *instance, uint16_t status);
-int hc_init(hc_t *instance, addr_range_t *regs, bool interupts);
+int hc_init(hc_t *, ddf_fun_t *, addr_range_t *, bool);
 
 /** Safely dispose host controller internal structures

uspace/drv/bus/usb/uhci/uhci.c

@@ -34 +34 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <errno.h>
 #include <stdbool.h>
@@ -62 +59 @@
         hc_t hc;
         /** Internal driver's representation of UHCI root hub */
-        rh_t rh;
+        rh_t *rh;
 } uhci_t;
 
@@ -186 +183 @@
 
         ddf_fun_set_ops(instance->hc_fun, &hc_ops);
-        ddf_fun_data_implant(instance->hc_fun, &instance->hc.generic);
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh");
@@ -196 +192 @@
 
         ddf_fun_set_ops(instance->rh_fun, &rh_ops);
-        ddf_fun_data_implant(instance->rh_fun, &instance->rh);
+        instance->rh = ddf_fun_data_alloc(instance->rh_fun, sizeof(rh_t));
 
         addr_range_t regs;
@@ -236 +232 @@
         }
 
-        rc = hc_init(&instance->hc, &regs, interrupts);
+        rc = hc_init(&instance->hc, instance->hc_fun, &regs, interrupts);
         if (rc != EOK) {
                 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(rc));
@@ -260 +256 @@
         }
 
-        rc = rh_init(&instance->rh, instance->rh_fun, &regs, 0x10, 4);
+        rc = rh_init(instance->rh, instance->rh_fun, &regs, 0x10, 4);
         if (rc != EOK) {
                 usb_log_error("Failed to setup UHCI root hub: %s.\n",