Changeset 7dd3318 in mainline for uspace/drv/uhci-hcd/uhci_struct

Timestamp:

2011-02-12T02:00:54Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

83c439c

Parents:

f6309b65

Message:

Add support for batch processing

Location:

uspace/drv/uhci-hcd/uhci_struct

Files:

• queue_head.h (modified) (1 diff)
• transfer_descriptor.c (modified) (1 diff)
• transfer_descriptor.h (modified) (1 diff)

uspace/drv/uhci-hcd/uhci_struct/queue_head.h

@@ -55 +55 @@
 }
 
-static inline void queue_head_add_next(queue_head_t *instance, uint32_t next_queue_pa)
+static inline void queue_head_append_qh(queue_head_t *instance, uint32_t pa)
 {
-        if (next_queue_pa) {
-                instance->next_queue = (next_queue_pa & LINK_POINTER_ADDRESS_MASK)
-                  | LINK_POINTER_QUEUE_HEAD_FLAG;
+        if (pa) {
+                instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK)
+                    | LINK_POINTER_QUEUE_HEAD_FLAG;
         }
 }
 
-static inline queue_head_t * queue_head_get()
-        { return malloc32(sizeof(queue_head_t)); }
+static inline void queue_head_element_qh(queue_head_t *instance, uint32_t pa)
+{
+        if (pa) {
+                instance->next_queue = (pa & LINK_POINTER_ADDRESS_MASK)
+                    | LINK_POINTER_QUEUE_HEAD_FLAG;
+        }
+}
+
+static inline void queue_head_element_td(queue_head_t *instance, uint32_t pa)
+{
+        if (pa) {
+                instance->element = (pa & LINK_POINTER_ADDRESS_MASK);
+        }
+}
+
+static inline queue_head_t * queue_head_get() {
+        queue_head_t *ret = malloc32(sizeof(queue_head_t));
+        if (ret)
+                queue_head_init(ret);
+        return ret;
+}
 
 static inline void queue_head_dispose(queue_head_t *head)

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ -40 +40 @@
 void transfer_descriptor_init(transfer_descriptor_t *instance,
     int error_count, size_t size, bool toggle, bool isochronous,
-    usb_target_t target, int pid, void *buffer)
+    usb_target_t target, int pid, void *buffer, transfer_descriptor_t *next)
 {
         assert(instance);
 
-        instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
+        instance->next =
+            (next != NULL) ? addr_to_phys(next) : LINK_POINTER_TERMINATE_FLAG;
 
         instance->status = 0

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

@@ -93 +93 @@
 void transfer_descriptor_init(transfer_descriptor_t *instance,
     int error_count, size_t size, bool toggle, bool isochronous,
-    usb_target_t target, int pid, void *buffer);
+    usb_target_t target, int pid, void *buffer, transfer_descriptor_t * next);
 
 int transfer_descriptor_status(transfer_descriptor_t *instance);
+
+static inline size_t transfer_descriptor_actual_size(
+    transfer_descriptor_t *instance)
+{
+        assert(instance);
+        return
+            ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK;
+}
 
 static inline bool transfer_descriptor_is_active(