Changeset 355f7c2 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/hub.c

Timestamp:

2010-10-25T07:44:02Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ca07cd3

Parents:

7a7bfeb3

Message:

Better debugging support in VHCD

Also, added some missing comments.

File:

• uspace/srv/hw/bus/usb/hcd/virtual/hub.c (modified) (7 diffs)

uspace/srv/hw/bus/usb/hcd/virtual/hub.c

@@ -43 +43 @@
 #include "hubintern.h"
 
-hub_port_t hub_ports[HUB_PORT_COUNT];
 
 /** Standard device descriptor. */
@@ -108 +107 @@
 };
 
+/** All hub configuration descriptors. */
 static usbvirt_device_configuration_extras_t extra_descriptors[] = {
         {
@@ -137 +137 @@
 };
 
+/** Hub as a virtual device. */
 usbvirt_device_t virthub_dev = {
         .ops = &hub_ops,
         .descriptors = &descriptors,
 };
- 
+
+/** Hub device. */
 hub_device_t hub_dev;
 
+/** Initialize virtual hub. */
 void hub_init(void)
 {
@@ -156 +159 @@
         
         usbvirt_connect_local(&virthub_dev);
-        //virthub_dev.send_data = send_data;
-        
-        printf("%s: virtual hub (%d ports) created.\n", NAME, HUB_PORT_COUNT);
-}
-
+        
+        dprintf(1, "virtual hub (%d ports) created", HUB_PORT_COUNT);
+}
+
+/** Connect device to the hub.
+ *
+ * @param device Device to be connected.
+ * @return Port where the device was connected to.
+ */
 size_t hub_add_device(virtdev_connection_t *device)
 {
@@ -191 +198 @@
 }
 
-
+/** Disconnect device from the hub. */
 void hub_remove_device(virtdev_connection_t *device)
 {
@@ -209 +216 @@
 }
 
+/** Tell whether device port is open.
+ *
+ * @return Whether communication to and from the device can go through the hub.
+ */
 bool hub_can_device_signal(virtdev_connection_t * device)
 {
@@ -221 +232 @@
 }
 
+/** Format hub port status.
+ *
+ * @param result Buffer where to store status string.
+ * @param len Number of characters that is possible to store in @p result
+ *      (excluding trailing zero).
+ */
+void hub_get_port_statuses(char *result, size_t len)
+{
+        if (len > HUB_PORT_COUNT) {
+                len = HUB_PORT_COUNT;
+        }
+        size_t i;
+        for (i = 0; i < len; i++) {
+                result[i] = hub_port_state_as_char(hub_dev.ports[i].state);
+        }
+        result[len] = 0;
+}
 
 /**