Changeset 3de48b5 in mainline

Timestamp:

2011-02-26T11:20:56Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

48563a3

Parents:

0063838

Message:

Switch back to polling

reduce debug verbosity

Location:

uspace/drv

Files:

• uhci-hcd/batch.c (modified) (2 diffs)
• uhci-hcd/main.c (modified) (1 diff)
• uhci-hcd/uhci.c (modified) (4 diffs)
• uhci-rhd/port.c (modified) (4 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -140 +140 @@
 {
         assert(instance);
-        usb_log_debug("Checking(%p) %d packet for completion.\n",
+        usb_log_debug2("Checking(%p) %d packet for completion.\n",
             instance, instance->packets);
         instance->transfered_size = 0;
@@ -157 +157 @@
                     transfer_descriptor_actual_size(&instance->tds[i]);
         }
-        /* This is just an ugly trick to support the old API */
         instance->transfered_size -= instance->setup_size;
         return true;

uspace/drv/uhci-hcd/main.c

@@ -95 +95 @@
         io_reg_size = 32;
 
-        ret = pci_enable_interrupts(device);
-        CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret);
+//      ret = pci_enable_interrupts(device);
+//      CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret);
 
         uhci_t *uhci_hc = malloc(sizeof(uhci_t));

uspace/drv/uhci-hcd/uhci.c

@@ -143 +143 @@
 
         instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
-//      fibril_add_ready(instance->cleaner);
+        fibril_add_ready(instance->cleaner);
 
         instance->debug_checker = fibril_create(uhci_debug_checker, instance);
@@ -287 +287 @@
 {
         assert(instance);
-        if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
-                return;
-        usb_log_debug2("UHCI interrupt: %X.\n", status);
+//      if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
+//              return;
+//      usb_log_debug2("UHCI interrupt: %X.\n", status);
         transfer_list_remove_finished(&instance->transfers_interrupt);
         transfer_list_remove_finished(&instance->transfers_control_slow);
@@ -304 +304 @@
         while (1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
-                usb_log_debug2("UHCI status: %x.\n", status);
+//              usb_log_debug2("UHCI status: %x.\n", status);
                 status |= 1;
                 uhci_interrupt(instance, status);
@@ -321 +321 @@
                 const uint16_t sts = pio_read_16(&instance->registers->usbsts);
                 const uint16_t intr = pio_read_16(&instance->registers->usbintr);
-                usb_log_debug("Command: %X Status: %X Interrupts: %x\n",
-                    cmd, sts, intr);
+                if (((cmd & UHCI_CMD_RUN_STOP) != 1) || (sts != 0)) {
+                        usb_log_debug2("Command: %X Status: %X Intr: %x\n",
+                            cmd, sts, intr);
+                }
 
                 uintptr_t frame_list =

uspace/drv/uhci-rhd/port.c

@@ -92 +92 @@
         uhci_port_t *port_instance = port;
         assert(port_instance);
+//      port_status_write(port_instance->address, 0);
 
         while (1) {
@@ -103 +104 @@
                 usb_log_debug("Port %d status at %p: 0x%04x.\n",
                   port_instance->number, port_instance->address, port_status);
-                print_port_status(port_status);
+//              print_port_status(port_status);
                 fibril_mutex_unlock(&dbg_mtx);
 
@@ -115 +116 @@
                         }
 
+                        port_status_write(port_instance->address, port_status);
+                        usb_log_debug("Change status ack on port %d.\n",
+                            port_instance->number);
+
                         /* remove any old device */
                         if (port_instance->attached_device) {
@@ -121 +126 @@
                                 uhci_port_remove_device(port_instance);
                         }
-
-                        port_status_write(port_instance->address, STATUS_CONNECTED_CHANGED);
-                        usb_log_debug("Change status erased on port %d.\n",
-                            port_instance->number);
 
                         if (port_status & STATUS_CONNECTED) {