Скрыты неработающие пункты в Setup

Shared_Includes

@@ -1 +1 @@
-Subproject commit 04aaef8ac955971d913babd95921a62937b597ae
+Subproject commit 4f546cb1d2cd8eeb1aec0de2c3e9902d1bb52fee

src/bios/exp/FUNC_5x.asm

@@ -23,7 +23,7 @@ DRV_VERSION:
 	AND	A
 	RET 
 
-DRV_LIST:																; ????? çâ® §  äã­ªæ¨ï ¨ ªã¤  㪠§ë¢ ¥â IX
+DRV_LIST:
 	IN	A,(SLOT3)
 	PUSH	AF
 	PUSH	IY

src/bios/loader/loader.asm

@@ -43,12 +43,12 @@
 
 ; !TODO ã¡à âì ¢¥©âë ¤«ï ªíè ?
 	LD BC,#FF*256 + Z84.SYS.Control
-	LD A,Z84.REG.CS_Boundary								; !HARDCODE
+	LD A,Z84.REG.CS_Boundary
 	OUT (C),A			; 0 register - waits
 	INC C
 	LD A,#F0
 	OUT (C),A			; boundaries FFFF..1000 - CS1
-;										  0FFF..0000 - CS0
+;					; 0FFF..0000 - CS0
 	LD HL,#1000			; !!!!! Load bitstream from Fast-RAM
 
 	JR .NEW_SHM

src/bios/rom/SETUP/MAIN.asm

@@ -524,7 +524,7 @@ START:
 	CALL	RESCREEN
 
 ;R06
-	LD	BC,CMOS_CELL.BootUpParams.Mask.QuickStart		;#010E
+	LD	BC,CMOS_CELL.BootUpParams.Mask.QuickStartROM		;#010E
 	CALL	G_VALUE
 	POP	BC
 	INC	B

src/bios/rom/SETUP/SETTINGS.asm

@@ -256,8 +256,7 @@ CCHANGE:
 	LD	B,A
 	LD	A,CMOS_CELL.ScreenSET
 	CALL	WRITCMS
-CSET:
+CSET:	LD	H,0
-	LD	H,0
 	LD	DE,STYLES
 	ADD	HL,HL
 	ADD	HL,HL
@@ -268,7 +267,8 @@ CSET:
 	LDI 
 	LDI 
 	CALL	FSCREEN
-REFRESH:
+	;
+	;REFRESH:
 	LD	BC,SettingsItemsTabsAddrs.max*256
 	LD	A,(ITEM)
 	PUSH	AF
@@ -1093,76 +1093,4 @@ CMOSARE:
 	DB	%0000'0000						;X3F - CHECKSUM
  BLOCK   #100 - low $                                                   ; ¤®¡¨¢ª  CMOSARE ¤® à §¬¥à  ¢ 256 ¡ ©â®¢
 ;DONT MOVE !!! ADDRESS
-
+;
-
-; !TODO ¢áñ ¯à ¢¨«ì­®?
-;REGISTER #0E
-; %1000'0000 - MEMORY TEST
-; %0100'0000 - SAVE RAM DISKS
-; %0010'0000 - UPDATE BIOS
-; %0001'1000 - START DELAY
-; %0000'0100 - LANGUAGE
-; %0000'0010 - NOT USED
-; %0000'0001 - QUICK START
-;REGISTER #0F
-; %1000'0000 - TYPEMATIC	ON/OFF
-; %0110'0000 - TYPEMATIC	DELAY 00-250, 01-500, 10-750, 11-1000
-; %0001'1111 - TYPEMATIC	RATE
-;		0-6, 1-8, 2-10,	3-12, 4-15, 5-20, 6-24,	7-30
-;REGISTER #10
-; %0000'0111 - SYSTEM DISK
-; %0111'0000 - ALT SYSTEM DISK
-;REGISTER #11
-; %0000'0011 - FDD FIRST	  720 /	1.44  /	NONE
-; %0000'1100 - FDD SECOND
-; %0011'0000 - IDE Primary MASTER AUTO /	SETUP /	DISABLED
-; %1100'0000 - IDE Primary SLAVE		-----//------
-;REGISTER #12 -	CYLINDERS (MASTER)
-;REGISTER #14 -	HEADS	  (MASTER)
-;REGISTER #15 -	SECTORS	  (MASTER)
-;REGISTER #16 -	CYLINDERS (SLAVE)
-;REGISTER #18 -	HEADS	  (SLAVE)
-;REGISTER #19 -	SECTORS	  (SLAVE)
-;REGISTER #1A
-; %0000'1111 - COLOR STYLE
-; %0011'0000 - Frame Int (Default/Pentagon/Scorpion/Original)
-; %1100'0000 - Screen V-Sinc (Default/312 lines 50 HZ/320 Lines 49 Hz)
-;REGISTER #1B -	HARDWARE CONFIGURATION
-; %0000'0001 - TURBO MODE (D0..D3 - 6 OR	7)
-; %0000'0010 - TURBO EXCHANGE ON/OFF - 1
-; %0000'0100 - PORT EXCHANGE ON/OFF - 1
-; %0001'1000 - COMPUTER
-;		0-SPRINTER
-;		1-SPECTRUM 256
-;		2-PENTAGON 128
-;		3-OTHER
-; %1110'0000 - RESERVED
-;REGISTER #1C -	RESET MODE
-;		0-RESET	128 Basic
-;		1-RESET	48 Basic & 128 mem
-;		2-RESET	TR-DOS & 128 mem
-;		3-RESET	EXPANSION (Disabled)
-;		4-RESET	TR-DOS & 48 mem
-;		5-RESET	48 Basic
-;REGISTER #1D
-; %0000'0010 - Reboot message
-; %0000'0001 - HDD Write	protect
-;REGISTER #1E
-; %0000'0011 - TR DOS A:	Default	 / FDD / HDD / RMD
-; %0000'1100 - TR DOS B:	Default	 / FDD / HDD / RMD
-; %0011'0000 - TR DOS C:	Default	 / FDD / HDD / RMD
-; %1100'0000 - TR DOS D:	Default	 / FDD / HDD / RMD
-;REGISTER #1F           ;R06
-; %1111'0000 - X-Screen position
-; %0000'1111 - Y-Screen position
-;REGISTER #20
-; %0011'0000 - IDE Secondary MASTER AUTO /	SETUP /	DISABLED
-; %1100'0000 - IDE Secondary SLAVE		-----//------
-; .
-; .
-;REGISTER #37 -	CYLINDERS (MASTER)
-;REGISTER #39 -	HEADS	  (MASTER)
-;REGISTER #3A -	SECTORS	  (MASTER)
-;REGISTER #3B -	CYLINDERS (SLAVE)
-;REGISTER #3D -	HEADS	  (SLAVE)
-;REGISTER #3E -	SECTORS	  (SLAVE)

src/bios/rom/SETUP/VIDEO_IO.asm

@@ -400,7 +400,7 @@ LOGO_TO_SCREEN:
 	LD	DE,#4040	; !HARDCODE  ª®®à¤¨­ â  ª à⨭ª¨ ¯® •
 	LD	BC,128		; !HARDCODE  ¤«¨­  £®à¨§®­â «ì­®© «¨­¨¨ ª à⨭ª¨
 	LDIR 
-	OR	A							; !!!!! or a 
+	OR	A
 	JP	NZ,.loop
 
 	POP	BC

src/bios/rom/SETUP/messages.z80

@@ -30,35 +30,39 @@
 	SettingsTabsOrder = {
 		[1]={
 			"Lang",		 -- 1
-			"MemTest",	 -- 2
+			"SaveRAMdrvs",	 -- 2
-			"SaveRAMdrvs",	 -- 3
+			"StartDelay",	 -- 3
-			"UpdBios",	 -- 4
+			"RebootMsg",	 -- 4
-			"StartDelay",	 -- 5
+			"SysDsk",	 -- 5
-			"TypRate",	 -- 6
+			"AltSysDsk",	 -- 6
-			"TypDelay",	 -- 7
+			"FddFirst",	 -- 7
-			"RebootMsg",	 -- 8
+			"FddSecond",	 -- 8
-			"SysDsk",	 -- 9
+			"PriIdeMA",	 -- 9
-			"AltSysDsk",	 -- 10
+			"PriIdeSl",	 -- 10
-			"FddFirst",	 -- 11
+			"SecIdeMA",	 -- 11
-			"FddSecond",	 -- 12
+			"SecIdeSl",	 -- 12
-			"PriIdeMA",	 -- 13
+			"ScreenY",	 -- 13
-			"PriIdeSl",	 -- 14
+			"ScreenX",	 -- 14
-			"SecIdeMA",	 -- 15
+			"FrameInt",	 -- 15
-			"SecIdeSl",	 -- 16
+			"VSync",	 -- 16
-					 -- 17
+			"QuickStartROM", -- 17
+			"MemTest",	 -- 	DEFINES.INC --> UnusedSettingsFeatures
+			"UpdBios",	 -- 	DEFINES.INC --> UnusedSettingsFeatures 
+			"TypRate",	 -- 	DEFINES.INC --> UnusedSettingsFeatures 
+			"TypDelay",	 -- 	DEFINES.INC --> UnusedSettingsFeatures 
 		},
 		[2]={
-			"ScreenY",	 -- 1
+			"TrDosA",	 -- 1
-			"ScreenX",	 -- 2
+			"TrDosB",	 -- 2
-			"FrameInt",	 -- 3
+			"TrDosC",	 -- 3
-			"VSync",	 -- 4
+			"TrDosD",	 -- 4
-			"QuickStartROM", -- 5
+                        "SetTime",	 -- 5	DEFINES.INC --> NEW_FEATURE
-			"TrDosA",	 -- 6
+			"HddWrPr",	 -- 6	DEFINES.INC --> HDDwriteProtect
-			"TrDosB",	 -- 7
+					 -- 7
-			"TrDosC",	 -- 8
+					 -- 8
-			"TrDosD",	 -- 9
+					 -- 9
-                        "SetTime",	 -- 10	DEFINES.INC --> NEW_FEATURE
+					 -- 10
-			"HddWrPr",	 -- 11	DEFINES.INC --> HDDwriteProtect
+					 -- 11
 					 -- 12
 					 -- 13
 					 -- 14
@@ -69,6 +73,12 @@
 	}
 	DeleteValueByDEFINE(SettingsTabsOrder,"NEW_FEATURE","SetTime")
 	DeleteValueByDEFINE(SettingsTabsOrder,"HDDwriteProtect","HddWrPr")
+	DeleteValueByDEFINE(SettingsTabsOrder,"UnusedSettingsFeatures","MemTest")
+	DeleteValueByDEFINE(SettingsTabsOrder,"UnusedSettingsFeatures","UpdBios")
+	DeleteValueByDEFINE(SettingsTabsOrder,"UnusedSettingsFeatures","TypRate")
+	DeleteValueByDEFINE(SettingsTabsOrder,"UnusedSettingsFeatures","TypDelay")
+	-- DeleteValueByDEFINE(SettingsTabsOrder,"UnusedSettingsFeatures","")
+	-- DeleteValueByDEFINE(SettingsTabsOrder,"UnusedSettingsFeatures","")
  ENDLUA
 ;
 
@@ -151,53 +161,59 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF			; ⨯ ¯ à ¬¥âà  (áâப  á® §­ ç¥­¨¥¬ ¨«¨ ª â «®£)
 	DB	columnNum,lineNum					; á⮫¡¥æ, áâப 
 	DB	paramName						; <20> §¢ ­¨¥ ¯ à ¬¥âà 
-	DB	CMOS_CELL.BootUpParams,%0000'0100,%0000'0100		; CMOS, MASK
+	DW	CMOS_CELL.BootUpParams.Mask.Language : DB %0000'0100	; CMOS : MASK
 	DB	msgStrings.valLangEng					; 1-© ¢ à¨ ­â ¯ à ¬¥âà  
 	DB	msgStrings.valLangRus					; 2-© ¢ à¨ ­â ¯ à ¬¥âà  
 
+
+	IF UnusedSettingsFeatures	; !TODO
 	 _mSETitemParams MemTest
 	 DW	OnChangeAction.nothing
          IF NEW_FEATURE :     DB paramLine : ENDIF
 	 DB	columnNum,lineNum
 	 DB	paramName
-	DB	CMOS_CELL.BootUpParams,%1000'0000,%1000'0000
+	 DW	CMOS_CELL.BootUpParams.Mask.MemTest : DB %1000'0000
 	 DB	msgStrings.valDisabled
 	 DB	msgStrings.valEnabled
+	ENDIF
 
 	_mSETitemParams SaveRAMdrvs
 	DW	OnChangeAction.nothing
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.BootUpParams,%0100'0000,%0100'0000
+	DW	CMOS_CELL.BootUpParams.Mask.SaveRAMdisks : DB %0100'0000
 	DB	msgStrings.valDisabled
 	DB	msgStrings.valEnabled
 
+	IF UnusedSettingsFeatures	; !TODO
 	 _mSETitemParams UpdBios
 	 DW	OnChangeAction.nothing
          IF NEW_FEATURE :     DB paramLine : ENDIF
 	 DB	columnNum,lineNum
 	 DB	paramName
-	DB	CMOS_CELL.BootUpParams,%0010'0000,%0010'0000
+	 DW	CMOS_CELL.BootUpParams.Mask.UpdBios : DB %0010'0000
 	 DB	msgStrings.valDisabled
 	 DB	msgStrings.valEnabled
+	ENDIF
 
 	_mSETitemParams StartDelay
 	DW	OnChangeAction.nothing
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.BootUpParams,%0001'1000,%0001'0000
+	DW	CMOS_CELL.BootUpParams.Mask.StartDelay : DB %0001'0000
 	DB	msgStrings.valDisabled
 	DB	msgStrings.valNormal
 	DB	msgStrings.valEnabled
 
+	IF UnusedSettingsFeatures	; !TODO
 	 _mSETitemParams TypRate
 	 DW	OnChangeAction.nothing
          IF NEW_FEATURE :     DB paramLine : ENDIF
 	 DB	columnNum,lineNum
 	 DB	paramName
-	DB	CMOS_CELL.Typematic,%0000'0111,%0000'0111
+	 DW	CMOS_CELL.Typematic.Mask.Rate : DB %0000'0111
 	 DB	msgStrings.val_6
 	 DB	msgStrings.val_8
 	 DB	msgStrings.val_10
@@ -206,24 +222,27 @@ SettingsItemsTabs:
 	 DB	msgStrings.val_20
 	 DB	msgStrings.val_24
 	 DB	msgStrings.val_30
+	ENDIF
 
+	IF UnusedSettingsFeatures	; !TODO
 	 _mSETitemParams TypDelay
 	 DW	OnChangeAction.nothing
          IF NEW_FEATURE :     DB paramLine : ENDIF
 	 DB	columnNum,lineNum
 	 DB	paramName
-	DB	CMOS_CELL.Typematic,%0110'0000,%0110'0000
+	 DW	CMOS_CELL.Typematic.Mask.Delay : DB %0110'0000
 	 DB	msgStrings.val_250
 	 DB	msgStrings.val_500
 	 DB	msgStrings.val_750
 	 DB	msgStrings.val_1000
+	ENDIF
 
 	_mSETitemParams RebootMsg
 	DW	OnChangeAction.nothing
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.Options,%0000'0010,%0000'0010
+	DW	CMOS_CELL.Options.Mask.RebootMSG : DB %0000'0010
 	DB	msgStrings.valDisabled
 	DB	msgStrings.valEnabled
 
@@ -232,7 +251,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.BootDrives,%0000'0111,%0000'0111											; !!!!!
+	DW	CMOS_CELL.BootDrives.Mask.SysDisk : DB %0000'0111
 	DB	msgStrings.val1stFDD
 	DB	msgStrings.val2ndFDD
 	DB	msgStrings.val1stIDE
@@ -247,7 +266,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.BootDrives,%0111'0000,%0111'0000
+	DW	CMOS_CELL.BootDrives.Mask.AltSysDisk : DB %0111'0000
 	DB	msgStrings.val1stFDD
 	DB	msgStrings.val2ndFDD
 	DB	msgStrings.val1stIDE
@@ -262,29 +281,29 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.DrivesSetup_1,%0000'0011,%0000'0000
+	DW	CMOS_CELL.DrivesSetup_1.Mask.FirstFDD : DB %0000'0000
 	DB	msgStrings.valAuto
-;	DB	msgStrings.val720
+	; DB	msgStrings.val720
-;	DB	msgStrings.val1440
+	; DB	msgStrings.val1440
-;	DB	msgStrings.valDash6
+	; DB	msgStrings.valDash6
 
 	_mSETitemParams FddSecond
 	DW	OnChangeAction.nothing
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.DrivesSetup_1,%0000'1100,%0000'0000
+	DW	CMOS_CELL.DrivesSetup_1.Mask.SecondFDD : DB %0000'0000
 	DB	msgStrings.valAuto
-;	DB	msgStrings.val720
+	; DB	msgStrings.val720
-;	DB	msgStrings.val1440
+	; DB	msgStrings.val1440
-;	DB	msgStrings.valDash6
+	; DB	msgStrings.valDash6
 
 	_mSETitemParams PriIdeMA
 	DW	OnChangeAction.nothing
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.DrivesSetup_1,%0011'0000,%0011'0000
+	DW	CMOS_CELL.DrivesSetup_1.Mask.PriIDEmaster : DB %0011'0000
 	DB	msgStrings.valAuto
 	DB	msgStrings.valSetup
 	DB	msgStrings.valCdRom
@@ -295,7 +314,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.DrivesSetup_1,%1100'0000,%1100'0000
+	DW	CMOS_CELL.DrivesSetup_1.Mask.PriIDEslave : DB %1100'0000
 	DB	msgStrings.valAuto
 	DB	msgStrings.valSetup
 	DB	msgStrings.valCdRom
@@ -306,7 +325,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.DrivesSetup_2,%0011'0000,%0011'0000
+	DW	CMOS_CELL.DrivesSetup_2.Mask.SecIDEmaster : DB %0011'0000
 	DB	msgStrings.valAuto
 	DB	msgStrings.valSetup
 	DB	msgStrings.valCdRom
@@ -317,7 +336,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.DrivesSetup_2,%1100'0000,%1100'0000
+	DW	CMOS_CELL.DrivesSetup_2.Mask.SecIDEslave : DB %1100'0000
 	DB	msgStrings.valAuto
 	DB	msgStrings.valSetup
 	DB	msgStrings.valCdRom
@@ -329,7 +348,7 @@ SettingsItemsTabs:
          IF NEW_FEATURE :     DB paramLine : ENDIF
 	 DB	columnNum,lineNum
 	 DB	paramName
-	 DB	CMOS_CELL.Options,%0000'0001,%0000'0001
+	 DW	CMOS_CELL.Options.Mask.HDDwriteProtect : DB %0000'0001
 	 DB	msgStrings.valDisabled
 	 DB	msgStrings.valEnabled
 	ENDIF
@@ -339,7 +358,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.ScreenPosition,%1111'0000,%1110'0000
+	DW	CMOS_CELL.ScreenPosition.Mask.X : DB %1110'0000
 	DB	msgStrings.valMinus7
 	DB	msgStrings.valMinus6
 	DB	msgStrings.valMinus5
@@ -361,7 +380,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.ScreenPosition,%0000'1111,%0000'1110
+	DW	CMOS_CELL.ScreenPosition.Mask.Y : DB %0000'1110
 	DB	msgStrings.valPlus7
 	DB	msgStrings.valPlus6
 	DB	msgStrings.valPlus5
@@ -383,7 +402,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.ScreenSET,%0011'0000,%0011'0000
+	DW	CMOS_CELL.ScreenSET.Mask.Int : DB %0011'0000
 	DB	msgStrings.valDash8
 	DB	msgStrings.valScorpion
 	DB	msgStrings.valPentagon
@@ -394,7 +413,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.ScreenSET,%1100'0000,%1000'0000
+	DW	CMOS_CELL.ScreenSET.Mask.Sinc : DB %1000'0000
 	DB	msgStrings.valDash8
 	DB	msgStrings.val312_50
 	DB	msgStrings.val320_49
@@ -404,7 +423,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.BootUpParams,%0000'0001,%0000'0001
+	DW	CMOS_CELL.BootUpParams.Mask.QuickStartROM : DB %0000'0001
 	DB	msgStrings.parQuickStartSP
 	DB	msgStrings.parQuickStartZX
 
@@ -413,7 +432,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.TRDOSmount,%0000'0011,%0000'0010
+	DW	CMOS_CELL.TRDOSmount.Mask.A : DB %0000'0010
 	DB	msgStrings.valDefault
 	DB	msgStrings.valFDD
 	DB	msgStrings.valHDD
@@ -423,7 +442,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.TRDOSmount,%0000'1100,%0000'1000
+	DW	CMOS_CELL.TRDOSmount.Mask.B : DB %0000'1000
 	DB	msgStrings.valDefault
 	DB	msgStrings.valFDD
 	DB	msgStrings.valHDD
@@ -433,7 +452,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.TRDOSmount,%0011'0000,%0010'0000
+	DW	CMOS_CELL.TRDOSmount.Mask.C : DB %0010'0000
 	DB	msgStrings.valDefault
 	DB	msgStrings.valFDD
 	DB	msgStrings.valHDD
@@ -443,7 +462,7 @@ SettingsItemsTabs:
         IF NEW_FEATURE :     DB paramLine : ENDIF
 	DB	columnNum,lineNum
 	DB	paramName
-	DB	CMOS_CELL.TRDOSmount,%1100'0000,%1000'0000
+	DW	CMOS_CELL.TRDOSmount.Mask.D : DB %1000'0000
 	DB	msgStrings.valDefault
 	DB	msgStrings.valFDD
 	DB	msgStrings.valHDD
@@ -625,10 +644,10 @@ msgStrings:
  _mSetStr parQuickStartROM, tmp_Counter		:	DZ	'Run in mode                : '
  _mSetStr parQuickStartZX, tmp_Counter		:	DZ	'Spectrum'
  _mSetStr parQuickStartSP, tmp_Counter		:	DZ	'Sprinter'
- _mSetStr parTrDosA, tmp_Counter		:	DZ	'TR DOS A:>          : '
  _mSetStr valDefault, tmp_Counter		:	DZ	'Default'
  _mSetStr valFDD, tmp_Counter			:	DZ	'FDD    '		; ????? ¯®¤ã¬ âì ª ª¨¥ ¢ à¨ ­âë ¢®§¬®¦­ë
  _mSetStr valHDD, tmp_Counter			:	DZ	'HDD    '		; ????? ¯®¤ã¬ âì ª ª¨¥ ¢ à¨ ­âë ¢®§¬®¦­ë
+ _mSetStr parTrDosA, tmp_Counter		:	DZ	'TR DOS A:>          : '
  _mSetStr parTrDosB, tmp_Counter		:	DZ	'TR DOS B:>          : '
  _mSetStr parTrDosC, tmp_Counter		:	DZ	'TR DOS C:>          : '
  _mSetStr parTrDosD, tmp_Counter		:	DZ	'TR DOS D:>          : '
@@ -778,10 +797,10 @@ msgRusStrings:
  _mSetStrRus parQuickStartROM, tmp_Counter	:	DZ	'‡ ¯ã᪠¢ ०¨¬¥            : '
  _mSetStrRus parQuickStartZX, tmp_Counter	:	DZ	'‘¯¥ªâàã¬'
  _mSetStrRus parQuickStartSP, tmp_Counter	:	DZ	'‘¯à¨­â¥à'
- _mSetStrRus parTrDosA, tmp_Counter		:	DZ	'TR DOS A:>          : '
  _mSetStrRus valDefault, tmp_Counter		:	DZ	'<EFBFBD>® 㬮«ç ­¨î'
  _mSetStrRus valFDD, tmp_Counter		:	DZ	'FDD         '
  _mSetStrRus valHDD, tmp_Counter		:	DZ	'HDD         '
+ _mSetStrRus parTrDosA, tmp_Counter		:	DZ	'TR DOS A:>          : '
  _mSetStrRus parTrDosB, tmp_Counter		:	DZ	'TR DOS B:>          : '
  _mSetStrRus parTrDosC, tmp_Counter		:	DZ	'TR DOS C:>          : '
  _mSetStrRus parTrDosD, tmp_Counter		:	DZ	'TR DOS D:>          : '

src/bios/shared/DEFINES.INC

@@ -1,5 +1,5 @@
 ;=======================[All shared EQUs]=======================;
-BETA_BUILD	EQU			4			; ¤®¡ ¢«ï¥â áâப㠨 á®®¡é¥­¨¥ ® â¥á⮢®© ᡮથ ­  áâ à⮢®¬ íªà ­¥
+BETA_BUILD	EQU			5			; ¤®¡ ¢«ï¥â áâப㠨 á®®¡é¥­¨¥ ® â¥á⮢®© ᡮથ ­  áâ à⮢®¬ íªà ­¥
 ;======================[All shared defines]=====================;
  DEFINE		PACKED_MAIN		0			; ¯ ª®¢ âì MAIN ¨«¨ ¢«¥§ ¥â ¡¥§ í⮣®?
  DEFINE		SP2000_Loader_Flag	#0107			;
@@ -21,4 +21,5 @@ BETA_BUILD	EQU			4			;
  DEFINE		RECOVERYmountTYPE	1			; 1 - ¡ëáâàë© ­¥¬­®£® § å à¤ª®¦¥­ë© ¢ à¨ ­â. 2 - ¡®«¥¥ "¯à ¢¨«ì­ë©"
  DEFINE		RECOVERYrdChooseTYPE	1			; 1 - RECOVERY £à㧨âáï ¢ ¤¨áª 15, 2 - ¨é¥âáï ᢮¡®¤­ë© à ¬¤¨áª, ¥á«¨ ­¥â, â® ¢ 15-ë©
  DEFINE		FDD_NormalCount		0			; !TODO 
+ DEFINE		UnusedSettingsFeatures	0			;
 ;===============================================================;