Changeset 0c3beeb in mainline for uspace/drv/vhc/hc.c

Timestamp:

2011-02-01T11:37:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

993a1e1, ec293a8

Parents:

a09128c (diff), 0b31409 (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:

Merge: unified logging (ticket 52)

File:

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

uspace/drv/vhc/hc.c

@@ -92 +92 @@
     usb_transaction_outcome_t outcome)
 {
-        dprintf(3, "transaction " TRANSACTION_FORMAT " done, outcome: %s",
+        usb_log_debug2("Transaction " TRANSACTION_FORMAT " done: %s.\n",
             TRANSACTION_PRINTF(*transaction),
             usb_str_transaction_outcome(outcome));
@@ -108 +108 @@
         static unsigned int seed = 4573;
         
-        printf("%s: transaction processor ready.\n", NAME);
+        usb_log_info("Transaction processor ready.\n");
         
         while (true) {
@@ -125 +125 @@
                 list_remove(first_transaction_link);
                 
-
-                dprintf(0, "about to process " TRANSACTION_FORMAT " [%s]",
+                usb_log_debug("Processing " TRANSACTION_FORMAT " [%s].\n",
                     TRANSACTION_PRINTF(*transaction), ports);
 
-                dprintf(3, "processing transaction " TRANSACTION_FORMAT "",
-                    TRANSACTION_PRINTF(*transaction));
-                
                 usb_transaction_outcome_t outcome;
                 outcome = virtdev_send_to_all(transaction);
@@ -148 +144 @@
         fid_t fid = fibril_create(hc_manager_fibril, NULL);
         if (fid == 0) {
-                printf(NAME ": failed to start HC manager fibril\n");
+                usb_log_fatal("Failed to start HC manager fibril.\n");
                 return;
         }
@@ -172 +168 @@
         transaction->callback = callback;
         transaction->callback_arg = arg;
-        
-        dprintf(3, "creating transaction " TRANSACTION_FORMAT,
+
+        return transaction;
+}
+
+static void hc_add_transaction(transaction_t *transaction)
+{
+        usb_log_debug("Adding transaction " TRANSACTION_FORMAT ".\n",
             TRANSACTION_PRINTF(*transaction));
-        
-        return transaction;
+        list_append(&transaction->link, &transaction_list);
 }
 
@@ -190 +190 @@
             target, transfer_type,
             buffer, len, callback, arg);
-        list_append(&transaction->link, &transaction_list);
+        hc_add_transaction(transaction);
 }
 
@@ -203 +203 @@
             target, transfer_type,
             buffer, len, callback, arg);
-        list_append(&transaction->link, &transaction_list);
+        hc_add_transaction(transaction);
 }