Changeset a00ac07 in mainline

Timestamp:

2011-09-13T11:39:48Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3822f7c9

Parents:

ffe3fe1

Message:

libusbhost: Use static area for setup_buffer

Location:

uspace/lib/usbhost

Files:

• include/usb/host/batch.h (modified) (3 diffs)
• src/batch.c (modified) (3 diffs)
• src/iface.c (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/batch.h

@@ -41 +41 @@
 #include <usb/host/endpoint.h>
 
+#define USB_SETUP_PACKET_SIZE 8
+
 typedef struct usb_transfer_batch usb_transfer_batch_t;
 struct usb_transfer_batch {
@@ -49 +51 @@
         char *buffer;
         size_t buffer_size;
-        char *setup_buffer;
+        char setup_buffer[USB_SETUP_PACKET_SIZE];
         size_t setup_size;
         size_t transfered_size;
@@ -76 +78 @@
     char *buffer,
     size_t buffer_size,
-    char *setup_buffer,
-    size_t setup_size,
+    char setup_buffer[USB_SETUP_PACKET_SIZE],
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out,

uspace/lib/usbhost/src/batch.c

@@ -44 +44 @@
     char *buffer,
     size_t buffer_size,
-    char *setup_buffer,
-    size_t setup_size,
+    char setup_buffer[USB_SETUP_PACKET_SIZE],
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out,
@@ -62 +61 @@
                 instance->buffer = buffer;
                 instance->buffer_size = buffer_size;
-                instance->setup_buffer = setup_buffer;
-                instance->setup_size = setup_size;
+                instance->setup_size = 0;
                 instance->fun = fun;
                 instance->private_data = private_data;
@@ -69 +67 @@
                 instance->transfered_size = 0;
                 instance->error = EOK;
+                if (ep && ep->transfer_type == USB_TRANSFER_CONTROL) {
+                        assert(setup_buffer);
+                        memcpy(instance->setup_buffer, setup_buffer,
+                            USB_SETUP_PACKET_SIZE);
+                        instance->setup_size = USB_SETUP_PACKET_SIZE;
+                }
                 if (instance->ep)
                         endpoint_use(instance->ep);

uspace/lib/usbhost/src/iface.c

@@ -78 +78 @@
         /* No private data and no private data dtor */
         usb_transfer_batch_t *batch =
-            usb_transfer_batch_get(ep, data, size, setup_data, setup_size,
+            usb_transfer_batch_get(ep, data, size, setup_data,
             in, out, arg, fun, NULL, NULL);
         if (!batch) {