diff --git a/asm/include/cpm_buildversion.asm b/asm/include/cpm_buildversion.asm index cdc5619..c28c4fb 100644 --- a/asm/include/cpm_buildversion.asm +++ b/asm/include/cpm_buildversion.asm @@ -1 +1 @@ -BUILD_VERSION EQU 2 +BUILD_VERSION EQU 3 diff --git a/asm/include/cpm_definitions.asm b/asm/include/cpm_definitions.asm index 6520679..5f39302 100644 --- a/asm/include/cpm_definitions.asm +++ b/asm/include/cpm_definitions.asm @@ -7,7 +7,7 @@ ;- Definitions for the Sharp MZ80A CPM v2.23 OS used in the RFS ;- ;- Credits: -;- Copyright: (c) 2019-21 Philip Smart +;- Copyright: (c) 2019-23 Philip Smart ;- ;- History: Jan 2020 - Initial version. ; May 2020 - Advent of the new RFS PCB v2.0, quite a few changes to accommodate the @@ -15,6 +15,7 @@ ; not using the printer interface card. ; May 2020 - Cut from the RFS version of CPM for the tranZPUter SW board. ;- Apr 2021 - Updates backported from the RFS version of CPM. +;- Mar 2023 - Updates to accommodate the FusionX. ;- ;-------------------------------------------------------------------------------------------------------- ;- This source file is free software: you can redistribute it and-or modify @@ -53,6 +54,13 @@ BUILD_80C EQU 1 ; Build BUILD_VIDEOMODULE EQU 0 ; Build for the Video Module v2 board (=1) otherwise build for the 80Char Colour Board v1.0 BUILD_MZ80A EQU 1 ; Build for the Sharp MZ-80A base hardware. BUILD_MZ700 EQU 0 ; Build for the Sharp MZ-700 base hardware. +BUILD_80C EQU 0 ; Build for an 80 column (Video Module or 40/80 Colour Card) equipped machine, 0 = standard 40 column. + ENDIF + ; CPM for MZ-700 with with standard 40 column display. + IF BUILD_VERSION = 3 +BUILD_VIDEOMODULE EQU 0 ; Build for the Video Module v2 board (=1) otherwise build for the 80Char Colour Board v1.0 +BUILD_MZ80A EQU 0 ; Build for the Sharp MZ-80A base hardware. +BUILD_MZ700 EQU 1 ; Build for the Sharp MZ-700 base hardware. BUILD_80C EQU 0 ; Build for an 80 column (Video Module or 40/80 Colour Card) equipped machine, 0 = standard 40 column. ENDIF diff --git a/asm/include/tzfs_definitions.asm b/asm/include/tzfs_definitions.asm index 6390f17..c7af141 100644 --- a/asm/include/tzfs_definitions.asm +++ b/asm/include/tzfs_definitions.asm @@ -34,8 +34,8 @@ ;----------------------------------------------- ; Features. ;----------------------------------------------- -BUILD_MZ80A EQU 1 ; Build for the standard Sharp MZ80A, no lower memory. -BUILD_MZ700 EQU 0 ; Build for the Sharp MZ-700 base hardware. +BUILD_MZ80A EQU 0 ; Build for the standard Sharp MZ80A, no lower memory. +BUILD_MZ700 EQU 1 ; Build for the Sharp MZ-700 base hardware. BUILD_MZ2000 EQU 0 ; Build for the Sharp MZ-2000 base hardware. BUILD_FUSIONX EQU 1 ; Build for the set host using the FusionX board. diff --git a/hdr/cpm22_mz700_40c.hdr b/hdr/cpm22_mz700_40c.hdr new file mode 100644 index 0000000..1d77d5f Binary files /dev/null and b/hdr/cpm22_mz700_40c.hdr differ diff --git a/roms/mz80afi.rom b/roms/mz80afi.rom index 159ad02..abaea63 100644 Binary files a/roms/mz80afi.rom and b/roms/mz80afi.rom differ diff --git a/roms/tzfs.rom b/roms/tzfs.rom index e016ad3..735e555 100644 Binary files a/roms/tzfs.rom and b/roms/tzfs.rom differ diff --git a/tools/assemble_cpm.sh b/tools/assemble_cpm.sh index 6b2b7b0..b262498 100755 --- a/tools/assemble_cpm.sh +++ b/tools/assemble_cpm.sh @@ -12,6 +12,7 @@ ## ## History: January 2020 - Initial script written. ## February 2023 - Updated as TZFS extracted into seperate repository. +## Mar 2023 - Updates to accommodate FusionX. ## ######################################################################################################### ## This source file is free software: you can redistribute it and/or modify @@ -39,7 +40,7 @@ INCDIR=${ROOTDIR}/asm/include ROMDIR=${ROOTDIR}/roms # Compiled or source ROM files. HDRDIR=${ROOTDIR}/hdr # MZF headers directory. MZFDIR=${ROOTDIR}/MZF/Common # MZF Format source files. -CPMVERSIONS="mz700_80c:0 mz80a_80c:1 mz80a_40c:2" +CPMVERSIONS="mz700_80c:0 mz80a_80c:1 mz80a_40c:2 mz700_40c:3" # As the tranZPUter project has eveolved different variants of CP/M are needed, so this loop along with the CPMVERSIONS string builds the versions as needed. for ver in ${CPMVERSIONS}