Changeset 026793d in mainline

Timestamp:

2011-07-07T20:17:39Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2bc7122, 9be9c4d, c028b22, f51f193

Parents:

38c9505

Message:

Increase message verbosity levels so that I/O is not normally logged. Works
around dead-lock when mounting a file system stored on USB mass storage device.

Location:

uspace

Files:

• drv/bus/usb/uhci/transfer_list.c (modified) (1 diff)
• drv/bus/usb/usbmast/mast.c (modified) (1 diff)
• lib/usbhost/src/batch.c (modified) (2 diffs)

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

@@ -141 +141 @@
         list_append(&batch->link, &instance->batch_list);
 
-        usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
             batch, USB_TRANSFER_BATCH_ARGS(*batch), instance->name);
         fibril_mutex_unlock(&instance->guard);

uspace/drv/bus/usb/usbmast/mast.c

@@ -42 +42 @@
 #include <usb/dev/request.h>
 
-bool usb_mast_verbose = true;
+bool usb_mast_verbose = false;
 
 #define MASTLOG(format, ...) \
         do { \
                 if (usb_mast_verbose) { \
-                        usb_log_debug("USB cl08: " format, ##__VA_ARGS__); \
+                        usb_log_debug2("USB cl08: " format, ##__VA_ARGS__); \
                 } \
         } while (false)

uspace/lib/usbhost/src/batch.c

@@ -128 +128 @@
         memcpy(instance->buffer, instance->data_buffer, instance->buffer_size);
 
-        usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " completed (%zuB): %s.\n",
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " completed (%zuB): %s.\n",
             instance, USB_TRANSFER_BATCH_ARGS(*instance),
             instance->transfered_size, str_error(instance->error));
@@ -145 +145 @@
         assert(instance->callback_out);
 
-        usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " completed: %s.\n",
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " completed: %s.\n",
             instance, USB_TRANSFER_BATCH_ARGS(*instance),
             str_error(instance->error));