From e3dc7573f09c45e31b625b73e67a759fbc7f3abd Mon Sep 17 00:00:00 2001 From: neil Date: Thu, 28 Aug 2014 15:36:11 +0000 Subject: [PATCH] Allow card.resource to be built with the right name again (by using the new 'includename' option in the conf file to specify "cardres" as the base name for its include files). git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49553 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/m68k-amiga/card/begincardaccess.c | 4 ++-- arch/m68k-amiga/card/cardaccessspeed.c | 4 ++-- arch/m68k-amiga/card/cardchangecount.c | 4 ++-- arch/m68k-amiga/card/cardforcechange.c | 4 ++-- arch/m68k-amiga/card/cardinterface.c | 4 ++-- arch/m68k-amiga/card/cardmiscontrol.c | 4 ++-- arch/m68k-amiga/card/cardprogramvoltage.c | 4 ++-- arch/m68k-amiga/card/cardresetcard.c | 4 ++-- arch/m68k-amiga/card/cardresetremove.c | 4 ++-- arch/m68k-amiga/card/copytuple.c | 4 ++-- arch/m68k-amiga/card/devicetuple.c | 4 ++-- arch/m68k-amiga/card/endcardaccess.c | 4 ++-- arch/m68k-amiga/card/getcardmap.c | 4 ++-- arch/m68k-amiga/card/ifamigaxip.c | 4 ++-- arch/m68k-amiga/card/owncard.c | 4 ++-- arch/m68k-amiga/card/readcardstatus.c | 4 ++-- arch/m68k-amiga/card/releasecard.c | 4 ++-- rom/card/{cardres.conf => card.conf} | 5 ++--- rom/card/card_init.c | 36 +++++++++++++++---------------- rom/card/mmakefile.src | 2 +- 20 files changed, 55 insertions(+), 56 deletions(-) rename rom/card/{cardres.conf => card.conf} (94%) diff --git a/arch/m68k-amiga/card/begincardaccess.c b/arch/m68k-amiga/card/begincardaccess.c index 6a348796b3..02de3b2e94 100644 --- a/arch/m68k-amiga/card/begincardaccess.c +++ b/arch/m68k-amiga/card/begincardaccess.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: BeginCardAccess() function. @@ -10,7 +10,7 @@ AROS_LH1(ULONG, BeginCardAccess, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 4, Cardres) + struct CardResource*, CardResource, 4, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardaccessspeed.c b/arch/m68k-amiga/card/cardaccessspeed.c index de96d746fd..2b5f1299c2 100644 --- a/arch/m68k-amiga/card/cardaccessspeed.c +++ b/arch/m68k-amiga/card/cardaccessspeed.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardAccessSpeed() function. @@ -11,7 +11,7 @@ AROS_LH2(ULONG, CardAccessSpeed, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, nanoseconds, D0), - struct CardResource*, CardResource, 9, Cardres) + struct CardResource*, CardResource, 9, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardchangecount.c b/arch/m68k-amiga/card/cardchangecount.c index 322887dcd0..259bb42180 100644 --- a/arch/m68k-amiga/card/cardchangecount.c +++ b/arch/m68k-amiga/card/cardchangecount.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardChangeCount() function. @@ -11,7 +11,7 @@ #include "card_intern.h" AROS_LH0(ULONG, CardChangeCount, - struct CardResource*, CardResource, 16, Cardres) + struct CardResource*, CardResource, 16, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardforcechange.c b/arch/m68k-amiga/card/cardforcechange.c index c3c5f05251..75c4a35469 100644 --- a/arch/m68k-amiga/card/cardforcechange.c +++ b/arch/m68k-amiga/card/cardforcechange.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardForceChange() function. @@ -11,7 +11,7 @@ #include "card_intern.h" AROS_LH0(ULONG, CardForceChange, - struct CardResource*, CardResource, 15, Cardres) + struct CardResource*, CardResource, 15, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardinterface.c b/arch/m68k-amiga/card/cardinterface.c index 34d90298d1..b82b9a5b02 100644 --- a/arch/m68k-amiga/card/cardinterface.c +++ b/arch/m68k-amiga/card/cardinterface.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardInterface() function. @@ -9,7 +9,7 @@ #include "card_intern.h" AROS_LH0(ULONG, CardInterface, - struct CardResource*, CardResource, 17, Cardres) + struct CardResource*, CardResource, 17, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardmiscontrol.c b/arch/m68k-amiga/card/cardmiscontrol.c index d29d9d3635..3ef8e36fa6 100644 --- a/arch/m68k-amiga/card/cardmiscontrol.c +++ b/arch/m68k-amiga/card/cardmiscontrol.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardMiscControl() function. @@ -16,7 +16,7 @@ AROS_LH2(UBYTE, CardMiscControl, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(UBYTE, control_bits, D1), - struct CardResource*, CardResource, 8, Cardres) + struct CardResource*, CardResource, 8, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardprogramvoltage.c b/arch/m68k-amiga/card/cardprogramvoltage.c index 3e5a2f9a03..4d078ad15f 100644 --- a/arch/m68k-amiga/card/cardprogramvoltage.c +++ b/arch/m68k-amiga/card/cardprogramvoltage.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardProgramVoltage() function. @@ -11,7 +11,7 @@ AROS_LH2(LONG, CardProgramVoltage, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, voltage, D0), - struct CardResource*, CardResource, 10, Cardres) + struct CardResource*, CardResource, 10, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardresetcard.c b/arch/m68k-amiga/card/cardresetcard.c index eb3b13e4b4..b7cfde2008 100644 --- a/arch/m68k-amiga/card/cardresetcard.c +++ b/arch/m68k-amiga/card/cardresetcard.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardResetCard() function. @@ -12,7 +12,7 @@ AROS_LH1(ULONG, CardResetCard, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 11, Cardres) + struct CardResource*, CardResource, 11, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/cardresetremove.c b/arch/m68k-amiga/card/cardresetremove.c index 0caf307345..395b445d0e 100644 --- a/arch/m68k-amiga/card/cardresetremove.c +++ b/arch/m68k-amiga/card/cardresetremove.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CardResetRemove() function. @@ -11,7 +11,7 @@ AROS_LH2(ULONG, CardResetRemove, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, flag, D0), - struct CardResource*, CardResource, 7, Cardres) + struct CardResource*, CardResource, 7, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/copytuple.c b/arch/m68k-amiga/card/copytuple.c index d2a1f3adc2..8acb5ec88d 100644 --- a/arch/m68k-amiga/card/copytuple.c +++ b/arch/m68k-amiga/card/copytuple.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: CopyTuple() function. @@ -84,7 +84,7 @@ AROS_LH4(ULONG, CopyTuple, AROS_LHA(UBYTE*, buffer, A0), AROS_LHA(ULONG, tuplecode, D1), AROS_LHA(ULONG, size, D0), - struct CardResource*, CardResource, 12, Cardres) + struct CardResource*, CardResource, 12, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/devicetuple.c b/arch/m68k-amiga/card/devicetuple.c index 817f8dd673..cea1161f34 100644 --- a/arch/m68k-amiga/card/devicetuple.c +++ b/arch/m68k-amiga/card/devicetuple.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: DeviceTuple() function. @@ -13,7 +13,7 @@ AROS_LH2(ULONG, DeviceTuple, AROS_LHA(UBYTE*, tuple_data, A0), AROS_LHA(struct DeviceTData*, storage, A1), - struct CardResource*, CardResource, 13, Cardres) + struct CardResource*, CardResource, 13, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/endcardaccess.c b/arch/m68k-amiga/card/endcardaccess.c index 27737e1754..a6f0130f15 100644 --- a/arch/m68k-amiga/card/endcardaccess.c +++ b/arch/m68k-amiga/card/endcardaccess.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: EndCardAccess() function. @@ -10,7 +10,7 @@ AROS_LH1(ULONG, EndCardAccess, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 5, Cardres) + struct CardResource*, CardResource, 5, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/getcardmap.c b/arch/m68k-amiga/card/getcardmap.c index fadb198aa4..af8701f391 100644 --- a/arch/m68k-amiga/card/getcardmap.c +++ b/arch/m68k-amiga/card/getcardmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: GetCardMap() function. @@ -19,7 +19,7 @@ const struct CardMemoryMap cmm = }; AROS_LH0(struct CardMemoryMap*, GetCardMap, - struct CardResource*, CardResource, 3, Cardres) + struct CardResource*, CardResource, 3, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/ifamigaxip.c b/arch/m68k-amiga/card/ifamigaxip.c index 126e5256a9..dd72cfa147 100644 --- a/arch/m68k-amiga/card/ifamigaxip.c +++ b/arch/m68k-amiga/card/ifamigaxip.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: IfAmigaXIP() function. @@ -10,7 +10,7 @@ AROS_LH1(struct Resident*, IfAmigaXIP, AROS_LHA(struct CardHandle*, handle, A2), - struct CardResource*, CardResource, 14, Cardres) + struct CardResource*, CardResource, 14, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/owncard.c b/arch/m68k-amiga/card/owncard.c index 2677594caf..2b5aa4cb29 100644 --- a/arch/m68k-amiga/card/owncard.c +++ b/arch/m68k-amiga/card/owncard.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: OwnCard() function. @@ -12,7 +12,7 @@ AROS_LH1(struct CardHandle*, OwnCard, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 1, Cardres) + struct CardResource*, CardResource, 1, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/readcardstatus.c b/arch/m68k-amiga/card/readcardstatus.c index df0ac80fdf..48c7a4225a 100644 --- a/arch/m68k-amiga/card/readcardstatus.c +++ b/arch/m68k-amiga/card/readcardstatus.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: ReadCardStatus() function. @@ -9,7 +9,7 @@ #include "card_intern.h" AROS_LH0(UBYTE, ReadCardStatus, - struct CardResource*, CardResource, 6, Cardres) + struct CardResource*, CardResource, 6, Card) { AROS_LIBFUNC_INIT diff --git a/arch/m68k-amiga/card/releasecard.c b/arch/m68k-amiga/card/releasecard.c index cb1a425dd5..ca87320f33 100644 --- a/arch/m68k-amiga/card/releasecard.c +++ b/arch/m68k-amiga/card/releasecard.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2014, The AROS Development Team. All rights reserved. $Id$ Desc: ReleaseCard() function. @@ -13,7 +13,7 @@ AROS_LH2(void, ReleaseCard, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, flags, D0), - struct CardResource*, CardResource, 2, Cardres) + struct CardResource*, CardResource, 2, Card) { AROS_LIBFUNC_INIT diff --git a/rom/card/cardres.conf b/rom/card/card.conf similarity index 94% rename from rom/card/cardres.conf rename to rom/card/card.conf index 52031f46d4..93cffa6a3e 100644 --- a/rom/card/cardres.conf +++ b/rom/card/card.conf @@ -1,5 +1,6 @@ ##begin config -version 41.2 +includename cardres +version 41.3 residentpri 48 libbase CardResource libbasetype struct CardResource @@ -12,8 +13,6 @@ options resautoinit ##end cdef ##begin cdefprivate -#undef MOD_NAME_STRING -#define MOD_NAME_STRING "card.resource" #include #include ##end cdefprivate diff --git a/rom/card/card_init.c b/rom/card/card_init.c index d6df692d81..803fde1f3e 100644 --- a/rom/card/card_init.c +++ b/rom/card/card_init.c @@ -1,5 +1,5 @@ /* - Copyright © 2011, The AROS Development Team. All rights reserved. + Copyright © 2011-2014, The AROS Development Team. All rights reserved. $Id$ Desc: dummy file @@ -10,7 +10,7 @@ AROS_LH1(struct CardHandle*, OwnCard, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 1, Cardres) + struct CardResource*, CardResource, 1, Card) { AROS_LIBFUNC_INIT @@ -22,7 +22,7 @@ AROS_LH1(struct CardHandle*, OwnCard, AROS_LH2(void, ReleaseCard, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, flags, D0), - struct CardResource*, CardResource, 2, Cardres) + struct CardResource*, CardResource, 2, Card) { AROS_LIBFUNC_INIT @@ -30,7 +30,7 @@ AROS_LH2(void, ReleaseCard, } AROS_LH0(struct CardMemoryMap*, GetCardMap, - struct CardResource*, CardResource, 3, Cardres) + struct CardResource*, CardResource, 3, Card) { AROS_LIBFUNC_INIT @@ -41,7 +41,7 @@ AROS_LH0(struct CardMemoryMap*, GetCardMap, AROS_LH1(BOOL, BeginCardAccess, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 4, Cardres) + struct CardResource*, CardResource, 4, Card) { AROS_LIBFUNC_INIT @@ -52,7 +52,7 @@ AROS_LH1(BOOL, BeginCardAccess, AROS_LH1(BOOL, EndCardAccess, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 5, Cardres) + struct CardResource*, CardResource, 5, Card) { AROS_LIBFUNC_INIT @@ -62,7 +62,7 @@ AROS_LH1(BOOL, EndCardAccess, } AROS_LH0(UBYTE, ReadCardStatus, - struct CardResource*, CardResource, 6, Cardres) + struct CardResource*, CardResource, 6, Card) { AROS_LIBFUNC_INIT @@ -74,7 +74,7 @@ AROS_LH0(UBYTE, ReadCardStatus, AROS_LH2(BOOL, CardResetRemove, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, flag, D0), - struct CardResource*, CardResource, 7, Cardres) + struct CardResource*, CardResource, 7, Card) { AROS_LIBFUNC_INIT @@ -86,7 +86,7 @@ AROS_LH2(BOOL, CardResetRemove, AROS_LH2(UBYTE, CardMiscControl, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(UBYTE, control_bits, D1), - struct CardResource*, CardResource, 8, Cardres) + struct CardResource*, CardResource, 8, Card) { AROS_LIBFUNC_INIT @@ -98,7 +98,7 @@ AROS_LH2(UBYTE, CardMiscControl, AROS_LH2(ULONG, CardAccessSpeed, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, nanoseconds, D0), - struct CardResource*, CardResource, 9, Cardres) + struct CardResource*, CardResource, 9, Card) { AROS_LIBFUNC_INIT @@ -110,7 +110,7 @@ AROS_LH2(ULONG, CardAccessSpeed, AROS_LH2(LONG, CardProgramVoltage, AROS_LHA(struct CardHandle*, handle, A1), AROS_LHA(ULONG, voltage, D0), - struct CardResource*, CardResource, 10, Cardres) + struct CardResource*, CardResource, 10, Card) { AROS_LIBFUNC_INIT @@ -121,7 +121,7 @@ AROS_LH2(LONG, CardProgramVoltage, AROS_LH1(BOOL, CardResetCard, AROS_LHA(struct CardHandle*, handle, A1), - struct CardResource*, CardResource, 11, Cardres) + struct CardResource*, CardResource, 11, Card) { AROS_LIBFUNC_INIT @@ -135,7 +135,7 @@ AROS_LH4(BOOL, CopyTuple, AROS_LHA(UBYTE*, buffer, A0), AROS_LHA(ULONG, tuplecode, D1), AROS_LHA(ULONG, size, D0), - struct CardResource*, CardResource, 12, Cardres) + struct CardResource*, CardResource, 12, Card) { AROS_LIBFUNC_INIT @@ -147,7 +147,7 @@ AROS_LH4(BOOL, CopyTuple, AROS_LH2(BOOL, DeviceTuple, AROS_LHA(UBYTE*, tuple_data, A0), AROS_LHA(struct DeviceTData*, storage, A1), - struct CardResource*, CardResource, 13, Cardres) + struct CardResource*, CardResource, 13, Card) { AROS_LIBFUNC_INIT @@ -158,7 +158,7 @@ AROS_LH2(BOOL, DeviceTuple, AROS_LH1(struct Resident*, IfAmigaXIP, AROS_LHA(struct CardHandle*, handle, A2), - struct CardResource*, CardResource, 14, Cardres) + struct CardResource*, CardResource, 14, Card) { AROS_LIBFUNC_INIT @@ -168,7 +168,7 @@ AROS_LH1(struct Resident*, IfAmigaXIP, } AROS_LH0(ULONG, CardChangeCount, - struct CardResource*, CardResource, 16, Cardres) + struct CardResource*, CardResource, 16, Card) { AROS_LIBFUNC_INIT @@ -178,7 +178,7 @@ AROS_LH0(ULONG, CardChangeCount, } AROS_LH0(BOOL, CardForceChange, - struct CardResource*, CardResource, 15, Cardres) + struct CardResource*, CardResource, 15, Card) { AROS_LIBFUNC_INIT @@ -188,7 +188,7 @@ AROS_LH0(BOOL, CardForceChange, } AROS_LH0(ULONG, CardInterface, - struct CardResource*, CardResource, 17, Cardres) + struct CardResource*, CardResource, 17, Card) { AROS_LIBFUNC_INIT diff --git a/rom/card/mmakefile.src b/rom/card/mmakefile.src index 3806686675..b0a3c99c4b 100644 --- a/rom/card/mmakefile.src +++ b/rom/card/mmakefile.src @@ -16,7 +16,7 @@ FUNCTIONS := card_init # cardchangecount cardinterface %build_module mmake=kernel-cardres \ - modname=cardres modtype=resource \ + modname=card modtype=resource \ files="$(FUNCTIONS)" %common -- 2.11.4.GIT