Changeset 56e9fb0 in mainline

Timestamp:

2011-09-14T18:52:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

365e29e2

Parents:

8e3d17f

Message:

usb: add support for packing target_t type into uint32_t

Location:

uspace

Files:

• drv/bus/usb/uhci/uhci_batch.c (modified) (2 diffs)
• lib/drv/generic/remote_usbhc.c (modified) (4 diffs)
• lib/usb/include/usb/hc.h (modified) (1 diff)
• lib/usb/include/usb/usb.h (modified) (3 diffs)
• lib/usbhost/src/batch.c (modified) (1 diff)

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -229 +229 @@
             uhci_batch->usb_batch->ep->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->usb_batch->ep->max_packet_size;
-        const usb_target_t target = {
+        const usb_target_t target = {{
             uhci_batch->usb_batch->ep->address,
-            uhci_batch->usb_batch->ep->endpoint };
+            uhci_batch->usb_batch->ep->endpoint }};
 
         int toggle = endpoint_toggle_get(uhci_batch->usb_batch->ep);
@@ -289 +289 @@
             uhci_batch->usb_batch->ep->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->usb_batch->ep->max_packet_size;
-        const usb_target_t target = {
+        const usb_target_t target = {{
             uhci_batch->usb_batch->ep->address,
-            uhci_batch->usb_batch->ep->endpoint };
+            uhci_batch->usb_batch->ep->endpoint }};
 
         /* setup stage */

uspace/lib/drv/generic/remote_usbhc.c

@@ -239 +239 @@
 
         usb_target_t target = {
-                .address = DEV_IPC_GET_ARG1(*call),
-                .endpoint = DEV_IPC_GET_ARG2(*call)
+                {.address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call) }
         };
         size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
@@ -302 +302 @@
         }
 
-        usb_target_t target = {
+        usb_target_t target = {{
                 .address = DEV_IPC_GET_ARG1(*call),
                 .endpoint = DEV_IPC_GET_ARG2(*call)
-        };
+        }};
 
         int rc;
@@ -436 +436 @@
         }
 
-        const usb_target_t target = {
+        const usb_target_t target = {{
                 .address = DEV_IPC_GET_ARG1(*call),
                 .endpoint = DEV_IPC_GET_ARG2(*call)
-        };
+        }};
 
 
@@ -484 +484 @@
         }
 
-        const usb_target_t target = {
+        const usb_target_t target = {{
                 .address = DEV_IPC_GET_ARG1(*call),
                 .endpoint = DEV_IPC_GET_ARG2(*call)
-        };
+        }};
 
 

uspace/lib/usb/include/usb/hc.h

@@ -62 +62 @@
     devman_handle_t *);
 
-int usb_hc_get_address_by_handle(devman_handle_t);
+usb_address_t usb_hc_get_address_by_handle(devman_handle_t);
 
 int usb_hc_find(devman_handle_t, devman_handle_t *);

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

@@ -106 +106 @@
  * Negative values could be used to indicate error.
  */
-typedef int usb_address_t;
+typedef int16_t usb_address_t;
 
 /** Default USB address. */
@@ -116 +116 @@
  * Negative values could be used to indicate error.
  */
-typedef int usb_endpoint_t;
+typedef int16_t usb_endpoint_t;
 
 /** Maximum endpoint number in USB 1.1.
@@ -126 +126 @@
  * Pair address + endpoint is identification of transaction recipient.
  */
-typedef struct {
-        usb_address_t address;
-        usb_endpoint_t endpoint;
+typedef union {
+        struct {
+                usb_address_t address;
+                usb_endpoint_t endpoint;
+        } __attribute__((packed));
+        uint32_t packed;
 } usb_target_t;
 

uspace/lib/usbhost/src/batch.c

@@ -136 +136 @@
         if (instance->ep->transfer_type == USB_TRANSFER_CONTROL
             && instance->error == EOK) {
-                usb_target_t target =
-                    {instance->ep->address, instance->ep->endpoint};
+                const usb_target_t target =
+                    {{ instance->ep->address, instance->ep->endpoint }};
                 reset_ep_if_need(
                     fun_to_hcd(instance->fun), target, instance->setup_buffer);