diff options
| author | Mark Cave-Ayland | 2018-05-06 16:20:05 +0200 |
|---|---|---|
| committer | David Gibson | 2018-06-12 01:33:52 +0200 |
| commit | 45fefe7c4d9bfc5a4a222d3d2c8244531e87130f (patch) | |
| tree | 8f8b9b4e338c19a7f00677e046a30726fe0fc71c /include/hw/pci-host | |
| parent | macio: add trace-events to timer device (diff) | |
| download | qemu-45fefe7c4d9bfc5a4a222d3d2c8244531e87130f.tar.gz qemu-45fefe7c4d9bfc5a4a222d3d2c8244531e87130f.tar.xz qemu-45fefe7c4d9bfc5a4a222d3d2c8244531e87130f.zip | |
uninorth: remove token register from uninorth device
>From observation of various OS sources it can be seen that the token register
introduced in 4e46dcdbd3 "PPC: Newworld: Add uninorth token register" is not
required, since the only register currently implemented is the uninorth hardware
version which is read-only.
Remove the token register implementation and instead return the uninorth
version corresponding to the hardware.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include/hw/pci-host')
| -rw-r--r-- | include/hw/pci-host/uninorth.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/hw/pci-host/uninorth.h b/include/hw/pci-host/uninorth.h index f6654bad9b..2a1cf9f284 100644 --- a/include/hw/pci-host/uninorth.h +++ b/include/hw/pci-host/uninorth.h @@ -29,6 +29,9 @@ #include "hw/ppc/openpic.h" +/* UniNorth version */ +#define UNINORTH_VERSION_10A 0x7 + #define TYPE_UNI_NORTH_PCI_HOST_BRIDGE "uni-north-pci-pcihost" #define TYPE_UNI_NORTH_AGP_HOST_BRIDGE "uni-north-agp-pcihost" #define TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE "uni-north-internal-pci-pcihost" @@ -57,7 +60,6 @@ typedef struct UNINState { SysBusDevice parent_obj; MemoryRegion mem; - int token[1]; } UNINState; #define TYPE_UNI_NORTH "uni-north" |