From c4debab264e2e3273b4ecb391f1142ef776d852a Mon Sep 17 00:00:00 2001 From: Anatoliy Belyanskiy Date: Fri, 24 May 2024 20:32:17 +1000 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D0=B2=20FN=5FCRIPT.choose?= =?UTF-8?q?=5Fchip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bios/exp/FUNC_SYS.ASM | 5 +++-- src/bios/rom/SETUP/MAIN.asm | 3 +-- src/bios/rom/SETUP/messages.z80 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bios/exp/FUNC_SYS.ASM b/src/bios/exp/FUNC_SYS.ASM index 58a8ec3..b0c0eff 100644 --- a/src/bios/exp/FUNC_SYS.ASM +++ b/src/bios/exp/FUNC_SYS.ASM @@ -105,12 +105,13 @@ FN_CRIPT: .choose_chip: XOR A LD HL, - ACEX.Chip_ID.K30 - ADD HL,DE + ADC HL,DE LD HL,.chip_ID_TXT.K30 RET Z + OR A ; снять CF INC A LD HL, - ACEX.Chip_ID.K50 - ADD HL,DE + ADC HL,DE LD HL,.chip_ID_TXT.K50 RET Z POP HL ; баланс стека diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index ebe2b36..97f02e3 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -1126,8 +1126,7 @@ PIDNUM: LD HL,memBUFFER.ID RET PIDBOARD: - LD B,1 - CALL FN_CRIPT + CALL FN_CRIPT.board_id PUSH DE PUSH HL diff --git a/src/bios/rom/SETUP/messages.z80 b/src/bios/rom/SETUP/messages.z80 index b9b6ba1..110aaa6 100644 --- a/src/bios/rom/SETUP/messages.z80 +++ b/src/bios/rom/SETUP/messages.z80 @@ -677,7 +677,7 @@ msgRusStrings: _mSetStrRus ideSkiped, tmp_Counter : DZ 'Пропущен ' _mSetStrRus ideFail, tmp_Counter : DZ 'Не определён ' _mSetStrRus spModel, tmp_Counter : DZ 'Модель : ' -.str_ACEX_MODEL EQU $ ; указатель на строку ниже для патча апдейтером +.str_ACEX_MODEL EQU $ ; указатель на строку ниже для патча апдейтером ; !FIXIT ? вытягивать через FN_CRIPT.Acex_ver ? _mSetStrRus spCNFver, tmp_Counter : DZ '1K30 конфиг: ' _mSetStrRus spMemory, tmp_Counter : DZ 'Память : ' _mSetStrRus cmosFound, tmp_Counter : DZ 'CMOS : Найден'