Changeset ebb98c5 in mainline

Timestamp:

2010-12-10T16:44:40Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

243cb86, 39701ed, fa9b606

Parents:

bf2063e9 (diff), cf978f2 (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 with vojtechhorky/ - minor changes

Fixed some bugs, root hub of VHC has address set.

Files:

• HelenOS.config (modified) (1 diff)
• uspace/app/virtusbkbd/virtusbkbd.c (modified) (1 diff)
• uspace/drv/root/root.c (modified) (2 diffs)
• uspace/drv/rootvirt/rootvirt.c (modified) (1 diff)
• uspace/drv/test1/test1.c (modified) (1 diff)
• uspace/drv/test2/test2.c (modified) (1 diff)
• uspace/drv/vhc/connhost.c (modified) (3 diffs)
• uspace/drv/vhc/hcd.c (modified) (1 diff)
• uspace/drv/vhc/hub.c (modified) (3 diffs)
• uspace/drv/vhc/hub.h (modified) (2 diffs)
• uspace/lib/drv/generic/driver.c (modified) (2 diffs)
• uspace/lib/drv/include/driver.h (modified) (1 diff)
• uspace/lib/usb/src/remotedrv.c (modified) (1 diff)

HelenOS.config

@@ -547 +547 @@
 
 % Launch (devman) test drivers
-! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (y/n)
-
+! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y)
+

uspace/app/virtusbkbd/virtusbkbd.c

@@ -202 +202 @@
 int main(int argc, char * argv[])
 {
-        printf("Dump of report descriptor (%u bytes):\n", report_descriptor_size);
+        printf("Dump of report descriptor (%zu bytes):\n", report_descriptor_size);
         size_t i;
         for (i = 0; i < report_descriptor_size; i++) {

uspace/drv/root/root.c

@@ -87 +87 @@
 
         int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
-            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
+            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE,
+            NULL);
 
         return res;
@@ -104 +105 @@
         
         int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
-            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE);
+            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE,
+            NULL);
 
         return res;

uspace/drv/rootvirt/rootvirt.c

@@ -84 +84 @@
 
         int rc = child_device_register_wrapper(parent, virt_dev->name,
-            virt_dev->match_id, 10);
+            virt_dev->match_id, 10, NULL);
 
         if (rc == EOK) {

uspace/drv/test1/test1.c

@@ -64 +64 @@
 
         int rc = child_device_register_wrapper(parent, name,
-            match_id, match_score);
+            match_id, match_score, NULL);
 
         if (rc == EOK) {

uspace/drv/test2/test2.c

@@ -64 +64 @@
 
         int rc = child_device_register_wrapper(parent, name,
-            match_id, match_score);
+            match_id, match_score, NULL);
 
         if (rc == EOK) {

uspace/drv/vhc/connhost.c

@@ -93 +93 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer OUT [%d.%d (%s); %u]\n",
+        printf(NAME ": transfer OUT [%d.%d (%s); %zu]\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -113 +113 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer SETUP [%d.%d (%s); %u]\n",
+        printf(NAME ": transfer SETUP [%d.%d (%s); %zu]\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -133 +133 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer IN [%d.%d (%s); %u]\n",
+        printf(NAME ": transfer IN [%d.%d (%s); %zu]\n",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),

uspace/drv/vhc/hcd.c

@@ -79 +79 @@
          * Initialize our hub and announce its presence.
          */
-        hub_init();
-        usb_hcd_add_root_hub(dev);
+        hub_init(dev);
 
         printf("%s: virtual USB host controller ready.\n", NAME);

uspace/drv/vhc/hub.c

@@ -37 +37 @@
 #include <usbvirt/device.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdlib.h>
+#include <driver.h>
 
 #include "vhcd.h"
 #include "hub.h"
 #include "hubintern.h"
+#include "conn.h"
 
 
@@ -148 +151 @@
 hub_device_t hub_dev;
 
+static usb_address_t hub_set_address(usbvirt_device_t *hub)
+{
+        usb_address_t new_address;
+        int rc = vhc_iface.request_address(NULL, &new_address);
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 0,
+                .request = USB_DEVREQ_SET_ADDRESS,
+                .index = 0,
+                .length = 0,
+        };
+        setup_packet.value = new_address;
+
+        hub->transaction_setup(hub, 0, &setup_packet, sizeof(setup_packet));
+        hub->transaction_in(hub, 0, NULL, 0, NULL);
+        
+        return new_address;
+}
+
 /** Initialize virtual hub. */
-void hub_init(void)
+void hub_init(device_t *hc_dev)
 {
         size_t i;
@@ -163 +188 @@
         
         dprintf(1, "virtual hub (%d ports) created", HUB_PORT_COUNT);
+
+        usb_address_t hub_address = hub_set_address(&virthub_dev);
+        if (hub_address < 0) {
+                dprintf(1, "problem changing hub address (%s)",
+                    str_error(hub_address));
+        }
+
+        dprintf(2, "virtual hub address changed to %d", hub_address);
+
+        char *id;
+        int rc = asprintf(&id, "usb&hub");
+        if (rc <= 0) {
+                return;
+        }
+        devman_handle_t hub_handle;
+        rc = child_device_register_wrapper(hc_dev, "hub", id, 10, &hub_handle);
+        if (rc != EOK) {
+                free(id);
+        }
+
+        vhc_iface.bind_address(NULL, hub_address, hub_handle);  
+
+        dprintf(2, "virtual hub has devman handle %d", (int) hub_handle);
 }
 

uspace/drv/vhc/hub.h

@@ -37 +37 @@
 
 #include <usbvirt/device.h>
+#include <driver.h>
 
 #include "devices.h"
@@ -47 +48 @@
 extern usbvirt_device_t virthub_dev;
 
-void hub_init(void);
+void hub_init(device_t *);
 size_t hub_add_device(virtdev_connection_t *);
 void hub_remove_device(virtdev_connection_t *);

uspace/lib/drv/generic/driver.c

@@ -390 +390 @@
  */
 int child_device_register_wrapper(device_t *parent, const char *child_name,
-    const char *child_match_id, int child_match_score)
+    const char *child_match_id, int child_match_score,
+    devman_handle_t *child_handle)
 {
         device_t *child = NULL;
@@ -418 +419 @@
                 goto failure;
 
+        if (child_handle != NULL) {
+                *child_handle = child->handle;
+        }
         return EOK;
 

uspace/lib/drv/include/driver.h

@@ -199 +199 @@
 
 int child_device_register(device_t *, device_t *);
-int child_device_register_wrapper(device_t *, const char *, const char *, int);
+int child_device_register_wrapper(device_t *, const char *, const char *, int,
+    devman_handle_t *);
 
 

uspace/lib/usb/src/remotedrv.c

@@ -300 +300 @@
  */
 static void remote_in_callback(usb_hc_device_t *hc,
-    usb_transaction_outcome_t outcome, size_t actual_size, void *arg)
+    size_t actual_size, usb_transaction_outcome_t outcome, void *arg)
 {
         transfer_info_t *transfer = (transfer_info_t *) arg;