Changes in / [6ab7f3e9:98e15b1] in mainline

Location:

uspace

Files:

• drv/ehci-hcd/hc_iface.c (modified) (2 diffs)
• drv/usbhub/usbhub.c (modified) (1 diff)
• drv/usbmouse/init.c (modified) (2 diffs)
• drv/usbmouse/mouse.c (modified) (1 diff)
• lib/drv/include/usbhc_iface.h (modified) (1 diff)
• lib/usbdev/include/usb/dev/driver.h (modified) (1 diff)
• lib/usbdev/src/devdrv.c (modified) (1 diff)
• srv/hid/console/console.c (modified) (9 diffs)

uspace/drv/ehci-hcd/hc_iface.c

@@ -48 +48 @@
             methodname, __FILE__, __LINE__)
 
-/** Reserve default address.
- *
- * This function may block the caller.
- *
- * @param[in] fun Device function the action was invoked on.
- * @param[in] speed Speed of the device for which the default address is
- *      reserved.
- * @return Error code.
- */
-static int reserve_default_address(ddf_fun_t *fun, usb_speed_t speed)
-{
-        UNSUPPORTED("reserve_default_address");
-
-        return ENOTSUP;
-}
-
-/** Release default address.
- *
- * @param[in] fun Device function the action was invoked on.
- * @return Error code.
- */
-static int release_default_address(ddf_fun_t *fun)
-{
-        UNSUPPORTED("release_default_address");
-
-        return ENOTSUP;
-}
-
 /** Found free USB address.
  *
@@ -332 +304 @@
 /** Host controller interface implementation for EHCI. */
 usbhc_iface_t ehci_hc_iface = {
-        .reserve_default_address = reserve_default_address,
-        .release_default_address = release_default_address,
         .request_address = request_address,
         .bind_address = bind_address,

uspace/drv/usbhub/usbhub.c

@@ -515 +515 @@
         fibril_mutex_unlock(&hub->pending_ops_mutex);
 
+        usb_device_destroy(hub->usb_device);
+
         free(hub->ports);
         free(hub);

uspace/drv/usbmouse/init.c

@@ -39 +39 @@
 #include <usb/hid/hid.h>
 #include <usb/dev/request.h>
+#include <usb/hid/request.h>
 #include <errno.h>
 
@@ -126 +127 @@
         
         /* 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);
+        rc = usbhid_req_set_protocol(&dev->ctrl_pipe, dev->interface_no,
+            USB_HID_PROTOCOL_BOOT);
         if (rc != EOK) {
                 goto leave;

uspace/drv/usbmouse/mouse.c

@@ -117 +117 @@
         async_hangup(mouse->console_phone);
         mouse->console_phone = -1;
+
+        usb_device_destroy(dev);
 }
 

uspace/lib/drv/include/usbhc_iface.h

@@ -212 +212 @@
 /** USB host controller communication interface. */
 typedef struct {
-        int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
-        int (*release_default_address)(ddf_fun_t *);
         int (*request_address)(ddf_fun_t *, usb_speed_t, usb_address_t *);
         int (*bind_address)(ddf_fun_t *, usb_address_t, devman_handle_t);

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -168 +168 @@
 int usb_device_destroy_pipes(ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
 int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **);
+void usb_device_destroy(usb_device_t *);
 
 size_t usb_interface_count_alternates(uint8_t *, size_t, uint8_t);

uspace/lib/usbdev/src/devdrv.c

@@ -533 +533 @@
 }
 
+/** Destroy instance of a USB device.
+ *
+ * @param dev Device to be destroyed.
+ */
+void usb_device_destroy(usb_device_t *dev)
+{
+        if (dev == NULL) {
+                return;
+        }
+
+        /* Ignore errors and hope for the best. */
+        usb_device_destroy_pipes(dev->ddf_dev, dev->pipes, dev->pipes_count);
+        if (dev->descriptors.configuration != NULL) {
+                free(dev->descriptors.configuration);
+        }
+
+        if (dev->alternate_interfaces != NULL) {
+                if (dev->alternate_interfaces->alternatives != NULL) {
+                        free(dev->alternate_interfaces->alternatives);
+                }
+                free(dev->alternate_interfaces);
+        }
+
+        free(dev);
+}
+
 /**
  * @}

uspace/srv/hid/console/console.c

@@ -57 +57 @@
 #include <io/style.h>
 #include <io/screenbuffer.h>
+#include <inttypes.h>
 
 #include "console.h"
@@ -67 +68 @@
 /** Interval for checking for new keyboard (1/4s). */
 #define HOTPLUG_WATCH_INTERVAL (1000 * 250)
+
+/* Kernel defines 32 but does not export it. */
+#define MAX_IPC_OUTGOING_PHONES 128
+/** To allow proper phone closing. */
+static ipc_callid_t driver_phones[MAX_IPC_OUTGOING_PHONES] = { 0 };
 
 /** Phone to the keyboard driver. */
@@ -90 +96 @@
                                        contents and related settings. */
 } console_t;
+
+
 
 /** Array of data for virtual consoles */
@@ -401 +409 @@
 }
 
+static void close_driver_phone(ipc_callid_t hash)
+{
+        int i;
+        for (i = 0; i < MAX_IPC_OUTGOING_PHONES; i++) {
+                if (driver_phones[i] == hash) {
+                        printf("Device %" PRIxn " gone.\n", hash);
+                        driver_phones[i] = 0;
+                        async_hangup(i);
+                        return;
+                }
+        }
+}
+
 /** Handler for keyboard */
 static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall)
@@ -415 +436 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
+                        close_driver_phone(iid);
                         return;
                 case KBD_EVENT:
@@ -458 +480 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
+                        close_driver_phone(iid);
                         return;
                 case MEVENT_BUTTON:
@@ -715 +738 @@
 }
 
+static int async_connect_to_me_hack(int phone, sysarg_t arg1, sysarg_t arg2,
+sysarg_t arg3, async_client_conn_t client_receiver, ipc_callid_t *hash)
+{
+        sysarg_t task_hash;
+        sysarg_t phone_hash;
+        int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
+            NULL, NULL, NULL, &task_hash, &phone_hash);
+        if (rc != EOK)
+                return rc;
+
+        if (client_receiver != NULL)
+                async_new_connection(task_hash, phone_hash, phone_hash, NULL,
+                    client_receiver);
+
+        if (hash != NULL) {
+                *hash = phone_hash;
+        }
+
+        return EOK;
+}
+
 static int connect_keyboard_or_mouse(const char *devname,
     async_client_conn_t handler, const char *path)
@@ -729 +773 @@
         }
         
-        int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0, handler);
+        ipc_callid_t hash;
+        int rc = async_connect_to_me_hack(phone, SERVICE_CONSOLE, 0, phone,
+            handler, &hash);
         if (rc != EOK) {
                 printf(NAME ": " \
@@ -737 +783 @@
         }
         
-        printf(NAME ": found %s \"%s\".\n", devname, path);
+        driver_phones[phone] = hash;
+
+        printf(NAME ": found %s \"%s\" (%" PRIxn ").\n", devname, path, hash);
 
         return phone;