Changeset 7a7bfeb3 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/hub.c

Timestamp:

2010-10-24T16:43:40Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

355f7c2

Parents:

b8a3cda

Message:

Virtual USB overhaul almost complete

The virtual HC, hub and keyboard are rewritten after changes to HCD API.
Comments will be added later.

File:

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

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

@@ -144 +144 @@
 hub_device_t hub_dev;
 
-static int send_data(struct usbvirt_device *dev,
-            usb_endpoint_t endpoint, void *buffer, size_t size)
-{
-        usb_target_t target = { dev->address, endpoint };
-        void *my_buffer = NULL;
-        if (size > 0) {
-                my_buffer = malloc(size);
-                memcpy(my_buffer, buffer, size);
-        }
-        hc_fillin_transaction_from_device(target, my_buffer, size);
-        
-        return EOK;
-}
-
 void hub_init(void)
 {
@@ -170 +156 @@
         
         usbvirt_connect_local(&virthub_dev);
-        virthub_dev.send_data = send_data;
+        //virthub_dev.send_data = send_data;
         
         printf("%s: virtual hub (%d ports) created.\n", NAME, HUB_PORT_COUNT);
@@ -235 +221 @@
 }
 
-void hub_check_port_changes(void)
-{
-        /* FIXME - what if HUB_PORT_COUNT is greater than 8. */
-        uint8_t change_map = 0;
-        
-        size_t i;
-        for (i = 0; i < HUB_PORT_COUNT; i++) {
-                hub_port_t *port = &hub_dev.ports[i];
-                
-                if (port->status_change != 0) {
-                        change_map |= (1 << (i + 1));
-                }
-        }
-        
-        /* FIXME - do not send when it has not changed since previous run. */
-        if (change_map != 0) {
-                virthub_dev.send_data(&virthub_dev, HUB_STATUS_CHANGE_PIPE,
-                    &change_map, 1);
-        }
-}
 
 /**