Changeset 9f0b6cc in mainline

Timestamp:

2010-12-12T17:35:02Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

f46f8e3

Parents:

8e8289d

Message:

fixes for port count

Location:

uspace/drv/usbhub

Files:

• main.c (modified) (1 diff)
• utils.c (modified) (4 diffs)

uspace/drv/usbhub/main.c

@@ -50 +50 @@
         while(true){
                 usb_hub_check_hub_changes();
-                async_usleep(10000);
+                async_usleep(10000000);
         }
         return 0;

uspace/drv/usbhub/utils.c

@@ -352 +352 @@
         result->port_count = descriptor->ports_count;
         result->attached_devs = (usb_hub_attached_device_t*)
-            malloc(result->port_count * sizeof(usb_hub_attached_device_t));
+            malloc((result->port_count+1) * sizeof(usb_hub_attached_device_t));
         int i;
-        for(i=0;i<result->port_count;++i){
+        for(i=0;i<result->port_count+1;++i){
                 result->attached_devs[i].devman_handle=0;
                 result->attached_devs[i].address=0;
@@ -428 +428 @@
 
 
-        for (port = 0; port < hub_info->port_count; ++port) {
+        for (port = 1; port < hub_info->port_count+1; ++port) {
                 usb_hub_set_power_port_request(&request, port);
                 opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
@@ -687 +687 @@
 
                 // FIXME: count properly
-                size_t byte_length = (port_count / 8) + 1;
+                size_t byte_length = ((port_count+1) / 8) + 1;
 
                 void *change_bitmap = malloc(byte_length);
@@ -707 +707 @@
                 }
                 unsigned int port;
-                for (port = 0; port < port_count; ++port) {
+                for (port = 1; port < port_count+1; ++port) {
                         bool interrupt = (((uint8_t*) change_bitmap)[port / 8] >> (port % 8)) % 2;
                         if (interrupt) {