Changeset cabda7f in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-02-25T20:48:30Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0fde1d5

Parents:

2d33eb5

Message:

Minor fixes

initialize stack variables
use fixed size 32B address space
get rid of USE_INTERRUPTS macro
comment interrupt enabling code
reset hc before taking control

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (5 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -141 +141 @@
 
         instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
-#ifndef USE_INTERRUTPS
         fibril_add_ready(instance->cleaner);
-#endif
 
         instance->debug_checker = fibril_create(uhci_debug_checker, instance);
@@ -153 +151 @@
 void uhci_init_hw(uhci_t *instance)
 {
+        /* reset hc, who knows what touched it before us */
+        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
+        async_usleep(10000); /* 10ms according to USB spec */
+        pio_write_16(&instance->registers->usbcmd, 0);
 
         /* set framelist pointer */
@@ -159 +161 @@
 
         /* enable all interrupts, but resume interrupt */
-        pio_write_16(&instance->registers->usbintr,
-                  UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
+//      pio_write_16(&instance->registers->usbintr,
+//                UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
 
         /* Start the hc with large(64B) packet FSBR */
@@ -295 +297 @@
         while(1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
+                usb_log_debug("UHCI status: %x.\n", status);
+                status |= 1;
                 uhci_interrupt(instance, status);
                 pio_write_16(&instance->registers->usbsts, 0x1f);
-                async_usleep(UHCI_CLEANER_TIMEOUT);
+                async_usleep(UHCI_CLEANER_TIMEOUT * 1000);
         }
         return EOK;
@@ -313 +317 @@
                     cmd, sts, intr);
 
-                uintptr_t frame_list = pio_read_32(&instance->registers->flbaseadd);
+                uintptr_t frame_list =
+                    pio_read_32(&instance->registers->flbaseadd) & ~0xfff;
                 if (frame_list != addr_to_phys(instance->frame_list)) {
                         usb_log_debug("Framelist address: %p vs. %p.\n",