Changeset 8b54fe6 in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2011-09-15T15:05:38Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

db2cb04

Parents:

f58ef61

Message:

usb: Rename device_keeper ⇒ sub-device_manager to match the rest of the library

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (3 diffs)
• hc.h (modified) (1 diff)
• ohci.c (modified) (1 diff)

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

@@ -128 +128 @@
 
         const usb_address_t hub_address =
-            device_keeper_get_free_address(
+            usb_device_manager_get_free_address(
                 &instance->generic.dev_manager, USB_SPEED_FULL);
         if (hub_address <= 0) {
@@ -136 +136 @@
         }
         instance->rh.address = hub_address;
-        usb_device_keeper_bind(
+        usb_device_manager_bind(
             &instance->generic.dev_manager, hub_address, hub_fun->handle);
 
@@ -144 +144 @@
         usb_endpoint_manager_unregister_ep( \
             &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH);\
-        usb_device_keeper_release( \
+        usb_device_manager_release( \
             &instance->generic.dev_manager, hub_address); \
         return ret; \

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

@@ -41 +41 @@
 
 #include <usb/usb.h>
-#include <usb/host/device_keeper.h>
-#include <usb/host/usb_endpoint_manager.h>
 #include <usb/host/hcd.h>
 

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

@@ -86 +86 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager =
+        usb_device_manager_t *manager =
             &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
 
-        const usb_address_t addr = usb_device_keeper_find(manager, handle);
+        const usb_address_t addr = usb_device_manager_find(manager, handle);
         if (addr < 0) {
                 return addr;