Changeset 0b31409 in mainline

Timestamp:

2011-02-01T11:34:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0c3beeb, 1537ba6

Parents:

6028ec8

Message:

Virtual host controller uses usb_log_* functions

Location:

uspace/drv/vhc

Files:

• Makefile (modified) (1 diff)
• conndev.c (modified) (2 diffs)
• connhost.c (modified) (3 diffs)
• debug.c (deleted)
• devices.c (modified) (2 diffs)
• hc.c (modified) (7 diffs)
• hcd.c (modified) (2 diffs)
• hub.c (modified) (1 diff)
• vhcd.h (modified) (1 diff)

uspace/drv/vhc/Makefile

@@ -44 +44 @@
         conndev.c \
         connhost.c \
-        debug.c \
         devices.c \
         hc.c \

uspace/drv/vhc/conndev.c

@@ -99 +99 @@
                 int rc = get_device_name(callback, devname, DEVICE_NAME_MAXLENGTH);
 
-                dprintf(0, "virtual device connected (name: %s, id: %x)",
+                usb_log_info("New virtual device `%s' (id = %x).\n",
                     rc == EOK ? devname : "<unknown>", dev->id);
 
@@ -122 +122 @@
         }
 
-        dprintf(0, "virtual device disconnected (id: %x)", dev->id);
+        usb_log_info("Virtual device disconnected (id = %x).\n", dev->id);
         virtdev_destroy_device(dev);
 }

uspace/drv/vhc/connhost.c

@@ -93 +93 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        dprintf(3, "transfer OUT [%d.%d (%s); %zu]",
+        usb_log_debug2("Transfer OUT [%d.%d (%s); %zu].\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -113 +113 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        dprintf(3, "transfer SETUP [%d.%d (%s); %zu]",
+        usb_log_debug2("Transfer SETUP [%d.%d (%s); %zu].\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -133 +133 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        dprintf(3, "transfer IN [%d.%d (%s); %zu]",
+        usb_log_debug2("Transfer IN [%d.%d (%s); %zu].\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),

uspace/drv/vhc/devices.c

@@ -196 +196 @@
         if (virtual_hub_device.address == transaction->target.address) {
                 size_t tmp;
-                dprintf(1, "sending `%s' transaction to hub",
+                usb_log_debug2("Sending `%s' transaction to hub.\n",
                     usbvirt_str_transaction_type(transaction->type));
                 switch (transaction->type) {
@@ -222 +222 @@
                                 break;
                 }
-                dprintf(4, "transaction on hub processed...");
                 outcome = USB_OUTCOME_OK;
         }

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);
 }
 

uspace/drv/vhc/hcd.c

@@ -94 +94 @@
         virtual_hub_device_init(dev);
 
-        printf("%s: virtual USB host controller ready.\n", NAME);
+        usb_log_info("Virtual USB host controller ready (id = %zu).\n",
+            (size_t) dev->handle);
 
         return EOK;
@@ -117 +118 @@
         sleep(5);
 
-        usb_dprintf_enable(NAME, -1);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         printf(NAME ": virtual USB host controller driver.\n");

uspace/drv/vhc/hub.c

@@ -63 +63 @@
             = fibril_create(hub_register_in_devman_fibril, hc_dev);
         if (root_hub_registration == 0) {
-                printf(NAME ": failed to create hub registration fibril\n");
+                usb_log_fatal("Failed to create hub registration fibril.\n");
                 return;
         }

uspace/drv/vhc/vhcd.h

@@ -45 +45 @@
 #define DEVMAP_PATH_DEV NAMESPACE "/" NAME_DEV
 
-#define dprintf(level, format, ...) \
-        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
-void dprintf_inval_call(int, ipc_call_t, sysarg_t);
+//#define dprintf(level, format, ...)
+//      usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
+//void dprintf_inval_call(int, ipc_call_t, sysarg_t);
 
 #endif