Changes in uspace/drv/bus/usb/ohci/ohci.c [6561a8e:44c1a48] in mainline

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (7 diffs)

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

@@ -42 +42 @@
 
 #include "ohci.h"
-#include "pci.h"
+#include "res.h"
 #include "hc.h"
 
@@ -75 +75 @@
         hc_interrupt(&ohci->hc, status);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Get USB address assigned to root hub.
  *
@@ -92 +92 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Gets handle of the respective hc (this device, hc function).
  *
@@ -110 +110 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
@@ -116 +116 @@
         .get_my_address = rh_get_my_address,
 };
-
+/*----------------------------------------------------------------------------*/
 /** Standard USB HC options (HC interface) */
 static ddf_dev_ops_t hc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
 };
-
+/*----------------------------------------------------------------------------*/
 /** Standard USB RH options (RH interface) */
 static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
 };
-
+/*----------------------------------------------------------------------------*/
 /** Initialize hc and rh ddf structures and their respective drivers.
  *
@@ -180 +180 @@
         int irq = 0;
 
-        ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get register memory addresses for %" PRIun ": %s.\n",
@@ -211 +211 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = pci_enable_interrupts(device);
+        ret = enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."