Changeset c4fb5ecd in mainline for uspace/drv/uhci_hcd/batch.c

Timestamp:

2011-06-18T19:18:41Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

497b6f31

Parents:

84eb7432

Message:

Less logging in USB host controller drivers

Many of the debug messages were degraded to debug2 level or
completely removed. Also added formatting string for unified
dump of USB transfer batches.

Warnings in EHCI stub use debug level now.

File:

• uspace/drv/uhci_hcd/batch.c (modified) (9 diffs)

uspace/drv/uhci_hcd/batch.c

@@ -147 +147 @@
             + sizeof(qh_t);
         void *data_buffer = setup + setup_size;
-        usb_target_t target =
-            { .address = ep->address, .endpoint = ep->endpoint };
         usb_transfer_batch_init(instance, ep, buffer, data_buffer, buffer_size,
             setup, setup_size, func_in, func_out, arg, fun,
@@ -154 +152 @@
 
         memcpy(instance->setup_buffer, setup_buffer, setup_size);
-        usb_log_debug("Batch(%p) %d:%d memory structures ready.\n",
-            instance, target.address, target.endpoint);
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT
+            " memory structures ready.\n", instance,
+            USB_TRANSFER_BATCH_ARGS(*instance));
         return instance;
 }
@@ -205 +204 @@
         return true;
 }
+
+#define LOG_BATCH_INITIALIZED(batch, name) \
+        usb_log_debug2("Batch %p %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+            (batch), (name), USB_TRANSFER_BATCH_ARGS(*(batch)))
+
 /*----------------------------------------------------------------------------*/
 /** Prepares control write transfer.
@@ -219 +223 @@
         batch_control(instance, USB_PID_OUT, USB_PID_IN);
         instance->next_step = usb_transfer_batch_call_out_and_dispose;
-        usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
+        LOG_BATCH_INITIALIZED(instance, "control write");
 }
 /*----------------------------------------------------------------------------*/
@@ -233 +237 @@
         batch_control(instance, USB_PID_IN, USB_PID_OUT);
         instance->next_step = usb_transfer_batch_call_in_and_dispose;
-        usb_log_debug("Batch(%p) CONTROL READ initialized.\n", instance);
+        LOG_BATCH_INITIALIZED(instance, "control read");
 }
 /*----------------------------------------------------------------------------*/
@@ -247 +251 @@
         batch_data(instance, USB_PID_IN);
         instance->next_step = usb_transfer_batch_call_in_and_dispose;
-        usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
+        LOG_BATCH_INITIALIZED(instance, "interrupt in");
 }
 /*----------------------------------------------------------------------------*/
@@ -263 +267 @@
         batch_data(instance, USB_PID_OUT);
         instance->next_step = usb_transfer_batch_call_out_and_dispose;
-        usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
+        LOG_BATCH_INITIALIZED(instance, "interrupt out");
 }
 /*----------------------------------------------------------------------------*/
@@ -277 +281 @@
         batch_data(instance, USB_PID_IN);
         instance->next_step = usb_transfer_batch_call_in_and_dispose;
-        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
+        LOG_BATCH_INITIALIZED(instance, "bulk in");
 }
 /*----------------------------------------------------------------------------*/
@@ -293 +297 @@
         batch_data(instance, USB_PID_OUT);
         instance->next_step = usb_transfer_batch_call_out_and_dispose;
-        usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
+        LOG_BATCH_INITIALIZED(instance, "bulk out");
 }
 /*----------------------------------------------------------------------------*/