From patchwork Wed Oct 4 08:37:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Cave-Ayland X-Patchwork-Id: 1843074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (4096-bit key; unprotected) header.d=ilande.co.uk header.i=@ilande.co.uk header.a=rsa-sha256 header.s=20220518 header.b=BTJ/YRbD; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S0p4z6tMJz1ypx for ; Wed, 4 Oct 2023 19:38:58 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnxOf-0003co-U4; Wed, 04 Oct 2023 04:38:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnxOe-0003b6-0H for qemu-devel@nongnu.org; Wed, 04 Oct 2023 04:38:20 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnxOc-0007Si-5y for qemu-devel@nongnu.org; Wed, 04 Oct 2023 04:38:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YV8nHNcsbd6o0yGcY5ig1X5fdu4k3mrgqEfaSSZLg8A=; b=BTJ/YRbDdON+C0GKCYIq4OKa87 Yt2lEZctJzanTgqZ23YQsf0wpw5G2+iDKQAKwP1bdHARd1wLcYspSG7bpmpQL9Fr7nl3cAmuMmc1j CTJaaQaYpMtC6pl1OZmutRUVU/lLSKqFj13lBkLxzt1ov+6kQPDDJTfBJDnBNuasBbuHv2Hs/gRk1 FRXZj8b2KlCDllhHbE9bCswsDajD3NIZxoHFbGFInZZu5S0WeSwrX6dy9PdmH2YqtLnrsb3dkTKVJ qIwDUZf784dOiJsMvnEiuzLZOe4ACzQY0QMtHDMLm5CTmzPcoh40zEyuMgnPs47jjutSYPv/ZnrB1 Fdx5+aQ2t4YV8Ik0sL/owuSbyLUo0RTQhDpp+88DgTvqz0e+oAyX/5T3fLli/xtWr8IHiPr0OKayM 6Cki2QAn+gBdQKJxB18ya2a0x9zCDLGUQFoxsx+NicLHyDkuEAk9KAHL+Qi2MNU8Bsdd8CMZMtR5L 6wbIrPoreh3pVwyMC5uUD5o1p/HRPoho0I9yDuWfgkLiDxr3ywo5rq6Qoub0+30tQqW1oLSt5nddv hMbDbUXml9IKXUxiBZvd3/FXDO5hexVia67UXKgjjfCeSA4asGVD07cZGvvI4+00YPjOOa0+RHQL6 TUFjCAOz4syDuMlNGQBB7ugFTimf2o4wAA3Hz1+IA=; Received: from host86-159-123-68.range86-159.btcentralplus.com ([86.159.123.68] helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qnxOI-0006za-RW; Wed, 04 Oct 2023 09:38:03 +0100 From: Mark Cave-Ayland To: laurent@vivier.eu, qemu-devel@nongnu.org Date: Wed, 4 Oct 2023 09:37:46 +0100 Message-Id: <20231004083806.757242-1-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 86.159.123.68 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v4 00/20] q800: add support for booting MacOS Classic - part 2 X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This series contains the remaining patches needed to allow QEMU's q800 machine to boot MacOS Classic when used in conjunction with a real Quadra 800 ROM image. In fact with this series applied it is possible to boot all of the following OSs: - MacOS 7.1 - 8.1, with or without virtual memory enabled - A/UX 3.0.1 - NetBSD 9.3 - Linux (via EMILE) If you are ready to experience some 90s nostalgia then all you need is to grab yourself a copy of the Quadra 800 ROM (checksum 0xf1acad13) and a suitable install ISO as follows: # Prepare a PRAM image $ qemu-img create -f raw pram.img 256b # Launch QEMU with blank disk and install CDROM $ ./qemu-system-m68k \ -M q800 \ -m 128 \ -bios Quadra800.rom \ -drive file=pram.img,format=raw,if=mtd \ -drive file=disk.img,media=disk,format=raw,if=none,id=hd \ -device scsi-hd,scsi-id=0,drive=hd \ -drive file=cdrom.iso,media=cdrom,if=none,id=cd \ -device scsi-cd,scsi-id=3,drive=cd And off you go! For more in-depth information about the installation process I highly recommend the installation guide over at emaculation.com [1]. Compatibility is generally very good, and I'm pleased to report it is possible to run one of the most popular productivity apps from the 90s [2]. I'd like to add a big thank you to all the people who have helped me work on this series, including testing on real hardware, answering questions about MacOS Classic internals and helping to diagnose and fix bugs in the 68k emulation. In particular thanks go to Laurent Vivier, Finn Thain, Howard Spoelstra, Volker Rümelin, Richard Henderson, Martin Husemann, Rin Okuyama, Elliot Nunn, and SolraBizna. Signed-off-by: Mark Cave-Ayland [1] https://www.emaculation.com/doku.php/qemu [2] https://www.youtube.com/watch?v=yI21gURQ1Ew v4: - Rebase onto master - Add R-B tag from Zoltan to patch 5 - Adjust AUD_register_card() and add machine audiodev property for ASC to reflect Paolo's recent audiodev changes v3: - Rebase onto master - Add R-B tags from Laurent - Squash fixes from Volker into patch 7 ("audio: add Apple Sound Chip (ASC) emulation") - Change iwmregs from uint16_t to uint8_t in patch 12 ("swim: split into separate IWM and ISM register blocks") v2: - Rebase onto master - Add R-B tags from Phil and Laurent - Improve ASC logic for generating interrupts when FIFO underflow occurs - Rework ASC silence generation logic similar to Volker's original proposal - Update A/UX timer calibration hack to reflect the change of accesses now that #360 is resolved Mark Cave-Ayland (20): q800-glue.c: convert to Resettable interface q800: add djMEMC memory controller q800: add machine id register q800: implement additional machine id bits on VIA1 port A q800: add IOSB subsystem q800: allow accesses to RAM area even if less memory is available audio: add Apple Sound Chip (ASC) emulation asc: generate silence if FIFO empty but engine still running q800: add Apple Sound Chip (ASC) audio to machine q800: add easc bool machine class property to switch between ASC and EASC swim: add trace events for IWM and ISM registers swim: split into separate IWM and ISM register blocks swim: update IWM/ISM register block decoding mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK mac_via: workaround NetBSD ADB bus enumeration issue mac_via: implement ADB_STATE_IDLE state if shift register in input mode mac_via: always clear ADB interrupt when switching to A/UX mode q800: add ESCC alias at 0xc000 q800: add alias for MacOS toolbox ROM at 0x40000000 mac_via: extend timer calibration hack to work with A/UX MAINTAINERS | 6 + hw/audio/Kconfig | 3 + hw/audio/asc.c | 727 ++++++++++++++++++++++++++++++++++++ hw/audio/meson.build | 1 + hw/audio/trace-events | 10 + hw/block/swim.c | 261 ++++++++----- hw/block/trace-events | 8 + hw/m68k/Kconfig | 3 + hw/m68k/q800-glue.c | 18 +- hw/m68k/q800.c | 138 ++++++- hw/misc/Kconfig | 6 + hw/misc/djmemc.c | 135 +++++++ hw/misc/iosb.c | 133 +++++++ hw/misc/mac_via.c | 234 +++++++++++- hw/misc/meson.build | 2 + hw/misc/trace-events | 10 + include/hw/audio/asc.h | 86 +++++ include/hw/block/swim.h | 21 +- include/hw/m68k/q800-glue.h | 4 +- include/hw/m68k/q800.h | 11 + include/hw/misc/djmemc.h | 30 ++ include/hw/misc/iosb.h | 25 ++ include/hw/misc/mac_via.h | 3 + 23 files changed, 1769 insertions(+), 106 deletions(-) create mode 100644 hw/audio/asc.c create mode 100644 hw/misc/djmemc.c create mode 100644 hw/misc/iosb.c create mode 100644 include/hw/audio/asc.h create mode 100644 include/hw/misc/djmemc.h create mode 100644 include/hw/misc/iosb.h