Changeset 411d9fa in mainline

Timestamp:

2011-03-18T16:53:18Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3746bfe

Parents:

98637224 (diff), 382f3266 (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:

Mouse sets boot protocol

Location:

uspace

Files:

• drv/usbmouse/init.c (modified) (1 diff)
• lib/usb/include/usb/devdrv.h (modified) (1 diff)
• lib/usb/src/devdrv.c (modified) (2 diffs)

uspace/drv/usbmouse/init.c

@@ -124 +124 @@
                 goto leave;
         }
+        
+        /* Open the control pipe. */
+        rc = usb_endpoint_pipe_start_session(&dev->ctrl_pipe);
+        if (rc != EOK) {
+                goto leave;
+        }
+        
+        /* Set the boot protocol. */
+        rc = usb_control_request_set(&dev->ctrl_pipe,
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
+            USB_HIDREQ_SET_PROTOCOL, USB_HID_PROTOCOL_BOOT, dev->interface_no,
+            NULL, 0);
+        if (rc != EOK) {
+                goto leave;
+        }
+        
+        /* Close the control pipe (ignore errors). */
+        usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+
 
         /* Everything allright. */

uspace/lib/usb/include/usb/devdrv.h

@@ -47 +47 @@
          */
         usb_endpoint_mapping_t *pipes;
+        /** Current interface.
+         * Usually, drivers operate on single interface only.
+         * This item contains the value of the interface or -1 for any.
+         */
+        int interface_no;
         /** Generic DDF device backing this one. */
         ddf_dev_t *ddf_dev;

uspace/lib/usb/src/devdrv.c

@@ -109 +109 @@
 {
         int rc;
-        int my_interface = usb_device_get_assigned_interface(dev->ddf_dev);
+        dev->interface_no = usb_device_get_assigned_interface(dev->ddf_dev);
 
         size_t pipe_count = count_other_pipes(drv);
@@ -134 +134 @@
 
                 dev->pipes[i].description = drv->endpoints[i];
-                dev->pipes[i].interface_no = my_interface;
+                dev->pipes[i].interface_no = dev->interface_no;
         }