Merge pull request #193 from wwarthen/dev

Handle 1MB RAM in MBC Memory Mapper

Source/HBIOS/ROM Layout.txt

@@ -0,0 +1,27 @@
+RomWBW ROM Layout Notes
+
+Bank		Module		Start	Size
+------		------		------	------		
+0		hbios		0x0000	0x8000
+		<end>		0x8000
+
+1		loader		0x0000	0x1000
+		dbgmon		0x1000	0x2000
+		cpm22		0x2000	0x3000
+		zsys		0x5000	0x3000
+		<end>		0x8000        
+
+2		fourth		0x0000	0x1700
+		basic		0x1700	0x2000
+		tbasic		0x3700	0x0900
+		game		0x4000	0x0900
+		egg		0x4900	0x0200
+		netboot         0x4B00	0x1000
+		updater         0x5B00	0x0D00
+		usrrom		0x6800	0x1800
+		<end>		0x8000
+
+3		imgpad2		0x0000	0x8000
+		<end>		0x8000
+
+4-N		ROM Disk Data

Source/HBIOS/hbios.asm

@@ -508,6 +508,15 @@ HBX_ROM:
         OR      A                       ; SET FLAGS
         JP      P,HBX_ROM               ; BIT 7 INDICATES RAM
         OUT     (MPCL_ROM),A            ; ENSURE ROM PAGE OUT OF MEMORY BEFORE SWITCH
+
+#IF (RAMSIZE == 256)
+	XOR	%00000100		; TOP 32K IS ALWAYS IN FIRST CHIP
+#ENDIF
+
+#IF (RAMSIZE == 1024)
+	XOR	%00010000		; TOP 32K IS ALWAYS IN FIRST CHIP
+#ENDIF
+
         OUT     (MPCL_RAM),A            ; SET RAM PAGE SELECTOR
 	JR	HBX_RAMX
 HBX_ROM:

Source/HBIOS/romldr.asm

@@ -2095,7 +2095,7 @@ ra_ent(str_tbas,  'T',	   KY_EN, BID_IMG1, TBC_IMGLOC,  TBC_LOC, TBC_SIZ, TBC_LO
 ra_ent(str_play,  'P',	   $FF,	  BID_IMG1, GAM_IMGLOC,  GAM_LOC, GAM_SIZ, GAM_LOC)
 ra_ent(str_egg,	  'E'+$80, $FF,   BID_IMG1, EGG_IMGLOC,  EGG_LOC, EGG_SIZ, EGG_LOC)
 ra_ent(str_net,   'N',	   $FF,	  BID_IMG1, NET_IMGLOC,  NET_LOC, NET_SIZ, NET_LOC)
-ra_ent(str_upd,   'O',	   $FF,	  BID_IMG1, UPD_IMGLOC,  UPD_LOC, UPD_SIZ, UPD_LOC)
+ra_ent(str_upd,   'X',	   $FF,	  BID_IMG1, UPD_IMGLOC,  UPD_LOC, UPD_SIZ, UPD_LOC)
 ra_ent(str_user,  'U',	   $FF,	  BID_IMG1, USR_IMGLOC,  USR_LOC, USR_SIZ, USR_LOC)
 #endif
 #if (DSKYENABLE)
@@ -2122,7 +2122,7 @@ str_fth		.db	"Forth",0
 str_bas		.db	"BASIC",0
 str_tbas	.db	"Tasty BASIC",0
 str_play	.db	"Play a Game",0
-str_upd		.db	"ROM Updater",0
+str_upd		.db	"XModem Flash Updater",0
 str_user	.db	"User App",0
 str_egg		.db	"",0
 str_net		.db	"Network Boot",0

Source/ver.inc

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

Source/ver.lib

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