Miscellaneous

- Correct and enhance some diskdefs entries.  Added RC2014 definitions.
- Change NETBOOT binary from 32K to 8K

Source/BPBIOS/diskdefs

@@ -416,7 +416,6 @@ diskdef wbw_hd512_3
   os 2.2
 end
 
-
 # RomWBW 8MB Hard Disk (1024 directory entry format)
 # New format, 1024 dir entries, 16,384 sectors / slice
 # Pure filesystem image, no MBR prefix
@@ -432,7 +431,7 @@ diskdef wbw_hd1024
 end
 
 # First 4 slices of wbw_hd1024
-# Assumes 128KB prefix (256 sectors)
+# Assumes 1MB prefix (2048 sectors)
 diskdef wbw_hd1024_0
   seclen 512
   tracks 1040
@@ -440,7 +439,7 @@ diskdef wbw_hd1024_0
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 18
+  boottrk 130
   os 2.2
 end
 
@@ -451,7 +450,7 @@ diskdef wbw_hd1024_1
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 1042
+  boottrk 1154
   os 2.2
 end
 
@@ -462,7 +461,7 @@ diskdef wbw_hd1024_2
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 2066
+  boottrk 2178
   os 2.2
 end
 
@@ -473,6 +472,225 @@ diskdef wbw_hd1024_3
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 3114
+  boottrk 3202
+  os 2.2
+end
+
+# SmallZ80 Hard Disk Image
+# 5 slices
+diskdef smz80_hd0
+  seclen 512
+  tracks 1034
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 10
+  os 2.2
+end
+
+diskdef smz80_hd1
+  seclen 512
+  tracks 2058
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 1034
+  os 2.2
+end
+
+diskdef smz80_hd2
+  seclen 512
+  tracks 1034
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 2058
+  os 2.2
+end
+
+diskdef smz80_hd3
+  seclen 512
+  tracks 4106
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 3082
+  os 2.2
+end
+
+diskdef smz80_hd4
+  seclen 512
+  tracks 5130
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 4106
+  os 2.2
+end
+
+# RC2014 standard hard disk image
+# Slices A-P
+diskdef rc2014a
+  seclen 512
+  tracks 512
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1
+  os 2.2
+end
+
+diskdef rc2014b
+  seclen 512
+  tracks 1024
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 512
+  os 2.2
+end
+
+diskdef rc2014c
+  seclen 512
+  tracks 1536
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1024
+  os 2.2
+end
+
+diskdef rc2014d
+  seclen 512
+  tracks 2048
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1536
+  os 2.2
+end
+
+diskdef rc2014e
+  seclen 512
+  tracks 2560
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 2048
+  os 2.2
+end
+
+diskdef rc2014f
+  seclen 512
+  tracks 3072
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 2560
+  os 2.2
+end
+
+diskdef rc2014g
+  seclen 512
+  tracks 3584
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 3072
+  os 2.2
+end
+
+diskdef rc2014h
+  seclen 512
+  tracks 4096
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 3584
+  os 2.2
+end
+
+diskdef rc2014i
+  seclen 512
+  tracks 4608
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 4096
+  os 2.2
+end
+
+diskdef rc2014j
+  seclen 512
+  tracks 5120
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 4608
+  os 2.2
+end
+
+diskdef rc2014k
+  seclen 512
+  tracks 5632
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 5120
+  os 2.2
+end
+
+diskdef rc2014l
+  seclen 512
+  tracks 6144
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 5632
+  os 2.2
+end
+
+diskdef rc2014m
+  seclen 512
+  tracks 6656
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 6144
+  os 2.2
+end
+
+diskdef rc2014n
+  seclen 512
+  tracks 7168
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 6656
+  os 2.2
+end
+
+diskdef rc2014o
+  seclen 512
+  tracks 7680
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 7168
+  os 2.2
+end
+
+diskdef rc2014p
+  seclen 512
+  tracks 7808
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 7680
   os 2.2
 end

Source/HBIOS/Build.ps1

@@ -170,7 +170,7 @@ ROMSIZE		.EQU		${ROMSize}
 Copy-Item '..\Fonts\font*.asm' '.'
 
 # Assemble individual components.  Note in the case of UNA, there is less to build.
-$RomComponentList = "dbgmon", "romldr", "eastaegg", "imgpad"
+$RomComponentList = "dbgmon", "romldr", "eastaegg"
 ForEach ($RomComponentName in $RomComponentList) {Asm $RomComponentName}
 
 if ($Platform -ne "UNA")
@@ -184,6 +184,7 @@ if ($Platform -ne "UNA")
 	Asm 'game'
 	Asm 'usrrom'
 	Asm 'imgpad1'
+	Asm 'imgpad2'
 }
 
 #
@@ -202,7 +203,7 @@ Concat 'romldr.bin', 'eastaegg.bin','dbgmon.bin', "..\zsdos\zsys_${Bios}.bin" os
 if ($Platform -ne "UNA")
 {
 	Concat '..\Forth\camel80.bin', 'nascom.bin', 'tastybasic.bin', 'game.bin', 'imgpad1.bin', 'usrrom.bin' osimg1.bin
-	Concat 'netboot.mod' osimg2.bin
+	Concat 'netboot.mod', 'imgpad2.bin' osimg2.bin
 }
 
 #

Source/HBIOS/Build.sh

@@ -99,10 +99,10 @@ done
 
 cp ../Forth/camel80.bin .
 
-make dbgmon.bin romldr.bin eastaegg.bin imgpad1.bin
+make dbgmon.bin romldr.bin eastaegg.bin imgpad1.bin imgpad2.bin
 
 if [ $platform != UNA ] ; then
-	make nascom.bin tastybasic.bin game.bin usrrom.bin imgpad1.bin
+	make nascom.bin tastybasic.bin game.bin usrrom.bin imgpad1.bin imgpad2.bin
 	make hbios_rom.bin hbios_app.bin hbios_img.bin
 fi
 
@@ -113,7 +113,7 @@ cat romldr.bin eastaegg.bin dbgmon.bin ../ZSDOS/zsys_$BIOS.bin >osimg_small.bin
 
 if [ $platform != UNA ] ; then
 	cat camel80.bin nascom.bin tastybasic.bin game.bin imgpad1.bin usrrom.bin >osimg1.bin
-	cat netboot.mod >osimg2.bin
+	cat netboot.mod imgpad2.bin >osimg2.bin
 fi
 
 echo "Building ${romsize}KB $romname ROM disk data file..."

Source/HBIOS/Makefile

@@ -34,8 +34,8 @@ else
 endif
 
 MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \
-	dbgmon.bin hbios_app.bin imgpad1.bin osimg1.bin osimg2.bin romldr.bin \
-	eastaegg.bin hbios_img.bin imgpad.bin osimg.bin tastybasic.bin \
+	dbgmon.bin hbios_app.bin imgpad1.bin imgpad2.bin osimg1.bin osimg2.bin romldr.bin \
+	eastaegg.bin hbios_img.bin osimg.bin tastybasic.bin \
 	game.bin usrrom.bin
 
 SUBDIRS =

Source/HBIOS/diskdefs

@@ -416,7 +416,6 @@ diskdef wbw_hd512_3
   os 2.2
 end
 
-
 # RomWBW 8MB Hard Disk (1024 directory entry format)
 # New format, 1024 dir entries, 16,384 sectors / slice
 # Pure filesystem image, no MBR prefix
@@ -432,7 +431,7 @@ diskdef wbw_hd1024
 end
 
 # First 4 slices of wbw_hd1024
-# Assumes 128KB prefix (256 sectors)
+# Assumes 1MB prefix (2048 sectors)
 diskdef wbw_hd1024_0
   seclen 512
   tracks 1040
@@ -440,7 +439,7 @@ diskdef wbw_hd1024_0
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 18
+  boottrk 130
   os 2.2
 end
 
@@ -451,7 +450,7 @@ diskdef wbw_hd1024_1
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 1042
+  boottrk 1154
   os 2.2
 end
 
@@ -462,7 +461,7 @@ diskdef wbw_hd1024_2
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 2066
+  boottrk 2178
   os 2.2
 end
 
@@ -473,6 +472,225 @@ diskdef wbw_hd1024_3
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 3114
+  boottrk 3202
+  os 2.2
+end
+
+# SmallZ80 Hard Disk Image
+# 5 slices
+diskdef smz80_hd0
+  seclen 512
+  tracks 1034
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 10
+  os 2.2
+end
+
+diskdef smz80_hd1
+  seclen 512
+  tracks 2058
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 1034
+  os 2.2
+end
+
+diskdef smz80_hd2
+  seclen 512
+  tracks 1034
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 2058
+  os 2.2
+end
+
+diskdef smz80_hd3
+  seclen 512
+  tracks 4106
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 3082
+  os 2.2
+end
+
+diskdef smz80_hd4
+  seclen 512
+  tracks 5130
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 4106
+  os 2.2
+end
+
+# RC2014 standard hard disk image
+# Slices A-P
+diskdef rc2014a
+  seclen 512
+  tracks 512
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1
+  os 2.2
+end
+
+diskdef rc2014b
+  seclen 512
+  tracks 1024
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 512
+  os 2.2
+end
+
+diskdef rc2014c
+  seclen 512
+  tracks 1536
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1024
+  os 2.2
+end
+
+diskdef rc2014d
+  seclen 512
+  tracks 2048
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1536
+  os 2.2
+end
+
+diskdef rc2014e
+  seclen 512
+  tracks 2560
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 2048
+  os 2.2
+end
+
+diskdef rc2014f
+  seclen 512
+  tracks 3072
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 2560
+  os 2.2
+end
+
+diskdef rc2014g
+  seclen 512
+  tracks 3584
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 3072
+  os 2.2
+end
+
+diskdef rc2014h
+  seclen 512
+  tracks 4096
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 3584
+  os 2.2
+end
+
+diskdef rc2014i
+  seclen 512
+  tracks 4608
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 4096
+  os 2.2
+end
+
+diskdef rc2014j
+  seclen 512
+  tracks 5120
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 4608
+  os 2.2
+end
+
+diskdef rc2014k
+  seclen 512
+  tracks 5632
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 5120
+  os 2.2
+end
+
+diskdef rc2014l
+  seclen 512
+  tracks 6144
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 5632
+  os 2.2
+end
+
+diskdef rc2014m
+  seclen 512
+  tracks 6656
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 6144
+  os 2.2
+end
+
+diskdef rc2014n
+  seclen 512
+  tracks 7168
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 6656
+  os 2.2
+end
+
+diskdef rc2014o
+  seclen 512
+  tracks 7680
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 7168
+  os 2.2
+end
+
+diskdef rc2014p
+  seclen 512
+  tracks 7808
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 7680
   os 2.2
 end

Source/HBIOS/imgpad2.asm

@@ -0,0 +1,12 @@
+#INCLUDE "std.asm"
+;
+SLACK		.EQU	($8000-NET_SIZ)
+		.FILL	SLACK,00H
+;
+MON_STACK	.EQU	$
+;
+		.ECHO	"Padspace space created: "
+		.ECHO	SLACK
+		.ECHO	" bytes.\n"
+
+		.END

Source/HBIOS/std.asm

@@ -542,7 +542,7 @@ USR_SIZ		.EQU	$1000
 USR_END		.EQU	USR_LOC + USR_SIZ
 
 NET_LOC		.EQU	$0100			; NETWORK BOOT
-NET_SIZ		.EQU	$8000
+NET_SIZ		.EQU	$2000
 NET_END		.EQU	NET_LOC + NET_SIZ
 
 MON_DSKY	.EQU	MON_LOC + (0 * 3)	; MONITOR ENTRY (DSKY)

Source/HBIOS/usrrom.asm

@@ -47,21 +47,12 @@ COUT:	PUSH	AF
 	LD	C,0
 	LD	E,A
 	RST	08
-	CALL	$FFF0
 	POP	HL
 	POP	DE
 	POP	BC
 	POP	AF
 	RET
 ;
-; OUTPUT CHARACTER IN A TO CONSOLE DEVICE
-;
-COUTE:	PUSH	AF
-	LD	A,E
-	CALL	COUT
-	POP	AF
-	RET
-;
 ; WAIT FOR A CHARACTER FROM THE CONSOLE DEVICE AND RETURN IT IN A
 ;
 CIN:	PUSH	BC
@@ -80,6 +71,9 @@ BOOTMSG:.DB	CR,LF,CR,LF
 	.DB	"No User ROM Installed."
 	.DB	CR,LF,CR,LF
 	.DB	"Press a key to return to Boot Loader.$"
+;
+; IT IS CRITICAL THAT THE FINAL BINARY BE EXACTLY USR_SIZ BYTES.
+; THIS GENERATES FILLER AS NEEDED.
 ;				
 SLACK	.EQU	(USR_END - $)
 	.FILL	SLACK,00

Source/Images/diskdefs

@@ -416,7 +416,6 @@ diskdef wbw_hd512_3
   os 2.2
 end
 
-
 # RomWBW 8MB Hard Disk (1024 directory entry format)
 # New format, 1024 dir entries, 16,384 sectors / slice
 # Pure filesystem image, no MBR prefix
@@ -432,7 +431,7 @@ diskdef wbw_hd1024
 end
 
 # First 4 slices of wbw_hd1024
-# Assumes 128KB prefix (256 sectors)
+# Assumes 1MB prefix (2048 sectors)
 diskdef wbw_hd1024_0
   seclen 512
   tracks 1040
@@ -440,7 +439,7 @@ diskdef wbw_hd1024_0
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 18
+  boottrk 130
   os 2.2
 end
 
@@ -451,7 +450,7 @@ diskdef wbw_hd1024_1
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 1042
+  boottrk 1154
   os 2.2
 end
 
@@ -462,7 +461,7 @@ diskdef wbw_hd1024_2
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 2066
+  boottrk 2178
   os 2.2
 end
 
@@ -473,6 +472,225 @@ diskdef wbw_hd1024_3
   blocksize 4096
   maxdir 1024
   skew 0
-  boottrk 3114
+  boottrk 3202
+  os 2.2
+end
+
+# SmallZ80 Hard Disk Image
+# 5 slices
+diskdef smz80_hd0
+  seclen 512
+  tracks 1034
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 10
+  os 2.2
+end
+
+diskdef smz80_hd1
+  seclen 512
+  tracks 2058
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 1034
+  os 2.2
+end
+
+diskdef smz80_hd2
+  seclen 512
+  tracks 1034
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 2058
+  os 2.2
+end
+
+diskdef smz80_hd3
+  seclen 512
+  tracks 4106
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 3082
+  os 2.2
+end
+
+diskdef smz80_hd4
+  seclen 512
+  tracks 5130
+  sectrk 16
+  blocksize 4096
+  maxdir 1024
+  skew 0
+  boottrk 4106
+  os 2.2
+end
+
+# RC2014 standard hard disk image
+# Slices A-P
+diskdef rc2014a
+  seclen 512
+  tracks 512
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1
+  os 2.2
+end
+
+diskdef rc2014b
+  seclen 512
+  tracks 1024
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 512
+  os 2.2
+end
+
+diskdef rc2014c
+  seclen 512
+  tracks 1536
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1024
+  os 2.2
+end
+
+diskdef rc2014d
+  seclen 512
+  tracks 2048
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 1536
+  os 2.2
+end
+
+diskdef rc2014e
+  seclen 512
+  tracks 2560
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 2048
+  os 2.2
+end
+
+diskdef rc2014f
+  seclen 512
+  tracks 3072
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 2560
+  os 2.2
+end
+
+diskdef rc2014g
+  seclen 512
+  tracks 3584
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 3072
+  os 2.2
+end
+
+diskdef rc2014h
+  seclen 512
+  tracks 4096
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 3584
+  os 2.2
+end
+
+diskdef rc2014i
+  seclen 512
+  tracks 4608
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 4096
+  os 2.2
+end
+
+diskdef rc2014j
+  seclen 512
+  tracks 5120
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 4608
+  os 2.2
+end
+
+diskdef rc2014k
+  seclen 512
+  tracks 5632
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 5120
+  os 2.2
+end
+
+diskdef rc2014l
+  seclen 512
+  tracks 6144
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 5632
+  os 2.2
+end
+
+diskdef rc2014m
+  seclen 512
+  tracks 6656
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 6144
+  os 2.2
+end
+
+diskdef rc2014n
+  seclen 512
+  tracks 7168
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 6656
+  os 2.2
+end
+
+diskdef rc2014o
+  seclen 512
+  tracks 7680
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 7168
+  os 2.2
+end
+
+diskdef rc2014p
+  seclen 512
+  tracks 7808
+  sectrk 32
+  blocksize 4096
+  maxdir 512
+  boottrk 7680
   os 2.2
 end

Source/ver.inc

@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.70"
+#DEFINE BIOSVER	"3.1.1-pre.71"

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.70"
+	db	"3.1.1-pre.71"
 	endm