Changeset 867e6735 in mainline for uspace/lib/drv

Timestamp:

2011-02-18T19:55:39Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

228f251

Parents:

72363a1 (diff), b6c7da6 (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/drv

Files:

• generic/remote_usbhc.c (modified) (7 diffs)
• include/usbhc_iface.h (modified) (4 diffs)

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 *);
@@ -163 +165 @@
                 return;
         }
-
-        int rc = usb_iface->reserve_default_address(device);
+        
+        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
+        
+        int rc = usb_iface->reserve_default_address(device, speed);
 
         async_answer_0(callid, rc);
@@ -193 +197 @@
                 return;
         }
+        
+        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
 
         usb_address_t address;
-        int rc = usb_iface->request_address(device, &address);
+        int rc = usb_iface->request_address(device, speed, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -322 +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);
 
@@ -368 +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);
 
@@ -576 +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,
@@ -640 +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

@@ -40 +40 @@
 #include "driver.h"
 #include <usb/usb.h>
+#include <bool.h>
 
 
@@ -215 +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 *);
@@ -231 +232 @@
         int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
 
-        int (*reserve_default_address)(device_t *);
+        int (*reserve_default_address)(device_t *, usb_speed_t);
         int (*release_default_address)(device_t *);
-        int (*request_address)(device_t *, usb_address_t *);
+        int (*request_address)(device_t *, usb_speed_t, usb_address_t *);
         int (*bind_address)(device_t *, usb_address_t, devman_handle_t);
         int (*release_address)(device_t *, usb_address_t);
@@ -251 +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 *);