Changeset fd9f6e4c in mainline

Timestamp:

2011-03-20T22:24:56Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

33577f81, 41ef5b9

Parents:

09daa8b (diff), e7bc999 (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 with usb/development

Files:

• .bzrignore (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/ehci-hcd/Makefile (modified) (1 diff)
• uspace/drv/ehci-hcd/ehci.h (added)
• uspace/drv/ehci-hcd/hc_iface.c (added)
• uspace/drv/ehci-hcd/main.c (modified) (5 diffs)
• uspace/drv/ohci/Makefile (added)
• uspace/drv/ohci/batch.c (added)
• uspace/drv/ohci/batch.h (added)
• uspace/drv/ohci/hc_iface.c (added)
• uspace/drv/ohci/iface.h (added)
• uspace/drv/ohci/main.c (added)
• uspace/drv/ohci/ohci.ma (added)
• uspace/drv/ohci/ohci_hc.c (added)
• uspace/drv/ohci/ohci_hc.h (added)
• uspace/drv/ohci/ohci_regs.h (added)
• uspace/drv/ohci/ohci_rh.c (added)
• uspace/drv/ohci/ohci_rh.h (added)
• uspace/drv/ohci/pci.c (added)
• uspace/drv/ohci/pci.h (added)

.bzrignore

@@ -84 +84 @@
 ./uspace/drv/test1/test1
 ./uspace/drv/test2/test2
+./uspace/drv/ohci/ohci
 ./uspace/drv/ehci-hcd/ehci-hcd
 ./uspace/drv/uhci-hcd/uhci-hcd

boot/arch/amd64/Makefile.inc

@@ -44 +44 @@
         ns8250 \
         ehci-hcd \
+        ohci \
         uhci-hcd \
         uhci-rhd \

uspace/Makefile

@@ -118 +118 @@
                 srv/hw/irc/i8259 \
                 drv/ehci-hcd \
+                drv/ohci \
                 drv/uhci-hcd \
                 drv/uhci-rhd \
@@ -136 +137 @@
                 srv/hw/irc/i8259 \
                 drv/ehci-hcd \
+                drv/ohci \
                 drv/uhci-hcd \
                 drv/uhci-rhd \

uspace/drv/ehci-hcd/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        hc_iface.c \
         main.c \
         pci.c

uspace/drv/ehci-hcd/main.c

@@ -44 +44 @@
 
 #include "pci.h"
-
-#define NAME "ehci-hcd"
+#include "ehci.h"
 
 static int ehci_add_device(ddf_dev_t *device);
@@ -57 +56 @@
         .driver_ops = &ehci_driver_ops
 };
+static ddf_dev_ops_t hc_ops = {
+        .interfaces[USBHC_DEV_IFACE] = &ehci_hc_iface,
+};
+
 /*----------------------------------------------------------------------------*/
 /** Initializes a new ddf driver instance of EHCI hcd.
@@ -71 +74 @@
         return ret; \
 }
-
-        usb_log_info("uhci_add_device() called\n");
 
         uintptr_t mem_reg_base = 0;
@@ -89 +90 @@
             "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));
 
+        ddf_fun_t *hc_fun = ddf_fun_create(device, fun_exposed, "ehci-hc");
+        if (hc_fun == NULL) {
+                usb_log_error("Failed to create EHCI function.\n");
+                return ENOMEM;
+        }
+        hc_fun->ops = &hc_ops;
+        ret = ddf_fun_bind(hc_fun);
+
+        CHECK_RET_RETURN(ret,
+            "Failed to bind EHCI function: %s.\n",
+            str_error(ret));
+
+        usb_log_info("Controlling new EHCI device `%s' (handle %llu).\n",
+            device->name, device->handle);
+
         return EOK;
 #undef CHECK_RET_RETURN
@@ -103 +119 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_ERROR, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
         return ddf_driver_main(&ehci_driver);
 }