Changes in uspace/drv/uhci-hcd/iface.c [1387692:1fb1339] in mainline

File:

• uspace/drv/uhci-hcd/iface.c (modified) (12 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -55 +55 @@
         assert(hc);
         usb_log_debug("Default address request with speed %d.\n", speed);
-        usb_device_keeper_reserve_default_address(&hc->device_manager, speed);
+        device_keeper_reserve_default(&hc->device_manager, speed);
         return EOK;
 }
@@ -70 +70 @@
         assert(hc);
         usb_log_debug("Default address release.\n");
-        usb_device_keeper_release_default_address(&hc->device_manager);
+        device_keeper_release_default(&hc->device_manager);
         return EOK;
 }
@@ -90 +90 @@
 
         usb_log_debug("Address request with speed %d.\n", speed);
-        *address = device_keeper_get_free_address(&hc->device_manager, speed);
+        *address = device_keeper_request(&hc->device_manager, speed);
         usb_log_debug("Address request with result: %d.\n", *address);
         if (*address <= 0)
@@ -111 +111 @@
         assert(hc);
         usb_log_debug("Address bind %d-%d.\n", address, handle);
-        usb_device_keeper_bind(&hc->device_manager, address, handle);
+        device_keeper_bind(&hc->device_manager, address, handle);
         return EOK;
 }
@@ -127 +127 @@
         assert(hc);
         usb_log_debug("Address release %d.\n", address);
-        usb_device_keeper_release(&hc->device_manager, address);
+        device_keeper_release(&hc->device_manager, address);
         return EOK;
 }
@@ -149 +149 @@
         uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
-        usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
 
         usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
             target.address, target.endpoint, size, max_packet_size);
 
-        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
             max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
             &hc->device_manager);
@@ -186 +186 @@
         uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
-        usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
         usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n",
             target.address, target.endpoint, size, max_packet_size);
 
-        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
             max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
                         &hc->device_manager);
@@ -222 +222 @@
         uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
-        usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
 
         usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
             target.address, target.endpoint, size, max_packet_size);
 
-        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
             max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
             &hc->device_manager);
@@ -259 +259 @@
         uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
-        usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
         usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
             target.address, target.endpoint, size, max_packet_size);
 
-        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
             max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
             &hc->device_manager);
@@ -298 +298 @@
         uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
-        usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
         usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
             speed, target.address, target.endpoint, size, max_packet_size);
@@ -305 +305 @@
                 return EINVAL;
 
-        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
             max_packet_size, speed, data, size, setup_data, setup_size,
             NULL, callback, arg, &hc->device_manager);
         if (!batch)
                 return ENOMEM;
-        usb_device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
+        device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
         batch_control_write(batch);
         const int ret = uhci_hc_schedule(hc, batch);
@@ -341 +341 @@
         uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
-        usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
 
         usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
             speed, target.address, target.endpoint, size, max_packet_size);
-        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+        batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
             max_packet_size, speed, data, size, setup_data, setup_size, callback,
             NULL, arg, &hc->device_manager);