Changeset 682b697 in mainline

Timestamp:

2010-12-12T18:05:19Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

37f7cfe, ecf52c4b

Parents:

5d4eb2df (diff), 9223dc5c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from smekideki

Location:

uspace

Files:

• app/virtusbkbd/virtusbkbd.c (modified) (1 diff)
• drv/usbhub/main.c (modified) (1 diff)
• drv/usbhub/utils.c (modified) (7 diffs)
• drv/vhc/devices.c (modified) (1 diff)
• drv/vhc/hubops.c (modified) (1 diff)
• lib/usb/src/addrkeep.c (modified) (1 diff)

uspace/app/virtusbkbd/virtusbkbd.c

@@ -223 +223 @@
         
         printf("%s: Simulating keyboard events...\n", NAME);
-        kb_process_events(&status, keyboard_events, keyboard_events_count,
-            on_keyboard_change);
+        while(1){
+                kb_process_events(&status, keyboard_events, keyboard_events_count,
+                        on_keyboard_change);
+        }
         
         printf("%s: Terminating...\n", NAME);

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);
+                printf("[usb_hub] powering port %d\n",port);
                 if (opResult != EOK) {
                         printf("[usb_hub]something went wrong when setting hub`s %dth port\n", port);
@@ -540 +541 @@
                 return;
         }
+        printf("[usb_hub] new device address %d, handle %d\n",
+            new_device_address, child_handle);
+        sleep(60);
         
 }
@@ -638 +642 @@
         usb_port_set_dev_connected(&status, false);
         if (status) {
-                printf("[usb_hub]there was some unsupported change on port\n");
+                printf("[usb_hub]there was some unsupported change on port %d\n",port);
         }
         /// \TODO handle other changes
@@ -675 +679 @@
                 target.address = hub_info->usb_device->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
+                printf("checking changes for hub at addr %d \n",target.address);
 
                 size_t port_count = hub_info->port_count;
@@ -687 +692 @@
 
                 // 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 +712 @@
                 }
                 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) {

uspace/drv/vhc/devices.c

@@ -147 +147 @@
         if (virthub_dev.address == transaction->target.address) {
                 size_t tmp;
-                dprintf(3, "sending `%s' transaction to hub",
+                dprintf(1, "sending `%s' transaction to hub",
                     usbvirt_str_transaction_type(transaction->type));
                 switch (transaction->type) {

uspace/drv/vhc/hubops.c

@@ -200 +200 @@
                 } \
         } while (false); \
-        hub_port_t *portvar = &hub_dev.ports[index]
+        hub_port_t *portvar = &hub_dev.ports[index-1]
 
 

uspace/lib/usb/src/addrkeep.c

@@ -199 +199 @@
                         usb_address_keeping_used_t *last
                             = used_address_get_instance(addresses->used_addresses.next);
-                        free_address = last->address;
+                        free_address = last->address + 1;
                 }
         }