Changeset bba0dc20 in mainline

Timestamp:

2011-05-07T10:25:36Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5d07f54

Parents:

f1d16663

Message:

Minor initialization fixes

File:

• uspace/drv/ohci/hc.c (modified) (4 diffs)

uspace/drv/ohci/hc.c

@@ -110 +110 @@
             ret, str_error(ret));
 
+        list_initialize(&instance->pending_batches);
         usb_device_keeper_init(&instance->manager);
         ret = usb_endpoint_manager_init(&instance->ep_manager,
@@ -116 +117 @@
             str_error(ret));
 
-        hc_gain_control(instance);
         ret = hc_init_memory(instance);
         CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
             str_error(ret));
+#undef CHECK_RET_RETURN
+
+
 //      hc_init_hw(instance);
+        hc_gain_control(instance);
         fibril_mutex_initialize(&instance->guard);
 
@@ -131 +135 @@
         }
 
-        list_initialize(&instance->pending_batches);
-#undef CHECK_RET_RETURN
         return EOK;
 }
@@ -338 +340 @@
             (uint32_t*)((char*)instance->registers + 0x100);
         usb_log_debug("OHCI legacy register %p: %x.\n",
-                ohci_emulation_reg, *ohci_emulation_reg);
-        *ohci_emulation_reg &= ~0x1;
+            ohci_emulation_reg, *ohci_emulation_reg);
+        /* Do not change A20 state */
+        *ohci_emulation_reg &= 0x100;
+        usb_log_debug("OHCI legacy register %p: %x.\n",
+            ohci_emulation_reg, *ohci_emulation_reg);
 
         /* Interrupt routing enabled => smm driver is active */