Changeset eff60ca in mainline

Timestamp:

2017-07-23T21:42:19Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

60f7c590

Parents:

2e7692f

Message:

Refactored the code to ease up the load of irrelevant information in the log and added some log entries for trb/command lifetime monitoring.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (3 diffs)
• hc.c (modified) (3 diffs)

uspace/drv/bus/usb/xhci/commands.c

@@ -408 +408 @@
         command->slot_id = slot_id;
 
-        usb_log_debug2("Completed command trb:");
-        xhci_dump_trb(command_trb);
+        usb_log_debug2("Completed command trb: %s", xhci_trb_str_type(TRB_TYPE(*command_trb)));
         if (TRB_TYPE(*command_trb) != XHCI_TRB_TYPE_NO_OP_CMD) {
                 if (code != XHCI_TRBC_SUCCESS) {
@@ -441 +440 @@
                 break;
         default:
-                usb_log_debug2("Unsupported command trb.");
-                xhci_dump_trb(command_trb);
+                usb_log_debug2("Unsupported command trb: %s", xhci_trb_str_type(TRB_TYPE(*command_trb)));
 
                 command->completed = true;
@@ -451 +449 @@
 
         if (!command->has_owner) {
+                usb_log_debug2("Command has no owner, deallocating.");
                 xhci_free_command(command);
         } else {
+                usb_log_debug2("Command has owner, don't forget to deallocate!");
                 /* Copy the trb for later use so that we can free space on the cmd ring. */
                 command->trb = malloc32(sizeof(xhci_trb_t));

uspace/drv/bus/usb/xhci/hc.c

@@ -357 +357 @@
         //       stuff, remove it.
         xhci_cmd_t *cmd = xhci_alloc_command();
-        xhci_dump_state(hc);
         xhci_send_no_op_command(hc, cmd);
         xhci_wait_for_command(cmd, 1000000);
         xhci_free_command(cmd);
-
-        xhci_dump_state(hc);
 
         for (int i = 0; i < 10; ++i) {
@@ -372 +369 @@
         }
 
-
-        xhci_dump_trb(hc->event_ring.dequeue_trb);
         return EOK;
 }
@@ -402 +397 @@
         while (err != ENOENT) {
                 if (err == EOK) {
-                        usb_log_debug2("Dequeued from event ring.");
-                        xhci_dump_trb(&trb);
+                        usb_log_debug2("Dequeued trb from event ring: %s",
+                                        xhci_trb_str_type(TRB_TYPE(trb)));
 
                         hc_handle_event(hc, &trb);