Changeset 82122f3 in mainline for uspace/drv/vhc/hc.c

Timestamp:

2010-12-17T14:51:41Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged development into lelian/hidd

File:

• uspace/drv/vhc/hc.c (modified) (13 diffs)

uspace/drv/vhc/hc.c

@@ -50 +50 @@
 #include "hub.h"
 
-#define USLEEP_BASE (500 * 1000)
-
-#define USLEEP_VAR 5000
+#define USLEEP_BASE (0 * 5 * 1000)
+
+#define USLEEP_VAR 50
 
 #define SHORTENING_VAR 15
@@ -68 +68 @@
 static link_t transaction_list;
 
-#define TRANSACTION_FORMAT "T[%d:%d %s (%d)]"
+#define TRANSACTION_FORMAT "T[%d.%d %s/%s (%d)]"
 #define TRANSACTION_PRINTF(t) \
         (t).target.address, (t).target.endpoint, \
+        usb_str_transfer_type((t).transfer_type), \
         usbvirt_str_transaction_type((t).type), \
         (int)(t).len
@@ -77 +78 @@
         list_get_instance(lnk, transaction_t, link)
 
+#define HUB_STATUS_MAX_LEN (HUB_PORT_COUNT + 64)
+
 static inline unsigned int pseudo_random(unsigned int *seed)
 {
@@ -89 +92 @@
     usb_transaction_outcome_t outcome)
 {
-        dprintf(3, "processing transaction " TRANSACTION_FORMAT ", outcome: %s",
+        dprintf(3, "transaction " TRANSACTION_FORMAT " done, outcome: %s",
             TRANSACTION_PRINTF(*transaction),
             usb_str_transaction_outcome(outcome));
@@ -99 +102 @@
 /** Host controller manager main function.
  */
-void hc_manager(void)
+static int hc_manager_fibril(void *arg)
 {
         list_initialize(&transaction_list);
@@ -114 +117 @@
                 }
                 
-                char ports[HUB_PORT_COUNT + 2];
-                hub_get_port_statuses(ports, HUB_PORT_COUNT + 1);
-                dprintf(3, "virtual hub: addr=%d ports=%s",
-                    virthub_dev.address, ports);
+                char ports[HUB_STATUS_MAX_LEN + 1];
+                virthub_get_status(&virtual_hub_device, ports, HUB_STATUS_MAX_LEN);
                 
                 link_t *first_transaction_link = transaction_list.next;
@@ -124 +125 @@
                 list_remove(first_transaction_link);
                 
+
+                dprintf(0, "about to process " TRANSACTION_FORMAT " [%s]",
+                    TRANSACTION_PRINTF(*transaction), ports);
+
                 dprintf(3, "processing transaction " TRANSACTION_FORMAT "",
                     TRANSACTION_PRINTF(*transaction));
@@ -134 +139 @@
                 free(transaction);
         }
+
+        assert(false && "unreachable");
+        return EOK;
+}
+
+void hc_manager(void)
+{
+        fid_t fid = fibril_create(hc_manager_fibril, NULL);
+        if (fid == 0) {
+                printf(NAME ": failed to start HC manager fibril\n");
+                return;
+        }
+        fibril_add_ready(fid);
 }
 
@@ -139 +157 @@
  */
 static transaction_t *transaction_create(usbvirt_transaction_type_t type,
-    usb_target_t target,
+    usb_target_t target, usb_transfer_type_t transfer_type,
     void * buffer, size_t len,
     hc_transaction_done_callback_t callback, void * arg)
@@ -147 +165 @@
         list_initialize(&transaction->link);
         transaction->type = type;
+        transaction->transfer_type = transfer_type;
         transaction->target = target;
         transaction->buffer = buffer;
@@ -153 +172 @@
         transaction->callback_arg = arg;
         
-        dprintf(1, "creating transaction " TRANSACTION_FORMAT,
+        dprintf(3, "creating transaction " TRANSACTION_FORMAT,
             TRANSACTION_PRINTF(*transaction));
         
@@ -162 +181 @@
  */
 void hc_add_transaction_to_device(bool setup, usb_target_t target,
+    usb_transfer_type_t transfer_type,
     void * buffer, size_t len,
     hc_transaction_done_callback_t callback, void * arg)
 {
         transaction_t *transaction = transaction_create(
-            setup ? USBVIRT_TRANSACTION_SETUP : USBVIRT_TRANSACTION_OUT, target,
+            setup ? USBVIRT_TRANSACTION_SETUP : USBVIRT_TRANSACTION_OUT,
+            target, transfer_type,
             buffer, len, callback, arg);
         list_append(&transaction->link, &transaction_list);
@@ -174 +195 @@
  */
 void hc_add_transaction_from_device(usb_target_t target,
+    usb_transfer_type_t transfer_type,
     void * buffer, size_t len,
     hc_transaction_done_callback_t callback, void * arg)
 {
         transaction_t *transaction = transaction_create(USBVIRT_TRANSACTION_IN,
-            target, buffer, len, callback, arg);
+            target, transfer_type,
+            buffer, len, callback, arg);
         list_append(&transaction->link, &transaction_list);
 }