Changes in uspace/drv/uhci/main.c [71ed4849:2972e21] in mainline

File:

• uspace/drv/uhci/main.c (modified) (3 diffs)

uspace/drv/uhci/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2010 Vojtech Horky, Jan Vesely
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 #include <usb/hcdhubd.h>
-#include <usb_iface.h>
-#include <usb/debug.h>
 #include <errno.h>
-#include <driver.h>
+
+#include "debug.h"
+#include "iface.h"
+#include "name.h"
 #include "uhci.h"
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
-{
-        /* This shall be called only for the UHCI itself. */
-        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 uhci_ops = {
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
-        .interfaces[USBHC_DEV_IFACE] = &uhci_iface
+        .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
 };
 
 static int uhci_add_device(device_t *device)
 {
-        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
+//      usb_dprintf(NAME, DEBUG, "uhci_add_device() called\n");
+        uhci_print_info( "uhci_add_device() called\n" );
         device->ops = &uhci_ops;
 
-        /*
-         * We need to announce the presence of our root hub.
-         */
-        usb_dprintf(NAME, 2, "adding root hub\n");
-        usb_hcd_add_root_hub(device);
+        uhci_init( device, (void*)0xc020 );
 
         return EOK;
@@ -79 +64 @@
          * Do some global initializations.
          */
-        sleep(5);
-        usb_dprintf_enable(NAME, 5);
+        sleep( 5 );
+        usb_dprintf_enable(NAME, DEBUG_LEVEL_MAX);
 
         return driver_main(&uhci_driver);