diff options
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -622,24 +622,31 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, if (pci_enabled && usb_enabled) { USBPort *usb_root_ports[2]; - USBDevice *usb_hub; + USBDevice *usb_dev; usb_uhci_init(pci_bus, usb_root_ports); #if 0 { USBPort *usb_hub1_ports[4]; USBPort *usb_hub2_ports[2]; /* test: we simulate a USB hub */ - usb_hub = usb_hub_init(usb_hub1_ports, 4); - usb_attach(usb_root_ports[0], usb_hub); + usb_dev = usb_hub_init(usb_hub1_ports, 4); + usb_attach(usb_root_ports[0], usb_dev); /* test: we simulate a USB hub */ - usb_hub = usb_hub_init(usb_hub2_ports, 2); - usb_attach(usb_hub1_ports[0], usb_hub); + usb_dev = usb_hub_init(usb_hub2_ports, 2); + usb_attach(usb_hub1_ports[0], usb_dev); } #endif +#if 0 + /* USB mouse */ + usb_dev = usb_mouse_init(); + usb_attach(usb_root_ports[0], usb_dev); +#endif +#if 1 /* simulated hub with the host USB devices connected to it */ - usb_hub = usb_host_hub_init(); - usb_attach(usb_root_ports[0], usb_hub); + usb_dev = usb_host_hub_init(); + usb_attach(usb_root_ports[0], usb_dev); +#endif } /* must be done after all PCI devices are instanciated */ |