Changeset 92574f4 in mainline for uspace/drv/usbmid/main.c

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/drv/usbmid/main.c (moved) (moved from uspace/drv/uhci/main.c ) (2 diffs)

uspace/drv/usbmid/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <usb/hcdhubd.h>
-#include <usb_iface.h>
-#include <usb/debug.h>
+
+/** @addtogroup drvusbmid
+ * @{
+ */
+/**
+ * @file
+ * Main routines of USB multi interface device driver.
+ */
 #include <errno.h>
 #include <str_error.h>
-#include <driver.h>
-#include "uhci.h"
+#include <usb/debug.h>
+#include <usb/classes/classes.h>
+#include <usb/request.h>
+#include <usb/descriptor.h>
+#include <usb/pipes.h>
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+#include "usbmid.h"
+
+static int usbmid_add_device(ddf_dev_t *gen_dev)
 {
-        /* This shall be called only for the UHCI itself. */
-        assert(dev->parent == NULL);
+        usbmid_device_t *dev = usbmid_device_create(gen_dev);
+        if (dev == NULL) {
+                return ENOMEM;
+        }
 
-        *handle = dev->handle;
+        usb_log_info("Taking care of new MID: addr %d (HC %zu)\n",
+            dev->wire.address, dev->wire.hc_handle);
+
+        int rc;
+
+        rc = usb_endpoint_pipe_start_session(&dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Failed to start session on control pipe: %s.\n",
+                    str_error(rc));
+                goto error_leave;
+        }
+
+        bool accept = usbmid_explore_device(dev);
+
+        rc = usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_warning("Failed to end session on control pipe: %s.\n",
+                    str_error(rc));
+        }
+
+        if (!accept) {
+                rc = ENOTSUP;
+                goto error_leave;
+        }
+
+        gen_dev->driver_data = dev;
+
         return EOK;
+
+
+error_leave:
+        free(dev);
+        return rc;
 }
 
-static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
+static driver_ops_t mid_driver_ops = {
+        .add_device = usbmid_add_device,
 };
 
-static device_ops_t uhci_ops = {
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
-        .interfaces[USBHC_DEV_IFACE] = &uhci_iface
-};
-
-static int uhci_add_device(device_t *device)
-{
-        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
-        device->ops = &uhci_ops;
-
-        uintptr_t io_reg_base;
-        size_t io_reg_size;
-        int irq;
-
-        int rc = pci_get_my_registers(device,
-            &io_reg_base, &io_reg_size, &irq);
-
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to get I/O registers addresses: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-
-        usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
-            io_reg_base, io_reg_size, irq);
-
-        /*
-         * We need to announce the presence of our root hub.
-         */
-        usb_dprintf(NAME, 2, "adding root hub\n");
-        usb_hcd_add_root_hub(device);
-
-        return EOK;
-}
-
-static driver_ops_t uhci_driver_ops = {
-        .add_device = uhci_add_device,
-};
-
-static driver_t uhci_driver = {
+static driver_t mid_driver = {
         .name = NAME,
-        .driver_ops = &uhci_driver_ops
+        .driver_ops = &mid_driver_ops
 };
 
 int main(int argc, char *argv[])
 {
-        /*
-         * Do some global initializations.
-         */
-        sleep(5);
-        usb_dprintf_enable(NAME, 5);
+        printf(NAME ": USB multi interface device driver.\n");
 
-        return driver_main(&uhci_driver);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        return ddf_driver_main(&mid_driver);
 }
+
+/**
+ * @}
+ */