From 16ae2b068b2a782332d7f4dca8b2b03d5fb93e05 Mon Sep 17 00:00:00 2001 From: Philip Smart Date: Tue, 14 Feb 2023 12:04:30 +0000 Subject: [PATCH] Minor updates, some due to perl changes, discovered during FusionX port --- Manuals | 1 + software/asm/cbios.asm | 2 +- software/asm/cbios_bank1.asm | 2 +- software/asm/cbios_bank2.asm | 2 +- software/asm/cbios_bank3.asm | 2 +- software/asm/cbios_bank4.asm | 2 +- software/asm/cpm22-bios.asm | 2 +- software/asm/include/cpm_definitions.asm | 2 +- software/asm/include/msbasic_definitions.asm | 2 +- software/asm/include/rfs_definitions.asm | 3 +- software/asm/include/rfs_utilities.asm | 2 +- software/asm/msbasic.asm | 2 +- software/asm/rfs.asm | 29 +++++++++++-------- software/asm/rfs_bank1.asm | 2 +- software/asm/rfs_bank2.asm | 6 ++-- software/asm/rfs_bank3.asm | 2 +- software/asm/rfs_bank4.asm | 2 +- software/asm/rfs_bank5.asm | 2 +- software/asm/rfs_bank6.asm | 2 +- software/asm/rfs_bank7.asm | 2 +- software/asm/rfs_mrom.asm | 2 +- software/asm/sharpmz-test.asm | 2 +- software/roms/rfs.rom | Bin 16384 -> 16384 bytes software/tools/assemble_cpm.sh | 2 +- software/tools/assemble_rfs.sh | 2 +- software/tools/assemble_roms.sh | 2 +- software/tools/make_cpmdisks.sh | 2 +- software/tools/make_roms.sh | 2 +- software/tools/make_sdcard.sh | 2 +- software/tools/mzftool.pl | 5 ++-- software/tools/processMZFfiles.sh | 2 +- 31 files changed, 51 insertions(+), 43 deletions(-) create mode 120000 Manuals diff --git a/Manuals b/Manuals new file mode 120000 index 0000000..cdd54fb --- /dev/null +++ b/Manuals @@ -0,0 +1 @@ +../SharpSoft/Manuals \ No newline at end of file diff --git a/software/asm/cbios.asm b/software/asm/cbios.asm index 678e679..2538d02 100644 --- a/software/asm/cbios.asm +++ b/software/asm/cbios.asm @@ -10,7 +10,7 @@ ;- ;- Credits: Some of the comments and parts of the standard CPM deblocking/blocking algorithm ;- come from the Z80-MBC2 project, (C) SuperFabius. -;- Copyright: (c) 2018-21 Philip Smart +;- Copyright: (c) 2018-23 Philip Smart ;- ;- History: Jan 2020 - Seperated Bank from RFS for dedicated use with CPM CBIOS. ;- May 2020 - Advent of the new RFS PCB v2.0, quite a few changes to accommodate the diff --git a/software/asm/cbios_bank1.asm b/software/asm/cbios_bank1.asm index d6710dd..3b0bac8 100644 --- a/software/asm/cbios_bank1.asm +++ b/software/asm/cbios_bank1.asm @@ -9,7 +9,7 @@ ;- CPM TPA programs. ;- ;- Credits: -;- Copyright: (c) 2018-21 Philip Smart +;- Copyright: (c) 2018-23 Philip Smart ;- ;- History: Jan 2020 - Seperated Bank from RFS for dedicated use with CPM CBIOS. ;- May 2020 - Advent of the new RFS PCB v2.0, quite a few changes to accommodate the diff --git a/software/asm/cbios_bank2.asm b/software/asm/cbios_bank2.asm index d58ad5d..62cf113 100644 --- a/software/asm/cbios_bank2.asm +++ b/software/asm/cbios_bank2.asm @@ -12,7 +12,7 @@ ; Ansi Parser. ; ; (C) Oct 2000 - only the ansiterm.22b module was used with a lot stripped out. -;- Copyright: (c) 2018-21 Philip Smart +;- Copyright: (c) 2018-23 Philip Smart ;- ;- History: Jan 2020 - Seperated Bank from RFS for dedicated use with CPM CBIOS. ;- May 2020 - Advent of the new RFS PCB v2.0, quite a few changes to accommodate the diff --git a/software/asm/cbios_bank3.asm b/software/asm/cbios_bank3.asm index f44c7a6..0874837 100644 --- a/software/asm/cbios_bank3.asm +++ b/software/asm/cbios_bank3.asm @@ -9,7 +9,7 @@ ;- CPM TPA programs. ;- ;- Credits: -;- Copyright: (c) 2018-21 Philip Smart +;- Copyright: (c) 2018-23 Philip Smart ;- ;- History: Jan 2020 - Seperated Bank from RFS for dedicated use with CPM CBIOS. ;- May 2020 - Advent of the new RFS PCB v2.0, quite a few changes to accommodate the diff --git a/software/asm/cbios_bank4.asm b/software/asm/cbios_bank4.asm index 8e73da0..9af52f9 100644 --- a/software/asm/cbios_bank4.asm +++ b/software/asm/cbios_bank4.asm @@ -9,7 +9,7 @@ ;- CPM TPA programs. ;- ;- Credits: -;- Copyright: (c) 2018-21 Philip Smart +;- Copyright: (c) 2018-23 Philip Smart ;- ;- History: Jan 2020 - Seperated Bank from RFS for dedicated use with CPM CBIOS. ;- May 2020 - Advent of the new RFS PCB v2.0, quite a few changes to accommodate the diff --git a/software/asm/cpm22-bios.asm b/software/asm/cpm22-bios.asm index 8130790..ee74e5a 100644 --- a/software/asm/cpm22-bios.asm +++ b/software/asm/cpm22-bios.asm @@ -10,7 +10,7 @@ ;- ;- Credits: Some of the comments and parts of the deblocking/blocking algorithm come from the ; Z80-MBC2 project, (C) SuperFabius. -;- Copyright: (c) 2020 Philip Smart +;- Copyright: (c) 2020-2023 Philip Smart ;- ;- History: January 2020 - Initial creation. ;- diff --git a/software/asm/include/cpm_definitions.asm b/software/asm/include/cpm_definitions.asm index 877dab3..5daf9d6 100644 --- a/software/asm/include/cpm_definitions.asm +++ b/software/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 diff --git a/software/asm/include/msbasic_definitions.asm b/software/asm/include/msbasic_definitions.asm index f59ddcf..c272ddd 100644 --- a/software/asm/include/msbasic_definitions.asm +++ b/software/asm/include/msbasic_definitions.asm @@ -7,7 +7,7 @@ ;- Definitions for the Sharp MZ80A CPM v2.23 OS used in the RFS ;- ;- Credits: -;- Copyright: (c) 2019-20 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 diff --git a/software/asm/include/rfs_definitions.asm b/software/asm/include/rfs_definitions.asm index 2ca64f8..fcd4b57 100644 --- a/software/asm/include/rfs_definitions.asm +++ b/software/asm/include/rfs_definitions.asm @@ -7,7 +7,7 @@ ;- Definitions for the RFS including SA1510 locations. ;- ;- Credits: -;- Copyright: (c) 2019-21 Philip Smart +;- Copyright: (c) 2019-23 Philip Smart ;- ;- History: Sep 2019 - Initial version. ;- May 2020 - Advent of the new RFS PCB v2.0, quite a few changes to accommodate the @@ -40,6 +40,7 @@ HW_SPI_ENA EQU 1 ; Set to 1 if hardware SPI is present on the RFS PCB v2 board. SW_SPI_ENA EQU 0 ; Set to 1 if software SPI is present on the RFS PCB v2 board. PP_SPI_ENA EQU 0 ; Set to 1 if using the SPI interface via the Parallel Port, ie. for RFS PCB v1 which doesnt have SPI onboard. +FUSIONX_ENA EQU 1 ; Set to 1 if using RFS on the tranZPUter FusionX board. ; Debugging ENADEBUG EQU 0 ; Enable debugging logic, 1 = enable, 0 = disable diff --git a/software/asm/include/rfs_utilities.asm b/software/asm/include/rfs_utilities.asm index 6e063cc..a124819 100644 --- a/software/asm/include/rfs_utilities.asm +++ b/software/asm/include/rfs_utilities.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2019-20 Philip Smart +;- Copyright: (c) 2019-23 Philip Smart ;- ;- History: September 2018 - Merged 2 utilities to create this compilation. ;- diff --git a/software/asm/msbasic.asm b/software/asm/msbasic.asm index eb929b4..5eb7934 100644 --- a/software/asm/msbasic.asm +++ b/software/asm/msbasic.asm @@ -23,7 +23,7 @@ ; Original source is: (C) 1978 Microsoft ; Updates (some reversed out): Grant Searle, http://searle.hostei.com/grant/index.html ; eMail: home.micros01@btinternet.com -; All other updates (C) Philip Smart, 2020-21. http://www.eaw.app philip.smart\@net2net.org +; All other updates (C) Philip Smart, 2020-23. http://www.eaw.app philip.smart\@net2net.org ;----------------------------------------------------------------------------------------------- diff --git a/software/asm/rfs.asm b/software/asm/rfs.asm index c660902..9ddcbd8 100644 --- a/software/asm/rfs.asm +++ b/software/asm/rfs.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded @@ -174,17 +174,21 @@ ROMFS_3: LD (BNKSELMROM),A ; start ; ; Replacement command processor in place of the SA1510 command processor. ; -MONITOR: IN A,(CPLDINFO) ; See if a tranZPUter board is present. - AND 0E7H ; Mask out the CPLD Version and host HW. - LD C,A - CP 020H ; Upper bits specify the version, should be at least 1. - JR C,CHKTZ1 - AND 007H ; Get Hardware, should be an MZ-80A for RFS. - CP MODE_MZ80A - LD A,C - JR Z,CHKTZ1 - XOR A -CHKTZ1: AND 0E0H +MONITOR: IF FUSIONX_ENA = 0 + IN A,(CPLDINFO) ; See if a tranZPUter board is present. + AND 0E7H ; Mask out the CPLD Version and host HW. + LD C,A + CP 020H ; Upper bits specify the version, should be at least 1. + JR C,CHKTZ1 + AND 007H ; Get Hardware, should be an MZ-80A for RFS. + CP MODE_MZ80A + LD A,C + JR Z,CHKTZ1 + XOR A +CHKTZ1: AND 0E0H + ELSE + XOR A + ENDIF LD (TZPU), A ; Flag = 0 if no tranZPUter present otherwise contains version (1 - 15). LD HL,DSPCTL ; Setup address of display control register latch. ; @@ -226,6 +230,7 @@ SIGNON1: CALL DPCT SIGNON2: LD DE,MSGSON ; Sign on message, SIGNON3: LD HL,PRINTMSG CALL BKSW0to6 + ; JR ST1X ; Initialise SD card, report any errors. LD HL, SDINIT ; SD Card Initialisation diff --git a/software/asm/rfs_bank1.asm b/software/asm/rfs_bank1.asm index 81ccd50..6250a89 100644 --- a/software/asm/rfs_bank1.asm +++ b/software/asm/rfs_bank1.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded diff --git a/software/asm/rfs_bank2.asm b/software/asm/rfs_bank2.asm index 846ca14..69baa0b 100644 --- a/software/asm/rfs_bank2.asm +++ b/software/asm/rfs_bank2.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded @@ -388,7 +388,7 @@ SDCMD2: PUSH HL CALL SPIIN POP HL CP 0FFH - JR NZ,SDCMD4 + JR NZ,SDCMD4 ; If != 0xFF then byte received is response R1. DEC HL LD A,H OR L @@ -689,7 +689,7 @@ SD_READ1: ; A = ACMD to send CALL SDCMDNP ; Execute SD Command, parameters already loaded into command buffer. LD A,(SDBUF+6) ; Fetch result and store. AND A - JP NZ,SD_READ6 + JP NZ,SD_READ6 ; If R1 is positive then an error occurred, get out. LD HL,1000 ; Sit in a tight loop waiting for the data packet arrival (ie. not 0xFF). SD_READ2: PUSH HL diff --git a/software/asm/rfs_bank3.asm b/software/asm/rfs_bank3.asm index 958a31c..79d1cd3 100644 --- a/software/asm/rfs_bank3.asm +++ b/software/asm/rfs_bank3.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded diff --git a/software/asm/rfs_bank4.asm b/software/asm/rfs_bank4.asm index 4ef6a13..31377ad 100644 --- a/software/asm/rfs_bank4.asm +++ b/software/asm/rfs_bank4.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded diff --git a/software/asm/rfs_bank5.asm b/software/asm/rfs_bank5.asm index a3718a6..5bda0db 100644 --- a/software/asm/rfs_bank5.asm +++ b/software/asm/rfs_bank5.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded diff --git a/software/asm/rfs_bank6.asm b/software/asm/rfs_bank6.asm index 7ab5617..6a36a8b 100644 --- a/software/asm/rfs_bank6.asm +++ b/software/asm/rfs_bank6.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded diff --git a/software/asm/rfs_bank7.asm b/software/asm/rfs_bank7.asm index 5a17581..5f66f24 100644 --- a/software/asm/rfs_bank7.asm +++ b/software/asm/rfs_bank7.asm @@ -8,7 +8,7 @@ ;- the MZ-80A RFS hardware upgrade. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: July 2019 - Merged 2 utilities to create this compilation. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded diff --git a/software/asm/rfs_mrom.asm b/software/asm/rfs_mrom.asm index ddb2bd0..c234b2a 100644 --- a/software/asm/rfs_mrom.asm +++ b/software/asm/rfs_mrom.asm @@ -10,7 +10,7 @@ ;- the RFS can read the User Banks and extract required programs. ;- ;- Credits: -;- Copyright: (c) 2018-2020 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: Sep 2019 - Initial version. ; May 2020 - Bank switch changes with release of v2 pcb with coded latch. The coded diff --git a/software/asm/sharpmz-test.asm b/software/asm/sharpmz-test.asm index 35c9c2a..c08c31f 100644 --- a/software/asm/sharpmz-test.asm +++ b/software/asm/sharpmz-test.asm @@ -14,7 +14,7 @@ ;- 4. Graphics RAM Test ;- ;- Credits: -;- Copyright: (c) 2018 Philip Smart +;- Copyright: (c) 2018-2023 Philip Smart ;- ;- History: October 2018 - Merged 2 utilities to create this compilation. ;- diff --git a/software/roms/rfs.rom b/software/roms/rfs.rom index 0c717d75d86b1ad7dfc24e80a58b3e8618b30172..f09f95491cdcaf98978d012e9c3118261b65ba9f 100644 GIT binary patch delta 512 zcmZo@U~Fh$oX{xA{Q58u9e;cH=i9>^?+zQiJ8b{%aMHWO6%%KvF|MC@c_QPn$*GJ! zPP<+nz4|szXiI>dI0lxN=KQk&RwZ9hfbmo1_=vDPf#V5osqT+>;Pe{!R7M~!$h@dx2 zK0#rV&6&&m`b^}Dg+mALzngVtV+fOPAzCUXK z3Zv}`C!mH+4ri0&fa)%uT+8MuxAdL%zKah}*8OA9_yKg_7jub^{}ONftG;ke;pExl zlb^7;=pTRgFG7J)Sn8jqhRr`k3yZTC-YJ*~YXZU6e2JG}aTTDr!r71S4CKyUm>kZ& ga`FUrp-mh&4H#7>-?A_Sl025tj4GQmEN8F*05cQj-T(jq delta 559 zcmZo@U~Fh$oX{vK`uZ>s-F$nP``uxwcZXfx9S(eVxa8g8u8FhMgm33Rd+z^F!Ghx% z`#i3?CG5OR?+FiOJ?T)-@wTa8I_b~z83Oy=6%cP)$>Zl zC&VwJ;)Rk=NX-itpCG@8ls8O1K^c=(namYhUde#SB-WK zM!(-5Zh3Wf!sZ$#8%D+#lXo)f$n(5cU{+EPxX8xA$53G;Az<|P{n4w63=Ea-d<>jt zUrc6U(Pi8^*@(r8@%7|f7F9<3$&*=@at6EwIrpUCpw{_!gCSZNA;J$rca9ae*QsDvU| zLPT-hJ4SYfw;Lb|-hQ+((iE^`*nUz`@cmf>P*`nOH~}+EgH`bMdkOBtx(tH5-b*kG z#zI5Xj&VCo$*I=K*=(M2+uv#LyZG>A-9HA6AOCnYzL-mV{Fiv+U-gA+3MbFroP3GR zMgQize-R3d!czYm;|70xohH;_B~XtFE&%1s +## Copyright: (c) 2020-23 Philip Smart ## ## History: January 2020 - Initial script written. ## diff --git a/software/tools/assemble_rfs.sh b/software/tools/assemble_rfs.sh index 9e2dcd6..4f0c38a 100755 --- a/software/tools/assemble_rfs.sh +++ b/software/tools/assemble_rfs.sh @@ -9,7 +9,7 @@ ## into a ROM file using the GLASS Z80 assembler. ## ## Credits: -## Copyright: (c) 2018-21 Philip Smart +## Copyright: (c) 2018-23 Philip Smart ## ## History: August 2018 - Initial script written. ## diff --git a/software/tools/assemble_roms.sh b/software/tools/assemble_roms.sh index 9fdeb37..b10b389 100755 --- a/software/tools/assemble_roms.sh +++ b/software/tools/assemble_roms.sh @@ -9,7 +9,7 @@ ## into a ROM file using the GLASS Z80 assembler. ## ## Credits: -## Copyright: (c) 2018-21 Philip Smart +## Copyright: (c) 2018-23 Philip Smart ## ## History: August 2018 - Initial script written. ## March 2021 - Updated to compile different versions of Microsoft BASIC. diff --git a/software/tools/make_cpmdisks.sh b/software/tools/make_cpmdisks.sh index 975afd3..9fdbd11 100755 --- a/software/tools/make_cpmdisks.sh +++ b/software/tools/make_cpmdisks.sh @@ -12,7 +12,7 @@ ## Credit goes to Grant Searle for the CPM_MC series of disks which can be found on his ## multicomputer project and to the various CPM archives on the net. ## Credits: -## Copyright: (c) 2020 Philip Smart +## Copyright: (c) 2020-2023 Philip Smart ## ## History: Jan 2020 - Initial script written. ## May 2020 - Updated to allow 240/320K Rom RFS images to be built diff --git a/software/tools/make_roms.sh b/software/tools/make_roms.sh index 935b073..a9785ee 100755 --- a/software/tools/make_roms.sh +++ b/software/tools/make_roms.sh @@ -11,7 +11,7 @@ ## and flash the images created into the Flast ROMS. ## ## Credits: -## Copyright: (c) 2020-21 Philip Smart +## Copyright: (c) 2020-23 Philip Smart ## ## History: January 2020 - Initial script written. ## March 2021 - Updates for the RFS v2.1 board. diff --git a/software/tools/make_sdcard.sh b/software/tools/make_sdcard.sh index a5ed5cc..de71bc0 100755 --- a/software/tools/make_sdcard.sh +++ b/software/tools/make_sdcard.sh @@ -10,7 +10,7 @@ ## ie. + .. . ## ## Credits: -## Copyright: (c) 2020-21 Philip Smart +## Copyright: (c) 2020-23 Philip Smart ## ## History: March 2020 - Initial script written. ## March 2021 - Updated the file list and filter out files stored in the ROM Drives. diff --git a/software/tools/mzftool.pl b/software/tools/mzftool.pl index 996b588..44db196 100755 --- a/software/tools/mzftool.pl +++ b/software/tools/mzftool.pl @@ -10,12 +10,13 @@ ## Also useful to add headers to homegrow machine code programs. ## ## Credits: -## Copyright: (c) 2018-2021 Philip Smart +## Copyright: (c) 2018-2023 Philip Smart ## ## History: August 2018 - Initial script written. ## March 2021 - Updated to fix MZF header files. Some programs have encoded ASCII ## into the header along with other strange characters, these need to ## be in Sharp ASCII format. +## February 2023 - POSIX::tmpnam obsolete, using File::Temp::tmpnam ## ######################################################################################################### ## This source file is free software: you can redistribute it and#or modify @@ -46,7 +47,7 @@ use IO::File; use File::stat; use File::Copy; use Time::localtime; -use POSIX qw(tmpnam); +use File::Temp qw(tmpnam); use Env qw(KPLUSHOME3 SYBASE SYBASE_OCS DSQUERY); use sigtrap qw(die normal-signals); diff --git a/software/tools/processMZFfiles.sh b/software/tools/processMZFfiles.sh index 99e17b3..a5449f1 100755 --- a/software/tools/processMZFfiles.sh +++ b/software/tools/processMZFfiles.sh @@ -11,7 +11,7 @@ ## according to its configuration. ## ## Credits: -## Copyright: (c) 2020 Philip Smart +## Copyright: (c) 2020-2023 Philip Smart ## ## History: January 2020 - Initial script written. ## March 2021 - Small updates to pull programs from machine model sorted directories.