Changeset 89acf204 in mainline for uspace/lib

Timestamp:

2011-02-04T17:07:33Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

400575c5, 474afc9

Parents:

2899980 (diff), 458e40c (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:

development changes

Location:

uspace/lib/usb

Files:

• include/usb/usbmem.h (modified) (3 diffs)
• src/debug.c (modified) (2 diffs)
• src/recognise.c (modified) (3 diffs)
• src/usbmem.c (modified) (2 diffs)

uspace/lib/usb/include/usb/usbmem.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Matus Dekanek
+ * Copyright (c) 2011 Matus Dekanek
  * All rights reserved.
  *
@@ -35 +35 @@
  * @{
  */
-/** @file definitions of special memory management, used mostly in usb stack
+/** @file definitions of memory management with address translation, used mostly in usb stack
  *
  * USB HCD needs traslation between physical and virtual addresses. These
@@ -59 +59 @@
 
 extern void * mman_malloc(
-                size_t size,
-                size_t alignment,
-                unsigned long max_physical_address);
+    size_t size,
+    size_t alignment,
+    unsigned long max_physical_address);
 
 extern void * mman_getVA(void * addr);

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;
 

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