Changeset 1825

Timestamp:

04/24/07 21:52:45 (6 years ago)

Author:

andrew

Message:

Initial Linux gadgetfs support. Fix usb-net USB config descriptors.

Location:

trunk/src/host/qemu-neo1973

Files:

• Makefile.target (modified) (1 diff)
• hw/usb-net.c (modified) (4 diffs)
• hw/usb.h (modified) (1 diff)
• vl.c (modified) (6 diffs)

trunk/src/host/qemu-neo1973/Makefile.target

@@ -339 +339 @@
 # USB layer
 VL_OBJS+= usb.o usb-hub.o usb-linux.o usb-hid.o usb-ohci.o usb-msd.o usb-net.o
+VL_OBJS+= usb-linux-gadget.o
 
 # PCI network cards

trunk/src/host/qemu-neo1973/hw/usb-net.c

@@ -112 +112 @@
         STRING_PRODUCT,      /*  u8  iProduct; */
         STRING_SERIALNUMBER, /*  u8  iSerialNumber; */
-        0x02                 /*  u8  bNumConfigurations; */
+        0x01                 /*  u8  bNumConfigurations; */
 };
 
@@ -119 +119 @@
         0x09,                /*  u8  bLength */
         USB_DT_CONFIG,       /*  u8  bDescriptorType */
-        0x00, 0x00,          /*  le16 wTotalLength */
+        0x43, 0x00,          /*  le16 wTotalLength */
         0x02,                /*  u8  bNumInterfaces */
         DEV_RNDIS_CONFIG_VALUE, /*  u8  bConfigurationValue */
@@ -194 +194 @@
         0x09,                /*  u8  bLength */
         USB_DT_CONFIG,       /*  u8  bDescriptorType */
-        0x00, 0x00,          /*  le16 wTotalLength */
+        0x50, 0x00,          /*  le16 wTotalLength */
         0x02,                /*  u8  bNumInterfaces */
         DEV_RNDIS_CONFIG_VALUE, /*  u8  bConfigurationValue */
@@ -973 +973 @@
                 case USB_DT_CONFIG:
                         switch (value & 0xff) {
-                        case 0:
+                        case 1:
                                 ret = sizeof(qemu_net_rndis_config_descriptor);
                                 memcpy(data, qemu_net_rndis_config_descriptor, ret);
                                 break;
 
-                        case 1:
+                        case 0:
                                 ret = sizeof(qemu_net_cdc_config_descriptor);
                                 memcpy(data, qemu_net_cdc_config_descriptor, ret);

trunk/src/host/qemu-neo1973/hw/usb.h

@@ -215 +215 @@
 void usb_host_info(void);
 
+/* usb-linux-gadget.c */
+int usb_gadget_init(void);
+
 /* usb-hid.c */
 USBDevice *usb_mouse_init(void);

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

@@ -6136 +6136 @@
            "-usb            enable the USB driver (will be the default soon)\n"
            "-usbdevice name add the host or guest USB device 'name'\n"
+           "-usbgadget      enable the linux USB GadgetFS as an HCD\n"
 #if defined(TARGET_PPC) || defined(TARGET_SPARC)
            "-g WxH[xDEPTH]  Set the initial graphical resolution and depth\n"
@@ -6288 +6289 @@
     QEMU_OPTION_usb,
     QEMU_OPTION_usbdevice,
+    QEMU_OPTION_usbgadget,
     QEMU_OPTION_smp,
     QEMU_OPTION_vnc,
@@ -6370 +6372 @@
     { "win2k-hack", 0, QEMU_OPTION_win2k_hack },
     { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice },
+    { "usbgadget", 0, QEMU_OPTION_usbgadget },
     { "smp", HAS_ARG, QEMU_OPTION_smp },
     { "vnc", HAS_ARG, QEMU_OPTION_vnc },
@@ -6627 +6630 @@
     char usb_devices[MAX_USB_CMDLINE][128];
     int usb_devices_index;
+    int usbgadget_enabled = 0;
     int fds[2];
 
@@ -7039 +7043 @@
                 usb_devices_index++;
                 break;
+            case QEMU_OPTION_usbgadget:
+                usbgadget_enabled = 1;
+                break;
             case QEMU_OPTION_smp:
                 smp_cpus = atoi(optarg);
@@ -7325 +7332 @@
     }
 
+    if (usbgadget_enabled) {
+        if (usb_gadget_init() < 0) {
+            fprintf(stderr, "Warning: could not find USB gadgetfs\n");
+        }
+    }
+
     gui_timer = qemu_new_timer(rt_clock, gui_update, NULL);
     qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock));