Changes in / [382f3266:98637224] in mainline

Location:

uspace

Files:

• app/netstart/self_test.c (added)
• app/netstart/self_test.h (added)
• drv/usbmouse/init.c (modified) (1 diff)
• lib/packet/include/net_byteorder.h (deleted)
• lib/packet/include/net_err.h (deleted)
• lib/packet/include/socket_errno.h (deleted)
• 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;
-        dev->interface_no = usb_device_get_assigned_interface(dev->ddf_dev);
+        int my_interface = 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 = dev->interface_no;
+                dev->pipes[i].interface_no = my_interface;
         }