Pull request q800 20231008
add support for booting: - MacOS 7.1 - 8.1, with or without virtual memory enabled - A/UX 3.0.1 - NetBSD 9.3 - Linux (via EMILE) -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmUiSrISHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L748oSUQAKAm3TPYQUDDVFTi2uhzv6IgNSgOVUhK 3I3xoNb0UR9AT3Wfg1fah5La3p0kL9Y25gvhCl6veUg39WVicv3fbqUevbJ1Nwgl ovwS3MRRcvYhU+omcXImFfoIPyOxfSf3vZ6SedIkB24hQyXN9eFBZMfgCODU6lfo rAd/Hm50N2jRI8aKjvN+uHFRz75wqq6rNk/4QLWihRqhtWrjUDPHOTMI9sQxWy9z LcXxVKbWCY8/WOAandsGL94l2jfu94HM6CfwHaumdxvPBZT6WUyCv3T1rJsVJU29 b8oTLcwKAmZ7lGLbjl6GdB8q5KAJFCAGLWuEbNIMj0orB37OpUd0Wx2SD9+aA53H yoKGbk6N1UappTtcnZCfwzWRzNaXrRno+w+/xYjlKsXBdHV9ZXHMGD5ERxoC6MY7 ISsCa4bafeUDes6SCetgq87ho69E8l+gAlNYPgidHaTP226BjrYWQRJIa0leczfO aE6dAG7MQFOnOjeOHEJMDB2XpKHiVe1lyVGQH485cLW1J6LHJFWUfUUH2Zjs1v1z eXZHBTclPO2wbuQzXG6pAz2jdF/9w4ft/aA0PQhQcFxa9RB6AoNFG/juHJN5eUiw NXJetR2g1juNPqmMFWDNMJ7Zzce5Chjoj69XJBFYSXhgbOtwpUpoEPZUeIMcW1eJ Va2HvyDQPp1B =RUHg -----END PGP SIGNATURE----- Merge tag 'q800-for-8.2-pull-request' of https://github.com/vivier/qemu-m68k into staging Pull request q800 20231008 add support for booting: - MacOS 7.1 - 8.1, with or without virtual memory enabled - A/UX 3.0.1 - NetBSD 9.3 - Linux (via EMILE) # -----BEGIN PGP SIGNATURE----- # # iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmUiSrISHGxhdXJlbnRA # dml2aWVyLmV1AAoJEPMMOL0/L748oSUQAKAm3TPYQUDDVFTi2uhzv6IgNSgOVUhK # 3I3xoNb0UR9AT3Wfg1fah5La3p0kL9Y25gvhCl6veUg39WVicv3fbqUevbJ1Nwgl # ovwS3MRRcvYhU+omcXImFfoIPyOxfSf3vZ6SedIkB24hQyXN9eFBZMfgCODU6lfo # rAd/Hm50N2jRI8aKjvN+uHFRz75wqq6rNk/4QLWihRqhtWrjUDPHOTMI9sQxWy9z # LcXxVKbWCY8/WOAandsGL94l2jfu94HM6CfwHaumdxvPBZT6WUyCv3T1rJsVJU29 # b8oTLcwKAmZ7lGLbjl6GdB8q5KAJFCAGLWuEbNIMj0orB37OpUd0Wx2SD9+aA53H # yoKGbk6N1UappTtcnZCfwzWRzNaXrRno+w+/xYjlKsXBdHV9ZXHMGD5ERxoC6MY7 # ISsCa4bafeUDes6SCetgq87ho69E8l+gAlNYPgidHaTP226BjrYWQRJIa0leczfO # aE6dAG7MQFOnOjeOHEJMDB2XpKHiVe1lyVGQH485cLW1J6LHJFWUfUUH2Zjs1v1z # eXZHBTclPO2wbuQzXG6pAz2jdF/9w4ft/aA0PQhQcFxa9RB6AoNFG/juHJN5eUiw # NXJetR2g1juNPqmMFWDNMJ7Zzce5Chjoj69XJBFYSXhgbOtwpUpoEPZUeIMcW1eJ # Va2HvyDQPp1B # =RUHg # -----END PGP SIGNATURE----- # gpg: Signature made Sun 08 Oct 2023 02:22:42 EDT # 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] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * tag 'q800-for-8.2-pull-request' of https://github.com/vivier/qemu-m68k: mac_via: extend timer calibration hack to work with A/UX q800: add alias for MacOS toolbox ROM at 0x40000000 q800: add ESCC alias at 0xc000 mac_via: always clear ADB interrupt when switching to A/UX mode mac_via: implement ADB_STATE_IDLE state if shift register in input mode mac_via: workaround NetBSD ADB bus enumeration issue mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK swim: update IWM/ISM register block decoding swim: split into separate IWM and ISM register blocks swim: add trace events for IWM and ISM registers q800: add easc bool machine class property to switch between ASC and EASC q800: add Apple Sound Chip (ASC) audio to machine asc: generate silence if FIFO empty but engine still running audio: add Apple Sound Chip (ASC) emulation q800: allow accesses to RAM area even if less memory is available q800: add IOSB subsystem q800: implement additional machine id bits on VIA1 port A q800: add machine id register q800: add djMEMC memory controller q800-glue.c: convert to Resettable interface Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
commit
f729410356
23 changed files with 1784 additions and 121 deletions
86
include/hw/audio/asc.h
Normal file
86
include/hw/audio/asc.h
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
/*
|
||||
* QEMU Apple Sound Chip emulation
|
||||
*
|
||||
* Apple Sound Chip (ASC) 344S0063
|
||||
* Enhanced Apple Sound Chip (EASC) 343S1063
|
||||
*
|
||||
* Copyright (c) 2012-2018 Laurent Vivier <laurent@vivier.eu>
|
||||
* Copyright (c) 2022 Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef HW_AUDIO_ASC_H
|
||||
#define HW_AUDIO_ASC_H
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "audio/audio.h"
|
||||
|
||||
#define ASC_FREQ 22257
|
||||
|
||||
enum {
|
||||
ASC_TYPE_ASC = 0, /* original discrete Apple Sound Chip */
|
||||
ASC_TYPE_EASC = 1 /* discrete Enhanced Apple Sound Chip */
|
||||
};
|
||||
|
||||
#define ASC_FIFO_OFFSET 0x0
|
||||
#define ASC_FIFO_SIZE 0x400
|
||||
|
||||
#define ASC_REG_OFFSET 0x800
|
||||
#define ASC_REG_SIZE 0x60
|
||||
|
||||
#define ASC_EXTREG_OFFSET 0xf00
|
||||
#define ASC_EXTREG_SIZE 0x20
|
||||
|
||||
typedef struct ASCFIFOState {
|
||||
int index;
|
||||
|
||||
MemoryRegion mem_fifo;
|
||||
uint8_t fifo[ASC_FIFO_SIZE];
|
||||
uint8_t int_status;
|
||||
|
||||
int cnt;
|
||||
int wptr;
|
||||
int rptr;
|
||||
|
||||
MemoryRegion mem_extregs;
|
||||
uint8_t extregs[ASC_EXTREG_SIZE];
|
||||
|
||||
int xa_cnt;
|
||||
uint8_t xa_val;
|
||||
uint8_t xa_flags;
|
||||
int16_t xa_last[2];
|
||||
} ASCFIFOState;
|
||||
|
||||
struct ASCState {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
uint8_t type;
|
||||
MemoryRegion asc;
|
||||
MemoryRegion mem_fifo;
|
||||
MemoryRegion mem_regs;
|
||||
MemoryRegion mem_extregs;
|
||||
|
||||
QEMUSoundCard card;
|
||||
SWVoiceOut *voice;
|
||||
uint8_t *mixbuf;
|
||||
int samples;
|
||||
int shift;
|
||||
|
||||
uint8_t *silentbuf;
|
||||
|
||||
/* Time when we were last able to generate samples */
|
||||
int64_t fifo_empty_ns;
|
||||
|
||||
qemu_irq irq;
|
||||
|
||||
ASCFIFOState fifos[2];
|
||||
|
||||
uint8_t regs[ASC_REG_SIZE];
|
||||
};
|
||||
|
||||
#define TYPE_ASC "apple-sound-chip"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(ASCState, ASC)
|
||||
|
||||
#endif
|
||||
|
|
@ -43,25 +43,22 @@ typedef struct FDrive {
|
|||
} FDrive;
|
||||
|
||||
struct SWIMCtrl {
|
||||
MemoryRegion iomem;
|
||||
MemoryRegion swim;
|
||||
MemoryRegion iwm;
|
||||
MemoryRegion ism;
|
||||
FDrive drives[SWIM_MAX_FD];
|
||||
int mode;
|
||||
/* IWM mode */
|
||||
int iwm_switch;
|
||||
uint16_t regs[8];
|
||||
#define IWM_PH0 0
|
||||
#define IWM_PH1 1
|
||||
#define IWM_PH2 2
|
||||
#define IWM_PH3 3
|
||||
#define IWM_MTR 4
|
||||
#define IWM_DRIVE 5
|
||||
#define IWM_Q6 6
|
||||
#define IWM_Q7 7
|
||||
uint8_t iwm_data;
|
||||
uint8_t iwm_mode;
|
||||
uint8_t iwm_latches;
|
||||
uint8_t iwmregs[8];
|
||||
/* SWIM mode */
|
||||
uint8_t ismregs[16];
|
||||
uint8_t swim_phase;
|
||||
uint8_t swim_mode;
|
||||
uint8_t swim_status;
|
||||
uint8_t pram[16];
|
||||
uint8_t pram_idx;
|
||||
SWIMBus bus;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ struct GLUEState {
|
|||
M68kCPU *cpu;
|
||||
uint8_t ipr;
|
||||
uint8_t auxmode;
|
||||
qemu_irq irqs[1];
|
||||
qemu_irq irqs[2];
|
||||
QEMUTimer *nmi_release;
|
||||
};
|
||||
|
||||
|
|
@ -44,7 +44,9 @@ 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
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -36,6 +36,9 @@
|
|||
#include "hw/block/swim.h"
|
||||
#include "hw/nubus/mac-nubus-bridge.h"
|
||||
#include "hw/display/macfb.h"
|
||||
#include "hw/misc/djmemc.h"
|
||||
#include "hw/misc/iosb.h"
|
||||
#include "hw/audio/asc.h"
|
||||
|
||||
/*
|
||||
* The main Q800 machine
|
||||
|
|
@ -44,8 +47,10 @@
|
|||
struct Q800MachineState {
|
||||
MachineState parent_obj;
|
||||
|
||||
bool easc;
|
||||
M68kCPU cpu;
|
||||
MemoryRegion rom;
|
||||
MemoryRegion rom_alias;
|
||||
GLUEState glue;
|
||||
MOS6522Q800VIA1State via1;
|
||||
MOS6522Q800VIA2State via2;
|
||||
|
|
@ -56,8 +61,14 @@ struct Q800MachineState {
|
|||
Swim swim;
|
||||
MacNubusBridge mac_nubus_bridge;
|
||||
MacfbNubusState macfb;
|
||||
DJMEMCState djmemc;
|
||||
IOSBState iosb;
|
||||
ASCState asc;
|
||||
MemoryRegion ramio;
|
||||
MemoryRegion macio;
|
||||
MemoryRegion macio_alias;
|
||||
MemoryRegion machine_id;
|
||||
MemoryRegion escc_alias;
|
||||
};
|
||||
|
||||
#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")
|
||||
|
|
|
|||
30
include/hw/misc/djmemc.h
Normal file
30
include/hw/misc/djmemc.h
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
* djMEMC, macintosh memory and interrupt controller
|
||||
* (Quadra 610/650/800 & Centris 610/650)
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef HW_MISC_DJMEMC_H
|
||||
#define HW_MISC_DJMEMC_H
|
||||
|
||||
#include "hw/sysbus.h"
|
||||
|
||||
#define DJMEMC_SIZE 0x2000
|
||||
#define DJMEMC_NUM_REGS (0x38 / sizeof(uint32_t))
|
||||
|
||||
#define DJMEMC_MAXBANKS 10
|
||||
|
||||
struct DJMEMCState {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion mem_regs;
|
||||
|
||||
/* Memory controller */
|
||||
uint32_t regs[DJMEMC_NUM_REGS];
|
||||
};
|
||||
|
||||
#define TYPE_DJMEMC "djMEMC"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(DJMEMCState, DJMEMC);
|
||||
|
||||
#endif
|
||||
25
include/hw/misc/iosb.h
Normal file
25
include/hw/misc/iosb.h
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* QEMU IOSB emulation
|
||||
*
|
||||
* Copyright (c) 2019 Laurent Vivier
|
||||
* Copyright (c) 2022 Mark Cave-Ayland
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef HW_MEM_IOSB_H
|
||||
#define HW_MEM_IOSB_H
|
||||
|
||||
#define IOSB_REGS 7
|
||||
|
||||
struct IOSBState {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion mem_regs;
|
||||
uint32_t regs[IOSB_REGS];
|
||||
};
|
||||
|
||||
#define TYPE_IOSB "IOSB"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(IOSBState, IOSB);
|
||||
|
||||
#endif
|
||||
|
|
@ -74,6 +74,9 @@ struct MOS6522Q800VIA1State {
|
|||
int64_t next_second;
|
||||
QEMUTimer *sixty_hz_timer;
|
||||
int64_t next_sixty_hz;
|
||||
|
||||
/* SETUPTIMEK hack */
|
||||
int timer_hack_state;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue