Changeset f567bcf in mainline for uspace/drv/uhci-hcd/batch.c

Timestamp:

2011-04-06T22:02:17Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4ca18ae

Parents:

8dc762e0

Message:

Switch to new endpoint toggle control.

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -49 +49 @@
         td_t *tds;
         size_t transfers;
-        usb_device_keeper_t *manager;
+//      usb_device_keeper_t *manager;
 } uhci_batch_t;
 
@@ -87 +87 @@
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out, void *arg,
-    usb_device_keeper_t *manager
+    usb_device_keeper_t *manager, endpoint_t *ep
     )
 {
@@ -105 +105 @@
         CHECK_NULL_DISPOSE_RETURN(instance,
             "Failed to allocate batch instance.\n");
-        usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
+        usb_transfer_batch_init(instance, target,
+            transfer_type, speed, max_packet_size,
             buffer, NULL, buffer_size, NULL, setup_size, func_in,
-            func_out, arg, fun, NULL);
+            func_out, arg, fun, ep, NULL);
 
 
@@ -114 +115 @@
             "Failed to allocate batch instance.\n");
         bzero(data, sizeof(uhci_batch_t));
-        data->manager = manager;
+//      data->manager = manager;
         instance->private_data = data;
 
@@ -180 +181 @@
                             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 (i > 0)
                                 goto substract_ret;
@@ -310 +314 @@
 
         const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = usb_device_keeper_get_toggle(
-            data->manager, instance->target, instance->direction);
+        int toggle = endpoint_toggle_get(instance->ep);
+//      usb_device_keeper_get_toggle(
+//          data->manager, instance->target, instance->direction);
         assert(toggle == 0 || toggle == 1);
 
@@ -342 +347 @@
         }
         td_set_ioc(&data->tds[transfer - 1]);
-        usb_device_keeper_set_toggle(data->manager, instance->target,
-            instance->direction, toggle);
+        endpoint_toggle_set(instance->ep, toggle);
+//      usb_device_keeper_set_toggle(data->manager, instance->target,
+//          instance->direction, toggle);
 }
 /*----------------------------------------------------------------------------*/