Changeset 11658b64 in mainline for uspace/lib/usbvirt/src

Timestamp:

2010-12-16T11:54:53Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

557c7d0, 5863a95, 82122f3, a8b7dfd, f2962621

Parents:

a9b6bec (diff), 70e5ad5 (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 vojtechhorky/ - libusbvirt clean-up

Location:

uspace/lib/usbvirt/src

Files:

• callback.c (moved) (moved from uspace/lib/usbvirt/callback.c ) (1 diff)
• ctrlpipe.c (added)
• debug.c (moved) (moved from uspace/lib/usbvirt/debug.c ) (1 diff)
• main.c (moved) (moved from uspace/lib/usbvirt/main.c ) (1 diff)
• private.h (moved) (moved from uspace/lib/usbvirt/private.h ) (2 diffs)
• stdreq.c (moved) (moved from uspace/lib/usbvirt/stdreq.c ) (7 diffs)
• transaction.c (moved) (moved from uspace/lib/usbvirt/transaction.c ) (1 diff)

uspace/lib/usbvirt/src/callback.c

@@ -40 +40 @@
 #include <mem.h>
 
-#include "hub.h"
-#include "device.h"
 #include "private.h"
 

uspace/lib/usbvirt/src/debug.c

@@ -36 +36 @@
 #include <bool.h>
 
-#include "device.h"
 #include "private.h"
 

uspace/lib/usbvirt/src/main.c

@@ -39 +39 @@
 #include <assert.h>
 
-#include "hub.h"
-#include "device.h"
 #include "private.h"
 

uspace/lib/usbvirt/src/private.h

@@ -36 +36 @@
 #define LIBUSBVIRT_PRIVATE_H_
 
-#include "device.h"
-#include "hub.h"
+#include <usbvirt/device.h>
+#include <usbvirt/hub.h>
+#include <assert.h>
 
 
@@ -86 +87 @@
 }
 
+extern usbvirt_control_transfer_handler_t control_pipe_zero_local_handlers[];
+
 #endif
 /**

uspace/lib/usbvirt/src/stdreq.c

@@ -40 +40 @@
 #include "private.h"
 
-
-
 /*
  * All sub handlers must return EFORWARD to inform the caller that
@@ -51 +49 @@
 /** GET_DESCRIPTOR handler. */
 static int handle_get_descriptor(usbvirt_device_t *device,
-    uint8_t type, uint8_t index, uint16_t language,
-    uint16_t length)
+    usb_device_request_setup_packet_t *setup_packet, uint8_t *extra_data)
 {
+        uint8_t type = setup_packet->value_high;
+        uint8_t index = setup_packet->value_low;
+
         /* 
          * Standard device descriptor.
@@ -110 +110 @@
 /** SET_ADDRESS handler. */
 static int handle_set_address(usbvirt_device_t *device,
-    uint16_t new_address,
-    uint16_t zero1, uint16_t zero2)
+    usb_device_request_setup_packet_t *setup_packet, uint8_t *extra_data)
 {
+        uint16_t new_address = setup_packet->value;
+        uint16_t zero1 = setup_packet->index;
+        uint16_t zero2 = setup_packet->length;
+
         if ((zero1 != 0) || (zero2 != 0)) {
                 return EINVAL;
@@ -128 +131 @@
 /** SET_CONFIGURATION handler. */
 static int handle_set_configuration(usbvirt_device_t *device,
-    uint16_t configuration_value,
-    uint16_t zero1, uint16_t zero2)
+    usb_device_request_setup_packet_t *setup_packet, uint8_t *extra_data)
 {
+        uint16_t configuration_value = setup_packet->value;
+        uint16_t zero1 = setup_packet->index;
+        uint16_t zero2 = setup_packet->length;
+
         if ((zero1 != 0) || (zero2 != 0)) {
                 return EINVAL;
@@ -151 +157 @@
         
         if (configuration_value == 0) {
+                if (DEVICE_HAS_OP(device, on_state_change)) {
+                        device->ops->on_state_change(device, device->state,
+                            USBVIRT_STATE_ADDRESS);
+                }
                 device->state = USBVIRT_STATE_ADDRESS;
         } else {
@@ -157 +167 @@
                 * user selected existing configuration.
                 */
+                if (DEVICE_HAS_OP(device, on_state_change)) {
+                        device->ops->on_state_change(device, device->state,
+                            USBVIRT_STATE_CONFIGURED);
+                }
                 device->state = USBVIRT_STATE_CONFIGURED;
                 if (device->descriptors) {
@@ -167 +181 @@
 }
 
-#define HANDLE_REQUEST(request, data, type, dev, user_callback, default_handler) \
-        do { \
-                if ((request)->request == (type)) { \
-                        int _rc = EFORWARD; \
-                        if (((dev)->ops) && ((dev)->ops->standard_request_ops) \
-                            && ((dev)->ops->standard_request_ops->user_callback)) { \
-                                _rc = (dev)->ops->standard_request_ops->\
-                                    user_callback(dev, request, data); \
-                        } \
-                        if (_rc == EFORWARD) { \
-                                default_handler; \
-                        } \
-                        return _rc; \
-                } \
-        } while (false)
-
-/** Handle standard device request. */
-int handle_std_request(usbvirt_device_t *device,
-    usb_device_request_setup_packet_t *request, uint8_t *data)
-{
-        device->lib_debug(device, 3, USBVIRT_DEBUGTAG_CONTROL_PIPE_ZERO,
-            "handling standard request %d", request->request);
-        
-        HANDLE_REQUEST(request, data, USB_DEVREQ_GET_DESCRIPTOR,
-            device, on_get_descriptor,
-            handle_get_descriptor(device, request->value_high, request->value_low,
-                request->index, request->length));
-        
-        HANDLE_REQUEST(request, data, USB_DEVREQ_SET_ADDRESS,
-            device, on_set_address,
-            handle_set_address(device, request->value,
-                request->index, request->length));
-        
-        HANDLE_REQUEST(request, data, USB_DEVREQ_SET_CONFIGURATION,
-            device, on_set_configuration,
-            handle_set_configuration(device, request->value,
-                request->index, request->length));
-        
-        return ENOTSUP;
-}
+
+#define MAKE_BM_REQUEST(direction, recipient) \
+        USBVIRT_MAKE_CONTROL_REQUEST_TYPE(direction, \
+            USBVIRT_REQUEST_TYPE_STANDARD, recipient)
+#define MAKE_BM_REQUEST_DEV(direction) \
+        MAKE_BM_REQUEST(direction, USBVIRT_REQUEST_RECIPIENT_DEVICE)
+
+usbvirt_control_transfer_handler_t control_pipe_zero_local_handlers[] = {
+        {
+                .request_type = MAKE_BM_REQUEST_DEV(USB_DIRECTION_IN),
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .name = "GetDescriptor()",
+                .callback = handle_get_descriptor
+        },
+        {
+                .request_type = MAKE_BM_REQUEST_DEV(USB_DIRECTION_OUT),
+                .request = USB_DEVREQ_SET_ADDRESS,
+                .name = "SetAddress()",
+                .callback = handle_set_address
+        },
+        {
+                .request_type = MAKE_BM_REQUEST_DEV(USB_DIRECTION_OUT),
+                .request = USB_DEVREQ_SET_CONFIGURATION,
+                .name = "SetConfiguration()",
+                .callback = handle_set_configuration
+        },
+        USBVIRT_CONTROL_TRANSFER_HANDLER_LAST
+};
 
 /**

uspace/lib/usbvirt/src/transaction.c

@@ -37 +37 @@
 #include <mem.h>
 
-#include "hub.h"
 #include "private.h"