Changeset 7c169ce in mainline for uspace/lib

Timestamp:

2011-01-21T13:01:58Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e2b1548

Parents:

6336b6e (diff), a1d12f4 (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 development

Location:

uspace/lib

Files:

• usb/Makefile (modified) (1 diff)
• usb/include/usb/debug.h (modified) (1 diff)
• usb/src/dump.c (added)
• usbvirt/src/callback.c (modified) (1 diff)

uspace/lib/usb/Makefile

@@ -38 +38 @@
         src/dp.c \
         src/drvpsync.c \
+        src/dump.c \
         src/hcdhubd.c \
         src/hcdrv.c \

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

@@ -35 +35 @@
 #ifndef LIBUSB_DEBUG_H_
 #define LIBUSB_DEBUG_H_
+#include <stdio.h>
+#include <usb/usb.h>
 
 void usb_dprintf(const char *tag, int level, const char *format, ...);
 void usb_dprintf_enable(const char *tag, int level);
 
+void usb_dump_standard_descriptor(FILE *, const char *, const char *,
+    const uint8_t *, size_t);
 
 #endif

uspace/lib/usbvirt/src/callback.c

@@ -160 +160 @@
                         return;
                 }
-                async_data_read_finalize(callid, buffer, receive_len);
-        }
-        
-        ipc_answer_0(iid, rc);
+                if (len > receive_len) {
+                        len = receive_len;
+                }
+                async_data_read_finalize(callid, buffer, len);
+        }
+        
+        ipc_answer_1(iid, rc, len);
 }