...

Shared_Includes

@@ -1 +1 @@
-Subproject commit 57f4969f09a1bfc005af0b60316f03f30ee815ba
+Subproject commit 591d3212c9341f17d6dd034bf2b8da91bd2f6107

bios/exp/DCP.ASM

@@ -410,12 +410,12 @@
 	DW	%00'000'0'0010'1111
 	DB	ACEX.CNF_PORT
 
-	;DW	%00'000'0'0110'1100
+	DW	%00'000'0'0110'1100
-	;DW	%11'001'0'0110'1111
+	DW	%11'001'0'0110'1111
-	;DB	ACEX.SCALE
+	DB	ACEX.SCALE
-	;DW	%11'000'0'0110'1100
+	DW	%11'000'0'0110'1100
-	;DW	%11'001'0'0110'1111
+	DW	%11'001'0'0110'1111
-	;DB	ACEX.SCALE
+	DB	ACEX.SCALE
 
 	DW	%00'000'0'0000'1010
 	DW	%00'010'0'0110'1111

bios/loader/loader.asm

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

bios/rom/SETUP/MAIN.asm

@@ -1624,6 +1624,9 @@ ElementsBuffer:
  INCLUDE	'KEY.asm'
 ;.......................................
 
+KEY:	EI 
+	JP	WAITKEY
+
 FindStringAddr:
 	LD	L,A
 	LD	H,0
@@ -1636,11 +1639,8 @@ FindStringAddr:
 	LD	L,A	
 	RET
 
-
 POSTLEN:
-	LD	A,E
 	CALL	FindStringAddr
-	PUSH	HL
 	LD	BC,#0100
 	XOR	A
 	CPIR 
@@ -1651,9 +1651,8 @@ POSTLEN:
 	LD	A,40
 	SUB	C
 	LD	E,A
-	CALL	LP_SET_PLACE
+	;JP	ScreenPOS.LOCAT
-	POP	HL
+        JP      LP_SET_PLACE
-	JP	PRINTZ
 
 SETLAND:
 	LD	A,#0E							; !HARDCODE CMOS ï祩ª  options
@@ -1699,18 +1698,14 @@ POSTMSC:	CALL	FindStringAddr
 		LD	A,E
 		JP	CPRINTZ
 ;
-
 //////////////////////////////////////////////////////////////////////
  INCLUDE	'IM2_INT.asm'
 //////////////////////////////////////////////////////////////////////
 
 POSTMSG:	CALL    FindStringAddr
 		JP	PRINTZ
-;
 
 
-KEY:	EI 
-	JP	WAITKEY
 
 ;----------------------------------------------------------------------[]
 ;—â® £à㧨âì ¢ v<>‡“ ¯à¨ áâ àâ¥. ‚ à¨ ­âë:

bios/rom/SETUP/SETTINGS.asm

@@ -1,5 +1,6 @@
 ;U_SETUP:
-SETTINGS:	LD	A,CMOS_CELL.ScreenSET
+SETTINGS:
+	LD	A,CMOS_CELL.ScreenSET
 	CALL	READCMS
 	AND	high CMOS_CELL.ScreenSET.Mask.ColorStyle
 	LD	L,A
@@ -11,28 +12,21 @@ SETTINGS:	LD	A,CMOS_CELL.ScreenSET
         CALL    LP_CLS_WIN
 
 
-		LD	DE,#0100 + msgStrings.setupBiosVer	; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
+	LD	A,msgStrings.setupBiosVer
+	LD	DE,#0100                                                ; ?????
 	CALL	POSTLEN
-		LD	DE,#0200 + msgStrings.setupCopyRight	; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
+	LD	A,msgStrings.setupBiosVer
+	CALL	POSTMSG
+	LD	A,msgStrings.setupCopyRight
+	LD	DE,#0200
 	CALL	POSTLEN
-		LD	DE,#0500 + msgStrings.setupUtilityVer	; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
+	LD	A,msgStrings.setupCopyRight
+	CALL	POSTMSG
+	LD	A,msgStrings.setupUtilityVer
+	LD	DE,#0500
 	CALL	POSTLEN
-
+	LD	A,msgStrings.setupUtilityVer
-		; LD	D,1					; ª®®à¤¨­ â  Y + áâப  ¤«ï ¢ë¢®¤ 
+	CALL	POSTMSG
-		; LD	A,msgStrings.setupBiosVer
-		; CALL	POSTLEN
-		; LD	A,msgStrings.setupBiosVer
-		; CALL	POSTMSG
-		; LD	A,msgStrings.setupCopyRight
-		; LD	D,2					; áâப  ¤«ï ¢ë¢®¤ 
-		; CALL	POSTLEN
-		; LD	A,msgStrings.setupCopyRight
-		; CALL	POSTMSG
-		; LD	A,msgStrings.setupUtilityVer
-		; LD	D,5					; áâப  ¤«ï ¢ë¢®¤ 
-		; CALL	POSTLEN
-		; LD	A,msgStrings.setupUtilityVer
-		; CALL	POSTMSG
 
 	CALL	setFRAME.double
 
@@ -53,18 +47,22 @@ SETTINGS:	LD	A,CMOS_CELL.ScreenSET
 	CALL	TLINEV
 
 	LD	DE,#1906
+	;CALL	ScreenPOS.LOCAT
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.setupHelpStr1
 	CALL	POSTMSG
 	LD	DE,#1A06
+	;CALL	ScreenPOS.LOCAT
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.setupHelpStr2
 	CALL	POSTMSG
 	LD	DE,#1B06
+	;CALL	ScreenPOS.LOCAT
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.setupHelpStr3
 	CALL	POSTMSG
 	LD	DE,#1C06
+	;CALL	ScreenPOS.LOCAT
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.setupHelpStr4
 	CALL	POSTMSG
@@ -72,6 +70,7 @@ SETTINGS:	LD	A,CMOS_CELL.ScreenSET
 	
 
  IF NEW_FEATURE
+
         ; LD      HL,CurrentDateTime
         ; CALL    GETTIME
 
@@ -79,6 +78,7 @@ SETTINGS:	LD	A,CMOS_CELL.ScreenSET
 
         ; LD      A,(HL)
         ; AND     #F0        
+
  ENDIF
 
 
@@ -144,6 +144,7 @@ AGAIN:		LD	HL,AGAIN
 	SBC	HL,DE
 	JP	Z,pressedEnter
  ENDIF
+
 ; F2
 	LD	HL,#3C00	
 	AND	A
@@ -177,13 +178,16 @@ AGAIN:		LD	HL,AGAIN
 	POP	HL
 	RET 
 
-OLD_VAL:	CALL	READING
+OLD_VAL:
+	CALL    READING
 	JR      RestartSetup
 	RET 
 
-DEF_VAL:	CALL	SETDEF
+DEF_VAL:
+	CALL    SETDEF
 ;---------------------------------------
-RestartSetup:	;setXYpos
+RestartSetup:	
+;setXYpos
 	CALL	XY_SCREEN
 ;setLang
 	CALL	SETLAND
@@ -193,29 +197,35 @@ RestartSetup:	;setXYpos
 	JP OnChangeAction.setInt
 ;---------------------------------------
 
-SAVEXIT:	CALL	WRITING
+SAVEXIT:
+	CALL	WRITING
 	POP	HL
 	RET 
 
-SAVEV:		CALL	WRITING
+SAVEV:
+	CALL	WRITING
 	RET 
 
-SUBITM:		CALL	RCURSOR
+SUBITM:
+	CALL	RCURSOR
 	LD	A,(ITEM)
 	SUB	17							; !HARDCODE max items in column
 	JR	NC,GODITM2
 	XOR	A
-GODITM2:	LD	(ITEM),A
+GODITM2:
+	LD	(ITEM),A
 	JP	PCURSOR
 
-ADDITM:		CALL	RCURSOR
+ADDITM:
+	CALL	RCURSOR
 	LD	A,(ITEM)
 	ADD	A,17							; !HARDCODE max items in column
 	CP	SettingsItemsTabsAddrs.max
 	JR	C,GODITM
 	LD	A,SettingsItemsTabsAddrs.max
 	DEC	A
-GODITM:		LD	(ITEM),A
+GODITM:
+	LD	(ITEM),A
 	JP	PCURSOR
 
 INCITM:	CALL	RCURSOR
@@ -227,7 +237,8 @@ INCITM:		CALL	RCURSOR
 1:	LD	(ITEM),A
 	JP	PCURSOR
 
-DECITM:		CALL	RCURSOR
+DECITM:
+	CALL	RCURSOR
 	LD	A,(ITEM)
 	OR	A
 	JR	NZ,1F
@@ -236,7 +247,8 @@ DECITM:		CALL	RCURSOR
 	LD	(ITEM),A
 	JP	PCURSOR
 
-CCHANGE:	LD	A,CMOS_CELL.ScreenSET
+CCHANGE:
+	LD	A,CMOS_CELL.ScreenSET
 	CALL	READCMS
 	INC	A
 	AND	high CMOS_CELL.ScreenSET.Mask.ColorStyle
@@ -272,13 +284,14 @@ STT2:		LD	A,C
 	CALL	PCURSOR
 	RET 
 
-PTEXT:		CALL	Get_Item_Address
+PTEXT:	call    Get_Item_Address
 	JP      PITEM
 
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[v]
  IF NEW_FEATURE
 ; New procedure with IY reg
-LocateCursor:	call	Get_Item_Address
+LocateCursor:
+	call    Get_Item_Address
         LD      E,(IY+MenusItem.Column)
 	LD	D,(IY+MenusItem.Line)
 	ld      a,(IY+MenusItem.Name)
@@ -303,8 +316,10 @@ LocateCursor:	call	Get_Item_Address
 	SUB	C
 	LD	B,A
 	ret
+
  ELSE
-LocateCursor:	call	Get_Item_Address
+LocateCursor:
+	call    Get_Item_Address
 	LD	E,(HL)
 	INC	HL
 	LD	D,(HL)
@@ -338,18 +353,22 @@ LocateCursor:	call	Get_Item_Address
  ENDIF
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 
-PCURSOR:	call	LocateCursor
+PCURSOR:
+	call    LocateCursor
 	LD	A,(CURCLR)
 	JP	PRINTA
 
-RCURSOR:	call	LocateCursor
+RCURSOR:
+	call    LocateCursor
 	LD	A,(NORCLR)
 	JP	PRINTA
 
-FSCREEN:	LD	DE,#0000
+FSCREEN:
+	LD	DE,#0000
 	EI 
 	HALT 
-FSC1:		PUSH	DE
+FSC1:
+	PUSH	DE
         CALL    LP_SET_PLACE
 
 	LD	A,(NORCLR)
@@ -426,13 +445,15 @@ OVERD:		OR	(IY+MenusItem.ValueMax)
 	JR OVER
 
 
+pressedEnter:
 ; !TODO New Feature
-pressedEnter:	ld a,(iy+MenusItem.Type)
+        ld a,(iy+MenusItem.Type)
         and a
         ret z
         ld l,(iy+MenusItem.Action)
         ld h,(iy+MenusItem.Action+1)
         jp (HL)
+
  ELSE
 INCVAL:	call    Get_Item_Address
 	INC	HL
@@ -484,8 +505,10 @@ DECVAL:		call Get_Item_Address
 	CALL	ADDVAL
 	SUB	B
 	JR	OVER
-OVERD:		OR	(HL)
+OVERD:
+	OR	(HL)
 	JR OVER
+
  ENDIF
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 
@@ -532,15 +555,16 @@ PITEM:		LD	E,(IY+MenusItem.Column)					; x-coordinate
 	JR	NC,.getParameterNum
 	RLCA 
 	OR	A
-		JR	Z,.printParameter					; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
+	jr	Z,.printParameter                                       ; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
 
-		LD	C,A
+	ld c,a
-		XOR	A
+	xor a
-		LD	B,A
+	ld b,a
-		ADD	HL,BC							; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
+	add hl,bc                                                       ; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
 .printParameter:
-		LD	A,(HL)
+	ld a,(hl)
-		JP	POSTMSG
+	jp POSTMSG
+
  ELSE
 ; ¢ë§®¢ë ¯à®æ¥¤ãà ¡¨®á  ­ ¤¥îâáï ­  â®, çâ® ­¥ª®â®àë¥ à¥£¨áâàë ­¥ ¯®àâïâáï
 ; HL - item's address
@@ -567,20 +591,21 @@ PITEM:		LD	E,(HL)							; x-coordinate
 	JR	NC,.getParameterNum
 	RLCA 
 	OR	A
-		JR	Z,.printParameter					; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
+	jr	Z,.printParameter                                       ; ¯¥à¢ë© ¯ à ¬¥âà ¢ë¢®¤¨¬?
 
-		LD	C,A
+	ld c,a
-		XOR	A
+	xor a
-		LD	B,A
+	ld b,a
-		ADD	HL,BC							; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
+	add hl,bc                                                       ; ­ å®¤¨¬ ­®¬¥à ¯ à ¬¥âà 
 .printParameter:
-		LD	A,(HL)
+	ld a,(hl)
-		JP	POSTMSG
+	jp POSTMSG
  ENDIF
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 
 ; <20>¥ ¯®àâ¨â HL
-GET_CMOS_VALUE:	PUSH	BC
+GET_CMOS_VALUE:
+	PUSH	BC
 	LD	A,C
 	CALL	READCMS
 	POP	BC
@@ -595,26 +620,27 @@ GET_CMOS_VALUE:	PUSH	BC
 READCMS:	LD	D,high CMOSARE
 		LD	E,A
 		CP	CMOS.USED_MAX_ADDRESS+1
-		CCF
+		JR	NC,.error	
-		RET	C
-		;
 		LD	A,(DE)
 		RET
-
+		;
+.error:		SCF
+		RET 
 
 ; [x] ç⮡ ­¥ ¢«¥§«® ªã¤  ­¥ ­ ¤®
-WRITCMS:	LD	D,high CMOSARE
+WRITCMS:
+	LD	D,high CMOSARE
 	LD	E,A
 	CP	CMOS.USED_MAX_ADDRESS+1
-		CCF
+	JR	NC,.error
-		RET	C
-		;
 	LD	A,B
 	LD	(DE),A
 	RET
+.error:	SCF
+	RET 
 
-
+CHEKSUM:
-CHEKSUM:	LD	BC,DEFVAL.Size*256 + CMOS.USED_MIN_ADDRESS
+	LD	BC,DEFVAL.Size*256 + CMOS.USED_MIN_ADDRESS
 	LD	H,#DE							;!HARDCODE
 .loop:	LD	A,C
 	CALL	READCMS
@@ -628,23 +654,28 @@ CHEKSUM:	LD	BC,DEFVAL.Size*256 + CMOS.USED_MIN_ADDRESS
 	DJNZ	.loop
 	RET 
 
-TEST_CHECKSUM:	CALL	CHEKSUM
+TEST_CHECKSUM:
+	CALL	CHEKSUM
 	LD	A,CMOS_CELL.CheckSum
 	CALL	READCMS
 	CP	H
 	RET 
 
-; TSTCMOS:	LD	C,BIOS.CMOS_TEST
+; TSTCMOS:
+; 	LD	C,BIOS.CMOS_TEST
 ; 	JP_to_BIOS
 
 
-; RDCMOS:	LD	C,BIOS.CMOS_RD
+; RDCMOS:
+; 	LD	C,BIOS.CMOS_RD
 ; 	JP_to_BIOS
 
-; WRCMOS: 	LD	C,BIOS.CMOS_WR
+; WRCMOS:
+; 	LD	C,BIOS.CMOS_WR
 ; 	JP_to_BIOS
 
-READING:	LD	D,CMOS.USED_MIN_ADDRESS
+READING:
+	LD	D,CMOS.USED_MIN_ADDRESS
 .loop:	PUSH	DE
 	CALL    CMOS_RD
         POP	DE
@@ -674,16 +705,18 @@ WRITING:	CALL	CHEKSUM
 		JR	NZ,.loop
 		RET 
 
-SETDEFX:	LD	A,#FF
+SETDEFX:
+	LD	A,#FF
 	LD	(ERRSUM),A
 	CALL	SETDEF
 	JP	WRITING
 
-;!TODO ¬®¦¥â ¡ å­ãâì LDIR®¬? ¯®á¬®âà¥âì
+SETDEF:							;!TODO ¬®¦¥â ¡ å­ãâì LDIR®¬? ¯®á¬®âà¥âì
-SETDEF:		LD	HL,DEFVAL
+	LD	HL,DEFVAL
 	LD	C,DEFVAL.Size
 	LD	A,CMOS.USED_MIN_ADDRESS
-.loop:		LD	B,(HL)
+.loop:
+	LD	B,(HL)
 	INC	HL
 	PUSH	AF
 	CALL	WRITCMS
@@ -743,12 +776,14 @@ Get_Item_Address:
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[^]
 ;
  MODULE	OnChangeAction
-nothing:	RET
+nothing:
+        ret
 
         ; !TODO New Feature
         ; !TODO § ¬ãâ¨âì çâ®-⮠⨯  API ¤«ï à¨á®¢ ­¨ï ¢á¯«ë¢ îé¨å ®ª®­
         IF NEW_FEATURE
-SetTime:	xor	a
+SetTime:
+         xor     a
          ld      hl,#050E
          ld      de,#0C20
          ld      ix,memBUFFER.Shared
@@ -784,9 +819,11 @@ SetTime:	xor	a
          JP      WIN_RESTORE
         ENDIF
 
-setXYpos:	JP	XY_SCREEN
+setXYpos:
+        JP XY_SCREEN
 
-setVsinc:	ld	a,CMOS_CELL.ScreenSET
+setVsinc:
+        ld a,CMOS_CELL.ScreenSET
         call READCMS
         and high CMOS_CELL.ScreenSET.Mask.Sinc
         SCF
@@ -797,7 +834,8 @@ setVsinc:	ld	a,CMOS_CELL.ScreenSET
         dec a							;320
 .set:   jp FN_SYNC
 
-setLang:	CALL	SETLAND
+setLang:
+        CALL SETLAND
         ld a,(ITEM)
         ld (ITEM_Restore),a
         pop hl							; delete return adress from stack
@@ -890,7 +928,8 @@ REBOOTM		EQU	#02
 HDDWP           EQU     #01
 ;-----------------------------------------------------------------------;
 
-STYLES:		; Color	Style 0
+STYLES:
+; Color	Style 0
 	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.WHITE
 	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.YELLOW
 	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.WHITE
@@ -995,7 +1034,8 @@ DEFVAL:		DB	SAVERAM + SETBOOTSOUND + SDELAY1				;#0E - OPTIONS
 
 ;!FIXIT à á¯¨á âì âãâ ï祩ª¨ ª¬®á  ¨ í⮠ᬥ饭¨¥ ¬¥âª®© ¯à¨¢ï§ âì ¢¬¥áâ® #0E ¢ SETDEF
         _mInfoALIGN 256,0						; ¢ëà ¢­¨¢ ­¨¥ ­   ¤à¥á #XX00
-CMOSARE:	DS	14
+CMOSARE:
+	DS	14
 	;
 	DB	SAVERAM + SETBOOTSOUND + SDELAY1			;#0E - OPTIONS
 	DB	TDL250+TRATE30						;#0F - KEYBOARD