Changeset ca07cd3 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/conndev.c

Timestamp:

2010-10-25T13:23:33Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

23cb44b

Parents:

355f7c2

Message:

Code cleanup, various bugfixes

The internal functions of virtual device framework always get
device structure as parameter, thus possible enabling more devices
within single task (that is not possible because currently there
is no way to pass extra argument into callback_connection()).

Also, added some missing comments and completely removed the device
id nonsense (devices can send their descriptors and the hub is able
to enable/disable its ports).

File:

• uspace/srv/hw/bus/usb/hcd/virtual/conndev.c (modified) (2 diffs)

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

@@ -42 +42 @@
 #include "hub.h"
 
+#define DEVICE_NAME_MAXLENGTH 32
+
+static int get_device_name(int phone, char *buffer, size_t len)
+{
+        ipc_call_t answer_data;
+        ipcarg_t answer_rc;
+        aid_t req;
+        int rc;
+        
+        req = async_send_0(phone,
+            IPC_M_USBVIRT_GET_NAME,
+            &answer_data);
+        
+        rc = async_data_read_start(phone, buffer, len);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return EINVAL;
+        }
+        
+        async_wait_for(req, &answer_rc);
+        rc = (int)answer_rc;
+        
+        if (IPC_GET_ARG1(answer_data) < len) {
+                len = IPC_GET_ARG1(answer_data);
+        } else {
+                len--;
+        }
+        buffer[len] = 0;
+        
+        return rc;
+}
+
 /** Connection handler for communcation with virtual device.
  *
@@ -53 +85 @@
         assert(dev != NULL);
         
-        dprintf(0, "virtual device connected through phone %#x", phone_hash);
+        char devname[DEVICE_NAME_MAXLENGTH + 1];
+        int rc = get_device_name(dev->phone, devname, DEVICE_NAME_MAXLENGTH);
+        
+        dprintf(0, "virtual device connected (phone: %#x, name: %s)",
+            phone_hash, rc == EOK ? devname : "<unknown>");
+        
         
         while (true) {