Changeset 8f748215 in mainline for uspace/drv/uhci/root_hub/port.c

Timestamp:

2011-01-07T16:42:00Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

93fb170c

Parents:

15701921

Message:

port_status refactoring, use flags instead of structure

File:

• uspace/drv/uhci/root_hub/port.c (modified) (2 diffs)

uspace/drv/uhci/root_hub/port.c

@@ -33 +33 @@
 
                 /* read register value */
-                port_status_t port_status;
-                port_status.raw_value = pio_read_16(port_instance->address);
+                port_status_t port_status =
+                        port_status_read(port_instance->address);
+//              port_status.raw_value = pio_read_16(port_instance->address);
 
                 /* debug print */
                 uhci_print_info("Port(%d) status %#.4x:\n",
-                  port_instance->number, port_status.raw_value);
-                print_port_status( &port_status );
-
-                if (port_status.status.connect_change) {
-                        if (port_status.status.connected) {
+                  port_instance->number, port_status);
+                print_port_status( port_status );
+
+                if (port_status & STATUS_CONNECTED_CHANGED) {
+                        if (port_status & STATUS_CONNECTED) {
                                 /* assign address and report new device */
                                 uhci_port_new_device(port_instance);
@@ -103 +104 @@
 
         /* read register value */
-        port_status_t port_status;
-        port_status.raw_value = pio_read_16( port->address );
+        port_status_t port_status
+                = port_status_read(port->address);
 
         /* enable port: register write */
+        if (enabled) {
+                port_status |= STATUS_ENABLED;
+        } else {
+                port_status &= ~STATUS_ENABLED;
+        }
+        port_status_write( port->address, port_status );
+
+/*
         port_status.status.enabled = enabled;
         pio_write_16( port->address, port_status.raw_value );
+*/
 
         uhci_print_info( "%s port %d.\n",