Changeset 33fbe95 in mainline

Timestamp:

2011-03-21T22:46:05Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

62ed5bc

Parents:

c01cd32

Message:

Rename uhci_rh ⇒ rh

Location:

uspace/drv/uhci-hcd

Files:

• Makefile (modified) (1 diff)
• root_hub.c (moved) (moved from uspace/drv/uhci-hcd/uhci_rh.c ) (2 diffs)
• root_hub.h (moved) (moved from uspace/drv/uhci-hcd/uhci_rh.h ) (1 diff)
• uhci.c (modified) (3 diffs)
• uhci.h (modified) (2 diffs)

uspace/drv/uhci-hcd/Makefile

@@ -38 +38 @@
         uhci.c \
         hc.c \
-        uhci_rh.c \
+        root_hub.c \
         uhci_struct/transfer_descriptor.c \
         pci.c \

uspace/drv/uhci-hcd/root_hub.c

@@ -39 +39 @@
 #include <usb/debug.h>
 
-#include "uhci_rh.h"
+#include "root_hub.h"
 
 /** Root hub initialization
@@ -48 +48 @@
  * @return Error code.
  */
-int uhci_rh_init(
-    uhci_rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size)
+int rh_init(
+    rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size)
 {
         assert(fun);

uspace/drv/uhci-hcd/root_hub.h

@@ -39 +39 @@
 #include <ops/hw_res.h>
 
-typedef struct uhci_rh {
+typedef struct rh {
         hw_resource_list_t resource_list;
         hw_resource_t io_regs;
-} uhci_rh_t;
+} rh_t;
 
-int uhci_rh_init(
-    uhci_rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size);
+int rh_init(
+    rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size);
 
 #endif

uspace/drv/uhci-hcd/uhci.c

@@ -120 +120 @@
 {
         assert(fun);
-        return &((uhci_rh_t*)fun->driver_data)->resource_list;
+        return &((rh_t*)fun->driver_data)->resource_list;
 }
 /*----------------------------------------------------------------------------*/
@@ -128 +128 @@
 };
 /*----------------------------------------------------------------------------*/
-static ddf_dev_ops_t uhci_rh_ops = {
+static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
         .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
@@ -223 +223 @@
             "Failed(%d) to create root hub function.\n", ret);
 
-        ret = uhci_rh_init(&instance->rh, instance->rh_fun,
+        ret = rh_init(&instance->rh, instance->rh_fun,
             (uintptr_t)instance->hc.registers + 0x10, 4);
         CHECK_RET_FINI_RETURN(ret,
             "Failed(%d) to setup UHCI root hub.\n", ret);
 
-        instance->rh_fun->ops = &uhci_rh_ops;
+        instance->rh_fun->ops = &rh_ops;
         instance->rh_fun->driver_data = &instance->rh;
         ret = ddf_fun_bind(instance->rh_fun);

uspace/drv/uhci-hcd/uhci.h

@@ -39 +39 @@
 
 #include "hc.h"
-#include "uhci_rh.h"
+#include "root_hub.h"
 
 typedef struct uhci {
@@ -46 +46 @@
 
         hc_t hc;
-        uhci_rh_t rh;
+        rh_t rh;
 } uhci_t;