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

Timestamp:

2011-03-06T18:38:55Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57c0a7e

Parents:

98807e16

Message:

Integrate device_keeper into bathc structure

Check every control write for toggle reset

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -49 +49 @@
 static void batch_control(batch_t *instance,
     usb_packet_id data_stage, usb_packet_id status_stage);
-static void batch_data(batch_t *instance, usb_packet_id pid, device_keeper_t *keeper);
+static void batch_data(batch_t *instance, usb_packet_id pid);
 static void batch_call_in(batch_t *instance);
 static void batch_call_out(batch_t *instance);
@@ -61 +61 @@
     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)
+    usbhc_iface_transfer_out_callback_t func_out, void *arg,
+    device_keeper_t *manager
+    )
 {
         assert(func_in == NULL || func_out == NULL);
@@ -137 +139 @@
         instance->arg = arg;
         instance->speed = speed;
+        instance->manager = manager;
 
         queue_head_element_td(instance->qh, addr_to_phys(instance->tds));
@@ -194 +197 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_in(batch_t *instance, device_keeper_t *keeper)
-{
-        assert(instance);
-        batch_data(instance, USB_PID_IN, keeper);
+void batch_interrupt_in(batch_t *instance)
+{
+        assert(instance);
+        batch_data(instance, USB_PID_IN);
         instance->next_step = batch_call_in_and_dispose;
         usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
@@ -203 +206 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_out(batch_t *instance, device_keeper_t *keeper)
+void batch_interrupt_out(batch_t *instance)
 {
         assert(instance);
         memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
-        batch_data(instance, USB_PID_OUT, keeper);
+        batch_data(instance, USB_PID_OUT);
         instance->next_step = batch_call_out_and_dispose;
         usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
@@ -213 +216 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_in(batch_t *instance, device_keeper_t *keeper)
-{
-        assert(instance);
-        batch_data(instance, USB_PID_IN, keeper);
+void batch_bulk_in(batch_t *instance)
+{
+        assert(instance);
+        batch_data(instance, USB_PID_IN);
         instance->next_step = batch_call_in_and_dispose;
         usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
@@ -222 +225 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_out(batch_t *instance, device_keeper_t *keeper)
+void batch_bulk_out(batch_t *instance)
 {
         assert(instance);
         memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
-        batch_data(instance, USB_PID_OUT, keeper);
+        batch_data(instance, USB_PID_OUT);
         instance->next_step = batch_call_out_and_dispose;
         usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
@@ -232 +235 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_data(batch_t *instance, usb_packet_id pid, device_keeper_t *keeper)
+void batch_data(batch_t *instance, usb_packet_id pid)
 {
         assert(instance);
         const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = device_keeper_get_toggle(keeper, instance->target);
+        int toggle = device_keeper_get_toggle(instance->manager, instance->target);
         assert(toggle == 0 || toggle == 1);
 
@@ -262 +265 @@
                 remain_size -= packet_size;
         }
-        device_keeper_set_toggle(keeper, instance->target, toggle);
+        device_keeper_set_toggle(instance->manager, instance->target, toggle);
 
         instance->tds[packet - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;