From 817bba0c1abebdb890f77ee129578ebe06fb5131 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Tue, 1 Oct 2024 00:44:21 +1000
Subject: [PATCH] ...

---
 constants/SP2000.inc | 71 +++++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/constants/SP2000.inc b/constants/SP2000.inc
index 0ea550d..610a2c4 100644
--- a/constants/SP2000.inc
+++ b/constants/SP2000.inc
@@ -957,22 +957,29 @@ ScreenSET		EQU	#1A
 .Mask.Int			EQU %0011'0000 * 256 + ScreenSET	; Frame Int (Default/Pentagon/Scorpion/Original)
 .Mask.Sinc			EQU %1100'0000 * 256 + ScreenSET	; Screen V-Sinc (Default/312 lines 50 HZ/320 Lines 49 Hz)
 
-;;;;;;;;;;;;;;;;;;;;;;; CONFIG_DE ;;;;;;;;;;;;;;;;;;;;;;;
-;Старое значение.
-;HardwareConfiguration	EQU	#1B
-;.Mask.TurboMode		EQU %0000'0001				; TURBO MODE (D0..D3 - 6 OR 7)
-;.Mask.TurboExchange		EQU %0000'0010				; TURBO EXCHANGE ON/OFF - 1
-;.Mask.PortExchange		EQU %0000'0100				; PORT EXCHANGE ON/OFF - 1
-;.Mask.Computer			EQU %0001'1000				; COMPUTER: 0-SPRINTER, 1-Scorpion 256, 2-PENTAGON 128, 3-Other
+;;;;;;;;;;;;;;;;;;;;;;;; CONFIG ;;;;;;;;;;;;;;;;;;;;;;;;;
+HardwareConfiguration	EQU	#1B
+.Mask.TurboMode			EQU %0000'0001 * 256 + HardwareConfiguration ; TURBO MODE (D0..D3 - 6 OR 7)
+.Mask.TurboExchange		EQU %0000'0010 * 256 + HardwareConfiguration ; TURBO EXCHANGE ON/OFF - 1
+.Mask.PortExchange		EQU %0000'0100 * 256 + HardwareConfiguration ; PORT EXCHANGE ON/OFF - 1
+.Mask.Computer			EQU %0001'1000 * 256 + HardwareConfiguration ; CONF: 0 - sprinter, 1 - spectrum, 2 - , 3 - ;!TODO
 ;
-;Старое значение.
-;ZX_RST_TO		EQU	#1C
-;.BASIC_128			EQU 0
-;.BASIC_48_RAM128		EQU 1
-;.TRDOS				EQU 2
-;.EXPANSION			EQU 3
-;.TRDOS_48			EQU 4
-;.BASIC_48			EQU 5
+QuickStartSetUp		EQU	#1C
+.Mask.ZxRom			EQU %0000'0111 * 256 + QuickStartSetUp
+.ZxRom.Basic128			EQU 0
+.ZxRom.Basic48_Ram128		EQU 1
+.ZxRom.TrDos			EQU 2
+.ZxRom.Expansion		EQU 3
+.ZxRom.TrDos48			EQU 4
+.ZxRom.Basic48			EQU 5
+.Mask.Hardware			EQU %0011'1000 * 256 + QuickStartSetUp
+.Hardware.SprinterZX		EQU 0
+.Hardware.Pentagon48		EQU 1
+.Hardware.Pentagon128		EQU 2
+.Hardware.Pentagon512		EQU 3
+.Hardware.Scorpion256		EQU 4
+.Hardware.ZXSpectrum48		EQU 5
+.Hardware.ZXSpectrum128 	EQU 6
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 Options			EQU	#1D
@@ -998,22 +1005,32 @@ DrivesSetup_2		EQU	#20
 
 ; НЕ ИСПОЛЬЗУЕТСЯ, туда срут старые проги и vROM
 ;REGISTER #35 - BASIC SETTING 1 (SYS_PAGE.CONFIG_DE+1 = #C13B on PAGE #FE), значение для CNF_PORT
-HardwareConfiguration	EQU	#35
-.Mask.TurboMode			EQU %0000'0001				; TURBO MODE (D0..D3 - 6 OR 7)
-.Mask.TurboExchange		EQU %0000'0010				; TURBO EXCHANGE ON/OFF - 1
-.Mask.PortExchange		EQU %0000'0100				; PORT EXCHANGE ON/OFF - 1
-.Mask.Computer			EQU %0001'1000				; COMPUTER: 0-SPRINTER, 1-Scorpion 256, 2-PENTAGON 128, 3-Other
+; HardwareConfiguration	EQU	#35
+; .Mask.TurboMode			EQU %0000'0001 * 256 + HardwareConfiguration ; TURBO MODE (D0..D3 - 6 OR 7)
+; .Mask.TurboExchange		EQU %0000'0010 * 256 + HardwareConfiguration ; TURBO EXCHANGE ON/OFF - 1
+; .Mask.PortExchange		EQU %0000'0100 * 256 + HardwareConfiguration ; PORT EXCHANGE ON/OFF - 1
+; .Mask.Computer			EQU %0001'1000 * 256 + HardwareConfiguration ; COMPUTER: 0-SPRINTER, 1-Scorpion 256, 2-PENTAGON 128, 3-Other
 
 ; НЕ ИСПОЛЬЗУЕТСЯ пока
 ;REGISTER #36 - BASIC SETTING 2
 ; %0000 0111
-ZX_RUN_ROM		EQU	#36
-.BASIC_128			EQU 0
-.BASIC_48_RAM128		EQU 1
-.TRDOS				EQU 2
-.EXPANSION			EQU 3
-.TRDOS_48			EQU 4
-.BASIC_48			EQU 5
+; QuickStartSetUp		EQU	#36
+; .Mask.ZxRom			EQU %0000'0111 * 256 + QuickStartSetUp
+; ;	0 - Basic128
+; ;	1 - Basic48_Ram128
+; ;	2 - TrDos
+; ;	3 - Expansion
+; ;	4 - TrDos48
+; ;	5 - Basic48
+; .Mask.Hardware			EQU %0011'1000 * 256 + QuickStartSetUp
+; ;	0 - ZX-Sprinter
+; ;	1 - Pentagon 48
+; ;	2 - Pentagon 128
+; ;	3 - Pentagon 512
+; ;	4 - Scorpion 256
+; ;	5 - ZX Spectrum 48
+; ;	6 - ZX Spectrum 128 
+
 
 IDE_Setup.SecMaster:
 .CylindersLow		EQU	#37