mac_newworld.c: add USB keyboard and mouse as default

Commit Message

Programmingkid March 16, 2016, 12:12 a.m. UTC

Add the USB keyboard and mouse by default to the mac99 target. This more closely
represents what a real PowerMac3,1 would be using.

Signed-off-by: John Arbuckle <[e-mail]>

---
The USB keyboard and mouse work better than their ADB counterparts.
I can right click on a Mac OS X guest with a USB mouse.
The Key Caps program on Mac OS 9 actually works well with the USB keyboard.
Apple System Profiler on Mac OS 9 actually displays a keyboard name under the keyboard heading.

 hw/ppc/mac_newworld.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

Patch

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index f0a36b3..ab38b77 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -165,7 +165,6 @@  static void ppc_core99_init(MachineState *machine)
     PCIBus *pci_bus;
     PCIDevice *macio;
     MACIOIDEState *macio_ide;
-    BusState *adb_bus;
     MacIONVRAMState *nvr;
     int bios_size;
     MemoryRegion *pic_mem, *escc_mem;
@@ -415,24 +414,11 @@  static void ppc_core99_init(MachineState *machine)
                                                         "ide[1]"));
     macio_ide_init_drives(macio_ide, &hd[MAX_IDE_DEVS]);
 
-    dev = DEVICE(object_resolve_path_component(OBJECT(macio), "cuda"));
-    adb_bus = qdev_get_child_bus(dev, "adb.0");
-    dev = qdev_create(adb_bus, TYPE_ADB_KEYBOARD);
-    qdev_init_nofail(dev);
-    dev = qdev_create(adb_bus, TYPE_ADB_MOUSE);
-    qdev_init_nofail(dev);
-
     if (machine->usb) {
         pci_create_simple(pci_bus, -1, "pci-ohci");
-
-        /* U3 needs to use USB for input because Linux doesn't support via-cuda
-        on PPC64 */
-        if (machine_arch == ARCH_MAC99_U3) {
-            USBBus *usb_bus = usb_bus_find(-1);
-
-            usb_create_simple(usb_bus, "usb-kbd");
-            usb_create_simple(usb_bus, "usb-mouse");
-        }
+        USBBus *usb_bus = usb_bus_find(-1);
+        usb_create_simple(usb_bus, "usb-kbd");
+        usb_create_simple(usb_bus, "usb-mouse");
     }
 
     pci_vga_init(pci_bus);