немного изменён подход к нумерации версий BIOS и Bitstream

Shared_Includes

@@ -1 +1 @@
-Subproject commit 215d0f3c90865dd2c4c0d92d17e64513a0b0407e
+Subproject commit 5a5dcf0bd035d2adaaa27d28bb8ed1bd86260d59

src/bios/BIOS.asm

@@ -19,6 +19,17 @@
  INCLUDE 'src/bios/shared/includes.inc'	; Includes
 ;---------------------------------------
 
+
+ LUA PASS1
+	local date, month, year = Get_date_RU(sj.get_define("__DATE__"))
+	BuildDate = "'" .. date .. "." .. month .. "." .. year .. "'"
+	sj.insert_define("BUILD_DATE", BuildDate)
+ ENDLUA
+ LUA ALLPASS
+	sj.insert_define("BUILD_DATE", BuildDate)
+ ENDLUA
+
+
  IF PACKED_MAIN
 ;------------[MAIN prebuild]------------;
 	LUA PASS1
@@ -126,8 +137,11 @@
 	OUTEND	
 ;---------------------------------------
 ;
-	EXPORT	ID_Version
+	;EXPORT	ID_Version
+	EXPORT	FN_CRIPT.cnf
+	EXPORT	ID_SPRINTER.BIOS_ver
 	EXPORT	ID_SPRINTER.bitstream_ver
+	EXPORT	BIOS_ver_hex
 	EXPORT	bitstream_ver_hex
 	EXPORT	Disk_subsystem_ver_hex
 	EXPORT	EXP_ID.VER

src/bios/exp/EXP.asm

@@ -207,25 +207,33 @@ NMI_Point:
 ;        POP DE
 ;        POP HL
 ;        RET
-
 ;=======================================
 ;	BLOCK MEM_MAP.ID_Version-$,0  ;#C0-$,0
+
 ID_Version:
- 	dw bitstream_ver_hex				; Version of bitstream hex
+ 	dw BIOS_ver_hex
 ID_SPRINTER_length:
 		DB	ID_SPRINTER.LENGTH
 ID_SPRINTER:	; § ¯¨áì 1
-		DB	'Hardware v'
+		DB	'Firmware v'
-.bitstream_ver:	DB	bitstream_ver_string,0
+.BIOS_ver:	DB	BIOS_ver_string,', '
+	IF DEBUG
+		DB	'BETA release'
+	ELSE
+		DB	'release ',BUILD_DATE
+	ENDIF
+		DB	0
 		; § ¯¨áì 2
 		DB	'Sprinter',0
+		; § ¯¨áì 3
+.bitstream_ver:	DB	bitstream_ver_string,0
 		DB	0
 		;
 .Records_Num	EQU	3
 .LENGTH		EQU $-ID_SPRINTER
 
 ; Check for max length of string
-	ASSERT ID_SPRINTER.LENGTH < #20, 'ERROR! ID String is to long!'
+	ASSERT ID_SPRINTER.LENGTH < #40, 'ERROR! ID String is to long!'
 ;=======================================
 
 

src/bios/exp/FUNC_SYS.ASM

@@ -96,6 +96,8 @@ FN_CRIPT:
 	POP	DE
 	LD	BC,.chip_ID_TXT.RecordSize
 	LDIR
+.cnf+1:	LD	DE,bitstream_ver_hex
+	AND	A
 	RET
 	;
 .choose_chip:

src/bios/rom/SETUP/MAIN.asm

@@ -410,9 +410,9 @@ INSTALL:
 	LD	HL,memBUFFER.ID
 	LD	A,COLORS.CGA.INC.LCYAN
 	CALL	CPRINTZ
-	LD	HL,BUILD
+	; LD	HL,BUILD
-	LD	A,COLORS.CGA.INC.LCYAN
+	; LD	A,COLORS.CGA.INC.LCYAN
-	CALL	CPRINTZ
+	; CALL	CPRINTZ
 
 	LD	DE,#0128				; !HARDCODE
         CALL    LP_SET_PLACE
@@ -444,8 +444,8 @@ INSTALL:
 	OUT	(SLOT3),A
 	RET 
 
-BUILD:
+;BUILD:
-	db	', BIOS v', Disk_subsystem_ver_txt,0                    ; !FIXIT ¬®¦¥â ¢®âª­ãâì ¢¬¥á⥠á msgStrings ?
+;	db	', BIOS v', Disk_subsystem_ver_txt,0                    ; !FIXIT ¬®¦¥â ¢®âª­ãâì ¢¬¥á⥠á msgStrings ?
 
 RSTID:	DB	"RESTART",0
 .size   EQU     $-RSTID
@@ -612,6 +612,11 @@ CHEKOK:	;CALL	ScreenPOS.GET_CUR
 	CALL	PIDBOARD
 	CALL	ScreenPOS.CRLF
 
+	LD	A,msgStrings.spCNFver
+	CALL	POSTMSG
+	CALL	CNF_VER_PRINT
+	CALL	ScreenPOS.CRLF
+
 	LD	A,msgStrings.spMemory
 	CALL	POSTMSG
         CALL    EMM.GetMemSize
@@ -1142,6 +1147,16 @@ PIDBOARD:
 	LD	A,E
 	JP	PRNHEX
 
+CNF_VER_PRINT:
+ 	LD	HL,memBUFFER.ID
+	IFN	BIOS.FN_VERSION.STR.BitstreamVer = 0
+	 LD	BC,BIOS.FN_VERSION.STR.BitstreamVer*256
+	 XOR	A
+.loop:	 CPIR
+	 DJNZ	.loop
+	ENDIF
+	JP	PRINTZ
+
 ;PIDNUM	LD	A,#0D
 ;	LD	HL,ID_BUFFER
 ;	LD	BC,#0030

src/bios/rom/SETUP/messages.z80

@@ -26,15 +26,6 @@
 	 end
         ENDLUA
 
-	LUA PASS1
-		local date, month, year = Get_date_RU(sj.get_define("__DATE__"))
-                BuildDate = "'" .. date .. "." .. month .. "." .. year .. "'"
-		sj.insert_define("BUILD_DATE", BuildDate)
-        ENDLUA
-        LUA ALLPASS
-                sj.insert_define("BUILD_DATE", BuildDate)
-        ENDLUA
-;
  LUA PASS1
 	SettingsTabsOrder = {
 		[1]={
@@ -515,7 +506,7 @@ tmp_Counter DEFL 0
 msgStrings:
  _mSetStr copyRightPeters, tmp_Counter		:	DZ	'Copyright (c) 2002 Peters Plus'
  _mSetStr copyRightSPTeam, tmp_Counter		:	DZ	'Copyright (c) 2009-', SPTeam_year, ' Sprinter Team'
- _mSetStr setupBiosVer, tmp_Counter		:	DZ	'Sprinter BIOS v', Disk_subsystem_ver_txt
+ _mSetStr setupBiosVer, tmp_Counter		:	DZ	'Sprinter BIOS v', BIOS_ver_string
  _mSetStr setupCopyRight, tmp_Counter		:	DZ	'Copyright (c) 2002 Peters Plus, (c) 2009-', SPTeam_year, ' Sprinter Team'
  _mSetStr setupUtilityVer, tmp_Counter		:	DZ	'SETUP Utility v', SetupVer
  _mSetStr setupHelpStr1, tmp_Counter		:	DZ	'ESC : Quit                               F10 : Save & Exit Setup'
@@ -535,6 +526,7 @@ msgStrings:
  _mSetStr ideSkiped, tmp_Counter		:	DZ	'Skipped           '
  _mSetStr ideFail, tmp_Counter			:	DZ	'Fail              '	; !FIXIT strFail
  _mSetStr spModel, tmp_Counter			:	DZ	'Model name: '
+ _mSetStr spCNFver, tmp_Counter			:	DZ	'Config.   : '
  _mSetStr spMemory, tmp_Counter			:	DZ	'Memory    : '
  _mSetStr cmosFound, tmp_Counter		:	DZ	'CMOS      : Found'
  _mSetStr cmosNone, tmp_Counter			:	DZ	'CMOS      : None'
@@ -664,7 +656,7 @@ tmp_Counter = 0
 msgRusStrings:
  _mSetStrRus copyRightPeters, tmp_Counter	:	DZ	'Copyright (c) 2002 Peters Plus'
  _mSetStrRus copyRightSPTeam, tmp_Counter	:	DZ	'Copyright (c) 2009-', SPTeam_year, ' Sprinter Team'
- _mSetStrRus setupBiosVer, tmp_Counter	        :       DZ      'Sprinter BIOS v', Disk_subsystem_ver_txt
+ _mSetStrRus setupBiosVer, tmp_Counter		:	DZ	'Sprinter BIOS v', BIOS_ver_string
  _mSetStrRus setupCopyRight, tmp_Counter	:	DZ	'Copyright (c) 2002 Peters Plus, (c) 2009-', SPTeam_year, ' Sprinter Team'
  _mSetStrRus setupUtilityVer, tmp_Counter	:	DZ	'SETUP Utility v', SetupVer
  _mSetStrRus setupHelpStr1, tmp_Counter		:	DZ	'ESC : ‚ë©â¨                              F10 : ‘®åà ­¨âì ¨ ¢ë©â¨'
@@ -684,12 +676,13 @@ msgRusStrings:
  _mSetStrRus ideSkiped, tmp_Counter		:	DZ	'<EFBFBD>யã饭          '
  _mSetStrRus ideFail, tmp_Counter		:	DZ	'<EFBFBD>¥ ®¯à¥¤¥«ñ­      '
  _mSetStrRus spModel, tmp_Counter		:	DZ	'Œ®¤¥«ì    : '
+ _mSetStrRus spCNFver, tmp_Counter		:	DZ	'Š®­ä¨£.   : '
  _mSetStrRus spMemory, tmp_Counter		:	DZ	'<EFBFBD> ¬ïâì    : '
  _mSetStrRus cmosFound, tmp_Counter		:	DZ	'CMOS      : <EFBFBD> ©¤¥­'
  _mSetStrRus cmosNone, tmp_Counter		:	DZ	'CMOS      : <EFBFBD>¥â'
  _mSetStrRus memoryAvailable, tmp_Counter	:	DZ	'„®áâ㯭®  : '
-; _mSetStrRus unknownSTR1, tmp_Counter          :       DZ      '7"
+; _mSetStrRus unknownSTR1, tmp_Counter		:	DZ	'7'
-; _mSetStrRus unknownSTR2, tmp_Counter          :       DZ      '8"
+; _mSetStrRus unknownSTR2, tmp_Counter		:	DZ	'8'
  _mSetStrRus boardID, tmp_Counter		:	DZ	'ID ¯« âë  : '
  _mSetStrRus bootFdd, tmp_Counter		:	DZ	'‡ ¯ãáª á ¤¨áª¥âë'
  _mSetStrRus bootHdd, tmp_Counter		:	DZ	'‡ ¯ã᪠á HDD '

src/bios/shared/VERSION.inc

@@ -1,12 +1,11 @@
 ;============[For EXP part]=============
 ;---[Version of bitstream "VER.MOD"]----
- MODULE EXP_ID
+EXP_ID:
-VER                     EQU     3                                       ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
+.VER			EQU	3                                       ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
-MOD                     EQU     05                                      ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
+.MOD			EQU	05                                      ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
- ENDMODULE
+BIOS_ver_hex		EQU	EXP_ID.VER*256+EXP_ID.MOD
-bitstream_ver_hex       EQU     EXP_ID.VER*256+EXP_ID.MOD
 
- DEFINE bitstream_ver_string '0'+EXP_ID.VER, '.', '0'+EXP_ID.MOD/10, '0'+EXP_ID.MOD-(EXP_ID.MOD/10)*10
+ DEFINE BIOS_ver_string '0'+EXP_ID.VER, '.', '0'+EXP_ID.MOD/10, '0'+EXP_ID.MOD-(EXP_ID.MOD/10)*10
 ;---------------------------------------
 
 
@@ -19,16 +18,26 @@ bitstream_ver_hex       EQU     EXP_ID.VER*256+EXP_ID.MOD
 
 ;============[For ROM part]=============
 ;-[Version of disk subsystem "VER.MOD"]-
- MODULE ROM_ID
+ROM_ID:
-VER                     EQU     2                                       ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
+.VER			EQU	2					; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
-MOD                     EQU     55                                      ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
+.MOD			EQU	55					; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
- ENDMODULE
 Disk_subsystem_ver_hex	EQU	ROM_ID.VER*256+ROM_ID.MOD
 
  DEFINE Disk_subsystem_ver_txt '0'+ROM_ID.VER, '.', '0'+ROM_ID.MOD/10, '0'+ROM_ID.MOD-(ROM_ID.MOD/10)*10
 ;---------------------------------------
 
+
+;============[For CNF part]=============
+CNF_ID:
+.VER			EQU	3					; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
+.MOD			EQU	05					; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
+bitstream_ver_hex       EQU     CNF_ID.VER*256+CNF_ID.MOD
+
+ DEFINE bitstream_ver_string '0'+CNF_ID.VER, '.', '0'+CNF_ID.MOD/10, '0'+CNF_ID.MOD-(CNF_ID.MOD/10)*10
+;---------------------------------------
+
+
+;=======================================
         DEFINE SPTeam_year      '2024'
         DEFINE SetupVer         '1.60'
-;=======================================
+;---------------------------------------
-;