@@ -357,11 +357,26 @@ TMS_INIT1:
357357 CALL TMS_CRTINIT ; SETUP THE TMS/V99x8 CHIP REGISTERS
358358
359359TMS_INIT2:
360- JR TMS_INIT3 ; SKIPPING THIS FOR NOW...
360+ ; ONLY DO VRAM DETECTION FOR V99X8 (NOT THE TMS OR F18A)
361361
362- CALL PRTSTRD
362+ LD A , (TMS_ATTRIB)
363+ OR A
364+ JR Z , TMS_INIT3 ; SKIP VRAM PROBE FOR TMS9918x
365+ CP TMSVDP_F18A
366+ JR Z , TMS_INIT3 ; SKIP VRAM PROBE FOR F18A
367+
368+ CALL PRTSTRD
363369 .TEXT " VRAM=$"
364370
371+ CP TMSVDP_SUPER ; SUPER HAS 1MB OF VRAM, NO NEED TO PROBE IT
372+ JR NZ , TMS_INIT2A
373+
374+ CALL PRTSTRD
375+ .TEXT "1MB$"
376+ JR TMS_INIT3
377+
378+ TMS_INIT2A:
379+
365380 CALL TMS_VRMPRB
366381
367382 DEC A
@@ -841,13 +856,13 @@ TMS_GETTYP:
841856;
842857 ; RETURN THE IDENTIFIED CHIP ID
843858 JR Z , TMS_ISV9938
844- CP 2
859+ CP TMSVDP_V9958
845860 RET Z ; RETURN 2 FOR V9958
846- LD A , 3
861+ LD A , TMSVDP_SUPER
847862 RET ; RETURN 3 FOR SUPER V9958
848863
849864TMS_ISV9938:
850- INC A ; RETURN 1 FOR V9938
865+ INC A ; RETURN 1 (TMSVDP_V9938)
851866 RET
852867
853868TMS_ISF18A:
@@ -894,7 +909,7 @@ TMS_ISF18A:
894909
895910 ; WE DON'T BOTHER TO RESET THE STATUS REGISTER SELECTION OR
896911 ; RELOCK BECAUSE THIS IS NOT AN F18A!
897- XOR A ; CHIP ID FOR 9918A
912+ XOR A ; CHIP ID FOR 9918A (TMSVDP_TMS9918)
898913 RET ; NOT F18A: A=0
899914
900915TMS_ISF18A1:
@@ -914,7 +929,7 @@ TMS_ISF18A1:
914929 EZ80_IO
915930 OUT (TMS_CMDREG) , A
916931;
917- LD A , 4 ; F18A: A=4
932+ LD A , TMSVDP_F18A ; F18A: A=4
918933 RET
919934
920935;
@@ -1542,7 +1557,7 @@ TMS_STRF18A .TEXT "F18A$"
15421557; ANSI-->TMS Color Conversion Table
15431558TMS_COLOR_TBL .DB $ 01 , $ 08 , $ 02 , $ 0A , $ 04 , $ 06 , $ 0C , $ 0F , $ 0E , $ 09 , $ 03 , $ 0B , $ 05 , $ 0D , $ 07 , $ 0F
15441559;
1545- TMS_ATTRIB .DW 0 ; VDA DEVICE ATTRIBUTES (VDP_ID,VRAM,FREQ)
1560+ TMS_ATTRIB .DW 0 ; VDA DEVICE ATTRIBUTES (VDP_ID,VRAM,FREQ) (TMSVDP_xxxx)
15461561;
15471562;==================================================================================================
15481563; TMS DRIVER - INSTANCE DATA
0 commit comments