Changeset ca07cd3 in mainline for uspace/lib/usbvirt/stdreq.c

Timestamp:

2010-10-25T13:23:33Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

23cb44b

Parents:

355f7c2

Message:

Code cleanup, various bugfixes

The internal functions of virtual device framework always get
device structure as parameter, thus possible enabling more devices
within single task (that is not possible because currently there
is no way to pass extra argument into callback_connection()).

Also, added some missing comments and completely removed the device
id nonsense (devices can send their descriptors and the hub is able
to enable/disable its ports).

File:

• uspace/lib/usbvirt/stdreq.c (modified) (4 diffs)

uspace/lib/usbvirt/stdreq.c

@@ -49 +49 @@
  */
  
-static int handle_get_descriptor(uint8_t type, uint8_t index, uint16_t language,
+/** GET_DESCRIPTOR handler. */
+static int handle_get_descriptor(usbvirt_device_t *device,
+    uint8_t type, uint8_t index, uint16_t language,
     uint16_t length)
 {
@@ -106 +108 @@
 }
 
-static int handle_set_address(uint16_t new_address,
+/** SET_ADDRESS handler. */
+static int handle_set_address(usbvirt_device_t *device,
+    uint16_t new_address,
     uint16_t zero1, uint16_t zero2)
 {
@@ -117 +121 @@
         }
         
-        dev_new_address = new_address;
+        device->new_address = new_address;
         
         return EOK;
 }
 
-static int handle_set_configuration(uint16_t configuration_value,
+/** SET_CONFIGURATION handler. */
+static int handle_set_configuration(usbvirt_device_t *device,
+    uint16_t configuration_value,
     uint16_t zero1, uint16_t zero2)
 {
@@ -177 +183 @@
         } while (false)
 
-
-int handle_std_request(usb_device_request_setup_packet_t *request, uint8_t *data)
+/** Handle standard device request. */
+int handle_std_request(usbvirt_device_t *device,
+    usb_device_request_setup_packet_t *request, uint8_t *data)
 {
         HANDLE_REQUEST(request, data, USB_DEVREQ_GET_DESCRIPTOR,
             device, on_get_descriptor,
-            handle_get_descriptor(request->value_low, request->value_high,
+            handle_get_descriptor(device, request->value_low, request->value_high,
                 request->index, request->length));
         
         HANDLE_REQUEST(request, data, USB_DEVREQ_SET_ADDRESS,
             device, on_set_address,
-            handle_set_address(request->value,
+            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(request->value,
+            handle_set_configuration(device, request->value,
                 request->index, request->length));