Changeset 954ea70 in mainline for uspace/lib/usbvirt/ctrlpipe.c

Timestamp:

2010-10-22T14:55:33Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b8a3cda

Parents:

a498728

Message:

usbvirt: standard requests handled better

Also, SET_ADDRESS works according to specification.

File:

• uspace/lib/usbvirt/ctrlpipe.c (modified) (3 diffs)

uspace/lib/usbvirt/ctrlpipe.c

@@ -45 +45 @@
         ((value & GET_MIDBITS_MASK(size, shift)) >> shift)
 
+usb_address_t dev_new_address = -1;
+
 static int request_get_type(uint8_t request_type)
 {
@@ -63 +65 @@
         int type = request_get_type(request->request_type);
         
+        int rc = EOK;
+        
         switch (type) {
                 case REQUEST_TYPE_STANDARD:
-                        return handle_std_request(request, remaining_data);
+                        rc = handle_std_request(request, remaining_data);
                         break;
                 case REQUEST_TYPE_CLASS:
                         if (DEVICE_HAS_OP(device, on_class_device_request)) {
-                                return device->ops->on_class_device_request(device,
+                                rc = device->ops->on_class_device_request(device,
                                     request, remaining_data);
                         }
@@ -77 +81 @@
         }
         
-        return EOK;
+        device->send_data(device, 0, NULL, 0);
+        
+        if (dev_new_address != -1) {
+                /*
+                 * TODO: handle when this request is invalid (e.g.
+                 * setting address when in configured state).
+                 */
+                if (dev_new_address == 0) {
+                        device->state = USBVIRT_STATE_DEFAULT;
+                } else {
+                        device->state = USBVIRT_STATE_ADDRESS;
+                }
+                device->address = dev_new_address;
+                
+                dev_new_address = -1;
+        }
+        
+        return rc;
 }