Changeset b8507a1 in mainline

Timestamp:

2010-10-20T21:17:32Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6c741e1d

Parents:

08af5a6

Message:

Virtual USB HC has a hub

So far, the hub does not respond to requests and automatically enables
any port device connects to. Will be completed in next revisions (hope
very soon).

Location:

uspace/srv/hw/bus/usb/hcd/virtual

Files:

• Makefile (modified) (2 diffs)
• conndev.c (modified) (2 diffs)
• devices.c (modified) (6 diffs)
• hcd.c (modified) (2 diffs)
• hub.c (added)
• hub.h (added)
• hubintern.h (added)
• hubops.c (added)
• vhcd.h (modified) (1 diff)

uspace/srv/hw/bus/usb/hcd/virtual/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../../../../..
-LIBS = $(LIBUSB_PREFIX)/libusb.a
+LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBUSBVIRT_PREFIX)/libusbvirt.a
 EXTRA_CFLAGS = -I$(LIB_PREFIX)
 BINARY = vhcd
@@ -37 +37 @@
         devices.c \
         hc.c \
-        hcd.c
+        hcd.c \
+        hub.c \
+        hubops.c
 
 include $(USPACE_PREFIX)/Makefile.common

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

@@ -40 +40 @@
 #include "conn.h"
 #include "hc.h"
+#include "hub.h"
 
-/** Handle data from device to function.
+/** Handle data from device to host.
  */
 static void handle_data_from_device(ipc_callid_t iid, ipc_call_t icall,
@@ -50 +51 @@
                 .endpoint = IPC_GET_ARG2(icall)
         };
+        
+        if (!hub_can_device_signal(dev)) {
+                ipc_answer_0(iid, EREFUSED);
+                return;
+        }
         
         dprintf("data from device %d [%d.%d]", dev->id,

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

@@ -47 +47 @@
 
 #include "devices.h"
+#include "hub.h"
 
 #define list_foreach(pos, head) \
@@ -61 +62 @@
 virtdev_connection_t *virtdev_recognise(int id, int phone)
 {
-        virtdev_connection_t * dev = NULL;
-        switch (id) {
-                case USBVIRT_DEV_KEYBOARD_ID:
-                        dev = virtdev_add_device(phone);
-                        break;
-                default:
-                        break;
-        }
+        virtdev_connection_t * dev = virtdev_add_device(phone);
         
         /*
@@ -98 +92 @@
         list_append(&dev->link, &devices);
         
+        hub_add_device(dev);
+        
         return dev;
 }
@@ -105 +101 @@
 void virtdev_destroy_device(virtdev_connection_t *dev)
 {
+        hub_remove_device(dev);
         list_remove(&dev->link);
         free(dev);
@@ -119 +116 @@
                 virtdev_connection_t *dev
                     = list_get_instance(pos, virtdev_connection_t, link);
+                
+                if (!hub_can_device_signal(dev)) {
+                        continue;
+                }
                 
                 ipc_call_t answer_data;
@@ -143 +144 @@
         
         /*
+         * Send the data to the virtual hub as well
+         * (if the address matches).
+         */
+        if (virthub_dev.address == transaction->target.address) {
+                virthub_dev.receive_data(&virthub_dev, transaction->target.endpoint,
+                    transaction->buffer, transaction->len);
+        }
+        
+        /*
          * TODO: maybe screw some transactions to get more
          * real-life image.

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

@@ -48 +48 @@
 #include "hc.h"
 #include "devices.h"
+#include "hub.h"
 #include "conn.h"
 
@@ -135 +136 @@
         }
         
+        hub_init();
+        
         printf("%s: accepting connections.\n", NAME);
         hc_manager();

uspace/srv/hw/bus/usb/hcd/virtual/vhcd.h

@@ -36 +36 @@
 #define VHCD_VHCD_H_
 
+#include <stdio.h>
+
 #define NAME "hcd-virt"
 #define NAMESPACE "usb"