Changeset b8100da in mainline for uspace/lib

Timestamp:

2010-10-10T17:01:40Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6c1315b

Parents:

b371844

Message:

Virtual USB device in separate library

The `usbvirt' library is intended to be a framework for creating
virtual USB devices.

So far, only the skeleton is ready.

Location:

uspace/lib

Files:

• usb/Makefile (modified) (1 diff)
• usb/devreq.h (moved) (moved from uspace/lib/usb/virtdev.h ) (1 diff)
• usbvirt/Makefile (added)
• usbvirt/ctrlpipe.c (added)
• usbvirt/device.h (added)
• usbvirt/hub.h (added)
• usbvirt/ids.h (added)
• usbvirt/incoming.c (added)
• usbvirt/main.c (moved) (moved from uspace/lib/usb/virtdev.c ) (7 diffs)
• usbvirt/private.h (added)

uspace/lib/usb/Makefile

@@ -31 +31 @@
 
 SOURCES = \
-        hcd.c \
-        virtdev.c
+        hcd.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usb/devreq.h

@@ -31 +31 @@
  */
 /** @file
- * @brief Virtual USB device.
+ * @brief Standard USB device requests.
  */
-#ifndef LIBUSB_VIRTDEV_H_
-#define LIBUSB_VIRTDEV_H_
+#ifndef LIBUSB_DEVREQ_H_
+#define LIBUSB_DEVREQ_H_
 
 #include <ipc/ipc.h>
 #include <async.h>
-#include "hcd.h"
 
-#define USB_VIRTDEV_KEYBOARD_ID 1
-#define USB_VIRTDEV_KEYBOARD_ADDRESS 1
+/** Standard device request. */
+typedef enum {
+        USB_DEVREQ_GET_STATUS = 0,
+        USB_DEVREQ_CLEAR_FEATURE = 1,
+        USB_DEVREQ_SET_FEATURE = 3,
+        USB_DEVREQ_SET_ADDRESS = 5,
+        USB_DEVREQ_GET_DESCRIPTOR = 6,
+        USB_DEVREQ_SET_DESCRIPTOR = 7,
+        USB_DEVREQ_GET_CONFIGURATION = 8,
+        USB_DEVREQ_SET_CONFIGURATION = 9,
+        USB_DEVREQ_GET_INTERFACE = 10,
+        USB_DEVREQ_SET_INTERFACE = 11,
+        USB_DEVREQ_SYNCH_FRAME = 12
+} usb_stddevreq_t;
 
-typedef void (*usb_virtdev_on_data_from_host_t)(usb_endpoint_t, void *, size_t);
 
-int usb_virtdev_connect(const char *, int, usb_virtdev_on_data_from_host_t);
-int usb_virtdev_data_to_host(int, usb_endpoint_t,
-    void *, size_t);
-
-typedef enum {
-        IPC_M_USB_VIRTDEV_DATA_TO_DEVICE = IPC_FIRST_USER_METHOD,
-        IPC_M_USB_VIRTDEV_DATA_FROM_DEVICE
-} usb_virtdev_method_t;
 
 #endif

uspace/lib/usbvirt/main.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusbvirt usb
  * @{
  */
 /** @file
- * @brief Virtual USB device (implementation).
+ * @brief Main handler for virtual USB device.
  */
-#include "virtdev.h"
 #include <devmap.h>
 #include <fcntl.h>
@@ -40 +39 @@
 #include <stdlib.h>
 
+#include "hub.h"
+#include "device.h"
+#include "private.h"
+
 #define NAMESPACE "usb"
 
-static usb_virtdev_on_data_from_host_t on_data_from_host = NULL;
+usbvirt_device_t *device = NULL;
+
 
 static void handle_data_to_device(ipc_callid_t iid, ipc_call_t icall)
@@ -59 +63 @@
         }
         
-        on_data_from_host(endpoint, buffer, len);
+        handle_incoming_data(endpoint, buffer, len);
         
         free(buffer);
@@ -80 +84 @@
                                 return;
                         
-                        case IPC_M_USB_VIRTDEV_DATA_TO_DEVICE:
+                        case IPC_M_USBVIRT_DATA_TO_DEVICE:
                                 handle_data_to_device(callid, call);
                                 break;
@@ -89 +93 @@
                 }
         }
+}
+
+int usbvirt_data_to_host(struct usbvirt_device *dev,
+    usb_endpoint_t endpoint, void *buffer, size_t size)
+{
+        int phone = dev->vhcd_phone_;
+        
+        if (phone < 0) {
+                return EINVAL;
+        }
+        if ((buffer == NULL) || (size == 0)) {
+                return EINVAL;
+        }
+
+        ipc_call_t answer_data;
+        ipcarg_t answer_rc;
+        aid_t req;
+        int rc;
+        
+        req = async_send_1(phone,
+            IPC_M_USBVIRT_DATA_FROM_DEVICE,
+            endpoint,
+            &answer_data);
+        
+        rc = async_data_write_start(phone, buffer, size);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
+        async_wait_for(req, &answer_rc);
+        rc = (int)answer_rc;
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        return EOK;
 }
 
@@ -107 +148 @@
  * @param device_id Internal device identification (used by HCD).
  * @param callback Handler for callbacks from HCD.
- * @return Phone for comunicating with HCD or error code from errno.h.
+ * @return EOK on success or error code from errno.h.
  */
-int usb_virtdev_connect(const char *hcd_path, int device_id,
-    usb_virtdev_on_data_from_host_t callback)
+int usbvirt_connect(usbvirt_device_t *dev, const char *hcd_path)
 {
         char dev_path[DEVMAP_NAME_MAXLEN + 1];
@@ -128 +168 @@
         
         ipcarg_t phonehash;
-        int rc = ipc_connect_to_me(hcd_phone, 1, device_id, 0, &phonehash);
-        if (rc != EOK) {
-                return rc;
-        }
-        on_data_from_host = callback;
-        async_new_connection(phonehash, 0, NULL, callback_connection);
-        
-        return hcd_phone;
-}
-
-int usb_virtdev_data_to_host(int phone,
-    usb_endpoint_t endpoint,
-    void * buffer, size_t size)
-{
-        if (phone < 0) {
-                return EINVAL;
-        }
-        if ((buffer == NULL) || (size == 0)) {
-                return EINVAL;
-        }
-
-        ipc_call_t answer_data;
-        ipcarg_t answer_rc;
-        aid_t req;
-        int rc;
-        
-        req = async_send_1(phone,
-            IPC_M_USB_VIRTDEV_DATA_FROM_DEVICE,
-            endpoint,
-            &answer_data);
-        
-        rc = async_data_write_start(phone, buffer, size);
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return rc;
-        }
-        
-        async_wait_for(req, &answer_rc);
-        rc = (int)answer_rc;
+        int rc = ipc_connect_to_me(hcd_phone, 1, dev->device_id_, 0, &phonehash);
         if (rc != EOK) {
                 return rc;
         }
         
+        dev->vhcd_phone_ = hcd_phone;
+        dev->send_data = usbvirt_data_to_host;
+        
+        device = dev;
+        
+        async_new_connection(phonehash, 0, NULL, callback_connection);
+        
         return EOK;
 }
+
+
+int usbvirt_disconnect(void)
+{
+        ipc_hangup(device->vhcd_phone_);
+        
+        device = NULL;
+        
+        return EOK;
+}
+
 
 /**