Changeset 0f3e68c in mainline

Timestamp:

2011-03-12T22:36:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

335382d

Parents:

dd6f59f (diff), 67352d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Minor fixes and refactoring

Location:

uspace/drv

Files:

• ehci-hcd/pci.c (modified) (3 diffs)
• uhci-hcd/batch.c (modified) (3 diffs)
• uhci-hcd/uhci.c (modified) (1 diff)
• uhci-hcd/uhci_struct/transfer_descriptor.c (modified) (2 diffs)
• uhci-hcd/uhci_struct/transfer_descriptor.h (modified) (2 diffs)
• uhci-rhd/port.c (modified) (3 diffs)
• uhci-rhd/port.h (modified) (2 diffs)
• uhci-rhd/port_status.h (deleted)

uspace/drv/ehci-hcd/pci.c

@@ -247 +247 @@
 
 
-        if ((value & USBLEGSUP_BIOS_CONTROL) != 0) {
+        if ((value & USBLEGSUP_BIOS_CONTROL) == 0) {
                 usb_log_info("BIOS released control after %d usec.\n", wait);
         } else {
                 /* BIOS failed to hand over control, this should not happen. */
-                usb_log_warning( "BIOS failed to release control after"
+                usb_log_warning( "BIOS failed to release control after "
                     "%d usecs, force it.\n", wait);
                 ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
@@ -258 +258 @@
                 CHECK_RET_HANGUP_RETURN(ret,
                     "Failed(%d) to force OS EHCI control.\n", ret);
-                /* TODO: This does not seem to work on my machine */
         }
 
@@ -280 +279 @@
         usb_log_debug2("USBLEGSUP: %x.\n", value);
 
-/*
- * TURN OFF EHCI FOR NOW, REMOVE IF THE DRIVER IS IMPLEMENTED
- */
+        /*
+         * TURN OFF EHCI FOR NOW, DRIVER WILL REINITIALIZE IT
+         */
 
         /* Get size of capability registers in memory space. */

uspace/drv/uhci-hcd/batch.c

@@ -177 +177 @@
                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
                             instance, i, instance->tds[i].status);
+                        td_print_status(&instance->tds[i]);
 
                         device_keeper_set_toggle(instance->manager,
@@ -318 +319 @@
                 ++packet;
         }
-        instance->tds[packet - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
+        instance->tds[packet - 1].status |= TD_STATUS_IOC_FLAG;
         device_keeper_set_toggle(instance->manager, instance->target, toggle);
 }
@@ -371 +372 @@
 
 
-        instance->tds[packet].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
+        instance->tds[packet].status |= TD_STATUS_IOC_FLAG;
         usb_log_debug2("Control last TD status: %x.\n",
             instance->tds[packet].status);

uspace/drv/uhci-hcd/uhci.c

@@ -436 +436 @@
 
                 int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
-                usb_log_debug2("Framelist item: %d \n", frnum );
 
                 uintptr_t expected_pa = instance->frame_list[frnum] & (~0xf);
                 uintptr_t real_pa = addr_to_phys(QH(interrupt));
                 if (expected_pa != real_pa) {
-                        usb_log_debug("Interrupt QH: %p vs. %p.\n",
-                            expected_pa, real_pa);
+                        usb_log_debug("Interrupt QH: %p(frame: %d) vs. %p.\n",
+                            expected_pa, frnum, real_pa);
                 }
 

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ -88 +88 @@
         }
 
-        usb_log_debug2("Created TD: %X:%X:%X:%X(%p).\n",
-            instance->next, instance->status, instance->device,
+        usb_log_debug2("Created TD(%p): %X:%X:%X:%X(%p).\n",
+            instance, instance->next, instance->status, instance->device,
             instance->buffer_ptr, buffer);
+        td_print_status(instance);
         if (pid == USB_PID_SETUP) {
                 usb_log_debug("SETUP BUFFER: %s\n",
@@ -126 +127 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+void td_print_status(td_t *instance)
+{
+        assert(instance);
+        const uint32_t s = instance->status;
+        usb_log_debug2("TD(%p) status(%#x):%s %d,%s%s%s%s%s%s%s%s%s%s%s %d.\n",
+            instance, instance->status,
+            (s & TD_STATUS_SPD_FLAG) ? " SPD," : "",
+            (s >> TD_STATUS_ERROR_COUNT_POS) & TD_STATUS_ERROR_COUNT_MASK,
+            (s & TD_STATUS_LOW_SPEED_FLAG) ? " LOW SPEED," : "",
+            (s & TD_STATUS_ISOCHRONOUS_FLAG) ? " ISOCHRONOUS," : "",
+            (s & TD_STATUS_IOC_FLAG) ? " IOC," : "",
+            (s & TD_STATUS_ERROR_ACTIVE) ? " ACTIVE," : "",
+            (s & TD_STATUS_ERROR_STALLED) ? " STALLED," : "",
+            (s & TD_STATUS_ERROR_BUFFER) ? " BUFFER," : "",
+            (s & TD_STATUS_ERROR_BABBLE) ? " BABBLE," : "",
+            (s & TD_STATUS_ERROR_NAK) ? " NAK," : "",
+            (s & TD_STATUS_ERROR_CRC) ? " CRC/TIMEOUT," : "",
+            (s & TD_STATUS_ERROR_BIT_STUFF) ? " BIT_STUFF," : "",
+            (s & TD_STATUS_ERROR_RESERVED) ? " RESERVED," : "",
+            (s >> TD_STATUS_ACTLEN_POS) & TD_STATUS_ACTLEN_MASK
+        );
+}
 /**
  * @}

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

@@ -53 +53 @@
 #define TD_STATUS_LOW_SPEED_FLAG ( 1 << 26 )
 #define TD_STATUS_ISOCHRONOUS_FLAG ( 1 << 25 )
-#define TD_STATUS_COMPLETE_INTERRUPT_FLAG ( 1 << 24 )
+#define TD_STATUS_IOC_FLAG ( 1 << 24 )
 
 #define TD_STATUS_ERROR_ACTIVE ( 1 << 23 )
@@ -127 +127 @@
         return (instance->status & TD_STATUS_ERROR_ACTIVE) != 0;
 }
+
+void td_print_status(td_t *instance);
 #endif
 /**

uspace/drv/uhci-rhd/port.c

@@ -44 +44 @@
 
 #include "port.h"
-#include "port_status.h"
 
 static int uhci_port_new_device(uhci_port_t *port, usb_speed_t speed);
@@ -126 +125 @@
                 port_status_t port_status = uhci_port_read_status(instance);
 
-                print_port_status(instance->id_string, port_status);
+                /* print the value if it's interesting */
+                if (port_status & ~STATUS_ALWAYS_ONE)
+                        uhci_port_print_status(instance, port_status);
 
                 if ((port_status & STATUS_CONNECTED_CHANGED) == 0)
@@ -158 +159 @@
                         /* Write one to WC bits, to ack changes */
                         uhci_port_write_status(instance, port_status);
-                        usb_log_debug("%s: Change status ACK.\n",
+                        usb_log_debug("%s: status change ACK.\n",
                             instance->id_string);
                 }

uspace/drv/uhci-rhd/port.h

@@ -36 +36 @@
 
 #include <assert.h>
+#include <stdint.h>
 #include <ddf/driver.h>
-#include <stdint.h>
+#include <libarch/ddi.h> /* pio_read and pio_write */
 #include <usb/usbdevice.h>
 
-#include "port_status.h"
+typedef uint16_t port_status_t;
+
+#define STATUS_CONNECTED         (1 << 0)
+#define STATUS_CONNECTED_CHANGED (1 << 1)
+#define STATUS_ENABLED           (1 << 2)
+#define STATUS_ENABLED_CHANGED   (1 << 3)
+#define STATUS_LINE_D_PLUS       (1 << 4)
+#define STATUS_LINE_D_MINUS      (1 << 5)
+#define STATUS_RESUME            (1 << 6)
+#define STATUS_ALWAYS_ONE        (1 << 7)
+
+#define STATUS_LOW_SPEED (1 <<  8)
+#define STATUS_IN_RESET  (1 <<  9)
+#define STATUS_SUSPEND   (1 << 12)
 
 typedef struct uhci_port
@@ -72 +86 @@
         pio_write_16(port->address, value);
 }
+
+static inline void uhci_port_print_status(
+    uhci_port_t *port, const port_status_t value)
+{
+        assert(port);
+        usb_log_debug2("%s Port status(%#x):%s%s%s%s%s%s%s%s%s%s%s.\n",
+            port->id_string, value,
+            (value & STATUS_SUSPEND) ? " SUSPENDED," : "",
+            (value & STATUS_RESUME) ? " IN RESUME," : "",
+            (value & STATUS_IN_RESET) ? " IN RESET," : "",
+            (value & STATUS_LINE_D_MINUS) ? " VD-," : "",
+            (value & STATUS_LINE_D_PLUS) ? " VD+," : "",
+            (value & STATUS_LOW_SPEED) ? " LOWSPEED," : "",
+            (value & STATUS_ENABLED_CHANGED) ? " ENABLED-CHANGE," : "",
+            (value & STATUS_ENABLED) ? " ENABLED," : "",
+            (value & STATUS_CONNECTED_CHANGED) ? " CONNECTED-CHANGE," : "",
+            (value & STATUS_CONNECTED) ? " CONNECTED," : "",
+            (value & STATUS_ALWAYS_ONE) ? " ALWAYS ONE" : " ERROR: NO ALWAYS ONE"
+        );
+}
 #endif
 /**