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

Timestamp:

2010-10-24T16:43:40Z (15 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/hubops.c (modified) (7 diffs)

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

@@ -59 +59 @@
 static int on_class_request(struct usbvirt_device *dev,
     usb_device_request_setup_packet_t *request, uint8_t *data);
+static int on_data_request(struct usbvirt_device *dev,
+    usb_endpoint_t endpoint,
+    void *buffer, size_t size, size_t *actual_size);
+
 
 static usbvirt_standard_device_request_ops_t standard_request_ops = {
@@ -78 +82 @@
         .standard_request_ops = &standard_request_ops,
         .on_class_device_request = on_class_request,
-        .on_data = NULL
+        .on_data = NULL,
+        .on_data_request = on_data_request
 };
 
@@ -85 +90 @@
 {
         if (request->value_high == USB_DESCTYPE_HUB) {
-                int rc = dev->send_data(dev, 0,
+                int rc = dev->control_transfer_reply(dev, 0,
                     &hub_descriptor, hub_descriptor.length);
                 
@@ -196 +201 @@
         uint32_t hub_status = 0;
         
-        return virthub_dev.send_data(&virthub_dev, 0, &hub_status, 4);
+        return virthub_dev.control_transfer_reply(&virthub_dev, 0,
+            &hub_status, 4);
 }
 
@@ -230 +236 @@
         status |= (port->status_change << 16);
         
-        return virthub_dev.send_data(&virthub_dev, 0, &status, 4);
+        return virthub_dev.control_transfer_reply(&virthub_dev, 0, &status, 4);
 }
 
@@ -334 +340 @@
 {
         port->status_change &= (~change);
-        hub_check_port_changes();
 }
 
@@ -341 +346 @@
         port->status_change |= change;
 }
+
+static int on_data_request(struct usbvirt_device *dev,
+    usb_endpoint_t endpoint,
+    void *buffer, size_t size, size_t *actual_size)
+{
+        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));
+                }
+        }
+        
+        uint8_t *b = (uint8_t *) buffer;
+        if (size > 0) {
+                *b = change_map;
+                *actual_size = 1;
+        }
+        
+        return EOK;
+}
+
 
 /**