Changes in / [458e40c:bfc12ef] in mainline

Location:

uspace

Files:

• drv/usbhub/main.c (modified) (1 diff)
• drv/usbhub/usbhub_private.h (modified) (1 diff)
• lib/usb/src/debug.c (modified) (2 diffs)
• lib/usb/src/recognise.c (modified) (3 diffs)

uspace/drv/usbhub/main.c

@@ -65 +65 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_dprintf_enable(NAME, USB_LOG_LEVEL_INFO);
         
         fibril_mutex_initialize(&usb_hub_list_lock);

uspace/drv/usbhub/usbhub_private.h

@@ -65 +65 @@
 //************
 #define dprintf(level, format, ...) \
-        usb_log_printf((level), format "\n", ##__VA_ARGS__)
+        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
 
 

uspace/lib/usb/src/debug.c

@@ -206 +206 @@
 void usb_log_printf(usb_log_level_t level, const char *format, ...)
 {
-        FILE *screen_stream = NULL;
+        FILE *stream = NULL;
         switch (level) {
                 case USB_LOG_LEVEL_FATAL:
                 case USB_LOG_LEVEL_ERROR:
-                        screen_stream = stderr;
+                        stream = stderr;
                         break;
                 default:
-                        screen_stream = stdout;
+                        stream = stdout;
                         break;
         }
-        assert(screen_stream != NULL);
+        assert(stream != NULL);
 
         va_list args;
+        va_start(args, format);
 
         /*
@@ -230 +231 @@
 
         if (log_stream != NULL) {
-                va_start(args, format);
-
                 fprintf(log_stream, "[%s]%s: ", log_prefix, level_name);
                 vfprintf(log_stream, format, args);
-                fflush(log_stream);
-
-                va_end(args);
         }
 
         if (level <= log_level) {
-                va_start(args, format);
-
-                fprintf(screen_stream, "[%s]%s: ", log_prefix, level_name);
-                vfprintf(screen_stream, format, args);
-                fflush(screen_stream);
-
-                va_end(args);
+                fprintf(stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(stream, format, args);
         }
 
         fibril_mutex_unlock(&log_serializer);
+
+        va_end(args);
 }
 

uspace/lib/usb/src/recognise.c

@@ -359 +359 @@
 {
         static size_t device_name_index = 0;
-        static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
-
-        size_t this_device_name_index;
-
-        fibril_mutex_lock(&device_name_index_mutex);
-        this_device_name_index = device_name_index;
-        device_name_index++;
-        fibril_mutex_unlock(&device_name_index_mutex);
-
 
         device_t *child = NULL;
@@ -383 +374 @@
          * naming etc., something more descriptive could be created.
          */
-        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
+        rc = asprintf(&child_name, "usbdev%02zu", device_name_index);
         if (rc < 0) {
                 goto failure;
@@ -405 +396 @@
         }
         
+        device_name_index++;
+
         return EOK;