[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/30] q800: add Apple Sound Chip (ASC) audio to machine
|
From: |
Mark Cave-Ayland |
|
Subject: |
[PATCH 16/30] q800: add Apple Sound Chip (ASC) audio to machine |
|
Date: |
Wed, 24 May 2023 22:10:50 +0100 |
The Quadra 800 has the enhanced ASC (EASC) audio chip which supports both the
legacy IRQ routing through VIA2 and also "A/UX" mode routing direct to the
CPU.
Co-developed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/m68k/q800.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index d12aeaa20e..ed862f9e9d 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -43,6 +43,7 @@
#include "hw/misc/djmemc.h"
#include "hw/misc/iosb.h"
#include "hw/input/adb.h"
+#include "hw/audio/asc.h"
#include "hw/nubus/mac-nubus-bridge.h"
#include "hw/display/macfb.h"
#include "hw/block/swim.h"
@@ -115,7 +116,7 @@ struct GLUEState {
M68kCPU *cpu;
uint8_t ipr;
uint8_t auxmode;
- qemu_irq irqs[1];
+ qemu_irq irqs[2];
QEMUTimer *nmi_release;
};
@@ -124,8 +125,10 @@ struct GLUEState {
#define GLUE_IRQ_IN_SONIC 2
#define GLUE_IRQ_IN_ESCC 3
#define GLUE_IRQ_IN_NMI 4
+#define GLUE_IRQ_IN_ASC 5
#define GLUE_IRQ_NUBUS_9 0
+#define GLUE_IRQ_ASC 1
/*
* The GLUE logic on the Quadra 800 supports 2 different IRQ routing modes
@@ -187,6 +190,11 @@ static void GLUE_set_irq(void *opaque, int irq, int level)
irq = 6;
break;
+ case GLUE_IRQ_IN_ASC:
+ /* Route to VIA2 instead, negative edge-triggered */
+ qemu_set_irq(s->irqs[GLUE_IRQ_ASC], !level);
+ return;
+
default:
g_assert_not_reached();
}
@@ -213,6 +221,10 @@ static void GLUE_set_irq(void *opaque, int irq, int level)
irq = 6;
break;
+ case GLUE_IRQ_IN_ASC:
+ irq = 4;
+ break;
+
default:
g_assert_not_reached();
}
@@ -304,7 +316,7 @@ static void glue_init(Object *obj)
qdev_init_gpio_in(dev, GLUE_set_irq, 8);
qdev_init_gpio_in_named(dev, glue_auxmode_set_irq, "auxmode", 1);
- qdev_init_gpio_out(dev, s->irqs, 1);
+ qdev_init_gpio_out(dev, s->irqs, 2);
/* NMI release timer */
s->nmi_release = timer_new_ms(QEMU_CLOCK_VIRTUAL, glue_nmi_release, s);
@@ -695,6 +707,20 @@ static void q800_machine_init(MachineState *machine)
scsi_bus_legacy_handle_cmdline(&esp->bus);
+ /* Apple Sound Chip */
+
+ dev = qdev_new(TYPE_ASC);
+ qdev_prop_set_uint8(dev, "asctype", ASC_TYPE_EASC);
+ sysbus = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(sysbus, &error_fatal);
+ memory_region_add_subregion(&m->macio, ASC_BASE - IO_BASE,
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
0));
+ sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(m->glue, GLUE_IRQ_IN_ASC));
+
+ /* Wire ASC IRQ via GLUE for use in classic mode */
+ qdev_connect_gpio_out(m->glue, GLUE_IRQ_ASC,
+ qdev_get_gpio_in(via2_dev, VIA2_IRQ_ASC_BIT));
+
/* SWIM floppy controller */
dev = qdev_new(TYPE_SWIM);
--
2.30.2
- [PATCH 17/30] q800: add easc bool machine class property to switch between ASC and EASC, (continued)
- [PATCH 17/30] q800: add easc bool machine class property to switch between ASC and EASC, Mark Cave-Ayland, 2023/05/24
- [PATCH 19/30] swim: split into separate IWM and ISM register blocks, Mark Cave-Ayland, 2023/05/24
- [PATCH 18/30] swim: add trace events for IWM and ISM registers, Mark Cave-Ayland, 2023/05/24
- [PATCH 22/30] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Mark Cave-Ayland, 2023/05/24
- [PATCH 21/30] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Mark Cave-Ayland, 2023/05/24
- [PATCH 23/30] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/05/24
- [PATCH 20/30] swim: update IWM/ISM register block decoding, Mark Cave-Ayland, 2023/05/24
- [PATCH 24/30] mac_via: workaround NetBSD ADB bus enumeration issue, Mark Cave-Ayland, 2023/05/24
- [PATCH 25/30] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Mark Cave-Ayland, 2023/05/24
- [PATCH 16/30] q800: add Apple Sound Chip (ASC) audio to machine,
Mark Cave-Ayland <=
- [PATCH 27/30] q800: add ESCC alias at 0xc000, Mark Cave-Ayland, 2023/05/24
- [PATCH 28/30] q800: add alias for MacOS toolbox ROM at 0x40000000, Mark Cave-Ayland, 2023/05/24
- [PATCH 26/30] mac_via: always clear ADB interrupt when switching to A/UX mode, Mark Cave-Ayland, 2023/05/24
- [PATCH 29/30] mac_via: extend timer calibration hack to work with A/UX, Mark Cave-Ayland, 2023/05/24
- [PATCH 30/30] mac_via: work around QEMU unaligned MMIO access bug, Mark Cave-Ayland, 2023/05/24