diff --git a/DSS/API/Write.asm b/DSS/API/Write.asm index 4c5a9cf..90474ae 100644 --- a/DSS/API/Write.asm +++ b/DSS/API/Write.asm @@ -53,7 +53,7 @@ WRITE: ;!TEST ;!TODO 5/12/23 ; [ ] PUSH DE PUSH BC .R_POINT+2: LD IX,0 - CALL BLOK_WRITE + CALL BLOCK_WRITE POP BC JR C,.ERR3 LD C,B @@ -62,7 +62,7 @@ WRITE: ;!TEST ;!TODO 5/12/23 ; [ ] .WOV5: ADD HL,DE DJNZ .WOV5 ; B=0 - LD (.R_POINT),HL ;!FIXIT это значение уже расcчитывается перед выходом в BLOK_WRITE? + LD (.R_POINT),HL ;!FIXIT это значение уже расcчитывается перед выходом в BLOCK_WRITE? ;LD B,0 POP HL ADD HL,BC @@ -103,7 +103,7 @@ WRITE: ;!TEST ;!TODO 5/12/23 ; [ ] PUSH AF IN A,(SLOT0) OUT (SLOT3),A - CALL BLOK_WRITE + CALL BLOCK_WRITE POP BC LD C,SLOT3 OUT (C),B @@ -181,7 +181,7 @@ WRITE: ;!TEST ;!TODO 5/12/23 ; [ ] PUSH AF IN A,(SLOT0) OUT (SLOT3),A - CALL BLOK_WRITE + CALL BLOCK_WRITE POP BC LD C,SLOT3 OUT (C),B diff --git a/DSS/FS/FAT.asm b/DSS/FS/FAT.asm index 19bfdf3..cba5fe8 100644 --- a/DSS/FS/FAT.asm +++ b/DSS/FS/FAT.asm @@ -2422,7 +2422,7 @@ CHECK_FIRST_CLUSTER: ; IX - data in RAM ; IY - FM ; B - количество секторов для записи -BLOK_WRITE: LD (READ.PointerOnBuffer),IX +BLOCK_WRITE: LD (READ.PointerOnBuffer),IX LD A,(CORE_BUFFERS.FS_Buffer.SectorsPerCluster) ;SECTORS PER CLUSTER LD C,A PUSH BC ; B - количество секторов для чтения, C - SectorsPerCluster diff --git a/DSS/KEYINTER.ASM b/DSS/KEYINTER.ASM index b08715e..76c73f3 100644 --- a/DSS/KEYINTER.ASM +++ b/DSS/KEYINTER.ASM @@ -451,14 +451,9 @@ PUTSYM: LD HL,HEAD AND #3F CP (HL) JR Z,FULL_BF - LD A,(HL) - INC (HL) - INC (HL) - INC (HL) - INC (HL) - RES 6,(HL) - LD L,A - LD H,high SBUF + ; + CALL GetSymAddr + ; LD (HL),E INC L LD (HL),D @@ -468,10 +463,8 @@ PUTSYM: LD HL,HEAD LD (HL),C RET -GETSYM: LD HL,HOST - LD A,(HEAD) - CP (HL) - RET Z + +GetSymAddr: LD A,(HL) INC (HL) INC (HL) @@ -480,6 +473,16 @@ GETSYM: LD HL,HOST RES 6,(HL) LD L,A LD H,high SBUF + RET + + +GETSYM: LD HL,HOST + LD A,(HEAD) + CP (HL) + RET Z + ; + CALL GetSymAddr + ; LD E,(HL) INC L LD D,(HL) diff --git a/DSS/build.txt b/DSS/build.txt index 2ebc651..f0b5c72 100644 --- a/DSS/build.txt +++ b/DSS/build.txt @@ -1 +1 @@ -56 \ No newline at end of file +57 \ No newline at end of file diff --git a/Shared_Includes b/Shared_Includes index 63faf9f..a0e68ce 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 63faf9f0823649cfb52e9fcaad430170a05b31a7 +Subproject commit a0e68ce3a19bd47537585e49bfbf5e45fab197a1