Changeset f241b05b in mainline for uspace/drv/uhci-hcd/tracker.c

Timestamp:

2011-02-07T22:09: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:

f82cc1a8

Parents:

a72620d

Message:

Adds new calbacks implementation

several debug texts

File:

• uspace/drv/uhci-hcd/tracker.c (modified) (10 diffs)

uspace/drv/uhci-hcd/tracker.c

@@ -109 +109 @@
 }
 /*----------------------------------------------------------------------------*/
-void tracker_control_write(tracker_t *instance)
+void tracker_control_write(
+    tracker_t *instance, char* setup_buffer, size_t setup_size)
 {
         assert(instance);
         assert(instance->buffer_offset == 0);
-
-        instance->packet_size = SETUP_PACKET_DATA_SIZE;
-        memcpy(instance->packet, instance->buffer, SETUP_PACKET_DATA_SIZE);
-
-        transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT,
-            SETUP_PACKET_DATA_SIZE, instance->toggle++, false, instance->target,
+        assert(setup_size == 8);
+
+        instance->packet_size = 0;
+        memcpy(instance->packet, setup_buffer, setup_size);
+
+        transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT,
+            setup_size, instance->toggle++, false, instance->target,
             USB_PID_SETUP, instance->packet);
 
-        instance->buffer_offset += SETUP_PACKET_DATA_SIZE;
         instance->next_step = tracker_control_write_data;
 
@@ -127 +128 @@
 }
 /*----------------------------------------------------------------------------*/
-void tracker_control_read(tracker_t *instance)
+void tracker_control_read(
+    tracker_t *instance, char* setup_buffer, size_t setup_size)
 {
         assert(instance);
         assert(instance->buffer_offset == 0);
-
-        instance->packet_size = SETUP_PACKET_DATA_SIZE;
-        memcpy(instance->packet, instance->buffer, SETUP_PACKET_DATA_SIZE);
-
-        transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT,
-            SETUP_PACKET_DATA_SIZE, instance->toggle++, false, instance->target,
+        assert(setup_size == 8);
+
+        memcpy(instance->packet, setup_buffer, setup_size);
+
+        transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT,
+            setup_size, instance->toggle++, false, instance->target,
             USB_PID_SETUP, instance->packet);
 
@@ -157 +159 @@
 
         /* we are data in, we want data from our device */
-        memcpy(instance->buffer + instance->buffer_offset, instance->packet,
-            instance->packet_size);
+        if (instance->packet_size) {
+                memcpy(instance->buffer + instance->buffer_offset, instance->packet,
+                    instance->packet_size);
+        }
         instance->buffer_offset += instance->packet_size;
 
@@ -190 +194 @@
         }
 
-        /* we are data out, we down't want data from our device */
+        /* we are data out, we don't want data from our device */
         instance->buffer_offset += instance->packet_size;
 
@@ -233 +237 @@
         instance->packet_size = 0;
         transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT,
-            0, 1, false, instance->target, USB_PID_OUT, NULL);
+            instance->packet_size, 1, false, instance->target, USB_PID_OUT, NULL);
 
         tracker_schedule(instance);
@@ -253 +257 @@
 
         /* we are data in, we want data from our device */
+        assert(
+            instance->buffer_offset + instance->packet_size <= instance->buffer_size);
         memcpy(instance->buffer + instance->buffer_offset, instance->packet,
             instance->packet_size);
@@ -261 +267 @@
         instance->packet_size = 0;
         transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT,
-            0, 1, false, instance->target, USB_PID_OUT, NULL);
+            instance->packet_size, 1, false, instance->target, USB_PID_IN, NULL);
 
         tracker_schedule(instance);
@@ -290 +296 @@
         instance->packet_size = MIN(instance->max_packet_size,
                         instance->buffer_size - instance->buffer_offset);
+        assert(instance->packet_size <= instance->max_packet_size);
 
         transfer_descriptor_init(instance->td, DEFAULT_ERROR_COUNT,
@@ -351 +358 @@
         }
         instance->buffer_offset += instance->packet_size;
-        usb_log_debug("Callback IN: %d, %zu.\n", err, instance->buffer_offset);
+        usb_log_debug("Callback IN(%d): %d, %zu.\n", instance->transfer_type,
+            err, instance->buffer_offset);
         instance->callback_in(instance->dev,
             err ? USB_OUTCOME_CRCERROR : USB_OUTCOME_OK, instance->buffer_offset,
@@ -364 +372 @@
         /* check for errors */
         int err = transfer_descriptor_status(instance->td);
-        usb_log_debug("Callback OUT: %d, %zu.\n", err, instance->buffer_offset);
+        usb_log_debug("Callback OUT(%d): %d, %zu.\n", instance->transfer_type,
+            err, instance->buffer_offset);
         instance->callback_out(instance->dev,
             err ? USB_OUTCOME_CRCERROR : USB_OUTCOME_OK, instance->arg);