Changeset d7f3040 in mainline

Timestamp:

2011-04-07T07:44:21Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

1c89f74

Parents:

e5ccfd1

Message:

fix attempt #2

Location:

uspace/drv/usbhub

Files:

• port_status.h (modified) (1 diff)
• usbhub.c (modified) (6 diffs)

uspace/drv/usbhub/port_status.h

@@ -257 +257 @@
  */
 static inline bool usb_port_get_bit(usb_port_status_t * status, int idx) {
-        return (*status)&(1 << idx);
+        return ((*status)&(1 << idx))!=0;
 }
 

uspace/drv/usbhub/usbhub.c

@@ -229 +229 @@
         {
                 unsigned int port;
-                for (port = 1; port <= port_count; ++port) {
+                for (port = 0; port < port_count; ++port) {
                         bool is_non_removable =
                                 hub_info->not_initialized_non_removables[port/8]
-                                & (1 << (port % 8));
+                                & (1 << (port-1 % 8));
                         if (is_non_removable) {
                                 opResult = initialize_non_removable(hub_info,
-                                        port);
+                                        port+1);
                         }
                 }
@@ -470 +470 @@
         usb_speed_t speed) {
         //if this hub already uses default address, it cannot request it once more
-        if (hub->is_default_address_used) return EREFUSED;
+        if (hub->is_default_address_used) {
+                usb_log_info("default address used, another time\n");
+                return EREFUSED;
+        }
         usb_log_debug("some connection changed\n");
         assert(hub->control_pipe->hc_phone);
@@ -710 +713 @@
                 usb_log_debug("connection change on port\n");
                 if (usb_port_dev_connected(&status)) {
-                        usb_log_debug("some connection changed\n");
                         usb_hub_init_add_device(hub, port,
                                 usb_port_speed(&status));
@@ -743 +745 @@
         /// \TODO what about port power change?
         if (status >> 16) {
-                usb_log_info("there was some unsupported change on port %d: %X\n",
+                usb_log_info("there was unsupported change on port %d: %X\n",
                         port, status);
 
@@ -898 +900 @@
         if (usb_port_dev_connected(&status)) {
                 usb_log_debug("there is connected device on this port\n");
+                opResult = usb_hub_init_add_device(hub_info, port,
+                        usb_port_speed(&status));
         }else{
                 usb_log_debug("the non-removable device is not connected\n");
-        }
-        if (!hub_info->is_default_address_used)
-                usb_hub_init_add_device(hub_info, port,
-                        usb_port_speed(&status));
+                opResult = EINVAL;
+        }
+        
         return opResult;
 }
@@ -1021 +1024 @@
         for (port = 1; port <= descriptor->ports_count; ++port) {
                 bool is_non_removable =
-                        ((non_removable_dev_bitmap[port / 8]) >> (port % 8)) % 2;
+                        ((non_removable_dev_bitmap[(port-1) / 8]) >> ((port-1) % 8)) % 2;
                 if (is_non_removable) {
                         usb_log_debug("CHECKING port %d is non-removable\n",