Changeset 026d6e2 in mainline for uspace/lib

Timestamp:

2011-02-18T19:41:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b6c7da6, fbf0589

Parents:

9df965ec (diff), 0c00dac (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

Files:

• drv/generic/remote_usbhc.c (modified) (5 diffs)
• drv/include/usbhc_iface.h (modified) (2 diffs)
• usbvirt/Makefile (modified) (1 diff)

uspace/lib/drv/generic/remote_usbhc.c

@@ -40 +40 @@
 
 #define USB_MAX_PAYLOAD_SIZE 1020
+#define HACK_MAX_PACKET_SIZE 8
+#define HACK_MAX_PACKET_SIZE_INTERRUPT_IN 4
 
 static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -326 +328 @@
         trans->size = len;
 
-        int rc = transfer_func(device, target, buffer, len,
+        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE,
+            buffer, len,
             callback_out, trans);
 
@@ -372 +375 @@
         trans->size = len;
 
-        int rc = transfer_func(device, target, trans->buffer, len,
+        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE_INTERRUPT_IN,
+            trans->buffer, len,
             callback_in, trans);
 
@@ -580 +584 @@
         trans->size = data_buffer_len;
 
-        rc = usb_iface->control_write(device, target,
+        rc = usb_iface->control_write(device, target, HACK_MAX_PACKET_SIZE,
             setup_packet, setup_packet_len,
             data_buffer, data_buffer_len,
@@ -644 +648 @@
         }
 
-        rc = usb_iface->control_read(device, target,
+        rc = usb_iface->control_read(device, target, HACK_MAX_PACKET_SIZE,
             setup_packet, setup_packet_len,
             trans->buffer, trans->size,

uspace/lib/drv/include/usbhc_iface.h

@@ -216 +216 @@
 
 /** Out transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t,
+typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t, size_t,
     void *, size_t,
     usbhc_iface_transfer_out_callback_t, void *);
 
-/** Setup transfer processing function prototype. */
+/** Setup transfer processing function prototype. @deprecated */
 typedef usbhc_iface_transfer_out_t usbhc_iface_transfer_setup_t;
 
 /** In transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t,
+typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t, size_t,
     void *, size_t,
     usbhc_iface_transfer_in_callback_t, void *);
@@ -252 +252 @@
 
         int (*control_write)(device_t *, usb_target_t,
+            size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_out_callback_t, void *);
 
         int (*control_read)(device_t *, usb_target_t,
+            size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_in_callback_t, void *);

uspace/lib/usbvirt/Makefile

@@ -30 +30 @@
 LIBRARY = libusbvirt
 
-LIBS = $(LIBUSB_PREFIX)/libusb.a
 EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -Iinclude