--- Merging r41747 into '.':

U    packages/os4units/src/asl.pas
U    packages/arosunits/src/asl.pas
--- Recording mergeinfo for merge of r41747 into '.':
 U   .

# revisions: 41747
r41747 | marcus | 2019-03-19 21:48:43 +0100 (Tue, 19 Mar 2019) | 1 line
Changed paths:
   M /trunk/packages/arosunits/src/asl.pas
   M /trunk/packages/os4units/src/asl.pas

AROS, AmigaOS4: unified ASL unit for all amiga-likes

git-svn-id: branches/fixes_3_2@41756 -

packages/arosunits/src/asl.pas

@@ -497,34 +497,28 @@ const
 var
   ASLBase: PLibrary;
 
-function AllocAslRequestA(ReqType: LongWord; TagList: PTagItem): Pointer; syscall ASLBase 8;
+function AllocAslRequest(ReqType: LongWord; TagList: PTagItem): Pointer; syscall ASLBase 8;
 function AllocFileRequest: PFileRequester; syscall ASLBase 5;
-function AslRequestA(Requester: Pointer; TagList: PTagItem): LongBool; syscall ASLBase 10;
+function AslRequest(Requester: Pointer; TagList: PTagItem): LongBool; syscall ASLBase 10;
 procedure FreeAslRequest(Requester: Pointer); syscall ASLBase 9;
 procedure FreeFileRequest(FileReq: PFileRequester); syscall ASLBase 6;
 function RequestFile(FileReq: PFileRequester): LongBool; syscall ASLBase 7;
 procedure AbortAslRequest(Requester: Pointer); syscall ASLBase 13;
 procedure ActivateAslRequest(Requester: Pointer); syscall ASLBase 14;
 
-function AllocAslRequest(ReqType: LongWord; const Tags: array of PtrUInt): Pointer;
-function AslRequest(Requester: Pointer; const Tags: array of PtrUInt): LongBool;
-function AslRequestTags(Requester: Pointer; const Tags: array of PtrUInt): LongBool;
+function AllocAslRequestTags(ReqType: LongWord; const Tags: array of PtrUInt): Pointer; inline;
+function AslRequestTags(Requester: Pointer; const Tags: array of PtrUInt): LongBool; inline;
 
 implementation
 
-function AllocAslRequest(ReqType: LongWord; const Tags: array of PtrUInt): Pointer; inline;
-begin
-  AllocAslRequest := AllocAslRequestA(reqType, @Tags);
-end;
-
-function AslRequest(Requester: Pointer; const Tags: array of PtrUInt): LongBool; inline;
+function AllocAslRequestTags(ReqType: LongWord; const Tags: array of PtrUInt): Pointer; inline;
 begin
-  AslRequest := AslRequestA(Requester, @Tags);
+  AllocAslRequestTags := AllocAslRequest(ReqType, @Tags);
 end;
 
 function AslRequestTags(Requester: Pointer; const Tags: array of PtrUInt): LongBool; inline;
 begin
-  AslRequestTags := AslRequestA(Requester, @Tags);
+  AslRequestTags := AslRequest(Requester, @Tags);
 end;
 
 initialization

packages/os4units/src/asl.pas

@@ -506,10 +506,10 @@ function ASLClone(): PInterface; syscall IDos 72;
 function AllocFileRequest: PFileRequester; syscall IASL 76;
 procedure FreeFileRequest(FileReq: PFileRequester); syscall IASL 80;
 function RequestFile(FileReq: PFileRequester): LongBool; syscall IASL 84;
-function AllocAslRequestA(ReqType: LongWord; TagList: PTagItem): Pointer; syscall IASL 88;
+function AllocAslRequest(ReqType: LongWord; TagList: PTagItem): Pointer; syscall IASL 88;
 // 92 AllocAslRequestTags
 procedure FreeAslRequest(Requester: Pointer); syscall IASL 96;
-function AslRequestA(Requester: Pointer; TagList: PTagItem): LongBool; syscall IASL 100;
+function AslRequest(Requester: Pointer; TagList: PTagItem): LongBool; syscall IASL 100;
 // 104 AslRequestTags
 procedure AslFreeVec(Memory: APTR); syscall IASL 108;
 function AslAllocVec(ByteSize: LongWord; Attributes: LongWord): APTR; syscall IASL 112;
@@ -518,25 +518,25 @@ procedure ActivateAslRequest(Requester: APTR); syscall IASL 120;
 function AslControl(const Tags: PTagItem): LongWord; syscall IASL 124;
 // 128 AslControlTags
 
-function AllocAslRequest(ReqType: LongWord; const Tags: array of PtrUInt): Pointer;
-function AslRequest(Requester: Pointer; const Tags: array of PtrUInt): LongBool;
-function AslRequestTags(Requester: Pointer; const Tags: array of PtrUInt): LongBool;
+function AllocAslRequestTags(ReqType: LongWord; const Tags: array of PtrUInt): Pointer; inline;
+function AslRequestTags(Requester: Pointer; const Tags: array of PtrUInt): LongBool; inline;
+function AslControlTags(const Tags: array of PtrUInt): LongWord; inline;
 
 implementation
 
-function AllocAslRequest(ReqType: LongWord; const Tags: array of PtrUInt): Pointer; inline;
+function AllocAslRequestTags(ReqType: LongWord; const Tags: array of PtrUInt): Pointer; inline;
 begin
-  AllocAslRequest := AllocAslRequestA(reqType, @Tags);
+  AllocAslRequestTags := AllocAslRequest(ReqType, @Tags);
 end;
 
-function AslRequest(Requester: Pointer; const Tags: array of PtrUInt): LongBool; inline;
+function AslRequestTags(Requester: Pointer; const Tags: array of PtrUInt): LongBool; inline;
 begin
-  AslRequest := AslRequestA(Requester, @Tags);
+  AslRequestTags := AslRequest(Requester, @Tags);
 end;
 
-function AslRequestTags(Requester: Pointer; const Tags: array of PtrUInt): LongBool; inline;
+function AslControlTags(const Tags: array of PtrUInt): LongWord; inline;
 begin
-  AslRequestTags := AslRequestA(Requester, @Tags);
+  AslControlTags := AslControl(@Tags);
 end;
 
 initialization