Changeset 72cd53d in mainline for uspace/lib

Timestamp:

2011-05-17T07:18:11Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3375bd4

Parents:

50cd285 (diff), e913cc9 (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:

Small fixes and improvements

Fixed buffer overflow in lsusb.
lsusb scans all adresses, not only first ones.
Played with logging levels, now it is configurable.
VHC prints name of connected device and destroys pending transfers
when device is unplugged.

Location:

uspace/lib

Files:

• c/generic/devman.c (modified) (1 diff)
• usb/include/usb/debug.h (modified) (1 diff)
• usb/src/debug.c (modified) (2 diffs)
• usbvirt/include/usbvirt/ipc.h (modified) (1 diff)

uspace/lib/c/generic/devman.c

@@ -415 +415 @@
         }
 
+        /* To be on the safe-side. */
         path[path_size - 1] = 0;
 
-        if (IPC_GET_ARG2(data_request_call) >= path_size) {
+        size_t transferred_size = IPC_GET_ARG2(data_request_call);
+
+        if (transferred_size >= path_size) {
                 return ELIMIT;
         }
+
+        /* Terminate the string (trailing 0 not send over IPC). */
+        path[transferred_size] = 0;
 
         return EOK;

uspace/lib/usb/include/usb/debug.h

@@ -81 +81 @@
 
 /** Default log level. */
-#define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG
-
+#ifdef CONFIG_USB_RELEASE_BUILD
+#  define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_INFO
+#else
+#  define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG
+#endif
 
 void usb_log_enable(usb_log_level_t, const char *);

uspace/lib/usb/src/debug.c

@@ -116 +116 @@
         /*
          * Serialize access to log files.
-         * Always print to log file, to screen print only when the enabled
-         * log level is high enough.
+         * Print to screen only messages with higher level than the one
+         * specified during logging initialization.
+         * Print also to file, to it print one more (lower) level as well.
          */
         fibril_mutex_lock(&log_serializer);
@@ -123 +124 @@
         const char *level_name = log_level_name(level);
 
-        if (log_stream != NULL) {
+        if ((log_stream != NULL) && (level <= log_level + 1)) {
                 va_start(args, format);
 

uspace/lib/usbvirt/include/usbvirt/ipc.h

@@ -39 +39 @@
 #include <usb/usb.h>
 #include <bool.h>
+#include <usbvirt/device.h>
 
 /** IPC methods communication between host controller and virtual device. */