Changes in / [ed0cc81:c28b3a5] in mainline

Location:

uspace/drv

Files:

• ohci/hc.c (modified) (1 diff)
• uhci-hcd/transfers.c (added)
• uhci-hcd/uhci.c (modified) (4 diffs)

uspace/drv/ohci/hc.c

@@ -343 +343 @@
 {
         assert(instance);
+        usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);
         if ((status & ~I_SF) == 0) /* ignore sof status */
                 return;
-        usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
         if (status & I_RHSC)
                 rh_interrupt(&instance->rh);

uspace/drv/uhci-hcd/uhci.c

@@ -61 +61 @@
 } uhci_t;
 
-static inline uhci_t * dev_to_uhci(const ddf_dev_t *dev)
+static inline uhci_t * dev_to_uhci(ddf_dev_t *dev)
 {
         assert(dev);
@@ -77 +77 @@
 {
         assert(dev);
-        uhci_t *uhci = dev_to_uhci(dev);
+        uhci_t *uhci = dev->driver_data;
+        assert(uhci);
         hc_t *hc = &uhci->hc;
-        const uint16_t status = IPC_GET_ARG1(*call);
+        uint16_t status = IPC_GET_ARG1(*call);
         assert(hc);
         hc_interrupt(hc, status);
 }
-/*----------------------------------------------------------------------------*/
-/** Operations supported by the HC driver */
-static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
-};
 /*----------------------------------------------------------------------------*/
 /** Get address of the device identified by handle.
@@ -119 +115 @@
  * @return Error code.
  */
-static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
+static int usb_iface_get_hc_handle(
+    ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
@@ -134 +131 @@
         .get_hc_handle = usb_iface_get_hc_handle,
         .get_address = usb_iface_get_address
+};
+/*----------------------------------------------------------------------------*/
+/** Operations supported by the HC driver */
+static ddf_dev_ops_t hc_ops = {
+        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
 };
 /*----------------------------------------------------------------------------*/