Changeset 41ef5b9 in mainline for uspace/drv/usbflbk/main.c

Timestamp:

2011-03-21T17:16:10Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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:

merge from usb/development

File:

• uspace/drv/usbflbk/main.c (moved) (moved from uspace/drv/ohci/ohci_hc.c ) (2 diffs)

uspace/drv/usbflbk/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbohcihc
+
+/** @addtogroup drvusbfallback
  * @{
  */
-/** @file
- * @brief OHCI Host controller driver routines
+/**
+ * @file
+ * Main routines of USB fallback driver.
  */
+#include <usb/devdrv.h>
+#include <usb/debug.h>
 #include <errno.h>
 #include <str_error.h>
-#include <adt/list.h>
-#include <libarch/ddi.h>
 
-#include <usb/debug.h>
-#include <usb/usb.h>
-#include <usb/ddfiface.h>
-#include <usb_iface.h>
+#define NAME "usbflbk"
 
-#include "ohci_hc.h"
+/** Callback when new device is attached and recognized by DDF.
+ *
+ * @param dev Representation of a generic DDF device.
+ * @return Error code.
+ */
+static int usbfallback_add_device(usb_device_t *dev)
+{
+        int rc;
+        const char *fun_name = "ctl";
 
-int ohci_hc_init(ohci_hc_t *instance, ddf_fun_t *fun,
-    uintptr_t regs, size_t reg_size, bool interrupts)
-{
-        assert(instance);
-        int ret = pio_enable((void*)regs, reg_size, (void**)&instance->registers);
-        if (ret != EOK) {
-                usb_log_error("Failed to gain access to device registers.\n");
-                return ret;
+        ddf_fun_t *ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed,
+            fun_name);
+        if (ctl_fun == NULL) {
+                usb_log_error("Failed to create control function.\n");
+                return ENOMEM;
         }
-        instance->registers->interrupt_disable = 0;
-        /* enable interrupt on root hub status change */
-        instance->registers->interupt_enable |= IE_RHSC | IE_MIE;
+        rc = ddf_fun_bind(ctl_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to bind control function: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
+        usb_log_info("Pretending to control %s `%s'" \
+            " (node `%s', handle %llu).\n",
+            dev->interface_no < 0 ? "device" : "interface",
+            dev->ddf_dev->name, fun_name, dev->ddf_dev->handle);
 
-        ohci_rh_init(&instance->rh, instance->registers);
-        /* TODO: implement */
-        /* TODO: register root hub */
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-int ohci_hc_schedule(ohci_hc_t *instance, batch_t *batch)
+
+/** USB fallback driver ops. */
+static usb_driver_ops_t usbfallback_driver_ops = {
+        .add_device = usbfallback_add_device,
+};
+
+/** USB fallback driver. */
+static usb_driver_t usbfallback_driver = {
+        .name = NAME,
+        .ops = &usbfallback_driver_ops,
+        .endpoints = NULL
+};
+
+int main(int argc, char *argv[])
 {
-        assert(instance);
-        assert(batch);
-        if (batch->target.address == instance->rh.address) {
-                ohci_rh_request(&instance->rh, batch);
-                return EOK;
-        }
-        /* TODO: implement */
-        return EOK;
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+
+        return usb_driver_main(&usbfallback_driver);
 }
-/*----------------------------------------------------------------------------*/
-void ohci_hc_interrupt(ohci_hc_t *instance, uint16_t status)
-{
-        assert(instance);
-        /* TODO: Check for interrupt cause */
-        ohci_rh_interrupt(&instance->rh);
-        /* TODO: implement */
-}
+
 /**
  * @}