Changeset 5f57929 in mainline

Timestamp:

2011-09-01T00:08:44Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f1586d0

Parents:

7bce1fc

Message:

uhci,ohci: remove logging macro

Location:

uspace/drv/bus/usb

Files:

• ohci/ohci_batch.c (modified) (6 diffs)
• uhci/uhci_batch.c (modified) (4 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -147 +147 @@
 /** Check batch TDs' status.
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] ohci_batch Batch structure to use.
  * @return False, if there is an active TD, true otherwise.
  *
@@ -213 +213 @@
 /** Starts execution of the TD list
  *
- * @param[in] instance Batch structure to use
+ * @param[in] ohci_batch Batch structure to use
  */
 void ohci_transfer_batch_commit(ohci_transfer_batch_t *ohci_batch)
@@ -223 +223 @@
 /** Prepare generic control transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] ohci_batch Batch structure to use.
  * @param[in] data_dir Direction to use for data stage.
  * @param[in] status_dir Direction to use for status stage.
@@ -289 +289 @@
 }
 /*----------------------------------------------------------------------------*/
-#define LOG_BATCH_INITIALIZED(batch, name, dir) \
-        usb_log_debug2("Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
-            (batch), (name), (dir), USB_TRANSFER_BATCH_ARGS(*(batch)))
-
 /** Prepare generic data transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] ohci_batch Batch structure to use.
  *
  * Direction is supplied by the associated ep and toggle is maintained by the
@@ -330 +326 @@
                 ++td_current;
         }
-        LOG_BATCH_INITIALIZED(ohci_batch->usb_batch,
+        usb_log_debug2(
+            "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+            ohci_batch->usb_batch,
             usb_str_transfer_type(ohci_batch->usb_batch->ep->transfer_type),
-            usb_str_direction(ohci_batch->usb_batch->ep->direction));
+            usb_str_direction(ohci_batch->usb_batch->ep->direction),
+            USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/
@@ -338 +337 @@
 {
         // TODO Find a better way to do this
+        /* Check first bit of the first setup request byte
+         * (it signals hc-> dev or dev->hc communication) */
+        const char *direction;
         if (ohci_batch->device_buffer[0] & (1 << 7)) {
                 batch_control(ohci_batch, USB_DIRECTION_IN, USB_DIRECTION_OUT);
-                LOG_BATCH_INITIALIZED(ohci_batch->usb_batch, "control", "write");
+                direction = "read";
         } else {
                 batch_control(ohci_batch, USB_DIRECTION_OUT, USB_DIRECTION_IN);
-                LOG_BATCH_INITIALIZED(ohci_batch->usb_batch, "control", "write");
-        }
+                direction = "write";
+        }
+        usb_log_debug2(
+            "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+            ohci_batch->usb_batch,
+            usb_str_transfer_type(ohci_batch->usb_batch->ep->transfer_type),
+            direction, USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -152 +152 @@
 /** Check batch TDs for activity.
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] uhci_batch Batch structure to use.
  * @return False, if there is an active TD, true otherwise.
  *
@@ -202 +202 @@
         return true;
 }
-
-#define LOG_BATCH_INITIALIZED(batch, name, dir) \
-        usb_log_debug2("Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
-            (batch), (name), (dir), USB_TRANSFER_BATCH_ARGS(*(batch)))
-
 /*----------------------------------------------------------------------------*/
 /** Prepare generic data transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] uhci_batch Batch structure to use.
  * @param[in] pid Pid to use for data transactions.
  *
@@ -261 +256 @@
         td_set_ioc(&uhci_batch->tds[td - 1]);
         endpoint_toggle_set(uhci_batch->usb_batch->ep, toggle);
-        LOG_BATCH_INITIALIZED(uhci_batch->usb_batch,
+        usb_log_debug2(
+            "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+            uhci_batch->usb_batch,
             usb_str_transfer_type(uhci_batch->usb_batch->ep->transfer_type),
-            usb_str_direction(uhci_batch->usb_batch->ep->direction));
+            usb_str_direction(uhci_batch->usb_batch->ep->direction),
+            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/
 /** Prepare generic control transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] uhci_batch Batch structure to use.
  * @param[in] data_stage Pid to use for data tds.
  * @param[in] status_stage Pid to use for data tds.
@@ -341 +339 @@
         /* Check first bit of the first setup request byte
          * (it signals hc-> dev or dev->hc communication) */
+        const char *direction = NULL;
         if (uhci_batch->usb_batch->setup_buffer[0] & (1 << 7)) {
                 batch_control(uhci_batch, USB_PID_IN, USB_PID_OUT);
-                LOG_BATCH_INITIALIZED(uhci_batch->usb_batch, "control", "read");
+                direction = "read";
         } else {
                 batch_control(uhci_batch, USB_PID_OUT, USB_PID_IN);
-                LOG_BATCH_INITIALIZED(uhci_batch->usb_batch, "control", "write");
-        }
+                direction = "write";
+        }
+        usb_log_debug2(
+            "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+            uhci_batch->usb_batch,
+            usb_str_transfer_type(uhci_batch->usb_batch->ep->transfer_type),
+            direction, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/