Changeset 41e645c in mainline for uspace/drv

Timestamp:

2011-02-20T21:43:50Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

070f11e, ace12560

Parents:

423e8c81 (diff), 063ead6f (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:

Add simple USB multi interface device driver

The MID driver serves as a mini bus driver for devices with several
interfaces or for devices with classes defined at interface level.

The keyboard driver is working with this driver with the same problems
as before introduction of USB MID driver.

The merge also includes addition of bulk transfers.

Location:

uspace/drv

Files:

• uhci-hcd/iface.c (modified) (2 diffs)
• uhci-hcd/main.c (modified) (2 diffs)
• uhci-rhd/main.c (modified) (2 diffs)
• usbhid/main.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (2 diffs)
• usbmid/Makefile (added)
• usbmid/dump.c (added)
• usbmid/explore.c (added)
• usbmid/main.c (added)
• usbmid/usbmid.c (added)
• usbmid/usbmid.h (added)
• usbmid/usbmid.ma (added)
• vhc/conn.h (modified) (2 diffs)
• vhc/connhost.c (modified) (5 diffs)
• vhc/hcd.c (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -42 +42 @@
 #include "uhci.h"
 
-static int get_address(device_t *dev, devman_handle_t handle,
-    usb_address_t *address)
-{
-        assert(dev);
-        uhci_t *hc = dev_to_uhci(dev);
-        assert(hc);
-        *address = usb_address_keeping_find(&hc->address_manager, handle);
-        if (*address <= 0)
-          return *address;
-        return EOK;
-}
 /*----------------------------------------------------------------------------*/
 static int reserve_default_address(device_t *dev, usb_speed_t speed)
@@ -168 +157 @@
 /*----------------------------------------------------------------------------*/
 usbhc_iface_t uhci_iface = {
-        .tell_address = get_address,
-
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include <driver.h>
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <device/hw_res.h>
 
@@ -48 +49 @@
 
 static int uhci_add_device(device_t *device);
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle);
-/*----------------------------------------------------------------------------*/
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+
+static int usb_iface_get_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
 {
-        /* This shall be called only for the UHCI itself. */
-        assert(dev->parent == NULL);
+        assert(dev);
+        uhci_t *hc = dev_to_uhci(dev);
+        assert(hc);
 
-        *handle = dev->handle;
+        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
+            handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        if (address != NULL) {
+                *address = addr;
+        }
+
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
+
 static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
+        .get_address = usb_iface_get_address
 };
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-rhd/main.c

@@ -34 +34 @@
 #include <driver.h>
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
 
 #include <errno.h>
@@ -56 +57 @@
 
 static usb_iface_t uhci_rh_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
+        .get_hc_handle = usb_iface_get_hc_handle,
+        .get_address = usb_iface_get_address_hub_impl
 };
 

uspace/drv/usbhid/main.c

@@ -265 +265 @@
         for (i = 0; i < count; ++i) {
                 printf("%d ", key_codes[i]);
+        }
+        printf("\n");
+
+        for (i = 0; i < count; ++i) {
                 // TODO: Key press / release
 
                 // TODO: NOT WORKING
                 unsigned int key = usbkbd_parse_scancode(key_codes[i]);
+
+                if (key == 0) {
+                        continue;
+                }
                 kbd_push_ev(KEY_PRESS, key);
         }
@@ -348 +356 @@
                 {
                         .pipe = &kbd_dev->poll_pipe,
-                        .description = &poll_endpoint_description
+                        .description = &poll_endpoint_description,
+                        .interface_no =
+                            usb_device_get_assigned_interface(kbd_dev->device)
                 }
         };

uspace/drv/usbhub/usbhub.c

@@ -39 +39 @@
 
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
@@ -50 +51 @@
 #include "usb/usb.h"
 
-static int iface_get_hc_handle(device_t *device, devman_handle_t *handle)
-{
-        return usb_hc_find(device->handle, handle);
-}
-
-static usb_iface_t hub_usb_iface = {
-        .get_hc_handle = iface_get_hc_handle
-};
-
 static device_ops_t hub_device_ops = {
-        .interfaces[USB_DEV_IFACE] = &hub_usb_iface
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
 };
 

uspace/drv/vhc/conn.h

@@ -38 +38 @@
 #include <usb/usb.h>
 #include <usbhc_iface.h>
+#include <usb_iface.h>
 #include "vhcd.h"
 #include "devices.h"
@@ -43 +44 @@
 void connection_handler_host(sysarg_t);
 
-usbhc_iface_t vhc_iface;
+extern usbhc_iface_t vhc_iface;
+extern usb_iface_t vhc_usb_iface;
 
 void address_init(void);

uspace/drv/vhc/connhost.c

@@ -37 +37 @@
 #include <usb/usb.h>
 #include <usb/addrkeep.h>
+#include <usb/ddfiface.h>
 
 #include "vhcd.h"
@@ -313 +314 @@
 static usb_address_keeping_t addresses;
 
+static int tell_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
+{
+        usb_address_t addr = usb_address_keeping_find(&addresses, handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        *address = addr;
+        return EOK;
+}
 
 static int reserve_default_address(device_t *dev, usb_speed_t ignored)
@@ -350 +362 @@
 }
 
-static int tell_address(device_t *dev, devman_handle_t handle,
-    usb_address_t *address)
-{
-        usb_address_t addr = usb_address_keeping_find(&addresses, handle);
-        if (addr < 0) {
-                return addr;
-        }
-
-        *address = addr;
-        return EOK;
-}
-
 void address_init(void)
 {
@@ -368 +368 @@
 
 usbhc_iface_t vhc_iface = {
-        .tell_address = tell_address,
-
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,
@@ -383 +381 @@
 };
 
+usb_iface_t vhc_usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
+        .get_address = tell_address
+};
+
+
 /**
  * @}

uspace/drv/vhc/hcd.c

@@ -45 +45 @@
 
 #include <usb/usb.h>
+#include <usb/ddfiface.h>
 #include <usb_iface.h>
 #include "vhcd.h"
@@ -52 +53 @@
 #include "conn.h"
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
-{
-        /* This shall be called only for VHC device. */
-        assert(dev->parent == NULL);
-
-        *handle = dev->handle;
-        return EOK;
-}
-
-static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
-};
-
 static device_ops_t vhc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USB_DEV_IFACE] = &vhc_usb_iface,
         .close = on_client_close,
         .default_handler = default_connection_handler