Changeset cd50486 in mainline for uspace/lib/usb/src

Timestamp:

2011-02-06T22:03:55Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (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:

Merge development/ changes

Location:

uspace/lib/usb/src

Files:

• addrkeep.c (modified) (1 diff)
• debug.c (modified) (3 diffs)
• pipes.c (modified) (2 diffs)
• recognise.c (modified) (4 diffs)
• usbdrv.c (modified) (1 diff)
• usbmem.c (modified) (2 diffs)

uspace/lib/usb/src/addrkeep.c

@@ -149 +149 @@
                         &addresses->default_condvar_guard);
         }
+        addresses->default_available = false;
         fibril_mutex_unlock(&addresses->default_condvar_guard);
 }

uspace/lib/usb/src/debug.c

@@ -67 +67 @@
 /** Serialization mutex for logging functions. */
 static FIBRIL_MUTEX_INITIALIZE(log_serializer);
+static FILE *log_stream = NULL;
 
 /** Find or create new tag with given name.
@@ -171 +172 @@
         log_prefix = message_prefix;
         log_level = level;
+        if (log_stream == NULL) {
+                char *fname;
+                int rc = asprintf(&fname, "/log/%s", message_prefix);
+                if (rc > 0) {
+                        log_stream = fopen(fname, "w");
+                        free(fname);
+                }
+        }
 }
 
@@ -197 +206 @@
 void usb_log_printf(usb_log_level_t level, const char *format, ...)
 {
-        if (level > log_level) {
-                return;
-        }
-
-        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);
-
+
+        /*
+         * Serialize access to log files.
+         * Always print to log file, to screen print only when the enabled
+         * log level is high enough.
+         */
         fibril_mutex_lock(&log_serializer);
-        fprintf(stream, "[%s]%s: ", log_prefix, log_level_name(level));
-        vfprintf(stream, format, args);
+
+        const char *level_name = log_level_name(level);
+
+        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);
+        }
+
         fibril_mutex_unlock(&log_serializer);
-
-        va_end(args);
 }
 

uspace/lib/usb/src/pipes.c

@@ -90 +90 @@
 
 leave:
-        ipc_hangup(hc_phone);
+        async_hangup(hc_phone);
         return rc;
 }
@@ -211 +211 @@
         }
 
-        int rc = ipc_hangup(pipe->hc_phone);
+        int rc = async_hangup(pipe->hc_phone);
         if (rc != EOK) {
                 return rc;

uspace/lib/usb/src/recognise.c

@@ -33 +33 @@
  * @brief Functions for recognising kind of attached devices.
  */
+#include <sys/types.h>
 #include <usb_iface.h>
 #include <usb/usbdrv.h>
@@ -359 +360 @@
 {
         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 +384 @@
          * 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 +406 @@
         }
         
-        device_name_index++;
-
         return EOK;
 

uspace/lib/usb/src/usbdrv.c

@@ -80 +80 @@
             IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
 
-        ipc_hangup(parent_phone);
+        async_hangup(parent_phone);
 
         if (rc != EOK) {

uspace/lib/usb/src/usbmem.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Matus Dekanek
+ * Copyright (c) 2011 Matus Dekanek
  * All rights reserved.
  *
@@ -69 +69 @@
 }
 
-static void addr_remove_callback(link_t *item)
+static void addr_remove_callback(link_t * item)
 {
         //delete item