diff options
| author | Mark Cave-Ayland | 2018-06-12 18:43:57 +0200 |
|---|---|---|
| committer | David Gibson | 2018-06-16 08:32:33 +0200 |
| commit | f1114c17eeda907d0a290f25f970d695fc3b16de (patch) | |
| tree | 81c03033a4465aa8edc5fe69f18936cc8e4ed317 /include | |
| parent | ppc: introduce Core99MachinesState for the mac99 machine (diff) | |
| download | qemu-f1114c17eeda907d0a290f25f970d695fc3b16de.tar.gz qemu-f1114c17eeda907d0a290f25f970d695fc3b16de.tar.xz qemu-f1114c17eeda907d0a290f25f970d695fc3b16de.zip | |
mac_newworld: add via machine option to control mac99 VIA/ADB configuration
This option allows the VIA configuration to be controlled between 3
different possible setups: cuda, pmu-adb and pmu with USB rather than ADB
keyboard/mouse.
For the moment we don't do anything with the configuration except to pass
it to the macio device (the via-cuda parent) and also to the firmware via
the fw_cfg interface so that it can present the correct device tree.
The default is cuda which is the current default and so will have no
change in behaviour.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/misc/macio/macio.h | 2 | ||||
| -rw-r--r-- | include/hw/ppc/ppc.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h index 838eaf1db0..9529073ba8 100644 --- a/include/hw/misc/macio/macio.h +++ b/include/hw/misc/macio/macio.h @@ -70,6 +70,8 @@ typedef struct NewWorldMacIOState { MacIOState parent_obj; /*< public >*/ + bool has_pmu; + bool has_adb; OpenPICState *pic; MACIOIDEState ide[2]; } NewWorldMacIOState; diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index b18ef3eefb..298ec354a8 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -101,6 +101,7 @@ enum { #define FW_CFG_PPC_NVRAM_ADDR (FW_CFG_ARCH_LOCAL + 0x08) #define FW_CFG_PPC_BUSFREQ (FW_CFG_ARCH_LOCAL + 0x09) #define FW_CFG_PPC_NVRAM_FLAT (FW_CFG_ARCH_LOCAL + 0x0a) +#define FW_CFG_PPC_VIACONFIG (FW_CFG_ARCH_LOCAL + 0x0b) #define PPC_SERIAL_MM_BAUDBASE 399193 |