From 3a10e437c80d5bf58dd4db73bb50e1b8079b5967 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Sun, 15 Mar 2020 14:07:19 -0700 Subject: [PATCH] Update util.z80 --- Doc/Contrib/LinuxBuild.txt | 49 -------------------------------------- Source/CPM3/util.z80 | 4 ++-- 2 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 Doc/Contrib/LinuxBuild.txt diff --git a/Doc/Contrib/LinuxBuild.txt b/Doc/Contrib/LinuxBuild.txt deleted file mode 100644 index 6855fe0f..00000000 --- a/Doc/Contrib/LinuxBuild.txt +++ /dev/null @@ -1,49 +0,0 @@ -Assembling the RomWBW firmware under Linux. - -Note: This process is generally deprecated as it has not been maintained. -This document remains in the hope that someday it will be useful for -resurrecting a Linux build. - -Note: Updated on 6/25/2013 to eliminate the need for the separate Linux -makefile. The standard makefile now has conditionals to allow it to be -used under Windows or Linux (I hope) --WW - -This method has been used under Ubuntu Linux and may have to be adapted for -other distributions. It is a bit more involved than the Windows procedure. - -What you need -You will need the TASM assembler, make, dos2unix and cpmtools. - -The TASM assembler is shareware and the Linux version is only available as -source code from the Author. I found one bug during compiling version 3.2 for -Ubuntu. In /src/tasm.c change the reference CLK_TIC to CLOCKS_PER_SEC. -After compiling install the tasm executable to /usr/local/bin and the table -files to /usr/local/lib. If you choose to place them somewhere else you will -have to edit the "makefile.linux" file to suit. - -The make, dos2unix and cpmtools packages are found in the Linux repository and -installed as for any other package. - -Before assembly -Some changes need to be made to cater for the differences between Linux and the -DOS/Windows environments. The examples below refer to the /RomWBW/current -directory, you'll have to allow for the stable or branches directories if used. -These are all done from a terminal. (: is end of the command prompt) - -1. Go to the RomWBW Source directory.e.g. -:cd /n8vem/RomWBW/current/Source - -2. The Linux version of TASM can't handle the CR-LF line endings. So from the -command prompt use dos2unix to convert all the source files. -:~/RomWBW/current/Source dos2unix -f *.asm *.inc *.z80 *.lib diskdefs - -3. You'll have to alter the disk definitions for the cpmtools package to cater -for the new roms. Easiest way is to copy the one given in the source over the -old. This must be done as superuser. -:~/RomWBW/current/Source sudo cp diskdefs /etc/cpmtools/diskdefs - -4. From now on it's the same as using the DOS/Windows instructions in Build.txt. -Make any last changes, go to the Source directory and make -:~/RomWBW/current/Source make clean ; make - -DGG diff --git a/Source/CPM3/util.z80 b/Source/CPM3/util.z80 index 639c3312..28b39244 100644 --- a/Source/CPM3/util.z80 +++ b/Source/CPM3/util.z80 @@ -140,8 +140,8 @@ crlf: phex16: phex8: cout: -newline2: -newline: +crlf2: +crlf: halt endif