Changeset 9348862 in mainline for uspace/drv/bus/usb

Timestamp:

2013-09-21T00:43:24Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4cf5b8e0

Parents:

3f03199

Message:

usb: Move HC driver implementation functions to a separate structure.

Location:

uspace/drv/bus/usb

Files:

• ohci/hc.c (modified) (1 diff)
• ohci/ohci.c (modified) (2 diffs)
• ohci/ohci_endpoint.c (modified) (2 diffs)
• uhci/hc.c (modified) (1 diff)
• uhci/uhci.c (modified) (1 diff)
• vhc/transfer.c (modified) (1 diff)

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

@@ -296 +296 @@
 {
         assert(hcd);
-        hc_t *instance = hcd->private_data;
+        hc_t *instance = hcd->driver.data;
         assert(instance);
 

uspace/drv/bus/usb/ohci/ohci.c

@@ -58 +58 @@
         assert(dev);
         hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->private_data) {
+        if (!hcd || !hcd->driver.data) {
                 usb_log_warning("Interrupt on device that is not ready.\n");
                 return;
@@ -64 +64 @@
 
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(hcd->private_data, status);
+        hc_interrupt(hcd->driver.data, status);
 }
 

uspace/drv/bus/usb/ohci/ohci_endpoint.c

@@ -90 +90 @@
         endpoint_set_hc_data(
             ep, ohci_ep, ohci_ep_toggle_get, ohci_ep_toggle_set);
-        hc_enqueue_endpoint(hcd->private_data, ep);
+        hc_enqueue_endpoint(hcd->driver.data, ep);
         return EOK;
 }
@@ -104 +104 @@
         assert(ep);
         ohci_endpoint_t *instance = ohci_endpoint_get(ep);
-        hc_dequeue_endpoint(hcd->private_data, ep);
+        hc_dequeue_endpoint(hcd->driver.data, ep);
         if (instance) {
                 free32(instance->ed);

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

@@ -444 +444 @@
 {
         assert(hcd);
-        hc_t *instance = hcd->private_data;
+        hc_t *instance = hcd->driver.data;
         assert(instance);
         assert(batch);

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

@@ -57 +57 @@
         assert(dev);
         hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->private_data) {
+        if (!hcd || !hcd->driver.data) {
                 usb_log_error("Interrupt on not yet initialized device.\n");
                 return;
         }
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(hcd->private_data, status);
+        hc_interrupt(hcd->driver.data, status);
 }
 

uspace/drv/bus/usb/vhc/transfer.c

@@ -167 +167 @@
         assert(hcd);
         assert(batch);
-        vhc_data_t *vhc = hcd->private_data;
+        vhc_data_t *vhc = hcd->driver.data;
         assert(vhc);