Changes in uspace/drv/uhci-hcd/batch.c [1387692:c15070c] in mainline

File:

• uspace/drv/uhci-hcd/batch.c (modified) (20 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -50 +50 @@
         td_t *tds;
         size_t packets;
-        usb_device_keeper_t *manager;
+        device_keeper_t *manager;
 } uhci_batch_t;
 
-static void batch_control(usb_transfer_batch_t *instance,
+static void batch_control(batch_t *instance,
     usb_packet_id data_stage, usb_packet_id status_stage);
-static void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid);
-static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
-static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
+static void batch_data(batch_t *instance, usb_packet_id pid);
+static void batch_call_in_and_dispose(batch_t *instance);
+static void batch_call_out_and_dispose(batch_t *instance);
 
 
@@ -82 +82 @@
  * transaction and callback.
  */
-usb_transfer_batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
+batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
     usb_speed_t speed, char *buffer, size_t buffer_size,
@@ -88 +88 @@
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out, void *arg,
-    usb_device_keeper_t *manager
+    device_keeper_t *manager
     )
 {
@@ -103 +103 @@
         } else (void)0
 
-        usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
+        batch_t *instance = malloc(sizeof(batch_t));
         CHECK_NULL_DISPOSE_RETURN(instance,
             "Failed to allocate batch instance.\n");
-        usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
+        batch_init(instance, target, transfer_type, speed, max_packet_size,
             buffer, NULL, buffer_size, NULL, setup_size, func_in,
             func_out, arg, fun, NULL);
@@ -161 +161 @@
  * is reached.
  */
-bool batch_is_complete(usb_transfer_batch_t *instance)
+bool batch_is_complete(batch_t *instance)
 {
         assert(instance);
@@ -182 +182 @@
                         td_print_status(&data->tds[i]);
 
-                        usb_device_keeper_set_toggle(data->manager,
+                        device_keeper_set_toggle(data->manager,
                             instance->target, instance->direction,
                             td_toggle(&data->tds[i]));
@@ -205 +205 @@
  * Uses genercir control function with pids OUT and IN.
  */
-void batch_control_write(usb_transfer_batch_t *instance)
+void batch_control_write(batch_t *instance)
 {
         assert(instance);
@@ -222 +222 @@
  * Uses generic control with pids IN and OUT.
  */
-void batch_control_read(usb_transfer_batch_t *instance)
+void batch_control_read(batch_t *instance)
 {
         assert(instance);
@@ -236 +236 @@
  * Data transaction with PID_IN.
  */
-void batch_interrupt_in(usb_transfer_batch_t *instance)
+void batch_interrupt_in(batch_t *instance)
 {
         assert(instance);
@@ -251 +251 @@
  * Data transaction with PID_OUT.
  */
-void batch_interrupt_out(usb_transfer_batch_t *instance)
+void batch_interrupt_out(batch_t *instance)
 {
         assert(instance);
@@ -269 +269 @@
  * Data transaction with PID_IN.
  */
-void batch_bulk_in(usb_transfer_batch_t *instance)
+void batch_bulk_in(batch_t *instance)
 {
         assert(instance);
@@ -284 +284 @@
  * Data transaction with PID_OUT.
  */
-void batch_bulk_out(usb_transfer_batch_t *instance)
+void batch_bulk_out(batch_t *instance)
 {
         assert(instance);
@@ -304 +304 @@
  * The last packet is marked with IOC flag.
  */
-void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid)
+void batch_data(batch_t *instance, usb_packet_id pid)
 {
         assert(instance);
@@ -311 +311 @@
 
         const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = usb_device_keeper_get_toggle(
+        int toggle = device_keeper_get_toggle(
             data->manager, instance->target, instance->direction);
         assert(toggle == 0 || toggle == 1);
@@ -343 +343 @@
         }
         td_set_ioc(&data->tds[packet - 1]);
-        usb_device_keeper_set_toggle(data->manager, instance->target,
+        device_keeper_set_toggle(data->manager, instance->target,
             instance->direction, toggle);
 }
@@ -358 +358 @@
  * The last packet is marked with IOC.
  */
-void batch_control(usb_transfer_batch_t *instance,
+void batch_control(batch_t *instance,
    usb_packet_id data_stage, usb_packet_id status_stage)
 {
@@ -411 +411 @@
 }
 /*----------------------------------------------------------------------------*/
-qh_t * batch_qh(usb_transfer_batch_t *instance)
+qh_t * batch_qh(batch_t *instance)
 {
         assert(instance);
@@ -423 +423 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
-{
-        assert(instance);
-        usb_transfer_batch_call_in(instance);
+void batch_call_in_and_dispose(batch_t *instance)
+{
+        assert(instance);
+        batch_call_in(instance);
         batch_dispose(instance);
 }
@@ -434 +434 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
-{
-        assert(instance);
-        usb_transfer_batch_call_out(instance);
+void batch_call_out_and_dispose(batch_t *instance)
+{
+        assert(instance);
+        batch_call_out(instance);
         batch_dispose(instance);
 }
@@ -445 +445 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_dispose(usb_transfer_batch_t *instance)
+void batch_dispose(batch_t *instance)
 {
         assert(instance);