Changeset 3e37964 in mainline

Timestamp:

2011-03-06T17:39:23Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

98807e16

Parents:

edb5f837

Message:

Use toggle tracking

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (10 diffs)
• batch.h (modified) (2 diffs)
• iface.c (modified) (4 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);
+static void batch_data(batch_t *instance, usb_packet_id pid, device_keeper_t *keeper);
 static void batch_call_in(batch_t *instance);
 static void batch_call_out(batch_t *instance);
@@ -194 +194 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_in(batch_t *instance)
-{
-        assert(instance);
-        batch_data(instance, USB_PID_IN);
+void batch_interrupt_in(batch_t *instance, device_keeper_t *keeper)
+{
+        assert(instance);
+        batch_data(instance, USB_PID_IN, keeper);
         instance->next_step = batch_call_in_and_dispose;
         usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
@@ -203 +203 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_out(batch_t *instance)
+void batch_interrupt_out(batch_t *instance, device_keeper_t *keeper)
 {
         assert(instance);
         memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
-        batch_data(instance, USB_PID_OUT);
+        batch_data(instance, USB_PID_OUT, keeper);
         instance->next_step = batch_call_out_and_dispose;
         usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
@@ -213 +213 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_in(batch_t *instance)
-{
-        assert(instance);
-        batch_data(instance, USB_PID_IN);
+void batch_bulk_in(batch_t *instance, device_keeper_t *keeper)
+{
+        assert(instance);
+        batch_data(instance, USB_PID_IN, keeper);
         instance->next_step = batch_call_in_and_dispose;
         usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
@@ -222 +222 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_out(batch_t *instance)
+void batch_bulk_out(batch_t *instance, device_keeper_t *keeper)
 {
         assert(instance);
         memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
-        batch_data(instance, USB_PID_OUT);
+        batch_data(instance, USB_PID_OUT, keeper);
         instance->next_step = batch_call_out_and_dispose;
         usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
@@ -232 +232 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_data(batch_t *instance, usb_packet_id pid)
+void batch_data(batch_t *instance, usb_packet_id pid, device_keeper_t *keeper)
 {
         assert(instance);
         const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = 1;
+        int toggle = device_keeper_get_toggle(keeper, instance->target);
+        assert(toggle == 0 || toggle == 1);
 
         size_t packet = 0;
@@ -245 +246 @@
                     - remain_size;
 
-                toggle = 1 - toggle;
 
                 const size_t packet_size =
@@ -256 +256 @@
                     &instance->tds[packet + 1]);
 
+                toggle = 1 - toggle;
                 ++packet;
                 assert(packet <= instance->packets);
@@ -261 +262 @@
                 remain_size -= packet_size;
         }
+        device_keeper_set_toggle(keeper, instance->target, toggle);
 
         instance->tds[packet - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
@@ -266 +268 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_control(batch_t *instance,
+void batch_control(batch_t *instance,
    usb_packet_id data_stage, usb_packet_id status_stage)
 {

uspace/drv/uhci-hcd/batch.h

@@ -42 +42 @@
 #include "uhci_struct/transfer_descriptor.h"
 #include "uhci_struct/queue_head.h"
+#include "utils/device_keeper.h"
 
 typedef struct batch
@@ -82 +83 @@
 void batch_control_read(batch_t *instance);
 
-void batch_interrupt_in(batch_t *instance);
+void batch_interrupt_in(batch_t *instance, device_keeper_t *keeper);
 
-void batch_interrupt_out(batch_t *instance);
+void batch_interrupt_out(batch_t *instance, device_keeper_t *keeper);
 
-void batch_bulk_in(batch_t *instance);
+void batch_bulk_in(batch_t *instance, device_keeper_t *keeper);
 
-void batch_bulk_out(batch_t *instance);
+void batch_bulk_out(batch_t *instance, device_keeper_t *keeper);
 #endif
 /**

uspace/drv/uhci-hcd/iface.c

@@ -117 +117 @@
         if (!batch)
                 return ENOMEM;
-        batch_interrupt_out(batch);
+        batch_interrupt_out(batch, &hc->device_manager);
         return EOK;
 }
@@ -136 +136 @@
         if (!batch)
                 return ENOMEM;
-        batch_interrupt_in(batch);
+        batch_interrupt_in(batch, &hc->device_manager);
         return EOK;
 }
@@ -156 +156 @@
         if (!batch)
                 return ENOMEM;
-        batch_bulk_out(batch);
+        batch_bulk_out(batch, &hc->device_manager);
         return EOK;
 }
@@ -175 +175 @@
         if (!batch)
                 return ENOMEM;
-        batch_bulk_in(batch);
+        batch_bulk_in(batch, &hc->device_manager);
         return EOK;
 }