попытки начать наводить порядок

src/bios/BIOS.asm

@@ -142,10 +142,10 @@
 	EXPORT	BoardID.end
 	EXPORT	FN_CRIPT.cnf
 	EXPORT	ID_SPRINTER.bitstream_ver
+	EXPORT	bitstream_ver_hex
 	;EXPORT	ID_Version
 	;EXPORT	ID_SPRINTER.BIOS_ver
 	;EXPORT	BIOS_ver_hex
-	;EXPORT	bitstream_ver_hex
 	;EXPORT	Disk_subsystem_ver_hex
 	EXPORT	EXP_ID.VER	; ‚¥àá¨ï ¡¨®á 
 	EXPORT	EXP_ID.MOD
@@ -153,7 +153,8 @@
 	;EXPORT	ROM_ID.MOD
 	EXPORT	CNF_ID.VER	; ‚¥àá¨ï ª®­äë
 	EXPORT	CNF_ID.MOD
-
+	EXPORT	msgStrings.str_ACEX_MODEL
+	EXPORT	msgRusStrings.str_ACEX_MODEL
 	; LUA ALLPASS
 	; 	print ("DEPACKER", sj.get_label("DEPACKER.PackedMAIN"))
 	; 	print ("UnPacker", sj.get_label("UnPacker.PackedMAIN"))

src/bios/exp/EXP.asm

@@ -1103,7 +1103,7 @@ PORTS_INIT:
 	        INCLUDE 'FUNC_SERVICE.asm'
 
 	        INCLUDE 'FLEX.asm'
-; INCLUDE 'EXP_SCR.ASZ'
+	; INCLUDE 'EXP_SCR.ASZ'
 	        INCLUDE 'FUNC_PIC.ASM'
 	        INCLUDE 'FUNC_RAM_ROM_DRV.ASM'
 	        INCLUDE 'FUNC_SYS.ASM'

src/bios/loader/loader.asm

@@ -156,7 +156,7 @@
 
 	DEFINE		Altera_Chip	altera_chip
         LUA
-	 local file_path        =       'Build/Bin/temp/'
+	 local file_path        =       'Build/ACEX/'
 	 local file_ext         =       '.BIN'
 	 local altera_ver       =       sj.get_define("Altera_Chip")
 	 sj.insert_define("Altera_File", '"' .. file_path .. altera_ver .. file_ext .. '"')

src/bios/rom/SETUP/MAIN.asm

@@ -42,11 +42,13 @@
 ;#FEE0-#FEEF : Any buffer (Video mode set?!) Used in Sprinter DOS and CD driver
 ;#FF00
 ;
+
+; ¤«ï ¢ à¨ ­â  á § ¯ ª®¢ª®© ç á⨠¡¨­ à­¨ª  (¬®¦¥â ­¥ áà ¡®â âì ¡¥§ ­ ¯¨«ì­¨ª  §  ¤ ¢­®áâìî «¥â)
  IFDEF PREBUILD
 ;  ENCODING "DOS"
   DEVICE	ZXSPECTRUM4096                                          ; ¬®¤¥«ì á 4 ¬¥âà ¬¨ ¯ ¬ïâ¨
   MMU		2 e, 0                                                  ; áâà ­¨æ  0 ¢ ¡ ­ªã 2 ¨ ¯à®¢¥àª  ­  £à ­¨æë.
-  INCLUDE 'src/bios/shared/includes.inc'; Includes
+  INCLUDE 'src/bios/shared/includes.inc'
   ORG	COMPILE_ADDR.MAIN
   OUTPUT 'Build/Bin/temp/MAIN.BIN'
  ENDIF

src/bios/rom/SETUP/messages.z80

@@ -525,15 +525,16 @@ msgStrings:
  _mSetStr ideNone, tmp_Counter			:	DZ	'None              '
  _mSetStr ideSkiped, tmp_Counter		:	DZ	'Skipped           '
  _mSetStr ideFail, tmp_Counter			:	DZ	'Fail              '	; !FIXIT strFail
- _mSetStr spModel, tmp_Counter			:	DZ	'Model name: '
+ _mSetStr spModel, tmp_Counter			:	DZ	'Model name : '
- _mSetStr spCNFver, tmp_Counter			:	DZ	'Config.   : '
+.str_ACEX_MODEL						EQU	 $					; 㪠§ â¥«ì ­  áâப㠭¨¦¥ ¤«ï ¯ âç   ¯¤¥©â¥à®¬
- _mSetStr spMemory, tmp_Counter			:	DZ	'Memory    : '
+ _mSetStr spCNFver, tmp_Counter			:	DZ	'1K30 config: '
- _mSetStr cmosFound, tmp_Counter		:	DZ	'CMOS      : Found'
+ _mSetStr spMemory, tmp_Counter			:	DZ	'Memory     : '
- _mSetStr cmosNone, tmp_Counter			:	DZ	'CMOS      : None'
+ _mSetStr cmosFound, tmp_Counter		:	DZ	'CMOS       : Found'
- _mSetStr memoryAvailable, tmp_Counter		:	DZ	'Available : '
+ _mSetStr cmosNone, tmp_Counter			:	DZ	'CMOS       : None'
+ _mSetStr memoryAvailable, tmp_Counter		:	DZ	'Available  : '
 ; _mSetStr unknownSTR1, tmp_Counter		:	DZ	"7"
 ; _mSetStr unknownSTR2, tmp_Counter		:	DZ	"8"
- _mSetStr boardID, tmp_Counter			:	DZ	'Board ID  : '
+ _mSetStr boardID, tmp_Counter			:	DZ	'Board ID   : '
  _mSetStr bootFdd, tmp_Counter			:	DZ	'Boot from Diskette'
 ; _mSetStr bootHdd, tmp_Counter			:	DZ	'Boot from Hard disk '
  _mSetStr bootHdd, tmp_Counter			:	DZ	'Boot from HDD '
@@ -675,15 +676,16 @@ msgRusStrings:
  _mSetStrRus ideNone, tmp_Counter		:	DZ	'<EFBFBD>¥â               '
  _mSetStrRus ideSkiped, tmp_Counter		:	DZ	'<EFBFBD>யã饭          '
  _mSetStrRus ideFail, tmp_Counter		:	DZ	'<EFBFBD>¥ ®¯à¥¤¥«ñ­      '
- _mSetStrRus spModel, tmp_Counter		:	DZ	'Œ®¤¥«ì    : '
+ _mSetStrRus spModel, tmp_Counter		:	DZ	'Œ®¤¥«ì     : '
- _mSetStrRus spCNFver, tmp_Counter		:	DZ	'Š®­ä¨£.   : '
+.str_ACEX_MODEL						EQU	 $					; 㪠§ â¥«ì ­  áâப㠭¨¦¥ ¤«ï ¯ âç   ¯¤¥©â¥à®¬
- _mSetStrRus spMemory, tmp_Counter		:	DZ	'<EFBFBD> ¬ïâì    : '
+ _mSetStrRus spCNFver, tmp_Counter		:	DZ	'1K30 ª®­ä¨£: '
- _mSetStrRus cmosFound, tmp_Counter		:	DZ	'CMOS      : <EFBFBD> ©¤¥­'
+ _mSetStrRus spMemory, tmp_Counter		:	DZ	'<EFBFBD> ¬ïâì     : '
- _mSetStrRus cmosNone, tmp_Counter		:	DZ	'CMOS      : <EFBFBD>¥â'
+ _mSetStrRus cmosFound, tmp_Counter		:	DZ	'CMOS       : <EFBFBD> ©¤¥­'
- _mSetStrRus memoryAvailable, tmp_Counter	:	DZ	'„®áâ㯭®  : '
+ _mSetStrRus cmosNone, tmp_Counter		:	DZ	'CMOS       : <EFBFBD>¥â'
+ _mSetStrRus memoryAvailable, tmp_Counter	:	DZ	'„®áâ㯭®   : '
 ; _mSetStrRus unknownSTR1, tmp_Counter		:	DZ	'7'
 ; _mSetStrRus unknownSTR2, tmp_Counter		:	DZ	'8'
- _mSetStrRus boardID, tmp_Counter		:	DZ	'ID ¯« âë  : '
+ _mSetStrRus boardID, tmp_Counter		:	DZ	'ID ¯« âë   : '
  _mSetStrRus bootFdd, tmp_Counter		:	DZ	'‡ ¯ãáª á ¤¨áª¥âë'
  _mSetStrRus bootHdd, tmp_Counter		:	DZ	'‡ ¯ã᪠á HDD '
  _mSetStrRus bootCd, tmp_Counter		:	DZ	'‡ ¯ã᪠á CD-ROM '
@@ -791,4 +793,3 @@ MSG_RUS.size     EQU $-MSG_RUS
 ;==================================================================================================================================
 	ASSERT MSG_ENG.size = MSG_RUS.size, "ERROR IN MESSAGE STRINGS: RUS and ENG do not match"
 ;
-;

src/bios/rom/_MEM_MAP.INC.txt

@@ -1,17 +0,0 @@
-;
-; ﾛﾛﾛﾛﾛﾛｻ ﾛﾛﾛﾛﾛﾛﾛｻﾛﾛﾛﾛﾛﾛｻ  ﾛﾛﾛﾛﾛｻ  ﾛﾛﾛﾛﾛﾛｻﾛﾛｻ  ﾛﾛｻﾛﾛﾛﾛﾛﾛﾛｻﾛﾛﾛﾛﾛﾛｻ 
-; ﾛﾛﾉﾍﾍﾛﾛｻﾛﾛﾉﾍﾍﾍﾍｼﾛﾛﾉﾍﾍﾛﾛｻﾛﾛﾉﾍﾍﾛﾛｻﾛﾛﾉﾍﾍﾍﾍｼﾛﾛｺ ﾛﾛﾉｼﾛﾛﾉﾍﾍﾍﾍｼﾛﾛﾉﾍﾍﾛﾛｻ
-; ﾛﾛｺ  ﾛﾛｺﾛﾛﾛﾛﾛｻ  ﾛﾛﾛﾛﾛﾛﾉｼﾛﾛﾛﾛﾛﾛﾛｺﾛﾛｺ     ﾛﾛﾛﾛﾛﾉｼ ﾛﾛﾛﾛﾛｻ  ﾛﾛﾛﾛﾛﾛﾉｼ
-; ﾛﾛｺ  ﾛﾛｺﾛﾛﾉﾍﾍｼ  ﾛﾛﾉﾍﾍﾍｼ ﾛﾛﾉﾍﾍﾛﾛｺﾛﾛｺ     ﾛﾛﾉﾍﾛﾛｻ ﾛﾛﾉﾍﾍｼ  ﾛﾛﾉﾍﾍﾛﾛｻ
-; ﾛﾛﾛﾛﾛﾛﾉｼﾛﾛﾛﾛﾛﾛﾛｻﾛﾛｺ     ﾛﾛｺ  ﾛﾛｺﾈﾛﾛﾛﾛﾛﾛｻﾛﾛｺ  ﾛﾛｻﾛﾛﾛﾛﾛﾛﾛｻﾛﾛｺ  ﾛﾛｺ
-; ﾈﾍﾍﾍﾍﾍｼ ﾈﾍﾍﾍﾍﾍﾍｼﾈﾍｼ     ﾈﾍｼ  ﾈﾍｼ ﾈﾍﾍﾍﾍﾍｼﾈﾍｼ  ﾈﾍｼﾈﾍﾍﾍﾍﾍﾍｼﾈﾍｼ  ﾈﾍｼ
-;
-Depacker_start			EQU #D000
-;Depacked_logo_start		EQU #D900
-;MAIN_Unpacked_Start		EQU #8000
-
-COMPILE_ADDR:
-.EXP:					EQU 0
-.ROM:					EQU 0
-.MAIN					EQU #8000
-

src/bios/rom/_ROM.txt

@@ -1,119 +0,0 @@
-;-----------[#0000 Extended]------------
-	INCLUDE 'src/bios/rom/EXTENDED/EXTENDED.ASM'
-;---------------------------------------
-
-
-
-;-------------[#1000 SETUP]-------------
-	BLOCK #1000-$,#FF
-setup_start		EQU	$
-
-	DISP #8000							;!!!!!!!!!!hardcode
-
-		DB	"SETUP"
-;		JR	JUMP
-		DB	" (C) 2001 PETERS PLUS LTD "
-SETUP_DEPACK:
-		DI 
-		POP	HL
-		LD	SP,#7FFF					;!!!!!!!!!!hardcode
-		PUSH	HL
-		PUSH	AF
-		LD	HL,#8000					;!!!!!!!!!!hardcode
-		PUSH	HL
-		LD	DE,Depacker_start			;  ¤à¥á ¯à®æ¥¤ãàë ¤¥¯ ª¥à  !!!!!
-		PUSH	DE
-		LD	HL,Depacker
-		LD	BC,Depacker.length
-		LDIR 
-		LD	HL,Depacker.packcode		; £¤¥  à娢
-		LD	DE,COMPILE_ADDR.MAIN		; ªã¤  à á¯ ª®¢ë¢ âì
-		RET 
-
-Depacker:
-	ENT
-
-
-DEPACK_CODE:
-	DISP		Depacker_start
-;		ᤥ« âì âãâ ãá«®¢¨¥ ¤«ï ¨á室­¨ª  ¤¥¯ ª¥à , ç⮡  ¢â®¬ â®¬ ¢ë¡¨à «áï à §­ë©  «£®à¨â¬ § ¯ ª®¢ª¨ ¨ à á¯ ª®¢ª¨
-		INCLUDE	'src/bios/ROM/SETUP/DEHRUST.ASM'
-	ENT
-DEPACK_CODE.length		EQU $-DEPACK_CODE
-
-
-	DISP Depacker+DEPACK_CODE.length
-Depacker.packcode:
-		INCBIN 'Build/Bin/MAIN.PAK'
-Depacker.length	EQU	$-Depacker.packcode+DEPACK_CODE.length
-	ENT
-
-setup_length	EQU	$-setup_start
-;---------------------------------------
-
-
-
-;---------------[SET EXP]---------------
-	BLOCK #3FD0-$,#FF
-; call exp bios from setup
-RST18h:
-	PUSH	AF
-	LD	A,D_ROM16OFF					; set exp-rom to bank0
-	OUT	(SYS_PORT_ON),A
-	POP	AF
-	RET 
-;---------------------------------------
-
-
-
-;-------------[???????????]-------------
-	BLOCK #3FD8-$,#FF
-A3FD8:
-	JP	#0107
-;---------------------------------------
-
-
-
-;-------------[???????????]-------------
-	BLOCK #3FE0-$,#FF
-
-A3FE0:
-	LD	A,#00
-	OUT	(SYS_PORT_OFF),A
-	JP	#0000
-;---------------------------------------
-
-
-
-;-------------[???????????]-------------
-	BLOCK #3FE8-$,#FF
-RET_EXP_ROM:
-	PUSH	AF
-	LD	A,D_ROM16OFF
-	OUT	(SYS_PORT_ON),A
-	JP	#0100
-;---------------------------------------
-
-
-
-;-------------[???????????]-------------
-	BLOCK #3FF0-$,255
-A3FF0:
-	PUSH	AF
-	DI 
-	LD	A,D_ROM16OFF
-	OUT	(SYS_PORT_OFF),A
-	JR	A3FD8
-;---------------------------------------
-
-
-
-;-------------[???????????]-------------
-A3FF8:
-	PUSH	AF
-	LD	A,#00
-	OUT	(SYS_PORT_OFF),A
-	JP	#0000
-;---------------------------------------
-A4000:
-;=======================================

src/bios/shared/VERSION.inc

@@ -2,7 +2,7 @@
 ;------[Version of BIOS "VER.MOD"]------
 EXP_ID:
 .VER			EQU	3                                       ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
-.MOD			EQU	05                                      ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
+.MOD			EQU	06                                      ; <EFBFBD>®¬¥à ¢¥àᨨ ¬¥­ïâì âãâ!
 BIOS_ver_hex		EQU	EXP_ID.VER*256+EXP_ID.MOD
 
  DEFINE BIOS_ver_string '0'+EXP_ID.VER, '.', '0'+EXP_ID.MOD/10, '0'+EXP_ID.MOD-(EXP_ID.MOD/10)*10