Changeset 186d630 in mainline

Timestamp:

2010-10-20T20:44:55Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bbfb86c

Parents:

47e3a8e

Message:

libusbvirt allows local device

By local device is meant virtual device in current task
(i.e. not connected through phones but called statically).

Location:

uspace/lib/usbvirt

Files:

• device.h (modified) (2 diffs)
• hub.h (modified) (1 diff)
• incoming.c (modified) (1 diff)
• main.c (modified) (4 diffs)
• private.h (modified) (1 diff)

uspace/lib/usbvirt/device.h

@@ -128 +128 @@
             usb_endpoint_t endpoint, void *buffer, size_t size);
         
-        
-        
         /* Device attributes. */
         
@@ -152 +150 @@
          */
         int device_id_;
+        
+        /** Main routine called when data is received from HC.
+         * @warning Do not change after initializing with
+         * usbvirt_device_init().
+         * This function is here merely to make the interface more OOP.
+         */
+        int (*receive_data)(struct usbvirt_device *dev,
+            usb_endpoint_t endpoint, void *buffer, size_t size);
+        
 } usbvirt_device_t;
 

uspace/lib/usbvirt/hub.h

@@ -46 +46 @@
 int usbvirt_connect(usbvirt_device_t *, const char *);
 int usbvirt_disconnect(void);
+int usbvirt_connect_local(usbvirt_device_t *);
 
 #endif

uspace/lib/usbvirt/incoming.c

@@ -38 +38 @@
 #include "private.h"
 
-int handle_incoming_data(usb_endpoint_t endpoint, void *buffer, size_t size)
+int handle_incoming_data(struct usbvirt_device *dev,
+    usb_endpoint_t endpoint, void *buffer, size_t size)
 {
         /*

uspace/lib/usbvirt/main.c

@@ -69 +69 @@
         }
         
-        handle_incoming_data(endpoint, buffer, len);
+        device->receive_data(device, endpoint, buffer, len);
         
         free(buffer);
@@ -104 +104 @@
 {
         dev->send_data = usbvirt_data_to_host;
+        dev->receive_data = handle_incoming_data;
         dev->state = USBVIRT_STATE_DEFAULT;
         dev->address = 0;
@@ -160 +161 @@
  * @param hcd_path HCD identification under devfs
  *     (without <code>/dev/usb/</code>).
- * @param device_id Internal device identification (used by HCD).
- * @param callback Handler for callbacks from HCD.
+ * @param dev Device to connect.
  * @return EOK on success or error code from errno.h.
  */
@@ -197 +197 @@
 }
 
-
+/** Prepares device as local.
+ * This is useful if you want to have a virtual device in the same task
+ * as HCD.
+ *
+ * @param dev Device to connect.
+ * @return Always EOK.
+ */
+int usbvirt_connect_local(usbvirt_device_t *dev)
+{
+        dev->vhcd_phone_ = -1;
+        device_init(dev);
+        
+        return EOK;
+}
+
+/** Disconnects device from HCD.
+ *
+ * @return Always EOK.
+ */
 int usbvirt_disconnect(void)
 {

uspace/lib/usbvirt/private.h

@@ -51 +51 @@
     usb_endpoint_t endpoint, void *buffer, size_t size);
 
-int handle_incoming_data(usb_endpoint_t endpoint, void *buffer, size_t size);
+int handle_incoming_data(struct usbvirt_device *dev,
+    usb_endpoint_t endpoint, void *buffer, size_t size);
 
 int control_pipe(void *buffer, size_t size);