Changeset 61bb85d in mainline

Timestamp:

2011-02-09T10:25:01Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2964aa87

Parents:

3cc5ccda

Message:

Fix: interrupt calls should use interrupt trackers
Fix: interrupt tracker should always set next step (it is NULL during te first call)

Location:

uspace/drv/uhci-hcd

Files:

• iface.c (modified) (3 diffs)
• tracker.c (modified) (5 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -113 +113 @@
         if (!tracker)
                 return ENOMEM;
-        tracker_control_read_data_old(tracker);
+        tracker_interrupt_out(tracker);
         return EOK;
 }
@@ -121 +121 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        size_t max_packet_size = 8;
+        size_t max_packet_size = 4;
         dev_speed_t speed = FULL_SPEED;
 
@@ -128 +128 @@
         if (!tracker)
                 return ENOMEM;
-        tracker_control_read_data_old(tracker);
+        tracker_interrupt_in(tracker);
         return EOK;
 }

uspace/drv/uhci-hcd/tracker.c

@@ -286 +286 @@
         }
 
+        assert(instance->packet_size <= instance->max_packet_size);
         if (instance->packet_size) {
                 /* we are data in, we want data from our device. if there is data */
@@ -309 +310 @@
                 /* that's all, end coomunication */
                 instance->next_step = tracker_call_in_and_dispose;
+        } else {
+                instance->next_step = tracker_interrupt_in;
         }
 }
@@ -323 +326 @@
         }
 
-        /* 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;
 
@@ -343 +346 @@
                 /* that's all, end coomunication */
                 instance->next_step = tracker_call_out_and_dispose;
+        } else {
+                instance->next_step = tracker_interrupt_out;
         }
 }
@@ -356 +361 @@
                 memcpy(instance->buffer + instance->buffer_offset, instance->packet,
                     instance->packet_size);
-        }
-        instance->buffer_offset += instance->packet_size;
+                instance->buffer_offset += instance->packet_size;
+        }
         usb_log_debug("Callback IN(%d): %d, %zu.\n", instance->transfer_type,
             err, instance->buffer_offset);