paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 11:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Amiga, AROS, MorphOS: unified AmigaDOS function names

Browse Source 
git-svn-id: trunk@30812 -
This commit is contained in:
marcus 2015-05-06 16:04:21 +00:00
parent 3b288554e7
commit 8237dbf22f
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/amunits/src/coreunits/amigados.pas
View File

@ -1598,7 +1598,7 @@ FUNCTION CreateProc(const name : pCHAR location 'd1'; pri : LONGINT location 'd2
FUNCTION CurrentDir(lock : LONGINT location 'd1') : LONGINT; syscall _DOSBase 126; FUNCTION CurrentDir(lock : LONGINT location 'd1') : LONGINT; syscall _DOSBase 126;
PROCEDURE DateStamp(date : pDateStamp location 'd1'); syscall _DOSBase 192; PROCEDURE DateStamp(date : pDateStamp location 'd1'); syscall _DOSBase 192;
FUNCTION DateToStr(datetime : pDateTime location 'd1') : LongBool; syscall _DOSBase 744; FUNCTION DateToStr(datetime : pDateTime location 'd1') : LongBool; syscall _DOSBase 744;
FUNCTION DeleteFile(const name : pCHAR location 'd1') : LongBool; syscall _DOSBase 072; FUNCTION DOSDeleteFile(const name : pCHAR location 'd1') : LongBool; syscall _DOSBase 072;
FUNCTION DeleteVar(const name : pCHAR location 'd1'; flags : ULONG location 'd2') : LongBool; syscall _DOSBase 912; FUNCTION DeleteVar(const name : pCHAR location 'd1'; flags : ULONG location 'd2') : LongBool; syscall _DOSBase 912;
FUNCTION DeviceProc(const name : pCHAR location 'd1') : pMsgPort; syscall _DOSBase 174; FUNCTION DeviceProc(const name : pCHAR location 'd1') : pMsgPort; syscall _DOSBase 174;
FUNCTION DoPkt(port : pMsgPort location 'd1'; action : LONGINT location 'd2'; arg1 : LONGINT location 'd3'; arg2 : LONGINT location 'd4'; arg3 : LONGINT location 'd5'; arg4 : LONGINT location 'd6'; arg5 : LONGINT location 'd7') : LONGINT; syscall _DOSBase 240; FUNCTION DoPkt(port : pMsgPort location 'd1'; action : LONGINT location 'd2'; arg1 : LONGINT location 'd3'; arg2 : LONGINT location 'd4'; arg3 : LONGINT location 'd5'; arg4 : LONGINT location 'd6'; arg5 : LONGINT location 'd7') : LONGINT; syscall _DOSBase 240;
@ -1756,7 +1756,7 @@ FUNCTION AssignPath(const name : pCHAR;const path : string) : BOOLEAN;
FUNCTION AssignPath(const name : string;const path : string) : BOOLEAN; FUNCTION AssignPath(const name : string;const path : string) : BOOLEAN;
FUNCTION CreateDir(const name : string) : LONGINT; FUNCTION CreateDir(const name : string) : LONGINT;
FUNCTION CreateProc(const name : string; pri : LONGINT; segList : LONGINT; stackSize : LONGINT) : pMsgPort; FUNCTION CreateProc(const name : string; pri : LONGINT; segList : LONGINT; stackSize : LONGINT) : pMsgPort;
FUNCTION DeleteFile(const name : string) : BOOLEAN; FUNCTION DOSDeleteFile(const name : string) : BOOLEAN;
FUNCTION DeleteVar(const name : string; flags : ULONG) : BOOLEAN; FUNCTION DeleteVar(const name : string; flags : ULONG) : BOOLEAN;
FUNCTION DeviceProc(const name : string) : pMsgPort; FUNCTION DeviceProc(const name : string) : pMsgPort;
FUNCTION DOSOpen(const name : string; accessMode : LONGINT) : LONGINT; FUNCTION DOSOpen(const name : string; accessMode : LONGINT) : LONGINT;
@ -1904,9 +1904,9 @@ begin
CreateProc := CreateProc(pas2c(name),pri,segList,stackSize); CreateProc := CreateProc(pas2c(name),pri,segList,stackSize);
end; end;
FUNCTION DeleteFile(const name : string) : BOOLEAN; FUNCTION DOSDeleteFile(const name : string) : BOOLEAN;
begin begin
DeleteFile := DeleteFile(pas2c(name)); DOSDeleteFile := DOSDeleteFile(pas2c(name));
end; end;
FUNCTION DeleteVar(const name : string; flags : ULONG) : BOOLEAN; FUNCTION DeleteVar(const name : string; flags : ULONG) : BOOLEAN;

4
packages/arosunits/src/amigados.pas
View File

@ -2265,14 +2265,14 @@ function Cli: PCommandLineInterface; syscall AOS_DOSBase 82;
function CliInitNewcli(Dp: PDosPacket): IPTR; syscall AOS_DOSBase 155; function CliInitNewcli(Dp: PDosPacket): IPTR; syscall AOS_DOSBase 155;
function CliInitRun(Dp: PDosPacket): IPTR; syscall AOS_DOSBase 156; function CliInitRun(Dp: PDosPacket): IPTR; syscall AOS_DOSBase 156;
function CompareDates(const Date1: PDateStamp; const Date2: PDateStamp): LongInt; syscall AOS_DOSBase 123; function CompareDates(const Date1: PDateStamp; const Date2: PDateStamp): LongInt; syscall AOS_DOSBase 123;
function CreateDir(const Name: STRPTR): BPTR; syscall AOS_DOSBase 20; function DOSCreateDir(const Name: STRPTR): BPTR; syscall AOS_DOSBase 20;
function CreateNewProc(const Tags: PTagItem): PProcess; syscall AOS_DOSBase 83; function CreateNewProc(const Tags: PTagItem): PProcess; syscall AOS_DOSBase 83;
//function CreateNewProcTagList(const Tags : PTagItem) : pProcess; //function CreateNewProcTagList(const Tags : PTagItem) : pProcess;
function CreateProc(const Name: STRPTR; Pri: LongInt; SegList: BPTR; StackSize: LongInt): PMsgPort; syscall AOS_DOSBase 23; function CreateProc(const Name: STRPTR; Pri: LongInt; SegList: BPTR; StackSize: LongInt): PMsgPort; syscall AOS_DOSBase 23;
function CurrentDir(Lock: BPTR): BPTR; syscall AOS_DOSBase 21; function CurrentDir(Lock: BPTR): BPTR; syscall AOS_DOSBase 21;
function DateStamp(Date: PDateStamp): PDateStamp; syscall AOS_DOSBase 32; function DateStamp(Date: PDateStamp): PDateStamp; syscall AOS_DOSBase 32;
function DateToStr(Datetime: PDateTime): LongBool; syscall AOS_DOSBase 124; function DateToStr(Datetime: PDateTime): LongBool; syscall AOS_DOSBase 124;
function DeleteFile(const Name: STRPTR): LongBool; syscall AOS_DOSBase 12; function DOSDeleteFile(const Name: STRPTR): LongBool; syscall AOS_DOSBase 12;
function DeleteVar(const Name: STRPTR; Flags: LongWord): LongInt; syscall AOS_DOSBase 152; function DeleteVar(const Name: STRPTR; Flags: LongWord): LongInt; syscall AOS_DOSBase 152;
function DeviceProc(const Name: STRPTR): PMsgPort; syscall AOS_DOSBase 29; function DeviceProc(const Name: STRPTR): PMsgPort; syscall AOS_DOSBase 29;
function DisplayError(FormstStr: STRPTR; Flags: LongWord; Args: APTR): LongInt; syscall AOS_DOSBase 81; function DisplayError(FormstStr: STRPTR; Flags: LongWord; Args: APTR): LongInt; syscall AOS_DOSBase 81;

4
packages/fcl-process/src/amicommon/pipes.inc
View File

@ -52,10 +52,6 @@ begin
DeleteIt := NameFromFH(BPTR(FHandle), @(Filename[0]), 255); DeleteIt := NameFromFH(BPTR(FHandle), @(Filename[0]), 255);
FileClose(FHandle); FileClose(FHandle);
if DeleteIt then if DeleteIt then
{$ifdef MorphOS}
AmigaDos.dosDeleteFile(@(Filename[0])); AmigaDos.dosDeleteFile(@(Filename[0]));
{$else}
AmigaDos.DeleteFile(@(Filename[0]));
{$endif}
end; end;
end; end;

4
packages/fcl-process/src/amicommon/process.inc
View File

@ -120,11 +120,7 @@ begin
TempName := 'T:'+HexStr(FindTask(nil)) + '_' + HexStr(Self) + '_'+ IntToStr(UID) + '_Starter.tmp'; TempName := 'T:'+HexStr(FindTask(nil)) + '_' + HexStr(Self) + '_'+ IntToStr(UID) + '_Starter.tmp';
until not FileExists(TempName); until not FileExists(TempName);
//sysdebugln('TProcess start: "' + ExecName + ' ' + Params+'" >' + TempName); //sysdebugln('TProcess start: "' + ExecName + ' ' + Params+'" >' + TempName);
{$ifdef MorphOS}
cos := AmigaDos.Open(PChar(TempName), MODE_READWRITE);
{$else}
cos := AmigaDos.DosOpen(PChar(TempName), MODE_READWRITE); cos := AmigaDos.DosOpen(PChar(TempName), MODE_READWRITE);
{$endif}
FExitCode := LongInt(amigados.Execute(PChar(ExecName + ' ' + Params), BPTR(0), cos)); FExitCode := LongInt(amigados.Execute(PChar(ExecName + ' ' + Params), BPTR(0), cos));
DosSeek(cos, 0, OFFSET_BEGINNING); DosSeek(cos, 0, OFFSET_BEGINNING);
CreateStreams(0, THandle(cos),0); CreateStreams(0, THandle(cos),0);

2
packages/morphunits/src/amigados.pas
View File

@ -1392,7 +1392,7 @@ type
{ dos.library functions } { dos.library functions }
function Open(fname : PChar location 'd1'; function dosOpen(fname : PChar location 'd1';
accessMode: LongInt location 'd2'): LongInt; accessMode: LongInt location 'd2'): LongInt;
SysCall MOS_DOSBase 30; SysCall MOS_DOSBase 30;