TEST HELP fix, BUILD auto-number

Added a work-around for the TEST help printing error, and added a script to generate new build numbers.

.gitignore

@@ -65,3 +65,7 @@ src/foenixmcp_ram.bin
 src/foenixmcp_flash.bin
 src/bin/archive/foenixmcp_u_flash_20211111_03.bin
 src/bin/archive/foenixmcp_u_flash_20211112_06.bin
+src/bin/archive/foenixmcp_u_ram_20211206_02.bin
+src/bin/archive/foenixmcp_u_ram_20211206_01.bin
+src/bin/archive/foenixmcp_u_flash_20211206_02.bin
+src/bin/archive/foenixmcp_u_flash_20211206_01.bin

src/Makefile

@@ -17,14 +17,11 @@ export CPU=32
 # MODEL_FOENIX_A2560U         9
 # MODEL_FOENIX_A2560K         13
 export MODEL=9
-export VER_MAJOR = 0
-export VER_MINOR = 1
-export VER_BUILD = 11
 
 export AS = vasmm68k_mot
 export ASFLAGS = -quiet -Fvobj -nowarn=62
 export CC = vc
-export DEFINES = -DCPU=$(CPU) -DMODEL=$(MODEL) -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) -DVER_BUILD=$(VER_BUILD) # -DKBD_POLLED
+export DEFINES = -DCPU=$(CPU) -DMODEL=$(MODEL) # -DKBD_POLLED
 
 ifeq ($(OS),Windows_NT)
 	export CFLAGS = +$(VBCC)/config/m68k-foenix -I. -I$(CURDIR)/include -I$(CURDIR)

src/cli/test_cmd2.c

@@ -339,17 +339,22 @@ const t_cli_test_feature cli_test_features[] = {
     {"PSG", "PSG: test the PSG sound chip", psg_test},
     {"PRINT", "PRINT: sent text to the printer", cmd_test_print},
     {"UART", "UART: test the serial port", cli_test_uart},
-    {0, 0, 0}
+    {"END", "END", 0}
 };
 
 void test_help(short screen) {
     p_cli_test_feature f;
+    int i;
+    int count;
 
     print(screen, "USAGE: TEST <feature>\nFeatures supported...\n");
 
-    for (f = cli_test_features; f->name != 0; f++) {
-        print(screen, f->help);
-        print(screen, "\n");
+    count = sizeof(cli_test_features) / sizeof(t_cli_test_feature);
+    for (i = 0; i < count - 1; i++) {
+        if (cli_test_features[i].help != 0) {
+            print(screen, cli_test_features[i].help);
+            print(screen, "\n");
+        }
     }
 }
 

src/m68k/startup_m68k.s

@@ -123,15 +123,17 @@ coldboot:   lea ___STACK,sp
             bsr _int_disable_all
 
             ; Clear BSS segment
-            lea	   ___BSSSTART,a0            
+            lea	   ___BSSSTART,a0
             move.l #___BSSSIZE,d0
             beq.s  callmain
 
+            move.l #0,d1
+
 clrloop:    ; We don't use clr.l because it's a read-modify-write operation
             ; that is not yet supported by the FPGA's bus logic for now.
             ; So we use a move instead.
             ; clr.l  (a0)+
-            move.l #0,(a0)+
+            move.l d1,(a0)+
             subq.l #4,d0
             bne.s  clrloop
 

src/newbuild.py

@@ -0,0 +1,16 @@
+
+import re
+
+# Update version.h with a new build number
+
+with open("version.h") as ver:
+    lines = ver.readlines();
+
+with open("version.h", "w") as ver:
+    for line in lines:
+        match = re.match("\#define\s*VER_BUILD\s*(\d+)", line)
+        if match:
+            build = int(match.group(1)) + 1
+            ver.write('#define VER_BUILD {}\n'.format(build))
+        else:
+            ver.write(line)

src/sys_general.h

@@ -5,6 +5,7 @@
 #ifndef __SYS_GENERAL_H
 #define __SYS_GENERAL_H
 
+#include "version.h"
 #include "types.h"
 
 /* IDs for the various Foenix machines supported */

src/version.h

@@ -0,0 +1,12 @@
+/*
+ * Version numbers for the kernel
+ */
+
+#ifndef __VERSION_H
+#define __VERSION_H
+
+#define VER_MAJOR 0
+#define VER_MINOR 1
+#define VER_BUILD 1
+
+#endif