Changeset 7f810b3 in mainline

Timestamp:

2011-03-12T15:56:20Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67352d2

Parents:

0db3ad6

Message:

Move port_status.h functionality to port.h

Location:

uspace/drv/uhci-rhd

Files:

• port.c (modified) (3 diffs)
• port.h (modified) (2 diffs)
• port_status.h (deleted)

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);
+                uhci_port_print_status(instance, port_status);
 
                 if ((port_status & STATUS_CONNECTED_CHANGED) == 0)
@@ -158 +157 @@
                         /* 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:%s%s%s%s%s%s%s%s.\n",
+            port->id_string,
+            (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
 /**