Skip to content

Feature/rename esxdos macros #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boriel merged 3 commits into from
May 5, 2021
Merged

Feature/rename esxdos macros #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c53f181
Undef ESXDOS labels
boriel Apr 29, 2021
ba8ae33
Make ESXDOS lib to use .core namespace
boriel May 1, 2021
dca7b76
Update esxdos.bas for zxnext
boriel May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions src/arch/zx48k/library/esxdos.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ Function ESXDosGetCwd as String
Dim addr as Uinteger

Asm
push namespace core
proc
local NotNull

Expand All @@ -287,6 +288,7 @@ NotNull:
db F_GETCWD
pop ix
endp
pop namespace
End Asm

cwd$ = ""
Expand Down Expand Up @@ -324,6 +326,7 @@ Function ESXDosOpenDir (ByVal path as String) as UInteger
end if

Asm
push namespace core
Proc
local NotNull
local HandleOK
Expand Down Expand Up @@ -382,6 +385,7 @@ HandleOK:

ExitFunction:
endp
pop namespace
End Asm

return handle
Expand Down Expand Up @@ -560,6 +564,7 @@ Sub ESXDosChDir (ByVal path as String)
end if

Asm
push namespace core
Proc
local NotNull
local HandleOK
Expand Down Expand Up @@ -603,6 +608,7 @@ HandleOK:
pop hl
call __MEM_FREE ;deallocate mem
endp
pop namespace
End Asm

End Sub
Expand Down Expand Up @@ -746,4 +752,46 @@ read_ok:
End Asm
End Sub


' Remove macros
#undef HOOK_BASE
#undef MISC_BASE
#undef FSYS_BASE
#undef M_GETSETDRV
#undef F_OPEN
#undef F_CLOSE
#undef F_READ
#undef F_WRITE
#undef F_SEEK
#undef F_GETPOS
#undef F_OPENDIR
#undef F_READDIR
#undef F_TELLDIR
#undef F_SEEKDIR
#undef F_REWINDDIR
#undef F_GETCWD
#undef F_CHDIR
#undef F_MKDIR
#undef F_RMDIR

#undef EDOS_FMODE_READ
#undef EDOS_FMODE_WRITE
#undef EDOS_FMODE_OPEN_EX
#undef EDOS_FMODE_OPEN_AL
#undef EDOS_FMODE_CREATE_NEW
#undef EDOS_FMODE_CREATE_AL

#undef SEEK_START
#undef SEEK_CUR
#undef SEEK_BKCUR

#undef FATTR_RDONLY
#undef FATTR_HIDDEN
#undef FATTR_SYSTEM
#undef FATTR_VOLUME
#undef FATTR_DIR
#undef FATTR_ARCHIVE

#undef EDOS_ERR_NR

#endif
48 changes: 48 additions & 0 deletions src/arch/zxnext/library/esxdos.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ Function ESXDosGetCwd as String
Dim addr as Uinteger

Asm
push namespace core
proc
local NotNull

Expand All @@ -287,6 +288,7 @@ NotNull:
db F_GETCWD
pop ix
endp
pop namespace
End Asm

cwd$ = ""
Expand Down Expand Up @@ -324,6 +326,7 @@ Function ESXDosOpenDir (ByVal path as String) as UInteger
end if

Asm
push namespace core
Proc
local NotNull
local HandleOK
Expand Down Expand Up @@ -382,6 +385,7 @@ HandleOK:

ExitFunction:
endp
pop namespace
End Asm

return handle
Expand Down Expand Up @@ -560,6 +564,7 @@ Sub ESXDosChDir (ByVal path as String)
end if

Asm
push namespace core
Proc
local NotNull
local HandleOK
Expand Down Expand Up @@ -603,6 +608,7 @@ HandleOK:
pop hl
call __MEM_FREE ;deallocate mem
endp
pop namespace
End Asm

End Sub
Expand Down Expand Up @@ -746,4 +752,46 @@ read_ok:
End Asm
End Sub


' Remove macros
#undef HOOK_BASE
#undef MISC_BASE
#undef FSYS_BASE
#undef M_GETSETDRV
#undef F_OPEN
#undef F_CLOSE
#undef F_READ
#undef F_WRITE
#undef F_SEEK
#undef F_GETPOS
#undef F_OPENDIR
#undef F_READDIR
#undef F_TELLDIR
#undef F_SEEKDIR
#undef F_REWINDDIR
#undef F_GETCWD
#undef F_CHDIR
#undef F_MKDIR
#undef F_RMDIR

#undef EDOS_FMODE_READ
#undef EDOS_FMODE_WRITE
#undef EDOS_FMODE_OPEN_EX
#undef EDOS_FMODE_OPEN_AL
#undef EDOS_FMODE_CREATE_NEW
#undef EDOS_FMODE_CREATE_AL

#undef SEEK_START
#undef SEEK_CUR
#undef SEEK_BKCUR

#undef FATTR_RDONLY
#undef FATTR_HIDDEN
#undef FATTR_SYSTEM
#undef FATTR_VOLUME
#undef FATTR_DIR
#undef FATTR_ARCHIVE

#undef EDOS_ERR_NR

#endif