fix bug in ATTRIB for 64 kb cluster

This commit is contained in:
Tolik committed 2025-07-05 03:01:44 +10:00
1 parent e6aa5aa304
commit 058f5e4859
21 files changed
+298 -222

No files matched your search

+22 -24
View File
@@ -1,9 +1,9 @@
////////////////////////////////////////////////////////////////////////
; INPUT: HL - "C:\DIR1\DIR2\filename.ext",#00
; INPUT: HL - "C:\DIR1\DIR2\filename.ext",#00
; A - ATTRIB
; B - MODE
; B = #00 GET ATTRIB
; B = #01 SET ATTRIB
; B - MODE:
; 0 GET ATTRIB
; 1 SET ATTRIB
; OUTPUT: A - ATTRIB
////////////////////////////////////////////////////////////////////////
ATTRIB: ;!TEST Current Dir ;[x] 15/10/23
@@ -15,6 +15,10 @@ ATTRIB: ;!TEST Current Dir ;[x] 15/10/23
POP BC
POP HL
RET C
; ­  á«ãç © ç⥭¨ï ¤«ï ®¡å®¤  ¯à®¢¥àª¨ CHECK_64kb_CLUSTER
LD A,1
LD (OPEN_FN.TMP),A
;
LD A,C
;
;
@@ -27,7 +31,7 @@ ATTRIB: ;!TEST Current Dir ;[x] 15/10/23
CALL .OPENATR ;R002
RET C
;!TEST ;[x] 16/11/23 optimize get attribute
LD A,(HANDBUF + FAT_DIRECTORY_RECORD.ATTRIBUT)
LD A,(CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.ATTRIBUT)
;LD B,(IY+_sFM.ATTRIBUT)
;PUSH BC
;CALL CLOSE
@@ -36,9 +40,9 @@ ATTRIB: ;!TEST Current Dir ;[x] 15/10/23
;LD A,B
;
RET
;
;
.B_1: DJNZ .B_2
;
;
.WRITE_FN: AND FAT_ATTR.NoVolID ; [x] 2/12/23 ä¨ªá ¤«ï volume ID
.WRITE: PUSH AF
XOR A
@@ -46,8 +50,7 @@ ATTRIB: ;!TEST Current Dir ;[x] 15/10/23
LD (OPEN_FN.TMP),A
;
CALL .OPENATR ;R002
;!TEST ;[x] 16/11/23 optimize get attribute
CALL NC,OPEN_FN.FM
CALL NC,OPEN_FN.FM
;
POP BC
RET C
@@ -60,34 +63,29 @@ ATTRIB: ;!TEST Current Dir ;[x] 15/10/23
RET C
LD A,B
RET
;R002
;
;
; ¢ë室: ¥á«¨ CF = 0, â® DE = record index
;!TEST 9/11/23 record index
.OPENATR: ;!TEST ;[x] 16/11/23 optimize get attribute
;LD (OPEN.TMP),A ; à ¡. ï祩ª  (§¤¥áì  âਡãâ § ¯¨á¨)
;
CALL SetPath_GetName ; â¥áâ ­  ¤®¯ãáâ. ¨¬ï ¨ ­ áâà. ­  ¤¨áª
.OPENATR: CALL SetPath_GetName ; â¥áâ ­  ¤®¯ãáâ. ¨¬ï ¨ ­ áâà. ­  ¤¨áª
RET C
; ¥á«¨ íâ® ­¥ ç⥭¨¥, â® ¯à®¢¥à塞 à §¬¥à ª« áâ¥à 
LD A,(OPEN_FN.TMP)
AND A
CALL Z,CHECK_64kb_CLUSTER
RET C
; [ ] 26/06/2024
CALL CHECK_64kb_CLUSTER
RET C
;
CALL MASK
RET C
LD A,FAT_ATTR.NoVolID
;!TEST ;[x] 16/11/23 optimize get attribute
JP SEARCH.Custom
;CALL SEARCH.Custom
;RET C ; § ¯¨áì ­¥ ­ ©¤¥­ 
;JP OPEN.FM ; ­  ¯®¨áª ᢮¡. ¤¥áªà¨¯â®à 
;
JP SEARCH.Custom
;
; [ ] ; !TODO ¤«ï ª®¬ ­¤ë LABEL ¢ Shell
; 1. ¯à®¢¥à¨âì çâ® ¢ HL 㪠§ ­  ⮫쪮 ¬¥âª  ¢ ª ¢ë窠å
; 2. ¥á«¨ ¬¥âª  ¡¥§ ­¥¤®¯ãá⨬ëå ᨬ¢®«®¢, â® ¤¥« ¥¬ ¥ñ ­¥
; ⮫쪮 ¢ BPB, ­® ¨ ­  ª®à­¥¢®¬ à §¤¥«¥, ¨­ ç¥ 㤠«ï¥¬ ­  ª®à­¥¢®¬
; 3. ®âªà뢠¥¬ âà¥¡ã¥¬ë© ¤¨áª ç¥à¥§ .force, ç⮡ á¡à®á¨âì ªíè¨
.B_2: DJNZ .error_fn
.B_2: DJNZ .error_fn
;
.error_fn: LD A,DSS_Error.sys.INVALID_FUNCTION
SCF
+1 -1
View File
@@ -28,7 +28,7 @@ CHDIR_FN:
;
CHDIR: CALL SetPath_GetName ; â¥áâ ­  ¤®¯ãáâ. ¨¬ï ¨ ­ áâà. ­  ¤¨áª
RET C
LD HL,TMPNAME
LD HL,CORE_BUFFERS.TMPNAME
LD A,(HL)
OR A
RET Z
+2 -2
View File
@@ -57,8 +57,8 @@ CREATE: ;!TEST Current Dir ;[x] 15/10/23 ;CREATE_FN:
;
;no_file_found
.DO: ; FAT_DIRECTORY_RECORD.NAME + .EXT
LD HL,MASKARE
LD DE,HANDBUF
LD HL,CORE_BUFFERS.MASKARE
LD DE,CORE_BUFFERS.HANDBUF
LD BC,11
LDIR
EX DE,HL
+18 -13
View File
@@ -56,7 +56,7 @@ EX_PATH: EXX
.EX_RESR: LD A,DSS_Error.sys.INVALID_FUNCTION
SCF
RET
; ‚뤥«¨âì ¨¬ï ¤¨áª 
; ‚뤥«¨âì ¨¬ï ¤¨áª 
.GET_DRIVE: LD (NM_DRIVE),DE
CALL .FULL
RET C
@@ -76,18 +76,18 @@ EX_PATH: EXX
SCF
RET
; ‚뤥«¨âì ¤¨à¥ªâ®à¨î
; ‚뤥«¨âì ¤¨à¥ªâ®à¨î
.GET_PATH: LD (NM_PATH),DE
JR .FULL
; ‚뤥«¨âì ¨¬ï ä ©« 
; ‚뤥«¨âì ¨¬ï ä ©« 
.GET_NAME: LD (NM_NAME),DE
JR .FULL
; ‚뤥«¨âì à áè¨à¥­¨¥ ä ©« 
; ‚뤥«¨âì à áè¨à¥­¨¥ ä ©« 
.GET_TYPE: LD (NM_EXTN),DE
JR .FULL
; ‚뤥«¨âì ¤¨áª, ¯ãâì, ä ©« ¨ à áè.
; ‚뤥«¨âì ¤¨áª, ¯ãâì, ä ©« ¨ à áè.
.GET_ALL_EX: EX DE,HL
LD C,(HL)
INC HL
@@ -110,7 +110,7 @@ EX_PATH: EXX
LD (NM_EXTN),BC
EX DE,HL
;JR EX_FULL
; � §®¡à âì áâபã
; � §®¡à âì áâபã
.FULL: EX AF,AF'
EXX
XOR A
@@ -125,7 +125,7 @@ EX_PATH: EXX
EXX
EX AF,AF'
.PAT0: LD DE,TMPBUF
LD BC,#0D01 ;!HARDCODE áç¥â稪¨
LD BC,256*TMPBUF.Size + 1 ; áç¥â稪¨
.PAT1: LD A,(HL)
CALL UPPER ; a..z -> A..Z
LD (DE),A
@@ -146,12 +146,12 @@ EX_PATH: EXX
LD A,DSS_Error.sys.INVALID_NAME
SCF
RET
;
;
.GLOBP1: EX AF,AF'
SET GLOB_PR,A
EX AF,AF'
JR .PAT2
;
;
.NAME_YEP: LD A,2
CP C
JR Z,.NOFNAME
@@ -194,7 +194,7 @@ EX_PATH: EXX
.NOFNAME: EX AF,AF'
AND A
RET
;
;
.DRIVE_YEP: XOR A
LD (DE),A
PUSH HL
@@ -207,7 +207,7 @@ EX_PATH: EXX
SET DRIV_PR,A ; 㪠§ ­® ¨¬ï ¤¨áª 
EX AF,AF'
JP .PAT0
;
;
.PATH_YEP: XOR A
LD (DE),A
PUSH HL
@@ -226,12 +226,17 @@ EX_PATH: EXX
SET PATH_PR,A
EX AF,AF'
JP .PAT0
;!TODO ¯¥à¥­¥áâ¨/§ ¬¥­¨âì ­  ®¡é¨©
TMPBUF: DB " ",#00 ; 12 ¯à®¡¥«®¢
;
;TMPBUF: DB " ",#00 ; 13 ¯à®¡¥«®¢ + 0
;TMPBUF: DB " ",#00 ; 12 ¯à®¡¥«®¢ + 0
TMPBUF EQU CORE_BUFFERS.TMPNAME
.Size EQU CORE_BUFFERS.TMPNAME.Size
NM_DRIVE: DW NM_DRIVE_A
NM_NAME: DW NM_NAME_A
NM_EXTN: DW NM_EXTN_A
NM_PATH: DW NM_PATH_A
;!TODO ¯¥à¥­¥áâ¨/§ ¬¥­¨âì ­  ®¡é¨© ¡ãä¥à
NM_DRIVE_A: BLOCK 9,0
NM_NAME_A: DB " ",#00 ; 12 ¯à®¡¥«®¢
NM_EXTN_A: DB " ",0
+2 -2
View File
@@ -235,7 +235,7 @@ RETFAR: LD B,DSS_Error.sys.UNEXPECTED_APP_TRMN
; …᫨ à áè. ä ©«  § ¤ ­®, áà ¢­¨âì ¥£® á "exe".
;-------------------------------------------------
TST_EXT: LD HL,EXE_EXT ; "EXE"
LD DE,MASKARE+8
LD DE,CORE_BUFFERS.MASKARE.Ext
LD B,3
LD A,(DE)
CP ' '
@@ -478,7 +478,7 @@ M_PSP: LD HL,(CORE_BUFFERS.EXEBUFF.LD_ADDR)
LD (HL),A
INC HL
.YP_ESLA: EX DE,HL
LD HL,TMPNAME
LD HL,CORE_BUFFERS.TMPNAME
.loop: LD A,(HL)
LDI
CP ' '+1
+6 -6
View File
@@ -31,7 +31,7 @@ F_FIRST: CALL .INIT_VARS
LD A,(.SEARCH_ATTRIBUT)
CALL SEARCH.Custom
RET C
LD HL,MASKARE
LD HL,CORE_BUFFERS.MASKARE
.DTABUF+1: LD DE,0
LD BC,FAT_DIRECTORY_RECORD.ATTRIBUT ; ª®¯¨à㥬 .NAME ¨ .EXT
LDIR
@@ -43,13 +43,13 @@ F_FIRST: CALL .INIT_VARS
LD BC,FAT_DIRECTORY_RECORD
ADD IX,BC
LD (F_NEXT.CURHND),IX
LD HL,HANDBUF + FAT_DIRECTORY_RECORD.RESERVED_NT
LD BC,HANDBUF.SIZE - FAT_DIRECTORY_RECORD.RESERVED_NT
LD HL,CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.RESERVED_NT
LD BC,CORE_BUFFERS.HANDBUF.SIZE - FAT_DIRECTORY_RECORD.RESERVED_NT
LDIR
LD A,(HANDBUF + FAT_DIRECTORY_RECORD.ATTRIBUT)
LD A,(CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.ATTRIBUT)
LD (DE),A
INC DE
LD HL,HANDBUF
LD HL,CORE_BUFFERS.HANDBUF
.FNDMODE+1: LD A,0
OR A
JR NZ,.FIND_M2
@@ -87,7 +87,7 @@ F_NEXT:
RET Z
LD (F_FIRST.DTABUF),DE
EX DE,HL
LD DE,MASKARE
LD DE,CORE_BUFFERS.MASKARE
LD BC,11 ;!HARDCODE
LDIR
+17 -17
View File
@@ -11,21 +11,21 @@
; DE - SWITCH BUFFER
;EXIT: BUFFER
//////////////////////////////////////////////////////////////////////
GSWITCH: XOR A
LD (DE),A
.loop1: LD A,(HL)
INC HL
CP " "
RET C
JR Z,.loop1
.loop2: LD (DE),A
LD A,(HL)
INC HL
INC DE
CP " "+1
JR NC,.loop2
CP " "
LD A,0
LD (DE),A
RET
GSWITCH: XOR A
LD (DE),A
.loop1: LD A,(HL)
INC HL
CP " "
RET C
JR Z,.loop1
.loop2: LD (DE),A
LD A,(HL)
INC HL
INC DE
CP " "+1
JR NC,.loop2
CP " "
LD A,0
LD (DE),A
RET
;
+22 -20
View File
@@ -13,17 +13,18 @@ MKDIR:
CCF
RET
;
; Entry point ;!TEST Current Dir ;[x] 15/10/23
.B: PUSH HL
CALL DIR_PATH_CHECK
POP HL
RET C
CALL .START
PUSH AF
LD HL,CORE_BUFFERS.CurrentDirectory
CALL CHDIR
POP AF
RET
; Entry point
.B: PUSH HL
CALL DIR_PATH_CHECK
POP HL
RET C
CALL .START
PUSH AF
;Current Dir
LD HL,CORE_BUFFERS.CurrentDirectory
CALL CHDIR
POP AF
RET
;
.START: CALL SetPath_GetName ; â¥áâ ­  ¤®¯ãáâ. ¨¬ï ¨ ­ áâà. ­  ¤¨áª
RET C
@@ -36,6 +37,7 @@ MKDIR:
;!TEST optimization à ­¥¥ SetPath_GetName 㦥 § £à㧨« ¤¨à¥ªâ®à¨î
;CALL LOADDIR ; ¯à®ç¨â âì ᯨ᮪ ª â «®£ 
;
;[ ] cdfs
CALL SEARCH.Dir ; ¯®¨áª § ¯¨á¨ ª â «®£  ¢ ᯨ᪥ ¤¨áª 
; [x] fixed a bug with incorrect search when there were too many files in the directory 12/03/2024
; LD A,DSS_Error.sys.DIR_EXISTS
@@ -59,8 +61,8 @@ MKDIR:
;
CALL WRITE_TO_FAT ; § ¯¨á âì ¢ ª¥è FAT-  ­®¬¥à ª« áâ¥à 
CALL WRITE_FAT_TABLE ; ¯®¤ª«. ¡ ­ªã ª¥è  FAT ¨ § ¯¨á âì ¥£® ­  ¤¨áª
LD HL,MASKARE
LD DE,HANDBUF
LD HL,CORE_BUFFERS.MASKARE
LD DE,CORE_BUFFERS.HANDBUF
LD BC,11
LDIR
EX DE,HL
@@ -113,7 +115,7 @@ MKDIR:
DJNZ .loop3
; ᪮¯¨à®¢ âì ¡ ©âë 11..31 FAT_DIRECTORY_RECORD
INC HL
LD DE,HANDBUF+FAT_DIRECTORY_RECORD.ATTRIBUT ; ï祩ª   âਡã⮢ ä ©« 
LD DE,CORE_BUFFERS.HANDBUF+FAT_DIRECTORY_RECORD.ATTRIBUT ; ï祩ª   âਡã⮢ ä ©« 
EX DE,HL
LD BC,21 ; !HARDCODE
LDIR
@@ -139,14 +141,14 @@ MKDIR:
;
;LD IX,HANDBUF
XOR A
LD (HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_L),A
LD (HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_L+1),A
LD (HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_H),A
LD (HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_H+1),A
LD DE,HANDBUF + FAT_DIRECTORY_RECORD.ATTRIBUT ; ï祩ª   âਡã⮢ ä ©« 
LD (CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_L),A
LD (CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_L+1),A
LD (CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_H),A
LD (CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_H+1),A
LD DE,CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.ATTRIBUT ; ï祩ª   âਡã⮢ ä ©« 
.copy_dir_record:
EX DE,HL
LD BC,HANDBUF.SIZE - FAT_DIRECTORY_RECORD.ATTRIBUT ; 21
LD BC,CORE_BUFFERS.HANDBUF.SIZE - FAT_DIRECTORY_RECORD.ATTRIBUT ; 21
LDIR
POP AF
OUT (SLOT3),A
+2 -2
View File
@@ -44,8 +44,8 @@ OPEN_FN: ;!TEST Current Dir ;[x] 15/10/23
;
LD D,YH
LD E,YL
LD HL,HANDBUF
LD BC,HANDBUF.SIZE
LD HL,CORE_BUFFERS.HANDBUF
LD BC,CORE_BUFFERS.HANDBUF.SIZE
LDIR
.TMP+1: LD A,0
LD (IY+_sFM.ACCESS_MODE),A
+1 -1
View File
@@ -71,7 +71,7 @@ RENAME: ;!TEST Current Dir ;[x] 15/10/23
SET_PAGE_X DIRPAGE
EX AF,AF'
;
LD HL,MASKARE
LD HL,CORE_BUFFERS.MASKARE
LD D,XH
LD E,XL
LD BC,11
+3 -3
View File
@@ -42,10 +42,10 @@ RMDIR: ;!TEST Current Dir ;[x] 15/10/23
CALL LOADDIR
CALL SEARCH.Dir
RET C
; fat32
LD HL,(HANDBUF+FAT_DIRECTORY_RECORD.FIRST_CLUSTER_H)
; fat32 ; [ ] CDFS
LD HL,(CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_H)
EXX
LD HL,(HANDBUF+FAT_DIRECTORY_RECORD.FIRST_CLUSTER_L)
LD HL,(CORE_BUFFERS.HANDBUF + FAT_DIRECTORY_RECORD.FIRST_CLUSTER_L)
PUSH IX ;!TODO record index. ¢®§¬®¦­®, çâ® ¬®¦¥â á«®¬ âìáï, ¥á«¨ ¡®«ìè¥ áâà ­¨æë
;
;!TODO �à®æ¥¤ãà  ¯®«­®£® ¢ëç¨â뢠­¨ï ª â «®£  (¢á¥ ª« áâ¥àë). Œ®¦­® § ¤¥©á⢮¢ âì ¢ ¤àã£¨å ¬¥áâ å
+2 -3
View File
@@ -193,7 +193,7 @@ SAVETXT: PUSH AF
LD L,#28
.SVTEXT1: LD (BACKTXT.WinMax),HL
LD DE,#0000
LD A,(BANKTBL+TXTPAGE)
LD A,(BANKTBL + TXTPAGE)
LD B,A
LD C,BIOS.WIN_COPY
@@ -216,7 +216,6 @@ SAVETXT: PUSH AF
.NOSAVET: POP AF
RET
;-----------------------------------------------------------------------
BACKTXT: PUSH AF
.VMODE+1: LD A,#00
;BIT 7,A
@@ -230,7 +229,7 @@ BACKTXT: PUSH AF
LD IX,#C000
.WinMax+1: LD HL,#2050
LD DE,#0000
LD A,(BANKTBL+TXTPAGE)
LD A,(BANKTBL + TXTPAGE)
LD B,A
LD C,BIOS.WIN_RESTORE
;[x] 29/9/23