Changes in uspace/drv/ohci/iface.c [be7950e8:1387692] in mainline

File:

• uspace/drv/ohci/iface.c (modified) (12 diffs)

uspace/drv/ohci/iface.c

@@ -64 +64 @@
   assert(hc);
   usb_log_debug("Default address request with speed %d.\n", speed);
-  device_keeper_reserve_default(&hc->manager, speed);
+  usb_device_keeper_reserve_default_address(&hc->manager, speed);
   return EOK;
 }
@@ -79 +79 @@
   assert(hc);
   usb_log_debug("Default address release.\n");
-  device_keeper_release_default(&hc->manager);
+  usb_device_keeper_release_default_address(&hc->manager);
   return EOK;
 }
@@ -99 +99 @@
 
   usb_log_debug("Address request with speed %d.\n", speed);
-  *address = device_keeper_request(&hc->manager, speed);
+  *address = device_keeper_get_free_address(&hc->manager, speed);
   usb_log_debug("Address request with result: %d.\n", *address);
   if (*address <= 0)
@@ -120 +120 @@
   assert(hc);
   usb_log_debug("Address bind %d-%d.\n", address, handle);
-  device_keeper_bind(&hc->manager, address, handle);
+  usb_device_keeper_bind(&hc->manager, address, handle);
   return EOK;
 }
@@ -136 +136 @@
   assert(hc);
   usb_log_debug("Address release %d.\n", address);
-  device_keeper_release(&hc->manager, address);
+  usb_device_keeper_release(&hc->manager, address);
   return EOK;
 }
@@ -200 +200 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 
   usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
       target.address, target.endpoint, size, max_packet_size);
 
-  batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
       max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
       &hc->manager);
@@ -243 +243 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
   usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n", 
       target.address, target.endpoint, size, max_packet_size);
 
-  batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
       max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
       &hc->manager);
@@ -285 +285 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 
   usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
       target.address, target.endpoint, size, max_packet_size);
 
-  batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
       max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
       &hc->manager);
@@ -329 +329 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
   usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
       target.address, target.endpoint, size, max_packet_size);
 
-  batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
       max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
       &hc->manager);
@@ -376 +376 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
   usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
       speed, target.address, target.endpoint, size, max_packet_size);
@@ -383 +383 @@
     return EINVAL;
 
-  batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
       max_packet_size, speed, data, size, setup_data, setup_size,
       NULL, callback, arg, &hc->manager);
   if (!batch)
     return ENOMEM;
-  device_keeper_reset_if_need(&hc->manager, target, setup_data);
+  usb_device_keeper_reset_if_need(&hc->manager, target, setup_data);
   batch_control_write(batch);
   const int ret = hc_schedule(hc, batch);
@@ -427 +427 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 
   usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
       speed, target.address, target.endpoint, size, max_packet_size);
-  batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
       max_packet_size, speed, data, size, setup_data, setup_size, callback,
       NULL, arg, &hc->manager);