Changeset bab71635 in mainline for uspace/drv/ohci/main.c

Timestamp:

2011-03-21T11:13:26Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b0beee82

Parents:

c15070c

Message:

Renames, remove ohci prefix

File:

• uspace/drv/ohci/main.c (modified) (5 diffs)

uspace/drv/ohci/main.c

@@ -45 +45 @@
 #include "pci.h"
 #include "iface.h"
-#include "ohci_hc.h"
+#include "hc.h"
 
 static int ohci_add_device(ddf_dev_t *device);
@@ -58 +58 @@
 {
         assert(dev);
-        ohci_hc_t *hc = (ohci_hc_t*)dev->driver_data;
+        hc_t *hc = (hc_t*)dev->driver_data;
         assert(hc);
-        ohci_hc_interrupt(hc, 0);
+        hc_interrupt(hc, 0);
 }
 /*----------------------------------------------------------------------------*/
@@ -72 +72 @@
 };
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &ohci_hc_iface,
+        .interfaces[USBHC_DEV_IFACE] = &hc_iface,
 };
 
@@ -105 +105 @@
             "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));
 
-        ohci_hc_t *hcd = malloc(sizeof(ohci_hc_t));
+        hc_t *hcd = malloc(sizeof(hc_t));
         if (hcd == NULL) {
                 usb_log_error("Failed to allocate OHCI driver.\n");
@@ -129 +129 @@
         }
 
-        ret = ohci_hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size, interrupts);
+        ret = hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size, interrupts);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize OHCI driver.\n");