Changeset 4ca18ae in mainline

Timestamp:

2011-04-06T22:21:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

87305bb

Parents:

f567bcf

Message:

Drop usage of deprecated deice-keeper_t toggle interface

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (7 diffs)
• batch.h (modified) (1 diff)
• iface.c (modified) (6 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -49 +49 @@
         td_t *tds;
         size_t transfers;
-//      usb_device_keeper_t *manager;
 } uhci_batch_t;
 
@@ -73 +72 @@
  * @param[in] func_out function to call on outbound transaction completion
  * @param[in] arg additional parameter to func_in or func_out
- * @param[in] manager Pointer to toggle management structure.
+ * @param[in] ep Pointer to endpoint toggle management structure.
  * @return Valid pointer if all substructures were successfully created,
  * NULL otherwise.
@@ -86 +85 @@
     char* setup_buffer, size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,
-    usbhc_iface_transfer_out_callback_t func_out, void *arg,
-    usb_device_keeper_t *manager, endpoint_t *ep
+    usbhc_iface_transfer_out_callback_t func_out, void *arg, endpoint_t *ep
     )
 {
@@ -115 +113 @@
             "Failed to allocate batch instance.\n");
         bzero(data, sizeof(uhci_batch_t));
-//      data->manager = manager;
         instance->private_data = data;
 
@@ -181 +178 @@
                             instance, i, data->tds[i].status);
                         td_print_status(&data->tds[i]);
-                        endpoint_toggle_set(instance->ep,
-                            td_toggle(&data->tds[i]));
-/*
-                        usb_device_keeper_set_toggle(data->manager,
-                            instance->target, instance->direction,
-                            td_toggle(&data->tds[i]));
-*/
+                        if (instance->ep != NULL)
+                                endpoint_toggle_set(instance->ep,
+                                    td_toggle(&data->tds[i]));
                         if (i > 0)
                                 goto substract_ret;
@@ -315 +308 @@
         const bool low_speed = instance->speed == USB_SPEED_LOW;
         int toggle = endpoint_toggle_get(instance->ep);
-//      usb_device_keeper_get_toggle(
-//          data->manager, instance->target, instance->direction);
         assert(toggle == 0 || toggle == 1);
 
@@ -348 +339 @@
         td_set_ioc(&data->tds[transfer - 1]);
         endpoint_toggle_set(instance->ep, toggle);
-//      usb_device_keeper_set_toggle(data->manager, instance->target,
-//          instance->direction, toggle);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-hcd/batch.h

@@ -56 +56 @@
     usbhc_iface_transfer_out_callback_t func_out,
                 void *arg,
-                usb_device_keeper_t *manager,
                 endpoint_t *ep
                 );

uspace/drv/uhci-hcd/iface.c

@@ -246 +246 @@
         usb_transfer_batch_t *batch =
             batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-                ep->speed, data, size, NULL, 0, NULL, callback, arg,
-                &hc->manager, ep);
+                ep->speed, data, size, NULL, 0, NULL, callback, arg, ep);
         if (!batch)
                 return ENOMEM;
@@ -305 +304 @@
         usb_transfer_batch_t *batch =
             batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-                ep->speed, data, size, NULL, 0, callback, NULL, arg,
-                &hc->manager, ep);
+                ep->speed, data, size, NULL, 0, callback, NULL, arg, ep);
         if (!batch)
                 return ENOMEM;
@@ -353 +351 @@
         usb_transfer_batch_t *batch =
             batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-                ep->speed, data, size, NULL, 0, NULL, callback, arg,
-                &hc->manager, ep);
+                ep->speed, data, size, NULL, 0, NULL, callback, arg, ep);
         if (!batch)
                 return ENOMEM;
@@ -400 +397 @@
         usb_transfer_batch_t *batch =
             batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
-                ep->speed, data, size, NULL, 0, callback, NULL, arg,
-                &hc->manager, ep);
+                ep->speed, data, size, NULL, 0, callback, NULL, arg, ep);
         if (!batch)
                 return ENOMEM;
@@ -449 +445 @@
         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, ep);
+                data, size, setup_data, setup_size, NULL, callback, arg, ep);
         if (!batch)
                 return ENOMEM;
@@ -496 +491 @@
         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, ep);
+                data, size, setup_data, setup_size, callback, NULL, arg, ep);
         if (!batch)
                 return ENOMEM;