Changeset 90d0522 in mainline

Timestamp:

2011-04-05T19:46:24Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

3dba1ca

Parents:

040ab02

Message:

major minor fixes in ohci root hub

File:

• uspace/drv/ohci/root_hub.c (modified) (3 diffs)

uspace/drv/ohci/root_hub.c

@@ -139 +139 @@
 //note that USB_HUB_FEATURE_PORT_POWER bit is translated into
 //USB_HUB_FEATURE_PORT_LOW_SPEED
+
+static const uint32_t port_status_change_mask =
+(1<< USB_HUB_FEATURE_C_PORT_CONNECTION) |
+(1<< USB_HUB_FEATURE_C_PORT_ENABLE) |
+(1<< USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
+(1<< USB_HUB_FEATURE_C_PORT_RESET) |
+(1<< USB_HUB_FEATURE_C_PORT_SUSPEND);
+
 
 static void usb_create_serialized_hub_descriptor(rh_t *instance,
@@ -391 +399 @@
         usb_transfer_batch_t * request) {
         uint32_t * uint32_buffer = (uint32_t*) request->transport_buffer;
+        request->transfered_size = 4;
         //bits, 0,1,16,17
-        request->transfered_size = 4;
-        uint32_t mask = 1 & (1 << 1) & (1 << 16) & (1 << 17);
+        uint32_t mask = 1 | (1 << 1) | (1 << 16) | (1 << 17);
         uint32_buffer[0] = mask & instance->registers->rh_status;
         return EOK;
@@ -456 +464 @@
         }
         int port;
-        mask = 0;
-        int i;
-        for (i = 16; i <= 20; ++i) {
-                mask += 1 << i;
-        }
+        mask = port_status_change_mask;
         for (port = 1; port <= instance->port_count; ++port) {
                 if (mask & instance->registers->rh_port_status[port - 1]) {