Changeset 458e40c in mainline

Timestamp:

2011-02-04T14:26:40Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

400575c5, 89acf204

Parents:

bfc12ef (diff), 6f8f808 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged minor fixes and improvements

See log messages of merged revisions.

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_dprintf_enable(NAME, USB_LOG_LEVEL_INFO);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
         
         fibril_mutex_initialize(&usb_hub_list_lock);

uspace/drv/usbhub/usbhub_private.h

@@ -65 +65 @@
 //************
 #define dprintf(level, format, ...) \
-        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
+        usb_log_printf((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 *stream = NULL;
+        FILE *screen_stream = NULL;
         switch (level) {
                 case USB_LOG_LEVEL_FATAL:
                 case USB_LOG_LEVEL_ERROR:
-                        stream = stderr;
+                        screen_stream = stderr;
                         break;
                 default:
-                        stream = stdout;
+                        screen_stream = stdout;
                         break;
         }
-        assert(stream != NULL);
+        assert(screen_stream != NULL);
 
         va_list args;
-        va_start(args, format);
 
         /*
@@ -231 +230 @@
 
         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) {
-                fprintf(stream, "[%s]%s: ", log_prefix, level_name);
-                vfprintf(stream, format, args);
+                va_start(args, format);
+
+                fprintf(screen_stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(screen_stream, format, args);
+                fflush(screen_stream);
+
+                va_end(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;
@@ -374 +383 @@
          * naming etc., something more descriptive could be created.
          */
-        rc = asprintf(&child_name, "usbdev%02zu", device_name_index);
+        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
         if (rc < 0) {
                 goto failure;
@@ -396 +405 @@
         }
         
-        device_name_index++;
-
         return EOK;