diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-06 13:31:11 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-06 13:31:11 +0000 |
commit | 30918661c17f90ae25a559a91603142f2bcfa34b (patch) | |
tree | 6a76c22cf81254d35e5b9345e42d16bb7e4da71b /include | |
parent | 7a5fd9343d758d077b6f783d02aa30d9789c4989 (diff) | |
parent | a879306ca14de576d3a5dd51f830ebf89753e223 (diff) | |
download | qemu-30918661c17f90ae25a559a91603142f2bcfa34b.zip qemu-30918661c17f90ae25a559a91603142f2bcfa34b.tar.gz qemu-30918661c17f90ae25a559a91603142f2bcfa34b.tar.bz2 |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20210106' into staging
qemu-sparc queue
# gpg: Signature made Wed 06 Jan 2021 11:43:02 GMT
# gpg: using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg: issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-20210106:
sun4m: don't connect two qemu_irqs directly to the same input
include/hw/sparc/grlib.h: Remove unused set_pil_in_fn typedef
hw/sparc: Make grlib-irqmp device handle its own inbound IRQ lines
hw/timer/slavio_timer: Allow 64-bit accesses
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/hw/sparc/grlib.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/hw/sparc/grlib.h b/include/hw/sparc/grlib.h index 78b6178..2104f49 100644 --- a/include/hw/sparc/grlib.h +++ b/include/hw/sparc/grlib.h @@ -34,10 +34,6 @@ /* IRQMP */ #define TYPE_GRLIB_IRQMP "grlib,irqmp" -typedef void (*set_pil_in_fn) (void *opaque, uint32_t pil_in); - -void grlib_irqmp_set_irq(void *opaque, int irq, int level); - void grlib_irqmp_ack(DeviceState *dev, int intno); /* GPTimer */ |