Changeset 8b54fe6 in mainline for uspace/drv/bus

Timestamp:

2011-09-15T15:05:38Z (14 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

Files:

• ohci/hc.c (modified) (3 diffs)
• ohci/hc.h (modified) (1 diff)
• ohci/ohci.c (modified) (1 diff)
• uhci/uhci.c (modified) (1 diff)
• vhc/connhost.c (modified) (5 diffs)
• vhc/main.c (modified) (1 diff)
• vhc/vhcd.h (modified) (2 diffs)

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;

uspace/drv/bus/usb/uhci/uhci.c

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

uspace/drv/bus/usb/vhc/connhost.c

@@ -62 +62 @@
         VHC_DATA(vhc, fun);
 
-        usb_address_t addr = device_keeper_get_free_address(&vhc->dev_keeper,
-            USB_SPEED_HIGH);
+        usb_address_t addr = usb_device_manager_get_free_address(
+            &vhc->dev_manager, USB_SPEED_HIGH);
         if (addr < 0) {
                 return addr;
@@ -88 +88 @@
         usb_log_debug("Binding handle %" PRIun " to address %d.\n",
             handle, address);
-        usb_device_keeper_bind(&vhc->dev_keeper, address, handle);
+        usb_device_manager_bind(&vhc->dev_manager, address, handle);
 
         return EOK;
@@ -105 +105 @@
         VHC_DATA(vhc, fun);
         bool found =
-            usb_device_keeper_find_by_address(&vhc->dev_keeper, address, handle);
+            usb_device_manager_find_by_address(&vhc->dev_manager, address, handle);
         return found ? EOK : ENOENT;
 }
@@ -119 +119 @@
         VHC_DATA(vhc, fun);
         usb_log_debug("Releasing address %d...\n", address);
-        usb_device_keeper_release(&vhc->dev_keeper, address);
+        usb_device_manager_release(&vhc->dev_manager, address);
 
         return ENOTSUP;
@@ -514 +514 @@
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
-        usb_address_t addr = usb_device_keeper_find(&vhc->dev_keeper, handle);
+        usb_address_t addr = usb_device_manager_find(&vhc->dev_manager, handle);
         if (addr < 0) {
                 return addr;

uspace/drv/bus/usb/vhc/main.c

@@ -80 +80 @@
                 return rc;
         }
-        usb_device_keeper_init(&data->dev_keeper);
+        usb_device_manager_init(&data->dev_manager);
 
         ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");

uspace/drv/bus/usb/vhc/vhcd.h

@@ -39 +39 @@
 #include <usbvirt/device.h>
 #include <usb/host/usb_endpoint_manager.h>
-#include <usb/host/device_keeper.h>
+#include <usb/host/usb_device_manager.h>
 #include <usbhc_iface.h>
 #include <async.h>
@@ -60 +60 @@
         fibril_mutex_t guard;
         usb_endpoint_manager_t ep_manager;
-        usb_device_keeper_t dev_keeper;
+        usb_device_manager_t dev_manager;
         usbvirt_device_t *hub;
         ddf_fun_t *hc_fun;