Changeset 3005db6 in mainline

Timestamp:

2011-03-11T13:51:13Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ab5a43d1

Parents:

0c8562c

Message:

Root hub refactoring

Location:

uspace/drv/uhci-rhd

Files:

• Makefile (modified) (1 diff)
• port.c (modified) (6 diffs)
• port.h (modified) (1 diff)
• port_status.c (deleted)
• port_status.h (modified) (1 diff)

uspace/drv/uhci-rhd/Makefile

@@ -35 +35 @@
         main.c \
         port.c \
-        port_status.c \
         root_hub.c
 

uspace/drv/uhci-rhd/port.c

@@ -123 +123 @@
 
                 /* read register value */
-                port_status_t port_status = port_status_read(instance->address);
+                port_status_t port_status = uhci_port_read_status(instance);
 
                 /* debug print mutex */
@@ -131 +131 @@
                 usb_log_debug2("Port(%p - %d): Status: %#04x. === %u\n",
                   instance->address, instance->number, port_status, count++);
-//              print_port_status(port_status);
+                print_port_status("Port", port_status);
                 fibril_mutex_unlock(&dbg_mtx);
 
@@ -163 +163 @@
                 } else {
                         /* Write one to WC bits, to ack changes */
-                        port_status_write(instance->address, port_status);
+                        uhci_port_write_status(instance, port_status);
                         usb_log_debug("Port(%p - %d): Change status ACK.\n",
                             instance->address, instance->number);
@@ -203 +203 @@
                 usb_log_debug("Port(%p - %d): Reset Signal start.\n",
                     port->address, port->number);
-                port_status_t port_status =
-                        port_status_read(port->address);
+                port_status_t port_status = uhci_port_read_status(port);
                 port_status |= STATUS_IN_RESET;
-                port_status_write(port->address, port_status);
+                uhci_port_write_status(port, port_status);
                 async_usleep(10000);
-                port_status = port_status_read(port->address);
+                port_status = uhci_port_read_status(port);
                 port_status &= ~STATUS_IN_RESET;
-                port_status_write(port->address, port_status);
+                uhci_port_write_status(port, port_status);
                 usb_log_debug("Port(%p - %d): Reset Signal stop.\n",
                     port->address, port->number);
@@ -278 +277 @@
 
         /* Read register value */
-        port_status_t port_status = port_status_read(port->address);
+        port_status_t port_status = uhci_port_read_status(port);
 
         /* Set enabled bit */
@@ -288 +287 @@
 
         /* Write new value. */
-        port_status_write(port->address, port_status);
+        uhci_port_write_status(port, port_status);
 
         usb_log_info("Port(%p-%d): %sabled port.\n",

uspace/drv/uhci-rhd/port.h

@@ -58 +58 @@
 
 void uhci_port_fini(uhci_port_t *port);
+
+static inline port_status_t uhci_port_read_status(uhci_port_t *port)
+{
+        assert(port);
+        return pio_read_16(port->address);
+}
+
+static inline void uhci_port_write_status(
+    uhci_port_t *port, port_status_t value)
+{
+        assert(port);
+        pio_write_16(port->address, value);
+}
 #endif
 /**

uspace/drv/uhci-rhd/port_status.h

@@ -54 +54 @@
 #define STATUS_SUSPEND   (1 << 12)
 
-static inline port_status_t port_status_read(port_status_t * address)
-        { return pio_read_16(address); }
 
-static inline void port_status_write(
-  port_status_t *address, port_status_t value)
-        { pio_write_16(address, value); }
-
-void print_port_status(const port_status_t status);
+static inline void print_port_status(
+    const char* prefix, const port_status_t value)
+{
+        usb_log_debug2("%s Port status:%s%s%s%s%s%s%s%s.\n",
+            prefix,
+            (value & STATUS_SUSPEND) ? " SUSPENDED," : "",
+            (value & STATUS_IN_RESET) ? " IN RESET," : "",
+            (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
 /**