Changes in uspace/drv/vhc/hc.c [daec5e04:e63a4e1] in mainline

File:

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

uspace/drv/vhc/hc.c

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbvhc
+/** @addtogroup usb
  * @{
  */
@@ -34 +34 @@
  */
 
+#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>
@@ -89 +90 @@
  */
 static void process_transaction_with_outcome(transaction_t * transaction,
-    int outcome)
-{
-        usb_log_debug2("Transaction " TRANSACTION_FORMAT " done: %s.\n",
+    usb_transaction_outcome_t outcome)
+{
+        dprintf(3, "transaction " TRANSACTION_FORMAT " done, outcome: %s",
             TRANSACTION_PRINTF(*transaction),
-            str_error(outcome));
-        
-        transaction->callback(transaction->buffer, transaction->actual_len,
-            outcome, transaction->callback_arg);
+            usb_str_transaction_outcome(outcome));
+        
+        transaction->callback(transaction->buffer, transaction->len, outcome,
+            transaction->callback_arg);
 }
 
@@ -107 +108 @@
         static unsigned int seed = 4573;
         
-        usb_log_info("Transaction processor ready.\n");
+        printf("%s: transaction processor ready.\n", NAME);
         
         while (true) {
@@ -124 +125 @@
                 list_remove(first_transaction_link);
                 
-                usb_log_debug("Processing " TRANSACTION_FORMAT " [%s].\n",
+
+                dprintf(0, "about to process " TRANSACTION_FORMAT " [%s]",
                     TRANSACTION_PRINTF(*transaction), ports);
 
-                int outcome;
+                dprintf(3, "processing transaction " TRANSACTION_FORMAT "",
+                    TRANSACTION_PRINTF(*transaction));
+                
+                usb_transaction_outcome_t outcome;
                 outcome = virtdev_send_to_all(transaction);
                 
@@ -143 +148 @@
         fid_t fid = fibril_create(hc_manager_fibril, NULL);
         if (fid == 0) {
-                usb_log_fatal("Failed to start HC manager fibril.\n");
+                printf(NAME ": failed to start HC manager fibril\n");
                 return;
         }
@@ -164 +169 @@
         transaction->buffer = buffer;
         transaction->len = len;
-        transaction->actual_len = len;
         transaction->callback = callback;
         transaction->callback_arg = arg;
-
+        
+        dprintf(3, "creating transaction " TRANSACTION_FORMAT,
+            TRANSACTION_PRINTF(*transaction));
+        
         return transaction;
-}
-
-static void hc_add_transaction(transaction_t *transaction)
-{
-        usb_log_debug("Adding transaction " TRANSACTION_FORMAT ".\n",
-            TRANSACTION_PRINTF(*transaction));
-        list_append(&transaction->link, &transaction_list);
 }
 
@@ -189 +189 @@
             target, transfer_type,
             buffer, len, callback, arg);
-        hc_add_transaction(transaction);
+        list_append(&transaction->link, &transaction_list);
 }
 
@@ -202 +202 @@
             target, transfer_type,
             buffer, len, callback, arg);
-        hc_add_transaction(transaction);
+        list_append(&transaction->link, &transaction_list);
 }