Changeset 7a7bfeb3 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/hc.c

Timestamp:

2010-10-24T16:43:40Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

355f7c2

Parents:

b8a3cda

Message:

Virtual USB overhaul almost complete

The virtual HC, hub and keyboard are rewritten after changes to HCD API.
Comments will be added later.

File:

• uspace/srv/hw/bus/usb/hcd/virtual/hc.c (modified) (6 diffs)

uspace/srv/hw/bus/usb/hcd/virtual/hc.c

@@ -48 +48 @@
 #include "hc.h"
 #include "devices.h"
+#include "hub.h"
 
 #define USLEEP_BASE (500 * 1000)
@@ -65 +66 @@
         } while (0)
 
-static link_t transaction_to_device_list;
-static link_t transaction_from_device_list;
+static link_t transaction_list;
 
-#define TRANSACTION_FORMAT "T[%d:%d (%d)]"
+#define TRANSACTION_FORMAT "T[%d:%d (%d) %d]"
 #define TRANSACTION_PRINTF(t) \
         (t).target.address, (t).target.endpoint, \
-        (int)(t).len
+        (int)(t).len, (int)(t).type
 
 #define transaction_get_instance(lnk) \
@@ -100 +100 @@
 void hc_manager(void)
 {
-        list_initialize(&transaction_to_device_list);
-        list_initialize(&transaction_from_device_list);
+        list_initialize(&transaction_list);
         
         static unsigned int seed = 4573;
@@ -110 +109 @@
                 async_usleep(USLEEP_BASE + (pseudo_random(&seed) % USLEEP_VAR));
                 
-                if (list_empty(&transaction_to_device_list)) {
+                if (list_empty(&transaction_list)) {
                         continue;
                 }
                 
-                link_t *first_transaction_link = transaction_to_device_list.next;
+                dprintf("virtual hub has address %d:*.", virthub_dev.address);
+                
+                link_t *first_transaction_link = transaction_list.next;
                 transaction_t *transaction
                     = transaction_get_instance(first_transaction_link);
                 list_remove(first_transaction_link);
+                
+                dprintf("processing transaction " TRANSACTION_FORMAT "",
+                    TRANSACTION_PRINTF(*transaction));
                 
                 usb_transaction_outcome_t outcome;
@@ -157 +161 @@
             setup ? USBVIRT_TRANSACTION_SETUP : USBVIRT_TRANSACTION_OUT, target,
             buffer, len, callback, arg);
-        list_append(&transaction->link, &transaction_to_device_list);
+        list_append(&transaction->link, &transaction_list);
 }
 
@@ -168 +172 @@
         transaction_t *transaction = transaction_create(USBVIRT_TRANSACTION_IN,
             target, buffer, len, callback, arg);
-        list_append(&transaction->link, &transaction_from_device_list);
-}
-
-/** Fill data to existing transaction from device.
- */
-int hc_fillin_transaction_from_device(usb_target_t target,
-    void * buffer, size_t len)
-{
-        dprintf("finding transaction to fill data in (%d:%d)...",
-            target.address, target.endpoint);
-        int rc;
-        
-        /*
-         * Find correct transaction envelope in the list.
-         */
-        if (list_empty(&transaction_from_device_list)) {
-                rc = ENOENT;
-                goto leave;
-        }
-        
-        transaction_t *transaction = NULL;
-        link_t *pos = transaction_from_device_list.next;
-        
-        while (pos != &transaction_from_device_list) {
-                transaction_t *t = transaction_get_instance(pos);
-                if (usb_target_same(t->target, target)) {
-                        transaction = t;
-                        break;
-                }
-                pos = pos->next;
-        }
-        if (transaction == NULL) {
-                rc = ENOENT;
-                goto leave;
-        }
-        
-        /*
-         * Remove the transaction from the list as it will be processed now.
-         */
-        list_remove(&transaction->link);
-        
-        if (transaction->len < len) {
-                process_transaction_with_outcome(transaction, USB_OUTCOME_BABBLE);
-                rc = ENOMEM;
-                goto leave;
-        }
-        
-        /*
-         * Copy the data and finish processing the transaction.
-         */
-        transaction->len = len;
-        memcpy(transaction->buffer, buffer, len);
-        
-        process_transaction_with_outcome(transaction, USB_OUTCOME_OK);
-        
-        dprintf("  ...transaction " TRANSACTION_FORMAT " sent back",
-            TRANSACTION_PRINTF(*transaction));
-        
-        
-        free(transaction);
-        rc = EOK;
-        
-leave:
-        dprintf("  ...fill-in transaction: %s", str_error(rc));
-        
-        return rc;
+        list_append(&transaction->link, &transaction_list);
 }