Changeset f0da4eb2 in mainline

Timestamp:

2010-11-21T23:07:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8cd1aa5e

Parents:

8f62b0f

Message:

Reenable rootia32 driver

Also, the uhci driver is started (if UHCI is present on PCI) but it does
not register root hub due to some bug in devman. Will investigate later.

Location:

uspace/drv

Files:

• root/root.c (modified) (1 diff)
• uhci/main.c (modified) (1 diff)
• uhci/uhci.ma (modified) (1 diff)
• vhc/hcd.c (modified) (1 diff)

uspace/drv/root/root.c

@@ -72 +72 @@
 static int add_platform_child(device_t *parent)
 {
-        return EOK;
         printf(NAME ": adding new child for platform device.\n");
         

uspace/drv/uhci/main.c

@@ -77 +77 @@
         /*
          * We need to announce the presence of our root hub.
+         * Commented out until the problem which causes the whole task to
+         * block is solved.
          */
-        usb_hcd_add_root_hub(device);
+        //usb_hcd_add_root_hub(device);
 
         return EOK;

uspace/drv/uhci/uhci.ma

@@ -1 @@
-0 pci/ven=8086&dev=7020
+10 pci/ven=8086&dev=7020
 10 usb&hc=uhci
 10 usb&hc=uhci&hub

uspace/drv/vhc/hcd.c

@@ -108 +108 @@
         fibril_add_ready(fid);
 
+        /*
+         * Temporary workaround. Wait a little bit to be the last driver
+         * in devman output.
+         */
+        sleep(4);
+
         return usb_hcd_main(&vhc_driver);
 }