diff options
| author | Richard Henderson | 2021-10-22 16:47:13 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-22 16:47:13 +0200 |
| commit | 1dafe7656a9c2770065e91208edd4c073f5f98a9 (patch) | |
| tree | 15c9a1a54f6b6e3321ccc05b30bcd2550a285782 /include/hw | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-arm-20211021' into staging (diff) | |
| parent | q800: drop 8-bit graphic_depth check for Apple 21 inch display (diff) | |
| download | qemu-1dafe7656a9c2770065e91208edd4c073f5f98a9.tar.gz qemu-1dafe7656a9c2770065e91208edd4c073f5f98a9.tar.xz qemu-1dafe7656a9c2770065e91208edd4c073f5f98a9.zip | |
Merge remote-tracking branch 'remotes/vivier-m68k/tags/q800-pull-request' into staging
Pull request Q800 20211022
GLUE updates for A/UX mode
# gpg: Signature made Fri 22 Oct 2021 12:16:29 AM PDT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
* remotes/vivier-m68k/tags/q800-pull-request:
q800: drop 8-bit graphic_depth check for Apple 21 inch display
q800: add NMI handler
q800: wire up remaining IRQs in classic mode
q800: route SONIC on-board Ethernet IRQ via nubus IRQ 9 in classic mode
q800: wire up auxmode GPIO to GLUE
mac_via: add GPIO for A/UX mode
q800: use GLUE IRQ numbers instead of IRQ level for GLUE IRQs
q800: move VIA1 IRQ from level 1 to level 6
mac_via: update comment for VIA1B_vMystery bit
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/misc/mac_via.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 4506abe5d0..b445565866 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -43,6 +43,7 @@ struct MOS6522Q800VIA1State { MemoryRegion via_mem; qemu_irq irqs[VIA1_IRQ_NB]; + qemu_irq auxmode_irq; uint8_t last_b; /* RTC */ |