diff --git a/src/bios/exp/BIOS_FUNC.asm b/src/bios/exp/BIOS_FUNC.asm index 654d9a1..608c1e0 100644 --- a/src/bios/exp/BIOS_FUNC.asm +++ b/src/bios/exp/BIOS_FUNC.asm @@ -473,15 +473,15 @@ TAB_5xFNS: ;-------------------------------------------------------------[ FDD #0 ] ; DB low FN_RESERVED_5x ;#50 - Дубль. На эту функцию прыгает из основного обработчика - DB low FDD_5x.RESET ;#51 - DB low FDD_5x.LONG_READ ;#52 - DB low FDD_5x.LONG_WRITE ;#53 + DB low FDD_5x_RESET ;#51 + DB low FDD_5x_LONG_READ ;#52 + DB low FDD_5x_LONG_WRITE ;#53 DB low FN_ABSENT_5x ;#54 - DB low FDD_5x.READ ;#55 - DB low FDD_5x.WRITE ;#56 - DB low FDD_5x.DETECT ;#57 - DB low FDD_5x.GETMED ;#58 - DB low FDD_5x.SETMED ;#59 + DB low FDD_5x_READ ;#55 + DB low FDD_5x_WRITE ;#56 + DB low FDD_5x_DETECT ;#57 + DB low FDD_5x_GETMED ;#58 + DB low FDD_5x_SETMED ;#59 DB low DRV_VERSION ;#5A - Дубль. На эту функцию прыгает из основного обработчика DB low FN_RESERVED_5x ;#5B - Дубль. На эту функцию прыгает из основного обработчика @@ -500,14 +500,14 @@ TAB_5xFNS: ; DB low FN_RESERVED_5x DB low FN_ABSENT_5x - DB low RMD_5x.LONG_READ - DB low RMD_5x.LONG_WRITE + DB low RMD_5x_LONG_READ + DB low RMD_5x_LONG_WRITE DB low FN_ABSENT_5x - DB low RMD_5x.READ - DB low RMD_5x.WRITE + DB low RMD_5x_READ + DB low RMD_5x_WRITE DB low FN_ABSENT_5x - DB low RMD_5x.GETMED - DB low RMD_5x.SETMED + DB low RMD_5x_GETMED + DB low RMD_5x_SETMED DB low DRV_VERSION DB low FN_RESERVED_5x @@ -524,15 +524,15 @@ TAB_5xFNS: ;-------------------------------------------------------------[ HDD #8 ] ; DB low FN_RESERVED_5x - DB low HDD_5x.RESET - DB low HDD_5x.LONG_READ - DB low HDD_5x.LONG_WRITE - DB low HDD_5x.VERIFY - DB low HDD_5x.READ - DB low HDD_5x.WRITE - DB low HDD_5x.DETECT - DB low HDD_5x.GETMED - DB low HDD_5x.SETMED + DB low HDD_5x_RESET + DB low HDD_5x_LONG_READ + DB low HDD_5x_LONG_WRITE + DB low HDD_5x_VERIFY + DB low HDD_5x_READ + DB low HDD_5x_WRITE + DB low HDD_5x_DETECT + DB low HDD_5x_GETMED + DB low HDD_5x_SETMED DB low DRV_VERSION DB low FN_RESERVED_5x @@ -549,13 +549,13 @@ TAB_5xFNS: ;-----------------------------------------------------------[ CDROM #C ] ; DB low FN_RESERVED_5x - DB low CD_5x.RESET - DB low CD_5x.LONG_READ + DB low CD_5x_RESET + DB low CD_5x_LONG_READ DB low FN_ABSENT_5x DB low FN_ABSENT_5x - DB low CD_5x.READ + DB low CD_5x_READ DB low FN_ABSENT_5x - DB low CD_5x.DETECT + DB low CD_5x_DETECT DB low FN_ABSENT_5x DB low FN_ABSENT_5x @@ -563,7 +563,7 @@ TAB_5xFNS: DB low FN_RESERVED_5x DB low FN_RESERVED_5x DB low FN_RESERVED_5x - DB low CD_5x.Extended + DB low CD_5x_Extended DB low DRV_LIST ;---------------------------------------------------------------------[] @@ -576,15 +576,15 @@ TAB_5xFNS: ;-------------------------------------------------------------[ FDD #0 ] ; DB high FN_RESERVED_5x ;#50 - Дубль. На эту функцию прыгает из основного обработчика - DB high FDD_5x.RESET ;#51 - DB high FDD_5x.LONG_READ ;#52 - DB high FDD_5x.LONG_WRITE ;#53 + DB high FDD_5x_RESET ;#51 + DB high FDD_5x_LONG_READ ;#52 + DB high FDD_5x_LONG_WRITE ;#53 DB high FN_ABSENT_5x ;#54 - DB high FDD_5x.READ ;#55 - DB high FDD_5x.WRITE ;#56 - DB high FDD_5x.DETECT ;#57 - DB high FDD_5x.GETMED ;#58 - DB high FDD_5x.SETMED ;#59 + DB high FDD_5x_READ ;#55 + DB high FDD_5x_WRITE ;#56 + DB high FDD_5x_DETECT ;#57 + DB high FDD_5x_GETMED ;#58 + DB high FDD_5x_SETMED ;#59 DB high DRV_VERSION ;#5A - Дубль. На эту функцию прыгает из основного обработчика DB high FN_RESERVED_5x ;#5B - Дубль. На эту функцию прыгает из основного обработчика DB high FN_RESERVED_5x ;#5C - Дубль. На эту функцию прыгает из основного обработчика @@ -602,14 +602,14 @@ TAB_5xFNS: ; DB high FN_RESERVED_5x DB high FN_ABSENT_5x - DB high RMD_5x.LONG_READ - DB high RMD_5x.LONG_WRITE + DB high RMD_5x_LONG_READ + DB high RMD_5x_LONG_WRITE DB high FN_ABSENT_5x - DB high RMD_5x.READ - DB high RMD_5x.WRITE + DB high RMD_5x_READ + DB high RMD_5x_WRITE DB high FN_ABSENT_5x - DB high RMD_5x.GETMED - DB high RMD_5x.SETMED + DB high RMD_5x_GETMED + DB high RMD_5x_SETMED DB high DRV_VERSION DB high FN_RESERVED_5x DB high FN_RESERVED_5x @@ -625,15 +625,15 @@ TAB_5xFNS: ;-------------------------------------------------------------[ HDD #8 ] ; DB high FN_RESERVED_5x - DB high HDD_5x.RESET - DB high HDD_5x.LONG_READ - DB high HDD_5x.LONG_WRITE - DB high HDD_5x.VERIFY - DB high HDD_5x.READ - DB high HDD_5x.WRITE - DB high HDD_5x.DETECT - DB high HDD_5x.GETMED - DB high HDD_5x.SETMED + DB high HDD_5x_RESET + DB high HDD_5x_LONG_READ + DB high HDD_5x_LONG_WRITE + DB high HDD_5x_VERIFY + DB high HDD_5x_READ + DB high HDD_5x_WRITE + DB high HDD_5x_DETECT + DB high HDD_5x_GETMED + DB high HDD_5x_SETMED DB high DRV_VERSION DB high FN_RESERVED_5x DB high FN_RESERVED_5x @@ -649,20 +649,20 @@ TAB_5xFNS: ;----------------------------------------------------------[ CDROM #C0 ] ; DB high FN_RESERVED_5x - DB high CD_5x.RESET - DB high CD_5x.LONG_READ + DB high CD_5x_RESET + DB high CD_5x_LONG_READ DB high FN_ABSENT_5x DB high FN_ABSENT_5x - DB high CD_5x.READ + DB high CD_5x_READ DB high FN_ABSENT_5x - DB high CD_5x.DETECT + DB high CD_5x_DETECT DB high FN_ABSENT_5x DB high FN_ABSENT_5x DB high DRV_VERSION DB high FN_RESERVED_5x DB high FN_RESERVED_5x DB high FN_RESERVED_5x - DB high CD_5x.Extended + DB high CD_5x_Extended DB high DRV_LIST ;---------------------------------------------------------------------[] diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index b2c41a3..a3560a4 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -86,7 +86,7 @@ RST38: IF TEST_INT JR Z,YESINT OUT (C),B JP NOINT -YESINT: PUSH HL +YESINT: PUSH HL LD HL,(SYS_PAGE.INT_ADRESS) LD A,H OR L @@ -95,7 +95,7 @@ YESINT: PUSH HL PUSH DE CALL NZ,EXTINT POP DE - POP HL + POP HL NOINT: POP AF POP BC EI @@ -387,7 +387,7 @@ EXTINT: OR A XOR A OUT (SYS_PORT.RAM),A -.patch EQU $+1-.switchProcedure +.patch EQU $+1-.switchProcedure CALL .JPHL DI diff --git a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm b/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm index b9da1e3..80ae606 100644 --- a/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm +++ b/src/bios/exp/EXTENDED/FDD_DRIVER_2.asm @@ -23,7 +23,7 @@ ; D7 - "1" - High Density, "0" - Double Density ;[]===========================================================[] ;!FIXIT всегда идет работа с данными для диска А -FDD_5x.GETMED: +FDD_5x_GETMED: ;!TEST FDD 720/1440 IF FDD_NormalCount LD IY,FDD_INI_TABLE.FDD_0 @@ -72,7 +72,7 @@ FDD_5x.GETMED: ; D7 - "1" - High Density, "0" - Double Density ;Return: None ;[]===========================================================[] -FDD_5x.SETMED: +FDD_5x_SETMED: ;!TEST FDD 720/1440 IF FDD_NormalCount LD IY,FDD_INI_TABLE.FDD_0 @@ -125,7 +125,7 @@ FDD_5x.SETMED: ;Return: ; A - Flag D7 - "1" - High Density, "0" - Double Density ;[]===========================================================[] -FDD_5x.DETECT: +FDD_5x_DETECT: CALL SET_DOS_ON CALL DISK_ID PUSH AF @@ -138,7 +138,7 @@ FDD_5x.DETECT: ; A - Disk ;Return: None ;[]===========================================================[] -FDD_5x.RESET: +FDD_5x_RESET: CALL SET_DOS_ON CALL S_FDD CALL DISK_ID @@ -163,7 +163,7 @@ FDD_5x.RESET: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;[]===========================================================[] -FDD_5x.READ: +FDD_5x_READ: EX AF,AF' IN A,(SLOT3) EX AF,AF' @@ -178,7 +178,7 @@ FDD_5x.READ: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;[]===========================================================[] -FDD_5x.LONG_READ: +FDD_5x_LONG_READ: PUSH IY PUSH BC PUSH HL @@ -310,7 +310,7 @@ ERRDOS: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;[]===========================================================[] -FDD_5x.WRITE: +FDD_5x_WRITE: EX AF,AF' IN A,(SLOT3) EX AF,AF' @@ -325,7 +325,7 @@ FDD_5x.WRITE: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;[]===========================================================[] -FDD_5x.LONG_WRITE: +FDD_5x_LONG_WRITE: PUSH IY PUSH BC PUSH HL diff --git a/src/bios/exp/EXTENDED/IDE/CD_DRV.ASM b/src/bios/exp/EXTENDED/IDE/CD_DRV.ASM index af8984b..95301d1 100644 --- a/src/bios/exp/EXTENDED/IDE/CD_DRV.ASM +++ b/src/bios/exp/EXTENDED/IDE/CD_DRV.ASM @@ -15,7 +15,7 @@ RAM_ATAPI_READ EQU SYS_PAGE.SHARED_BUFFER_32b+16 ASSERT ((PKTSIZE % 2) = 0), "PKTSIZE must be an even number" ;[]================================================================[#51] -CD_5x.RESET: +CD_5x_RESET: LD C,IDE.Device.CDROM CALL SELECT_DRIVE RET C @@ -42,7 +42,7 @@ CD_5x.RESET: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;READ SECTOR(S) -CD_5x.READ: +CD_5x_READ: EX AF,AF' IN A,(SLOT3) EX AF,AF' @@ -57,7 +57,7 @@ CD_5x.READ: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;LONG READ SECTOR(S) -CD_5x.LONG_READ: +CD_5x_LONG_READ: LD C,IDE.Device.CDROM CALL SELECT_DRIVE RET C @@ -113,7 +113,7 @@ CD_5x.LONG_READ: ; A - Disk ;Return: CF=0 - A=Drive type ; CF=1 - drive not present, A=#02 -CD_5x.DETECT: +CD_5x_DETECT: LD C,IDE.Device.CDROM AND %1011'1111 JP DRV_DETECT @@ -126,7 +126,7 @@ CD_5x.DETECT: ; B - SubFunction ;Return: ; -CD_5x.Extended: +CD_5x_Extended: LD C,IDE.Device.CDROM CALL SELECT_DRIVE RET C diff --git a/src/bios/exp/EXTENDED/IDE/HDD_DRV.ASM b/src/bios/exp/EXTENDED/IDE/HDD_DRV.ASM index c79efdc..43ddb30 100644 --- a/src/bios/exp/EXTENDED/IDE/HDD_DRV.ASM +++ b/src/bios/exp/EXTENDED/IDE/HDD_DRV.ASM @@ -78,7 +78,7 @@ WRITE_OUTI_DUPs EQU 32 ; bytes ;[]================================================================[#51] ;Function: Reset drive -HDD_5x.RESET: ; !FIXIT не ресетится? +HDD_5x_RESET: ; !FIXIT не ресетится? ;For non-ATAPI drives, the only method a driver has of resetting a drive ; after a major error is to do a "software reset" on the bus. ; Set bit 2 (SRST, value = 4) in the proper Control Register for the @@ -99,7 +99,7 @@ HDD_5x.RESET: ; !FIXIT ; DE - Cylinders ; IX - Capacity sector in bytes ; B - Flags: MASTER/SLAVE, LBA/CHS -HDD_5x.GETMED: +HDD_5x_GETMED: LD C,IDE.Device.HDD CALL SELECT_DRIVE RET C @@ -129,7 +129,7 @@ HDD_5x.GETMED: ; IX - Capacity sector in bytes ; B - Flags ;Return: None -HDD_5x.SETMED: +HDD_5x_SETMED: LD C,IDE.Device.HDD CALL SELECT_DRIVE RET C @@ -159,7 +159,7 @@ HDD_5x.SETMED: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;READ SECTOR(S) -HDD_5x.READ: +HDD_5x_READ: EX AF,AF' IN A,(SLOT3) EX AF,AF' @@ -174,7 +174,7 @@ HDD_5x.READ: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;LONG READ SECTOR(S) -HDD_5x.LONG_READ: +HDD_5x_LONG_READ: PUSH IY SAFE_PORTY_2 @@ -320,7 +320,7 @@ RDS004: DUP 16 ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;WRITE SECTOR(S) -HDD_5x.WRITE: +HDD_5x_WRITE: EX AF,AF' IN A,(SLOT3) EX AF,AF' @@ -335,7 +335,7 @@ HDD_5x.WRITE: ; HL:IX - Sector + Sector counter ; DE - Address + (Sector counter * Size sector) ;WRITE SECTOR(S) -HDD_5x.LONG_WRITE: +HDD_5x_LONG_WRITE: PUSH IY SAFE_PORTY_2 @@ -496,7 +496,7 @@ WRS003: ; B - Sector counter ;Return: None ;VERIFY SECTOR(S) -HDD_5x.VERIFY: +HDD_5x_VERIFY: PUSH IY SAFE_PORTY_2 PUSH IX @@ -659,7 +659,7 @@ WAITPRT: ; A - Disk ;Return: CF=0 - A=Drive type ; CF=1 - drive not present, A=#02 -HDD_5x.DETECT: +HDD_5x_DETECT: LD C,IDE.Device.HDD JP DRV_DETECT ;[]================================================================[#57] \ No newline at end of file diff --git a/src/bios/exp/EXTENDED/RAM_DISK_DRIVER_1.asm b/src/bios/exp/EXTENDED/RAM_DISK_DRIVER_1.asm index cb95869..deb1421 100644 --- a/src/bios/exp/EXTENDED/RAM_DISK_DRIVER_1.asm +++ b/src/bios/exp/EXTENDED/RAM_DISK_DRIVER_1.asm @@ -12,7 +12,7 @@ ;Return: None ;[]===========================================================[] ;!FIXIT -RMD_5x.SETMED: +RMD_5x_SETMED: and a ret ; A - Disk @@ -35,7 +35,7 @@ RMD_5x.SETMED: ; IX - Capacity sector in bytes ; B - Flags: ramblock ID ;[]===========================================================[] -RMD_5x.GETMED: +RMD_5x_GETMED: .SectorSize EQU 512 ;!HARDCODE AND #0F CALL GET_RAMD_ST ; получение идентификатора блока @@ -64,16 +64,16 @@ RMD_5x.GETMED: RET //////////////////////////////////////////////////////////////////////////////////// -RMD_5x.LONG_WRITE: +RMD_5x_LONG_WRITE: LD C,#FF JP RAM_DRV_READ_WRITE -RMD_5x.LONG_READ: +RMD_5x_LONG_READ: LD C,0 JP RAM_DRV_READ_WRITE -RMD_5x.WRITE: +RMD_5x_WRITE: LD C,#FF JP RAM_DRV_NO_LONG -RMD_5x.READ: +RMD_5x_READ: LD C,0 ;JP RAM_DRV_NO_LONG RAM_DRV_NO_LONG: diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index 52cf035..ebe2b36 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -935,7 +935,7 @@ FDSTART: LD A,msgStrings.bootFdd CALL POSTMSG POP AF - CALL FDD_5x.RESET + CALL FDD_5x_RESET POP BC RET C JP OS_LOAD diff --git a/src/bios/rom/SETUP/SETTINGS.asm b/src/bios/rom/SETUP/SETTINGS.asm index f33af36..cbd99fe 100644 --- a/src/bios/rom/SETUP/SETTINGS.asm +++ b/src/bios/rom/SETUP/SETTINGS.asm @@ -898,6 +898,7 @@ SDIDE2 EQU #03 SDRAM EQU #04 ASDFDD1 EQU #00 ASDFDD2 EQU #10 +ASDRECOVERY EQU #70 ASDIDE1 EQU #20 ASDIDE2 EQU #30 ASDRAM EQU #40 @@ -1012,7 +1013,7 @@ STYLES: DEFVAL: DB SAVERAM+EXTBIOS+SDELAY1 ;X0E - OPTIONS DB TDL250+TRATE30 ;X0F - KEYBOARD - DB SDIDE1+ASDFDD2 ;X10 - SYSTEM DISKS + DB SDIDE1+ASDRECOVERY ;X10 - SYSTEM DISKS DB FD1720+FD2720+HD1AUTO+HD2AUTO ;X11 - FDD & Primary HDD's DB 0 ;X12 - CYLINDERS LOW MASTER DB 0 ;X13 - CYLINDERS HIGH MASTER @@ -1036,7 +1037,7 @@ DEFVAL: DB SAVERAM+EXTBIOS+SDELAY1 ;X0E - OPTIONS _mInfoALIGN 256,0 ; выравнивание на адрес #XX00 CMOSARE: DS 14 - + ; DB SAVERAM+EXTBIOS ;X0E - OPTIONS DB TDL250+TRATE30 ;X0F - KEYBOARD DB SDIDE1+ASDFDD2 ;X10 - SYSTEM DISKS diff --git a/src/bios/shared/DEFINES.INC b/src/bios/shared/DEFINES.INC index 0da9fb6..150ba86 100644 --- a/src/bios/shared/DEFINES.INC +++ b/src/bios/shared/DEFINES.INC @@ -9,7 +9,7 @@ DEFINE PICTURE_FILE './src/bios/logo/psfathers.bmp' DEFINE StandartCGApallete 1 ; Подключать палитру из standart_colors.inc DEFINE BitStream_SizeInPages 4 - DEFINE USE_E1_SCANCODE 0 + DEFINE USE_E1_SCANCODE 0 ; Задержка в кадрах после отрисовки логотипа (0 = 256) @@ -22,7 +22,7 @@ DEFINE TEST_INT 1 ; Тестовый обработчик пользовательского INT DEFINE NEW_FEATURE 0 ; !TODO пункты в сетап DEFINE HDDwriteProtect 0 - DEFINE RECOVERYmountTYPE 2 ; 1 - быстрый немного захардкоженый вариант. 2 - более "правильный" + DEFINE RECOVERYmountTYPE 1 ; 1 - быстрый немного захардкоженый вариант. 2 - более "правильный" DEFINE RECOVERYrdChooseTYPE 1 ; 1 - RECOVERY всегда грузится в диск 15, 2 - ищется свободный рамдиск и если такого нет, то занимается 15ый DEFINE FDD_NormalCount 0 ; \ No newline at end of file diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG index 8578f12..eeb9913 100755 Binary files a/src/bios/shared/RECOVERY.IMG and b/src/bios/shared/RECOVERY.IMG differ