| Message ID | 20180622080009.5707-3-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | ppc: minor Mac fixes | expand |
On Fri, Jun 22, 2018 at 09:00:09AM +0100, Mark Cave-Ayland wrote: > Commit 84051eb400 "adb: add property to disable direct reg 3 writes" added a > workaround for MacOS 9 incorrectly setting the mouse address during boot of > PMU machines. > > Further testing has shown that since fb6649f172 "adb: fix read reg 3 byte > ordering" this can still sometimes happen with the CUDA mac99 machine, > so let's enable this workaround for all New World machines using ADB for now. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Applied to ppc-for-3.0, thanks. > --- > hw/ppc/mac_newworld.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c > index ff715ffffd..2b13fcdde5 100644 > --- a/hw/ppc/mac_newworld.c > +++ b/hw/ppc/mac_newworld.c > @@ -407,11 +407,11 @@ static void ppc_core99_init(MachineState *machine) > > adb_bus = qdev_get_child_bus(dev, "adb.0"); > dev = qdev_create(adb_bus, TYPE_ADB_KEYBOARD); > - qdev_prop_set_bit(dev, "disable-direct-reg3-writes", has_pmu); > + qdev_prop_set_bit(dev, "disable-direct-reg3-writes", true); > qdev_init_nofail(dev); > > dev = qdev_create(adb_bus, TYPE_ADB_MOUSE); > - qdev_prop_set_bit(dev, "disable-direct-reg3-writes", has_pmu); > + qdev_prop_set_bit(dev, "disable-direct-reg3-writes", true); > qdev_init_nofail(dev); > } >
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index ff715ffffd..2b13fcdde5 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -407,11 +407,11 @@ static void ppc_core99_init(MachineState *machine) adb_bus = qdev_get_child_bus(dev, "adb.0"); dev = qdev_create(adb_bus, TYPE_ADB_KEYBOARD); - qdev_prop_set_bit(dev, "disable-direct-reg3-writes", has_pmu); + qdev_prop_set_bit(dev, "disable-direct-reg3-writes", true); qdev_init_nofail(dev); dev = qdev_create(adb_bus, TYPE_ADB_MOUSE); - qdev_prop_set_bit(dev, "disable-direct-reg3-writes", has_pmu); + qdev_prop_set_bit(dev, "disable-direct-reg3-writes", true); qdev_init_nofail(dev); }
Commit 84051eb400 "adb: add property to disable direct reg 3 writes" added a workaround for MacOS 9 incorrectly setting the mouse address during boot of PMU machines. Further testing has shown that since fb6649f172 "adb: fix read reg 3 byte ordering" this can still sometimes happen with the CUDA mac99 machine, so let's enable this workaround for all New World machines using ADB for now. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/ppc/mac_newworld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)