Updates after feedback and differing hardware platform states

software/asm/cbios.asm

@@ -35,9 +35,9 @@
 ;--------------------------------------------------------------------------------------------------------
 
             ; Bring in definitions and macros.
-            INCLUDE "CPM_BuildVersion.asm"
-            INCLUDE "CPM_Definitions.asm"
-            INCLUDE "Macros.asm"
+            INCLUDE "cpm_buildversion.asm"
+            INCLUDE "cpm_definitions.asm"
+            INCLUDE "macros.asm"
 
             ORG     CBIOSSTART
 

software/asm/cbios_bank1.asm

@@ -33,9 +33,9 @@
 ;--------------------------------------------------------------------------------------------------------
 
             ; Bring in definitions and macros.
-            INCLUDE "CPM_BuildVersion.asm"
-            INCLUDE "CPM_Definitions.asm"
-            INCLUDE "Macros.asm"
+            INCLUDE "cpm_buildversion.asm"
+            INCLUDE "cpm_definitions.asm"
+            INCLUDE "macros.asm"
 
             ;======================================
             ;

software/asm/cbios_bank2.asm

@@ -35,9 +35,9 @@
 ;--------------------------------------------------------------------------------------------------------
 
             ; Bring in definitions and macros.
-            INCLUDE "CPM_BuildVersion.asm"
-            INCLUDE "CPM_Definitions.asm"
-            INCLUDE "Macros.asm"
+            INCLUDE "cpm_buildversion.asm"
+            INCLUDE "cpm_definitions.asm"
+            INCLUDE "macros.asm"
 
             ;======================================
             ;

software/asm/cbios_bank3.asm

@@ -32,9 +32,9 @@
 ;--------------------------------------------------------------------------------------------------------
 
             ; Bring in definitions and macros.
-            INCLUDE "CPM_BuildVersion.asm"
-            INCLUDE "CPM_Definitions.asm"
-            INCLUDE "Macros.asm"
+            INCLUDE "cpm_buildversion.asm"
+            INCLUDE "cpm_definitions.asm"
+            INCLUDE "macros.asm"
 
             ;============================================================
             ;

software/asm/cbios_bank4.asm

@@ -32,9 +32,9 @@
 ;--------------------------------------------------------------------------------------------------------
 
             ; Bring in definitions and macros.
-            INCLUDE "CPM_BuildVersion.asm"
-            INCLUDE "CPM_Definitions.asm"
-            INCLUDE "Macros.asm"
+            INCLUDE "cpm_buildversion.asm"
+            INCLUDE "cpm_definitions.asm"
+            INCLUDE "macros.asm"
 
             ;============================================================
             ;

software/asm/cpm22.asm

@@ -9,9 +9,9 @@
 ;**************************************************************
 
            ; Bring in definitions and macros.
-           INCLUDE "CPM_BuildVersion.asm"
-           INCLUDE "CPM_Definitions.asm"
-           INCLUDE "Macros.asm"
+           INCLUDE "cpm_buildversion.asm"
+           INCLUDE "cpm_definitions.asm"
+           INCLUDE "macros.asm"
 ;
 ;   Set memory limit here. This is the amount of contigeous
 ; ram starting from 0000. CP/M will reside at the end of this space.

software/asm/include/CPM_BuildVersion.asm

@@ -1 +0,0 @@
-BUILD_VERSION EQU 0

software/asm/include/cpm_buildversion.asm

@@ -0,0 +1 @@
+BUILD_VERSION EQU 1

software/asm/include/cpm_definitions.asm

@@ -41,8 +41,8 @@ PP_SPI_ENA              EQU     0                                        ; Set t
 
 ; Build time options, only set to '1' to build, '0' to disable, only 1 can be set to '1'.
 ;                        IF BUILD_VERSION = 0
-BUILD_80C               EQU     0                                        ; Build for an MZ-80A with a 40/80 column card.
-BUILD_40C               EQU     1                                        ; Build for a standard 40 column MZ-80A.
+BUILD_80C               EQU     1                                        ; Build for an MZ-80A with a 40/80 column card.
+BUILD_40C               EQU     0                                        ; Build for a standard 40 column MZ-80A.
 ;                        ENDIF
 ;                        IF BUILD_VERSION = 1
 ;BUILD_80C               EQU     0                                        ; Build for an MZ-80A with a 40/80 column card.

software/asm/include/msbasic_buildversion.asm

@@ -0,0 +1 @@
+BUILD_VERSION EQU 2

software/asm/monitor_1z-013a.asm

@@ -4,4 +4,4 @@ ROW:    EQU     25                      ; Number of rows on display screen.
 SCRNSZ: EQU     COLW * ROW              ; Total size, in bytes, of the screen display area.
 MODE80C:EQU     0
 
-		INCLUDE "1Z-013A.asm"
+		INCLUDE "1z-013a.asm"

software/asm/monitor_80c_1z-013a.asm

@@ -4,4 +4,4 @@ ROW:    EQU     25                      ; Number of rows on display screen.
 SCRNSZ: EQU     COLW * ROW              ; Total size, in bytes, of the screen display area.
 MODE80C:EQU     1
 
-		INCLUDE "1Z-013A.asm"
+		INCLUDE "1z-013a.asm"

software/asm/msbasic.asm

@@ -28,9 +28,9 @@
 
 
             ; Bring in additional resources.
-            INCLUDE "MSBASIC_BuildVersion.asm"
-            INCLUDE "MSBASIC_Definitions.asm"
-            INCLUDE "Macros.asm"
+            INCLUDE "msbasic_buildversion.asm"
+            INCLUDE "msbasic_definitions.asm"
+            INCLUDE "macros.asm"
 
             ; Sharp MZ-80A Tape Format Header - used by all software including RFS/TZFS 
             ; in processing/loading of this file.

software/asm/mz80afi.asm

@@ -8,8 +8,8 @@
 ; on Thursday, 06 of February 2020 at 01:38 PM
 ; 
 i          ; Bring in additional resources.
-           INCLUDE "RFS_Definitions.asm"
-           INCLUDE "Macros.asm"
+           INCLUDE "rfs_definitions.asm"
+           INCLUDE "macros.asm"
 
 
            ;======================================

software/asm/rfs.asm

@@ -38,7 +38,7 @@
 ;--------------------------------------------------------------------------------------------------------
 
             ; Bring in additional resources.
-            INCLUDE "RFS_Definitions.asm"
+            INCLUDE "rfs_definitions.asm"
 
 
             ;============================================================
@@ -1319,8 +1319,8 @@ DEFAULTFNE: EQU     $
             USE_ISNUMERIC:    EQU   1
             USE_CNVSTRTONUM:  EQU   1
             ;
-            INCLUDE "Macros.asm"
-            INCLUDE "RFS_Utilities.asm"
+            INCLUDE "macros.asm"
+            INCLUDE "rfs_utilities.asm"
             ;
             ; Ensure we fill the entire 2K by padding with FF's.
             ;

software/asm/rfs_mrom.asm

@@ -735,9 +735,9 @@ LROMLOAD5: PUSH     AF
            USE_ISNUMERIC:    EQU   1
            USE_CNVSTRTONUM:  EQU   1
            ;
-           INCLUDE "Macros.asm"
-          ;INCLUDE "RFS_Definitions.asm"
-           INCLUDE "RFS_Utilities.asm"
+           INCLUDE "macros.asm"
+          ;INCLUDE "rfs_definitions.asm"
+           INCLUDE "rfs_utilities.asm"
 
            ; Ensure we fill the entire 4K by padding with FF's.
            ALIGN    1000H

software/asm/sa1510_hiload.asm

@@ -2727,7 +2727,7 @@ GAPCK3: JP      RET3
         ALIGN_NOPS 0D000H
 
         ; Bring in additional macros.
-        INCLUDE "Macros.asm"
+        INCLUDE "macros.asm"
 
         ;    MONITOR WORK AREA
         ;    (MZ700)

software/tools/assemble_cpm.sh

@@ -43,7 +43,7 @@ BLOCKSIZELIST="128 256"
 
 # Go through list and build images.
 #
-for f in ${BUILDROMLIST} ${BUILDMZFLIST}
+for f in ${BUILDROMLIST}
 do
     echo "Assembling: $f..."
 
@@ -59,7 +59,8 @@ do
         if [[ ${BUILDROMLIST} = *"${f}"* ]]; then
             echo "Copy ${ASMDIR}/${f}.obj to ${ROMDIR}/${f}.rom"
             cp ${ASMTMPDIR}/${f}.obj ${ROMDIR}/${f}.rom
-        else
+        fi
+        if [[ ${BUILDMZFLIST} = *"${f}"* ]]; then
             # Build standard MZF files for inclusion in the SD Drive.
             echo "Copy ${ASMDIR}/${f}.obj to ${MZFDIR}/${f}.mzf"
             cp ${ASMTMPDIR}/${f}.obj ${MZFDIR}/${f}.mzf

software/tools/assemble_roms.sh

@@ -34,9 +34,9 @@ TOOLDIR=${ROOTDIR}/software/tools
 JARDIR=${ROOTDIR}/software/tools
 ASM=glass.jar
 #BUILDROMLIST="MZ80AFI rfs rfs_mrom IPL monitor_SA1510 monitor_80c_SA1510 monitor_mz-1r12 quickdisk_mz-1e05 quickdisk_mz-1e14 monitor_1Z-013A monitor_80c_1Z-013A"
-BUILDROMLIST="monitor_SA1510_hiload monitor_80c_SA1510_hiload monitor_80c_SA1510 MZ80AFI monitor_SA1510 monitor_80c_SA1510 monitor_1Z-013A monitor_80c_1Z-013A IPL"
+BUILDROMLIST="monitor_sa1510_hiload monitor_80c_sa1510_hiload monitor_80c_sa1510 mz80afi monitor_sa1510 monitor_80c_sa1510 monitor_1z-013a monitor_80c_1z-013a ipl"
 #BUILDMZFLIST="hi-ramcheck sharpmz-test"
-BUILDMZFLIST="SA-5510_RFS MSBASIC_MZ80A MSBASIC_RFS40 MSBASIC_RFS80 sharpmz-test"
+BUILDMZFLIST="sa-5510_rfs msbasic_mz80a msbasic_rfs40 msbasic_rfs80 sharpmz-test"
 ASMDIR=${ROOTDIR}/software/asm
 ASMTMPDIR=${ROOTDIR}/software/tmp
 INCDIR=${ROOTDIR}/software/asm/include
@@ -59,20 +59,20 @@ do
     MZFNAME=${f}.MZF
 
     # Special handling for the 4 version of MS BASIC.
-    if [[ ${SRCNAME} = "MSBASIC_MZ80A" ]]; then
-        ASMNAME="MSBASIC.asm"
+    if [[ ${SRCNAME} = "msbasic_mz80a" ]]; then
+        ASMNAME="msbasic.asm"
         echo "BUILD_VERSION EQU 0" > ${INCDIR}/MSBASIC_BuildVersion.asm
-    elif [[ ${SRCNAME} = "MSBASIC_RFS40" ]]; then
-        ASMNAME="MSBASIC.asm"
+    elif [[ ${SRCNAME} = "msbasic_rfs40" ]]; then
+        ASMNAME="msbasic.asm"
         echo "BUILD_VERSION EQU 1" > ${INCDIR}/MSBASIC_BuildVersion.asm
-    elif [[ ${SRCNAME} = "MSBASIC_RFS80" ]]; then
-        ASMNAME="MSBASIC.asm"
+    elif [[ ${SRCNAME} = "msbasic_rfs80" ]]; then
+        ASMNAME="msbasic.asm"
         echo "BUILD_VERSION EQU 2" > ${INCDIR}/MSBASIC_BuildVersion.asm
-    elif [[ ${SRCNAME} = "MSBASIC_RFSTZ" ]]; then
-        ASMNAME="MSBASIC.asm"
+    elif [[ ${SRCNAME} = "msbasic_rfstz" ]]; then
+        ASMNAME="msbasic.asm"
         echo "BUILD_VERSION EQU 3" > ${INCDIR}/MSBASIC_BuildVersion.asm
-    elif [[ ${SRCNAME} = "MSBASIC_TZFS" ]]; then
-        ASMNAME="MSBASIC.asm"
+    elif [[ ${SRCNAME} = "msbasic_tzfs" ]]; then
+        ASMNAME="msbasic.asm"
         echo "BUILD_VERSION EQU 4" > ${INCDIR}/MSBASIC_BuildVersion.asm
     fi
 

software/tools/make_cpmdisks.sh

@@ -232,10 +232,10 @@ do
         CPMIMAGE=""
         echo "ALERT! ALERT! Couldnt find CPM image:${f}.RAW, not creating MZF file!"
     fi
-
     if [ "${CPMIMAGE}" != "" ]; then
         # Building is just a matter of concatenating together the heaader and the rom image.
-        cat "${HDRDIR}/${f}.HDR" "${CPMIMAGE}" > "${MZFDIR}/${f}.MZF"
+        #echo "cat \"${HDRDIR}/${f}.hdr\" \"${CPMIMAGE}\" > \"${MZFDIR}/${f}.mzf\""
+        cat "${HDRDIR}/${f}.hdr" "${CPMIMAGE}" > "${MZFDIR}/${f}.mzf"
 
         # Place the name of the file into the MZF list so that we create an MZF format binary from this image.
         (cd ${MZFDIR}; ls -l ${f}.MZF ${f}.mzf 2>/dev/null | sed 's/  / /g' | sed 's/  / /g' | cut -d' ' -f5,9- >> /tmp/filelist 2>/dev/null)
@@ -247,7 +247,7 @@ IFS=' '; while read -r FSIZE FNAME;
 do
   TNAME=`echo $FNAME | sed 's/mzf/MZF/g'`
   if [ "$FNAME" != "$TNAME" ]; then
-      mv "$FNAME" "$TNAME"
+      mv "${MZFDIR}/$FNAME" "${MZFDIR}/$TNAME"
   fi
   for BLOCKSIZE in ${BLOCKSIZELIST}
   do

software/tools/make_sdcard.sh

@@ -64,7 +64,7 @@ function addFileToImage
     # Use the File Type and ROM File List to filter out duplicates.
     #
     if [[ ${FILETYPE} == $ft ]] || [[ ${FORMAT} -eq 1 ]]; then
-        grep `basename "${FILENAME}" .MZF` ${ROM_LIST_FILE} > /dev/null
+        grep `basename "${FILENAME}" .mzf` ${ROM_LIST_FILE} > /dev/null
         if [ $? -eq 1 -o ${FILTER} -eq 0 ]; then
 
             # Filter out CPM ROM Drive images.
@@ -115,7 +115,7 @@ function addMachineFiles
     elif [[ ${FORMAT} -eq 1 ]] && [[ "${SRCDIR}" == "BAS"  ]]; then
         FILELIST=`(cd ${MZF_PATH}/${SRCDIR}; ls *.bas)`
     else
-        FILELIST=`(cd ${MZF_PATH}/${SRCDIR}; ls *.MZF)`
+        FILELIST=`(cd ${MZF_PATH}/${SRCDIR}; ls *.mzf)`
     fi
 
     for f in ${FILELIST}

software/tools/processMZFfiles.sh

@@ -61,7 +61,7 @@ do
     do
       FDIRNAME=`dirname ${FNAME}`
       FILENAME=`basename ${FNAME}`
-      TNAME=`echo $FILENAME | sed 's/mzf/MZF/g'`
+      TNAME=`echo $FILENAME | sed 's/MZF/mzf/g'`
       if [ "${FILENAME}" != "${TNAME}" ]; then
           mv "${FILENAME}" "${TNAME}"
       fi
@@ -70,7 +70,7 @@ do
       do
           for SECTORSIZE in `seq -s ' ' ${BLOCKSIZE} ${BLOCKSIZE} 524288`
           do
-            BASE=`basename "$TNAME" .MZF`
+            BASE=`basename "$TNAME" .mzf`
             if [ `echo ${FSIZE} - ${SECTORSIZE}   | bc` -le 0 ];
             then
                 echo $BASE $TNAME $SECTORSIZE