Changeset 954ea70 in mainline

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.

Location:

uspace/lib/usbvirt

Files:

• ctrlpipe.c (modified) (3 diffs)
• ids.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• private.h (modified) (1 diff)
• stdreq.c (modified) (1 diff)

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;
 }
 

uspace/lib/usbvirt/ids.h

@@ -44 +44 @@
 int usbvirt_disconnect(void);
 
+typedef enum {
+        USBVIRT_TRANSACTION_SETUP,
+        USBVIRT_TRANSACTION_IN,
+        USBVIRT_TRANSACTION_OUT
+} usbvirt_transaction_type_t;
+
+
 #endif
 /**

uspace/lib/usbvirt/main.c

@@ -122 +122 @@
                 return EINVAL;
         }
-        if ((buffer == NULL) || (size == 0)) {
+        if ((buffer == NULL) && (size != 0)) {
                 return EINVAL;
         }
@@ -131 +131 @@
         int rc;
         
-        req = async_send_2(phone,
+        req = async_send_3(phone,
             IPC_M_USBVIRT_DATA_FROM_DEVICE,
             dev->address,
             endpoint,
+            size,
             &answer_data);
         
-        rc = async_data_write_start(phone, buffer, size);
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return rc;
+        if (size > 0) {
+                rc = async_data_write_start(phone, buffer, size);
+                if (rc != EOK) {
+                        async_wait_for(req, NULL);
+                        return rc;
+                }
         }
         

uspace/lib/usbvirt/private.h

@@ -58 +58 @@
 int handle_std_request(usb_device_request_setup_packet_t *request, uint8_t *data);
 
+extern usb_address_t dev_new_address;
+
 #endif
 /**

uspace/lib/usbvirt/stdreq.c

@@ -117 +117 @@
         }
         
-        /*
-         * TODO: handle when this request is invalid (e.g.
-         * setting address when in configured state).
-         */
-        if (new_address == 0) {
-                device->state = USBVIRT_STATE_DEFAULT;
-        } else {
-                device->state = USBVIRT_STATE_ADDRESS;
-        }
-        
-        device->address = new_address;
+        dev_new_address = new_address;
         
         return EOK;