Changeset ca07cd3 in mainline for uspace/lib/usbvirt/ctrlpipe.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/ctrlpipe.c (modified) (4 diffs)

uspace/lib/usbvirt/ctrlpipe.c

@@ -47 +47 @@
 usb_address_t dev_new_address = -1;
 
+/** Tell request type.
+ * By type is meant either standard, class, vendor or other.
+ */
 static int request_get_type(uint8_t request_type)
 {
@@ -52 +55 @@
 }
 
-
-int control_pipe(usbvirt_control_transfer_t *transfer)
+/** Handle communication over control pipe zero.
+ */
+int control_pipe(usbvirt_device_t *device, usbvirt_control_transfer_t *transfer)
 {
         if (transfer->request_size < sizeof(usb_device_request_setup_packet_t)) {
@@ -68 +72 @@
         switch (type) {
                 case REQUEST_TYPE_STANDARD:
-                        rc = handle_std_request(request, remaining_data);
+                        rc = handle_std_request(device, request, remaining_data);
                         break;
                 case REQUEST_TYPE_CLASS:
@@ -80 +84 @@
         }
         
-        if (dev_new_address != -1) {
+        if (device->new_address != -1) {
                 /*
                  * TODO: handle when this request is invalid (e.g.
                  * setting address when in configured state).
                  */
-                if (dev_new_address == 0) {
+                if (device->new_address == 0) {
                         device->state = USBVIRT_STATE_DEFAULT;
                 } else {
                         device->state = USBVIRT_STATE_ADDRESS;
                 }
-                device->address = dev_new_address;
+                device->address = device->new_address;
                 
-                dev_new_address = -1;
+                device->new_address = -1;
         }