Fix for 256k computers

monroe-diagnosticrom/monroeoc8800diag.asm

@@ -150,16 +150,24 @@ spt_check_size:
 		; Check if 256k memory or 128k
 		ld hl,0c000h	; Point to test address
 		ld a,0a0h		; Memory bank
-		ld b,00h		;
+		ld b,$FF		; B = FF
+		out (0c5h),a	;
+		ld (hl),b		;	
+		inc a			; A = A1
+		out (0c5h),a	;
+		ld (hl),b		;
+		dec a			; A = A0
+		add b			; B = 00
+
 		out (0c5h),a	; Select memory bank 9
 		ld (hl),b		;
-		dec b			;
-		inc a			; 
+		dec b			; B = FF
+		inc a			; A = A1
 		out (0c5h),a	; Select memory bank 1
 		ld (hl),b		;
-		dec a			;
+		dec a			; A = A0
 		out (0c5h),a	; Select memory bank 9
-		ld b,(hl)		;
+		ld b,(hl)		; If 256kb B should be 0
 
 		ret
 spt_check_vram_contents:
@@ -445,22 +453,31 @@ setupclearloop:
 
 label_vram:	dbz " 4K VRAM 3000-3FFE "
 label_dram16k1:	dbz "16K DRAM 0 C000-FFFF "
-label_dram16k2:	dbz "16K DRAM 1 C000-FFFF "
-label_dram16k3:	dbz "16K DRAM 2 C000-FFFF "
-label_dram16k4:	dbz "16K DRAM 3 C000-FFFF "
-label_dram16k5:	dbz "16K DRAM 4 C000-FFFF "
-label_dram16k6:	dbz "16K DRAM 5 C000-FFFF "
-label_dram16k7:	dbz "16K DRAM 6 C000-FFFF "
-label_dram16k8:	dbz "16K DRAM 7 C000-FFFF "
-
-label_dram16k9:		dbz "16K DRAM 8 C000-FFFF "
-label_dram16k10:	dbz "16K DRAM 9 C000-FFFF "
-label_dram16k11:	dbz "16K DRAM 10 C000-FFFF "
-label_dram16k12:	dbz "16K DRAM 11 C000-FFFF "
-label_dram16k13:	dbz "16K DRAM 12 C000-FFFF "
-label_dram16k14:	dbz "16K DRAM 13 C000-FFFF "
-label_dram16k15:	dbz "16K DRAM 14 C000-FFFF "
-label_dram16k16:	dbz "16K DRAM 15 C000-FFFF "
+label_dram16k2:	dbz "16K DRAM 1 "
+label_dram16k3:	dbz "16K DRAM 2 "
+label_dram16k4:	dbz "16K DRAM 3 "
+label_dram16k5:	dbz "16K DRAM 4 "
+label_dram16k6:	dbz "16K DRAM 5 "
+label_dram16k7:	dbz "16K DRAM 6 "
+label_dram16k8:	dbz "16K DRAM 7 "
+
+label_dram64k1:	dbz " 0K  DRAM 0 C000-FFFF "
+label_dram64k2:	dbz "16K DRAM 0 "
+label_dram64k3:	dbz "32K DRAM 0 "
+label_dram64k4:	dbz "48K DRAM 0 "
+label_dram64k5:	dbz " 0K DRAM 1 "
+label_dram64k6:	dbz "16K DRAM 1 "
+label_dram64k7:	dbz "32K DRAM 1 "
+label_dram64k8:	dbz "48K DRAM 1 "
+
+label_dram64k9:		dbz " 0K DRAM 2 "
+label_dram64k10:	dbz "16K DRAM 2 "
+label_dram64k11:	dbz "32K DRAM 2 "
+label_dram64k12:	dbz "48K DRAM 2 "
+label_dram64k13:	dbz " 0K DRAM 3 "
+label_dram64k14:	dbz "16K DRAM 3 "
+label_dram64k15:	dbz "32K DRAM 3 "
+label_dram64k16:	dbz "48K DRAM 3 "
 msg_banner:	dbz "Monroe OC8820 TEST ROM -- FRANK IZ8DWF / DAVE KI3V / ADRIAN BLACK"
 msg_charset:	dbz "-CHARACTER SET-"
 ; msg_testing:	db " ", " "+$80, "t"+$80, "e"+$80, "s"+$80, "t"+$80, " "+$80, "  ", 0
@@ -507,33 +524,33 @@ spt_ld_iya7 .macro
 tp_vram:	dw	VSIZE, VBASE, label_vram, tones_vram
 
 
-tp_16k:		dw	$4000, $C000, label_dram16k1, $a100,$31e0
-			dw	$4000, $C000, label_dram16k2, $c100,$3280
-			dw	$4000, $C000, label_dram16k3, $e100,$3320
-			dw	$4000, $C000, label_dram16k4, $0000,$33c0
-			dw	$4000, $C000, label_dram16k5, $2000,$3460
-			dw	$4000, $C000, label_dram16k6, $4020,$3500
-			dw	$4000, $C000, label_dram16k7, $6000,$35a0
-			dw	$4000, $C000, label_dram16k8, $8000,$3640
+tp_16k:		dw	$4000, $C000, label_dram16k1,  $a100,$31e0
+			dw	$4000, $C000, label_dram16k2,  $c100,$3280
+			dw	$4000, $C000, label_dram16k3,  $e100,$3320
+			dw	$4000, $C000, label_dram16k4,  $0000,$33c0
+			dw	$4000, $C000, label_dram16k5,  $2000,$3460
+			dw	$4000, $C000, label_dram16k6,  $4000,$3500
+			dw	$4000, $C000, label_dram16k7,  $6000,$35a0
+			dw	$4000, $C000, label_dram16k8,  $8000,$3640
 			dw	$0000, tp_16k
 
-tp_16k_256:	dw	$4000, $C000, label_dram16k1, $a100,$31e0
-			dw	$4000, $C000, label_dram16k2, $c100,$3280
-			dw	$4000, $C000, label_dram16k3, $e100,$3320
-			dw	$4000, $C000, label_dram16k4, $0000,$33c0
-			dw	$4000, $C000, label_dram16k5, $2000,$3460
-			dw	$4000, $C000, label_dram16k6, $4000,$3500
-			dw	$4000, $C000, label_dram16k7, $6000,$35a0
-			dw	$4000, $C000, label_dram16k8, $8000,$3640
-			dw	$4000, $C000, label_dram16k9, $a000,$3230
-			dw	$4000, $C000, label_dram16k10, $c000,$32d0
-			dw	$4000, $C000, label_dram16k11, $e000,$3370
-			dw	$4000, $C000, label_dram16k12, $0100,$3410
-			dw	$4000, $C000, label_dram16k13, $2100,$34b0
-			dw	$4000, $C000, label_dram16k14, $4120,$3550
-			dw	$4000, $C000, label_dram16k15, $6100,$35f0
-			dw	$4000, $C000, label_dram16k16, $8100,$3690
-			dw	$0000, tp_16k
+tp_16k_256:	dw	$4000, $C000, label_dram64k1,  $a100,$31e0
+			dw	$4000, $C000, label_dram64k2,  $c100,$3280
+			dw	$4000, $C000, label_dram64k3,  $e100,$3320
+			dw	$4000, $C000, label_dram64k4,  $0000,$33c0
+			dw	$4000, $C000, label_dram64k5,  $2000,$3460
+			dw	$4000, $C000, label_dram64k6,  $4000,$3500
+			dw	$4000, $C000, label_dram64k7,  $6000,$35a0
+			dw	$4000, $C000, label_dram64k8,  $8000,$3640
+			dw	$4000, $C000, label_dram64k9,  $a000,$3230
+			dw	$4000, $C000, label_dram64k10, $c000,$32d0
+			dw	$4000, $C000, label_dram64k11, $e000,$3370
+			dw	$4000, $C000, label_dram64k12, $0100,$3410
+			dw	$4000, $C000, label_dram64k13, $2100,$34b0
+			dw	$4000, $C000, label_dram64k14, $4120,$3550
+			dw	$4000, $C000, label_dram64k15, $6100,$35f0
+			dw	$4000, $C000, label_dram64k16, $8100,$3690
+			dw	$0000, tp_16k_256
 	
 set_regs_start:
 	defb 0b5h		;005a io port CRT register select

monroe-diagnosticrom/monroeoc8800diag.hex

@@ -1,128 +1,125 @@
 :10000000F3ED56AFD3C0D3C4D3C5D3C6D3C7D3D46F
-:10001000D3D821E505C3A502C3B0023E80D3D43EA8
+:10001000D3D821BD05C3AE02C3B9023E80D3D43EBE
 :1000200005D3A33E68D3A33EF0D3C83E04D3C83162
-:100030003300C92C066800FFFFFFFFFFFFFFFFFF33
+:100030003300C904066800FFFFFFFFFFFFFFFFFF5B
 :10004000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC0
 :10005000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0
-:10006000FFFFFFFFFFFFED457007A3072406E50430
-:10007000510624012F068400D80085022C067C003E
-:100080002307C504D8003F074031C2016301800047
-:100090002307D9043F07A030EF005E01AA00230721
-:1000A000A404240641052C06B60023079704240661
-:1000B000ED042C06B6003F07E031A50143062F06EC
-:1000C000CC002307BB043A022C06D0002307B1045E
-:1000D0008A01B6002C06BA00D908EB2100003908C5
-:1000E000D931E500C94F0723073B045C02270621ED
-:1000F00000C03EA00600D3C570053CD3C5703DD3FB
-:10010000C546C9C1785121003001FE0F77EDA1EA43
-:100110000C0121003001FE0F7AEDA12005EA190142
-:10012000B7C937C9D03E40BB280237C9D908EB212F
-:1001300000003908D9313901C9030140003306599B
-:10014000010301BFFF330659010301AAAA3306596F
-:100150000103015555330659012706D137C9E1047A
-:10016000C0F9C9E13E40BBC0F9C9E13E00BBC0F9DE
-:10017000C9FD6E04FD6605C9FD6E06FD6607C9FD75
-:100180007E09DD67FD7E08DD6FC9E1010A00FD091A
-:10019000FD7E00FD8601C0FD4E02FD4603FD2100EF
-:1001A00000FD09F9C9D908EB2100003908D931B29D
-:1001B00001C97F017101240723078D046C07EEFF3D
-:1001C0002706D908EB2100003908D931CF01C971C0
-:1001D00001240723078D046C07EEFF2706D908EBDF
-:1001E0002100003908D931EA01C978013302002021
-:1001F000F2013EFFBB28212FBB28291608CB033074
-:100200000521D107180321CB07310D02C9330200A4
-:100210002013021520E71816311C02C93302008092
-:100220002202180A312802C9330200802E02D9F9AD
-:10023000EBD9C9C10B78B120FBC93E04D3C83E3706
-:100240000608CB033005DD77011804DD36012EDD0D
-:1002500023DD233D10ECAFD3C8C9C1C9DD7C67DD08
-:100260007D6F3E00D908EB2100003908D9317102B9
-:10027000C93F07903923077D043F07003A5A02001F
-:10028000018C022706DD21003001FE0F3E04D3C899
-:100290003E20DD77013CDD23DD23EDA1EA9202AFB4
-:1002A000D3C8C9EDB34E23462378A720F6C3180060
-:1002B000AF01B90E211606D3B83CEDA320F9C31B3C
-:1002C0000020344B205652414D20333030302D33F6
-:1002D000464645200031364B204452414D203020C7
-:1002E000433030302D46464646200031364B2044C0
-:1002F00052414D203120433030302D464646462075
-:100300000031364B204452414D20322043303030B2
-:100310002D46464646200031364B204452414D2062
-:100320003320433030302D46464646200031364B90
-:10033000204452414D203420433030302D46464633
-:1003400046200031364B204452414D203520433069
-:1003500030302D46464646200031364B204452412F
-:100360004D203620433030302D4646464620003161
-:10037000364B204452414D203720433030302D46FB
-:10038000464646200031364B204452414D2038200D
-:10039000433030302D46464646200031364B20440F
-:1003A00052414D203920433030302D4646464620BC
-:1003B0000031364B204452414D2031302043303003
-:1003C000302D46464646200031364B204452414DA2
-:1003D00020313120433030302D4646464620003112
-:1003E000364B204452414D20313220433030302DA5
-:1003F00046464646200031364B204452414D20317E
-:100400003320433030302D46464646200031364BAF
-:10041000204452414D20313420433030302D464667
-:100420004646200031364B204452414D2031352084
-:10043000433030302D4646464620004D6F6E726F79
-:1004400065204F4338383230205445535420524FA2
-:100450004D202D2D204652414E4B20495A384457AD
-:1004600046202F2044415645204B493356202F200B
-:1004700041445249414E20424C41434B002D434898
-:1004800041524143544552205345542D002E2E5481
-:100490004553542E2E20003132384B206D61636855
-:1004A000696E65003235364B206D616368696E6533
-:1004B000002D2D2D4F4B2D2D2D2000424954204530
-:1004C00052525320004F4B212028372D42495420AF
-:1004D0004D4F44454C203129004F4B212028382DC9
-:1004E0004249542900FE0F0030C102A70700400016
-:1004F000C0D50200A1E031004000C0EB0200C18085
-:1005000032004000C0010300E12033004000C0176A
-:10051000030000C033004000C02D03002060340001
-:100520004000C0430320400035004000C059030094
-:1005300060A035004000C06F03008040360000ED31
-:1005400004004000C0D50200A1E031004000C0EB33
-:100550000200C18032004000C0010300E1203300EE
-:100560004000C017030000C033004000C02D03004E
-:10057000206034004000C0430300400035004000CC
-:10058000C059030060A035004000C06F03008040E8
-:1005900036004000C0850300A03032004000C09B00
-:1005A0000300C0D032004000C0B10300E07033004F
-:1005B0004000C0C80300011034004000C0DF030049
-:1005C00021B034004000C0F6032041503500400007
-:1005D000C00D040061F035004000C024040081908B
-:1005E000360000ED04B504CFB837EFB40101A10621
-:1005F0004848044405EAA30848480444010003C1EC
-:10060000A5024848A7024848A8020303A902030319
-:10061000AA02574E00006950560B19031818000B18
-:1006200020000000FDE1C9D9F9EBD9C9E1F9C9E120
-:10063000D8F9C9E1D0F9C9E1D908EB21000039089E
-:10064000D9F9C93EF0D3C8FD7E07D3C5FD7E06D3D8
-:10065000C0AF5F57FD6E02FD6603440E012F772F7A
-:1006600002BE2806FE0028F618041EFF184DFD4E97
-:1006700000FD4601FD6E02FD660372230B79B0207A
-:10068000F9FD4E00FD4601FD6E02FD66037EBA28AF
-:1006900004AAB35F7A2F77230B79B020F0FD4E00C8
-:1006A000FD4601FD6E02FD66037E2FBA2804AAB343
-:1006B0005F7A72230B79B020F01804186118AFFD2F
-:1006C0004E00FD4601FD6E02FD6603092B7EBA2831
-:1006D00004AAB35F7A2F772B0B79B020F0FD4E0080
-:1006E000FD4601FD6E02FD6603092B7E2FBA28042C
-:1006F000AAB35F7A722B0B79B020F0FD4E00FD4655
-:1007000001FD6E02FD6603092B7EBA2804AAB35FC1
-:100710007A2B0B79B020F27AFE001655289F97B3FA
-:10072000C837C9E13E04D3C87EB7280ADD7701DDAA
-:1007300023DD232318F2AFD3C8C9DD210030C9DD82
-:10074000E1C9DD7DE6AFC6A0DD6F3002DD24C92141
-:10075000003001FE0F3E04D3C836002336200BEDD7
-:10076000A1EA5907AFDD210030D3C8C9C1DD09C9ED
-:10077000E14E79B72828237EB7281446D3D4180031
-:100780001800180010F8CB4F20F10D20EE180B06C2
-:10079000001800180010FA0D20F57E2318D33E80B3
-:1007A000D3D4C960400000108110801081108010E7
-:1007B00081108010811080000003C003B004A004E9
-:1007C000900480057005604050000040302000001B
-:1007D0000010C020000000FF30000044C080000076
-:0107E0000018
+:10006000FFFFFFFFFFFFED4548077B07FC05BD04D1
+:1000700029062D0107068400D8008E0204067C00A4
+:10008000FB069D04D80017074031CB016C018000AE
+:10009000FB06B1041707A030EF006701AA00FB06BA
+:1000A0007C04FC0519050406B600FB066F04FC057C
+:1000B000C5040406B6001707E031AE011B060706AB
+:1000C000CC00FB06930443020406D000FB0689041F
+:1000D0009301B6000406BA00D908EB2100003908E4
+:1000E000D931E500C92707FB0613046502FF052186
+:1000F00000C03EA006FFD3C5703CD3C5703D80D381
+:10010000C570053CD3C5703DD3C546C9C1785121E2
+:10011000003001FE0F77EDA1EA150121003001FE4C
+:100120000F7AEDA12005EA2201B7C937C9D03E40B8
+:10013000BB280237C9D908EB2100003908D9314260
+:1001400001C90C0140000B0662010C01BFFF0B0648
+:1001500062010C01AAAA0B0662010C0155550B069F
+:100160006201FF05D137C9E104C0F9C9E13E40BBD6
+:10017000C0F9C9E13E00BBC0F9C9FD6E04FD6605CA
+:10018000C9FD6E06FD6607C9FD7E09DD67FD7E08B7
+:10019000DD6FC9E1010A00FD09FD7E00FD8601C099
+:1001A000FD4E02FD4603FD210000FD09F9C9D908F5
+:1001B000EB2100003908D931BB01C988017A01FC63
+:1001C00006FB0665044407EEFFFF05D908EB210096
+:1001D000003908D931D801C97A01FC06FB0665044B
+:1001E0004407EEFFFF05D908EB2100003908D9319B
+:1001F000F301C981013C020020FB013EFFBB282125
+:100200002FBB28291608CB03300521A90718032185
+:10021000A307311602C93C0200201C021520E71872
+:1002200016312502C93C0200802B02180A31310226
+:10023000C93C0200803702D9F9EBD9C9C10B78B1AA
+:1002400020FBC93E04D3C83E370608CB033005DD8A
+:1002500077011804DD36012EDD23DD233D10ECAFE0
+:10026000D3C8C9C1C9DD7C67DD7D6F3E00D908EB0D
+:100270002100003908D9317A02C917079039FB06E5
+:1002800055041707003A630200019502FF05DD21BE
+:10029000003001FE0F3E04D3C83E20DD77013CDD77
+:1002A00023DD23EDA1EA9B02AFD3C8C9EDB34E23F2
+:1002B000462378A720F6C31800AF01B90E21EE053A
+:1002C000D3B83CEDA320F9C31B0020344B20565279
+:1002D000414D20333030302D3346464520003136F5
+:1002E0004B204452414D203020433030302D464683
+:1002F0004646200031364B204452414D20312000EB
+:1003000031364B204452414D2032200031364B20B3
+:100310004452414D2033200031364B204452414D50
+:100320002034200031364B204452414D20352000EE
+:1003300031364B204452414D2036200031364B207F
+:100340004452414D2037200020304B202044524160
+:100350004D203020433030302D4646464620003177
+:10036000364B204452414D2030200033324B204444
+:1003700052414D2030200034384B204452414D2012
+:1003800030200020304B204452414D20312000319C
+:10039000364B204452414D2031200033324B204413
+:1003A00052414D2031200034384B204452414D20E1
+:1003B00031200020304B204452414D20322000316A
+:1003C000364B204452414D2032200033324B2044E2
+:1003D00052414D2032200034384B204452414D20B0
+:1003E00032200020304B204452414D203320003138
+:1003F000364B204452414D2033200033324B2044B1
+:1004000052414D2033200034384B204452414D207E
+:100410003320004D6F6E726F65204F433838323095
+:10042000205445535420524F4D202D2D20465241EB
+:100430004E4B20495A38445746202F2044415645B8
+:10044000204B493356202F2041445249414E2042EF
+:100450004C41434B002D43484152414354455220A7
+:100460005345542D002E2E544553542E2E2000312A
+:1004700032384B206D616368696E65003235364BEA
+:10048000206D616368696E65002D2D2D4F4B2D2DFC
+:100490002D2000424954204552525320004F4B21F9
+:1004A0002028372D424954204D4F44454C203129B6
+:1004B000004F4B212028382D4249542900FE0F00BF
+:1004C00030CA027F07004000C0DE0200A1E0310018
+:1004D0004000C0F40200C18032004000C0000300B0
+:1004E000E12033004000C00C030000C03300400096
+:1004F000C0180300206034004000C0240300400006
+:1005000035004000C030030060A035004000C03C12
+:1005100003008040360000C504004000C0480300CE
+:10052000A1E031004000C05F0300C1803200400004
+:10053000C06B0300E12033004000C077030000C01F
+:1005400033004000C0830300206034004000C08FAF
+:100550000300400035004000C09B030060A0350050
+:100560004000C0A70300804036004000C0B3030035
+:10057000A03032004000C0BF0300C0D032004000B5
+:10058000C0CB0300E07033004000C0D7030001106F
+:1005900034004000C0E3030021B034004000C0EF4D
+:1005A0000320415035004000C0FB030061F03500DE
+:1005B0004000C007040081903600001905B504CF43
+:1005C000B837EFB40101A1064848044405EAA3087E
+:1005D00048480444010003C1A5024848A70248480E
+:1005E000A8020303A9020303AA02574E00006950A0
+:1005F000560B19031818000B20000000FDE1C9D9A3
+:10060000F9EBD9C9E1F9C9E1D8F9C9E1D0F9C9E1F2
+:10061000D908EB2100003908D9F9C93EF0D3C8FD4B
+:100620007E07D3C5FD7E06D3C0AF5F57FD6E02FDCA
+:100630006603440E012F772F02BE2806FE0028F61F
+:1006400018041EFF184DFD4E00FD4601FD6E02FD13
+:10065000660372230B79B020F9FD4E00FD4601FDC3
+:100660006E02FD66037EBA2804AAB35F7A2F772351
+:100670000B79B020F0FD4E00FD4601FD6E02FD66D7
+:10068000037E2FBA2804AAB35F7A72230B79B020B5
+:10069000F01804186118AFFD4E00FD4601FD6E0212
+:1006A000FD6603092B7EBA2804AAB35F7A2F772B45
+:1006B0000B79B020F0FD4E00FD4601FD6E02FD6697
+:1006C00003092B7E2FBA2804AAB35F7A722B0B7909
+:1006D000B020F0FD4E00FD4601FD6E02FD660309EF
+:1006E0002B7EBA2804AAB35F7A2B0B79B020F27A5A
+:1006F000FE001655289F97B3C837C9E13E04D3C8FA
+:100700007EB7280ADD7701DD23DD232318F2AFD37E
+:10071000C8C9DD210030C9DDE1C9DD7DE6AFC6A075
+:10072000DD6F3002DD24C921003001FE0F3E04D30D
+:10073000C836002336200BEDA1EA3107AFDD2100DA
+:1007400030D3C8C9C1DD09C9E14E79B72828237E55
+:10075000B7281446D3D418001800180010F8CB4F4F
+:1007600020F10D20EE180B06001800180010FA0DED
+:1007700020F57E2318D33E80D3D4C96040000010FA
+:1007800081108010811080108110801081108000F5
+:100790000003C003B004A00490048005700560400D
+:1007A00050000040302000000010C020000000FF7A
+:0907B00030000044C0800000008C
 :00000001FF