This commit is contained in:
Tolik 2024-09-19 23:52:26 +10:00
parent e7c6ad1dca
commit a23b2eb756
7 changed files with 54 additions and 36 deletions

@ -1 +1 @@
Subproject commit c3a5d38deff864c3b08dd129572a20428f9219f1
Subproject commit 51a136edca8c04554de0b189d7680ebbe358c64a

View File

@ -840,7 +840,7 @@ No_Reset_handlers:
;-----------------------------------------------------------------------;
MODULE Prepare_For_Setup
Set_ALL_Mode: LD A,#FF
Set_ALL_Mode: LD A,Port_All_Mode.DEFAULT
LD BC,Port_All_Mode
OUT (C),A
@ -1138,7 +1138,7 @@ Exec:
OUT (SYS_PORT.ROM),A
;-----------[Check SPACE]
LD A,#FE ; !HARDCODE
LD A,Port_All_Mode.DEFAULT - Port_All_Mode.SPECTRUM_MODE_OFF ; !HARDCODE
LD BC,Port_All_Mode ; keyboard int & acc off
OUT (C),A
LD A,high ZXKeys.Line_7

View File

@ -818,11 +818,10 @@ FN_SYNC:
.set_waits:
ld a,h
and 8 ; check waits. Z - no waits, NZ - waits
ld h,#FF
ld h,Port_All_Mode.DEFAULT
jr z,1F
ld h,#FB
1:
ld bc,(Port_All_Mode)
ld h,Port_All_Mode.DEFAULT - Port_All_Mode.MEM_WAITS_OFF
1: ld bc,(Port_All_Mode)
in a,(C)
and h
out (C),a

View File

@ -14,14 +14,16 @@
RST_CONF:
;--[] ZX Spectrum
.AY8910:
LD D,#35 ;!HARDCODE REG #35 - BASIC SETTING 1 (SYS_PAGE.CONFIG_DE+1 = #C13B on PAGE #FE)
CALL CMOS_RD
OR 1
CALL CMOS_WR
; !FIXIT ­¥ ­ã¦­® íâ® ¡®«ìè¥ ¢ CMOS, ¯¥à¥¤¥« âì ¯®¤ TASK
;LD D,CMOS_CELL.HardwareConfiguration ; CONFIG_DE (D) - §­ ç¥­¨¥ CNF_PORT
;CALL CMOS_RD
;OR 1
;CALL CMOS_WR
;
LD BC,Port_All_Mode
IN A,(C)
AND #FE ;!HARDCODE
AND Port_All_Mode.DEFAULT - Port_All_Mode.SPECTRUM_MODE_OFF
OUT (C),A ; ACC_OFF
;LD A,PG_AY
@ -31,11 +33,13 @@ RST_CONF:
;--[] Sprinter ZX
.SP97_1:
LD D,#35 ;!HARDCODE REG #35 - BASIC SETTING 1 (SYS_PAGE.CONFIG_DE+1 = #C13B on PAGE #FE)
CALL CMOS_RD
AND #FE
CALL CMOS_WR
; !FIXIT ­¥ ­ã¦­® íâ® ¡®«ìè¥ ¢ CMOS, ¯¥à¥¤¥« âì ¯®¤ TASK
;LD D,CMOS_CELL.HardwareConfiguration ; CONFIG_DE (D) - §­ ç¥­¨¥ CNF_PORT
;CALL CMOS_RD
;AND #FE
;CALL CMOS_WR
;
LD BC,Port_All_Mode
IN A,(C)
AND #FE ;!HARDCODE

View File

@ -324,11 +324,25 @@ GET_SCORP_RAM: CALL FREE_vRAM
IF FREE_ZX_PAGES ;----------------------------------------------------[v]
;!TODO § ¤¥©á⢮¢ âì
; ‚室: B = 0 - BASIC 128, 1 - BASIC 48, 2 - TR-DOS 128,
; 3 - EXPANSION. C § ªàëâ묨 128-¬¨ ¯®àâ ¬¨:
; 4 - TR-DOS, 5 - BASIC 48
; A = TASK
; CF = 1 - ­¥ ¯¥à¥ãáâ ­ ¢«¨¢ âì ¯ «¨âàã
; <20><EFBFBD>…„€œ: ­®¬¥à vROM, vRAM, CONFIG_DE, FN_SYNC, PORT_ALL_MODE, MEM_TYPE
; ‚室: B[3..0]: 0 - BASIC 128, 1 - BASIC 48, 2 - TR-DOS 128, ;!FIXIT ¯¥à¥¤¥« âì, íâ® CONFIG_DE
; 3 - EXPANSION. C § ªàëâ묨 128-¬¨ ¯®àâ ¬¨:
; 4 - TR-DOS, 5 - BASIC 48
; B[7..4]: ;!TODO Port All Mode: b4 - Acc off/on
; DE:
; A: TASK Number
; CF: 1 - ­¥ ¯¥à¥ãáâ ­ ¢«¨¢ âì ¯ «¨âàã
/*
; ‚室: D[3..0]: 0 - BASIC 128, 1 - BASIC 48, 2 - TR-DOS 128, ;!FIXIT ¯¥à¥¤¥« âì, íâ® CONFIG_DE
; 3 - EXPANSION. C § ªàëâ묨 128-¬¨ ¯®àâ ¬¨:
; 4 - TR-DOS, 5 - BASIC 48
; D[7..4]: ;!TODO Port All Mode: b4 - Acc off/on
; E: §­ ç¥­¨¥ ¤«ï SYS_PORT/CNF_PORT
; A: TASK Number
; CF: 1 - ­¥ ¯¥à¥ãáâ ­ ¢«¨¢ âì ¯ «¨âàã
*/
GOTO_SPEC: DI
PUSH AF
; set shared pages

View File

@ -728,8 +728,8 @@ SETDEF: ;!TODO
DEC C
JR NZ,.loop
LD A,CMOS_CELL.ZX_RST_TO
LD B,CMOS_CELL.ZX_RST_TO.BASIC_128
LD A,CMOS_CELL.HardwareConfiguration ; ­¥ ¨á¯®«ì§ã¥âáï
LD B,0
CALL WRITCMS
LD A,CMOS_CELL.ZX_CONFIG

View File

@ -523,7 +523,7 @@ SPRINTER_1X:
RST_to_BIOS
CALL CNF_PN_320
LD L,2 ;FN_SYNC.INT_PENT
JR 1F ;!FIXIT ¬¥âªã ¯à¨¤ã¬ âì
JR AY8910_X.SET_DE
;
;ZX Spectrum
AY8910_X:
@ -536,7 +536,8 @@ AY8910_X:
CALL CNF_SC_312
LD L,3 ;FN_SYNC.INT_ORIG
1: LD DE,CNF_PORT.CNF_0 + CNF_PORT.TURBO.ON
.SET_DE:
LD DE,CNF_PORT.CNF_0 + CNF_PORT.TURBO.ON
CALL CONFIG_SET
CALL CLS ;!FIXIT ­ã¦­® «¨?
RET
@ -569,19 +570,19 @@ CONFIG_SET:
HALT
DI
IN A,(SLOT3)
EX AF,AF'
LD A,SYS_PAGE
OUT (SLOT3),A
LD (SYS_PAGE.CONFIG_DE),DE
;!FIXIT ¥áâì «¨ á¬ëá« ¤¥« âì ¤® FN_SYNC?
LD A,(ZX_VARS.BORDER)
IN A,(SLOT3)
EX AF,AF'
LD A,SYS_PAGE
OUT (SLOT3),A
LD (SYS_PAGE.CONFIG_DE),DE
;!FIXIT ¥áâì «¨ á¬ëá« ¤¥« âì ¤® FN_SYNC?
LD A,(ZX_VARS.BORDER)
RRCA
RRCA
RRCA
AND 7
OUT (BorderColor),A
;
AND 7
OUT (BorderColor),A
;
EX AF,AF'
OUT (SLOT3),A