From 00776cee064f4814c3118b867932808ce7a15577 Mon Sep 17 00:00:00 2001 From: Tolik Date: Sun, 20 Apr 2025 05:35:39 +1000 Subject: [PATCH] recovery.img update --- Shared_Includes | 2 +- src/bios/exp/EXTENDED/FDD_DRIVER_2.asm | 13 +++++++------ src/bios/rom/SETUP/MAIN.asm | 13 ++++++++----- src/bios/shared/RECOVERY.IMG | Bin 98304 -> 98304 bytes 4 files changed, 16 insertions(+), 12 deletions(-) mode change 100755 => 100644 src/bios/shared/RECOVERY.IMG diff --git a/Shared_Includes b/Shared_Includes index 4ecde88..4a5753e 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 4ecde88739cd3e2b7447dd36b79163f1a5e0d40d +Subproject commit 4a5753ea2c090485263117929d6a734d4a669ec4 diff --git a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm b/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm index 3a2f58f..6f98de1 100644 --- a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm +++ b/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm @@ -669,10 +669,9 @@ SEEK: LD XL,A OUT (FDC_93.DrvCTRL),A IN A,(FDC_93.Track) CP C - PUSH BC + ;PUSH BC CALL NZ,P50ms - ; - POP BC + ;POP BC LD A,C OUT (FDC_93.Data),A IN A,(FDC_93.Track) @@ -685,9 +684,9 @@ SEEK: LD XL,A LD A,C OUT (FDC_93.Track),A RET Z -.STOL: PUSH BC +.STOL: ;PUSH BC CALL P50ms - POP BC + ;POP BC RET ; ;P750ms LD B,3 @@ -695,12 +694,14 @@ SEEK: LD XL,A ; CALL P1ms ; DJNZ PMS2 ; RET -P50ms: LD A,12 +P50ms: PUSH BC + LD A,12 .P1ms: LD C,255 .PMS: DEC C JR NZ,.PMS DEC A JR NZ,.P1ms + POP BC RET ; diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index f4e1785..d12460a 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -1194,22 +1194,25 @@ MOVE1: LD HL,#8000 ; !HARDCODE SYSID: DZ "Starting..." .length EQU $-SYSID +;!FIXIT переделать под структуру для переменных FDD, отдельные переменные под A и B FD144A: DB #80,#12,#02,#50,#00,#00,#02,FDD_INIT_TABLE.FDD +.Size EQU $ - FD144A FD720A: DB #00,#09,#02,#50,#00,#00,#02,FDD_INIT_TABLE.FDD +.Size EQU $ - FD720A FDD_INSTAL: IN A,(SLOT3) EX AF,AF' LD A,SYS_PAGE OUT (SLOT3),A LD HL,FDD_INIT_TABLE.FDD_0 - LD BC,SYS_PAGE.FDD_TBL.Size*256 + #FF ; table_size*256 + fill_byte + LD BC,SYS_PAGE.FDD_TBL.Size*256 + #FF ; table_size*256 + fill_byte .FILLFDD: LD (HL),C INC HL DJNZ .FILLFDD ; EX AF,AF' OUT (SLOT3),A - LD BC,CMOS_CELL.DrivesSetup_1.Mask.FirstFDD ;#0311 + LD BC,CMOS_CELL.DrivesSetup_1.Mask.FirstFDD ;#0311 CALL GET_CMOS_VALUE LD HL,FD720A OR A @@ -1222,11 +1225,11 @@ FDD_INSTAL: IN A,(SLOT3) LD A,SYS_PAGE OUT (SLOT3),A LD DE,FDD_INIT_TABLE.FDD_0 - LD BC,#0008 ; !HARDCODE + LD BC,FD144A.Size ; !HARDCODE LDIR EX AF,AF' OUT (SLOT3),A -.NOFDD0: LD BC,CMOS_CELL.DrivesSetup_1.Mask.SecondFDD ;#0C11 +.NOFDD0: LD BC,CMOS_CELL.DrivesSetup_1.Mask.SecondFDD ;#0C11 CALL GET_CMOS_VALUE LD HL,FD720A OR A @@ -1239,7 +1242,7 @@ FDD_INSTAL: IN A,(SLOT3) LD A,SYS_PAGE OUT (SLOT3),A LD DE,FDD_INIT_TABLE.FDD_1 - LD BC,#0008 ; !HARDCODE + LD BC,FD144A.Size ; !HARDCODE LDIR EX AF,AF' OUT (SLOT3),A diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG old mode 100755 new mode 100644 index 2508338b5f833175757e4a79d0b687b404a59a76..be9229c23a3e1d9c191c1ada17d844d4408297bc GIT binary patch delta 2214 zcmeHJe`p(39KV;^m~>m3TO}^j+1#y@^oDYrYz^lUrB1S0w2;~j8%qCB94M?5COBGX z)+Xn8EVgp<&mt;V7;4joER@=iHjV2ooLRdc%~5YL+fuS-FIZShCz|@M#qDnq{HyTp z-uK=2`##?v_jzBQ&!_kK^n>4n&=)_v%#Ol|ju|CD5^<}PFVdq>9tt3D6k79Yjv0sO zE%{GBRxaLIb!}X~!-vH9FRX18A`jk_+uHS52g??R)yB&)(VVvELIE+hQ3uT8+vyj> zG4K=k_yMGsA(#eP?o8l%pB(L@R(%=yD?hdKT!tyYo``J+@-9J&cpZ6Iooj=;5QwfS z%x$PJ_aOEq9}O5*><0`Edhr_!;nHz!0c^uh3T0~kaG%TzMWv`}lPYyuY=6r2>I0~ru2MhTq2_ReJmDil0%!%< zm8s6N(#WY!dK}Vm$W20Alr0su$z~|;XXKFhb&Bep6*^Z;?`5AL^GTundxn`1aB!Ri znV3LF;fT9gIn{ZxLqXo3h3+w%2@AJ`ZUqA)?+pR9Oh7&^l!0CEv?{1g*?c)|>vRk% zbP_74X+rpPI7L3YHJbHAk(m;DBKBUx!I2{w)X4r(#2>k7XrvQRb1uOWMysu_o&U0* zz5IJdO`TU})qmL5-d^M-AT=aGN~*nSepVQm{t} zuU*9Ek}2VOT!B`)1U1cT*Ia}XGkaDG2~)b5I2PcwhN_=bLpAXNO21u>jp!7cG#f=wJg Qz~w!lt5y@fbAV%i0|@3#X8-^I delta 2233 zcmeHJZ%i9y7{9kjX<;iIBw#h8y#tbRL_KRZ@J8!`F?AymQ!I-#lW&{o95H^`90?t? zCwa9py%79jjGBzHxs=fq*a(h)P3YjyuP+}-=$ zJMy`2{E+i9I{?R8W}+UFn9zrnBs~DdUJr8mpGoH*?Hpsb1db7yOD)sO56>0I0C zmc9!m;M*b9=iuWtNUuUL1>)xOp2bdaq?1ayVq%}0I&>w*tibl5F%LN(L5etm?5xVV zV|IH+QWEnJO3WV+Gm5ny&6cS`Q$sKRgdwadv)zMrxFDaV?jP$E&3sZyN?7qhtuT16 zv7*(T3BgFndKQ#L!TObuqD(tH%(ZUPaUI#KCqgoHRygyV_4pc;FXYN+^W+5fkRx2A zj|UDA-cCq@e8t7_%T9tOz>@6y7%Mz$lN%e-i$E; z9y@2Agv>Bc`=Q^~u$vJHIe+CZ4;giMGsj<+Ffeld#-qjn+_JgUFPhZH|@2H|ODm)d4A)5k0z1*F{+DV+y;w@{MmLXKT;bx5)o3_WJe*josa6Qh3q@j_72_@vu|+=eA-o0 zo~b5GQcOsUAMXNiJ>R6U?M7Gd6z4_4`DGsP$oY_`Z$Q*|6N;a>WgIn5y47s<;j<^i zsHZ=|C{k!(pL8UDmlMc224y{RjziQu8D?%kg}Dh8&Ii+G z9F8#y8!@9$W`-fI3~|AokP@*8TsN_#BH>GHbz_a^AE#tR!RJrpv!rQnS#JbpuzqyYFvj3_85a=GUQx`nL;(z z6mfQsO=suM3+!BR`8rO>U8twmp@f}zW5G&Ta7oW*e8RPyoIc^forl}?_`ttxSGZvY zjsl}fZRCbD!>TN$R1j|G9?7f$DffGo=9^NX`3&*dVPQ+tIiza}YFE4<8^mK=N@$rj z9NqMeRL@#W#pX>fv*AVce|fd^hPR5$BKna%Mu}gMUw#dW02<_~yC{N?@lCD>foT@Z z32W2bv3-TDXJRjC0`p;PKwftM4H4Ja4pq+{PP^EGkht7AG0AKQ@6FIJU`HHao_W-R z+Z2;khs($nukOtyjDK~eoLuRl5l%6tV-k9=1GB*Xq&HTdxDe*l8NN74WQ