Changeset 1898

Timestamp:

05/03/07 04:46:03 (6 years ago)

Author:

andrew

Message:

Monitor commands to handle the USB gadget functionality, various gadgetfs usage fixes.

Location:

trunk/src/host/qemu-neo1973

Files:

• usb-linux-gadget.c (modified) (5 diffs)
• vl.c (modified) (5 diffs)
• vl.h (modified) (2 diffs)

trunk/src/host/qemu-neo1973/usb-linux-gadget.c

@@ -362 +362 @@
         goto fail;
     cfg = (struct usb_config_descriptor *) src;
+    if (packet->len < cfg->wTotalLength)
+        goto fail;
     if (dl + cfg->wTotalLength > sizeof(buffer))
         goto fail;
@@ -377 +379 @@
         goto fail;
     memcpy(dst, hci->dev_desc, hci->desc_len);
+    /* HACK: report always only a single Configuration */
+    ((struct usb_device_descriptor *) dst)->bNumConfigurations = 1;
     dl += hci->desc_len;
     dst += hci->desc_len;
@@ -492 +496 @@
     int ret, len;
 
-    if (!s->addr)
+    if (!s->connected)
         return;
 
@@ -498 +502 @@
     if (ret < 0 && errno != EAGAIN)
         fprintf(stderr, "%s: event error: %i\n", __FUNCTION__, errno);
-    if (ret < sizeof(event))
+    if (ret < (int) sizeof(event))
         return;
 
@@ -713 +717 @@
     atexit(gadget_done);
 
+    hci->addr = 0;
+
     qemu_register_usb_port(&hci->port, hci, USB_INDEX_HOST, gadget_attach);
 

trunk/src/host/qemu-neo1973/vl.c

@@ -3956 +3956 @@
 static USBPort *used_usb_ports;
 static USBPort *free_usb_ports;
+static USBPort *host_usb_ports;
+static USBDevice *usb_gadget;
 
 /* ??? Maybe change this to register a hub to keep track of the topology.  */
@@ -3964 +3966 @@
     port->index = index;
     port->attach = attach;
-    port->next = free_usb_ports;
-    free_usb_ports = port;
+    if (index == USB_INDEX_HOST) {
+        port->next = host_usb_ports;
+        host_usb_ports = port;
+    } else {
+        port->next = free_usb_ports;
+        free_usb_ports = port;
+    }
+}
+
+void qemu_register_usb_gadget(USBDevice *device)
+{
+    usb_gadget = device;
 }
 
@@ -3990 +4002 @@
                 return -1;
         dev = usb_net_init(&nd_table[nr]);
+    } else if (!strcmp(devname, "gadget")) {
+        dev = usb_gadget;
+        port = host_usb_ports;
+        if (!dev || !port)
+            return -1;
+        goto attach;
     } else {
-        return -1;
+        return 0;
     }
     if (!dev)
@@ -4014 +4032 @@
     port->next = used_usb_ports;
     used_usb_ports = port;
+attach:
     usb_attach(port, dev);
     return 0;
@@ -4025 +4044 @@
     int bus_num, addr;
     const char *p;
+
+    if (!strcmp(devname, "gadget")) {
+        port = host_usb_ports;
+        if (!port)
+            return -1;
+        usb_attach(port, NULL);
+        return 0;
+    }
 
     if (!used_usb_ports)

trunk/src/host/qemu-neo1973/vl.h

@@ -1230 +1230 @@
 /* usb ports of the VM */
 
+#define USB_INDEX_HOST  -1
 void qemu_register_usb_port(USBPort *port, void *opaque, int index,
                             usb_attachfn attach);
+void qemu_register_usb_gadget(USBDevice *device);
 
 #define VM_USB_HUB_SIZE 8
@@ -1458 +1460 @@
 #include "hw/i2c.h"
 
+#define unlikely(cond)  __builtin_expect(cond, 0)
+
 #ifdef TARGET_ARM
 #include "hw/pxa.h"