From 39591de23fce107df78817e23d294eeffa264249 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Mon, 13 Aug 2012 01:42:18 +0000 Subject: [PATCH] rexxsys.library: Actually use the rl_SysBase field Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45533 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/rexxsyslib/createargstring.c | 2 +- workbench/libs/rexxsyslib/createrexxmsg.c | 2 +- workbench/libs/rexxsyslib/deleteargstring.c | 2 +- workbench/libs/rexxsyslib/deleterexxmsg.c | 2 +- workbench/libs/rexxsyslib/fillrexxmsg.c | 2 +- workbench/libs/rexxsyslib/lockrexxbase.c | 2 +- workbench/libs/rexxsyslib/mmakefile.src | 1 + workbench/libs/rexxsyslib/rexxsyslib_init.c | 15 ++++++++------- workbench/libs/rexxsyslib/rexxsyslib_intern.h | 3 +++ workbench/libs/rexxsyslib/unlockrexxbase.c | 2 +- 10 files changed, 19 insertions(+), 14 deletions(-) diff --git a/workbench/libs/rexxsyslib/createargstring.c b/workbench/libs/rexxsyslib/createargstring.c index 0ac57fd976..77b4ea7ceb 100644 --- a/workbench/libs/rexxsyslib/createargstring.c +++ b/workbench/libs/rexxsyslib/createargstring.c @@ -20,7 +20,7 @@ AROS_LHA(ULONG , length, D0), /* LOCATION */ - struct Library *, RexxSysBase, 21, RexxSys) + struct RxsLib *, RexxSysBase, 21, RexxSys) /* FUNCTION This function will create a RexxArg structure and copy the supplied diff --git a/workbench/libs/rexxsyslib/createrexxmsg.c b/workbench/libs/rexxsyslib/createrexxmsg.c index 4df42fbf2d..d3e805a62a 100644 --- a/workbench/libs/rexxsyslib/createrexxmsg.c +++ b/workbench/libs/rexxsyslib/createrexxmsg.c @@ -22,7 +22,7 @@ AROS_LHA(UBYTE *, host , D0), /* LOCATION */ - struct Library *, RexxSysBase, 24, RexxSys) + struct RxsLib *, RexxSysBase, 24, RexxSys) /* FUNCTION Creation and initialization of a RexxMsg structure diff --git a/workbench/libs/rexxsyslib/deleteargstring.c b/workbench/libs/rexxsyslib/deleteargstring.c index 7eb42b1209..5b78ca58e2 100644 --- a/workbench/libs/rexxsyslib/deleteargstring.c +++ b/workbench/libs/rexxsyslib/deleteargstring.c @@ -20,7 +20,7 @@ AROS_LHA(UBYTE *, argstring, A0), /* LOCATION */ - struct Library *, RexxSysBase, 22, RexxSys) + struct RxsLib *, RexxSysBase, 22, RexxSys) /* FUNCTION Deletes a RexxArg structure previously created with CreateArgstring diff --git a/workbench/libs/rexxsyslib/deleterexxmsg.c b/workbench/libs/rexxsyslib/deleterexxmsg.c index d00ac8c673..40c48cea89 100644 --- a/workbench/libs/rexxsyslib/deleterexxmsg.c +++ b/workbench/libs/rexxsyslib/deleterexxmsg.c @@ -18,7 +18,7 @@ AROS_LHA(struct RexxMsg *, packet, A0), /* LOCATION */ - struct Library *, RexxSysBase, 25, RexxSys) + struct RxsLib *, RexxSysBase, 25, RexxSys) /* FUNCTION Deletes a RexxMsg structure diff --git a/workbench/libs/rexxsyslib/fillrexxmsg.c b/workbench/libs/rexxsyslib/fillrexxmsg.c index 29663f47b5..5b5a683444 100644 --- a/workbench/libs/rexxsyslib/fillrexxmsg.c +++ b/workbench/libs/rexxsyslib/fillrexxmsg.c @@ -22,7 +22,7 @@ AROS_LHA(ULONG , mask , D1), /* LOCATION */ - struct Library *, RexxSysBase, 27, RexxSys) + struct RxsLib *, RexxSysBase, 27, RexxSys) /* FUNCTION This function will convert the value(s) provided in rm_Args of the diff --git a/workbench/libs/rexxsyslib/lockrexxbase.c b/workbench/libs/rexxsyslib/lockrexxbase.c index 12354b0302..841beb108d 100644 --- a/workbench/libs/rexxsyslib/lockrexxbase.c +++ b/workbench/libs/rexxsyslib/lockrexxbase.c @@ -18,7 +18,7 @@ AROS_LHA(ULONG, resource, D0), /* LOCATION */ - struct Library *, RexxSysBase, 75, RexxSys) + struct RxsLib *, RexxSysBase, 75, RexxSys) /* FUNCTION diff --git a/workbench/libs/rexxsyslib/mmakefile.src b/workbench/libs/rexxsyslib/mmakefile.src index 92d87215c5..3ff619945d 100644 --- a/workbench/libs/rexxsyslib/mmakefile.src +++ b/workbench/libs/rexxsyslib/mmakefile.src @@ -15,6 +15,7 @@ FUNCS := \ #MM- workbench-libs-rexxsyslib-includes : kernel-exec-includes includes-copy #MM- workbench-libs-rexxsyslib : includes linklibs +USER_CFLAGS += -D__NOLIBBASE__ # TODO: At the moment sprintf needs the math library %build_module mmake=workbench-libs-rexxsyslib \ diff --git a/workbench/libs/rexxsyslib/rexxsyslib_init.c b/workbench/libs/rexxsyslib/rexxsyslib_init.c index dac9ba0d0b..aae1533dac 100644 --- a/workbench/libs/rexxsyslib/rexxsyslib_init.c +++ b/workbench/libs/rexxsyslib/rexxsyslib_init.c @@ -16,14 +16,15 @@ #include #include LC_LIBDEFS_FILE -static int InitData(LIBBASETYPEPTR LIBBASE) +static int InitData(struct RexxSysBase_intern *RSBI) { - LIBBASE->rexxmsgid = "RexxMsgId"; - InitSemaphore(&LIBBASE->semaphore); - NewList(&LIBBASE->library.rl_LibList); - LIBBASE->library.rl_NumLib = 0; - NewList(&LIBBASE->library.rl_ClipList); - LIBBASE->library.rl_NumClip = 0; + struct RxsLib *RexxSysBase = &RSBI->library; + RSBI->rexxmsgid = "RexxMsgId"; + InitSemaphore(&RSBI->semaphore); + NewList(&RexxSysBase->rl_LibList); + RexxSysBase->rl_NumLib = 0; + NewList(&RexxSysBase->rl_ClipList); + RexxSysBase->rl_NumClip = 0; return TRUE; } diff --git a/workbench/libs/rexxsyslib/rexxsyslib_intern.h b/workbench/libs/rexxsyslib/rexxsyslib_intern.h index b5c4f64527..6734d7836e 100644 --- a/workbench/libs/rexxsyslib/rexxsyslib_intern.h +++ b/workbench/libs/rexxsyslib/rexxsyslib_intern.h @@ -56,4 +56,7 @@ struct RexxSysBase_intern #define RSBI(base) ((struct RexxSysBase_intern *)base) +#define SysBase (RexxSysBase->rl_SysBase) +#define DOSBase (RexxSysBase->rl_DOSBase) + #endif /* REXXSYSLIB_INTERN_H */ diff --git a/workbench/libs/rexxsyslib/unlockrexxbase.c b/workbench/libs/rexxsyslib/unlockrexxbase.c index e2384b0a2d..e2a4a59857 100644 --- a/workbench/libs/rexxsyslib/unlockrexxbase.c +++ b/workbench/libs/rexxsyslib/unlockrexxbase.c @@ -18,7 +18,7 @@ AROS_LHA(ULONG, resource, D0), /* LOCATION */ - struct Library *, RexxSysBase, 76, RexxSys) + struct RxsLib *, RexxSysBase, 76, RexxSys) /* FUNCTION -- 2.11.4.GIT