From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <45066019.7030302@domain.hid> Date: Tue, 12 Sep 2006 09:22:01 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig6C7A8F03429F69D9CD17F88C" Sender: jan.kiszka@domain.hid Subject: [Xenomai-core] [PATCH] resolve naming clash between RTAI and native List-Id: "Xenomai life and development \(bug reports, patches, discussions\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: xenomai-core This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig6C7A8F03429F69D9CD17F88C Content-Type: multipart/mixed; boundary="------------090505010607030308060303" This is a multi-part message in MIME format. --------------090505010607030308060303 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Hi, any reason why we shouldn't resolve the naming conflict between the RTAI and the native skin not like this? (Would allow me to include RTAI in my test builds where native is normally built-in.) Jan --------------090505010607030308060303 Content-Type: text/plain; name="rtai-naming.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="rtai-naming.patch" Index: include/rtai/task.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- include/rtai/task.h (Revision 1589) +++ include/rtai/task.h (Arbeitskopie) @@ -77,6 +77,34 @@ int __rtai_task_pkg_init(void); =20 void __rtai_task_pkg_cleanup(void); =20 +void __rtai_task_wait_period(void); + +static inline void rt_task_wait_period(void) +{ + __rtai_task_wait_period(); +} + +int __rtai_task_suspend(RT_TASK *task); + +static inline int rt_task_suspend(RT_TASK *task) +{ + return __rtai_task_suspend(task); +} + +int __rtai_task_resume(RT_TASK *task); + +static inline int rt_task_resume(RT_TASK *task) +{ + return __rtai_task_resume(task); +} + +int __rtai_task_delete(RT_TASK *task); + +static inline int rt_task_delete(RT_TASK *task) +{ + return __rtai_task_delete(task); +} + #ifdef __cplusplus } #endif @@ -89,6 +117,22 @@ void __rtai_task_pkg_cleanup(void); =20 typedef RT_TASK_PLACEHOLDER RT_TASK; =20 +#ifdef __cplusplus +extern "C" { +#endif + +void rt_task_wait_period(void); + +int rt_task_suspend(RT_TASK *task); + +int rt_task_resume(RT_TASK *task); + +int rt_task_delete(RT_TASK *task); + +#ifdef __cplusplus +} +#endif + #endif /* __KERNEL__ || __XENO_SIM__ */ =20 #ifdef __cplusplus @@ -112,13 +156,6 @@ int rt_task_make_periodic(RT_TASK *task, int rt_task_make_periodic_relative_ns(RT_TASK *task, RTIME start_delay, RTIME period); -void rt_task_wait_period(void); - -int rt_task_suspend(RT_TASK *task); - -int rt_task_resume(RT_TASK *task); - -int rt_task_delete(RT_TASK *task); =20 #ifdef __cplusplus } Index: include/rtai/sem.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- include/rtai/sem.h (Revision 1589) +++ include/rtai/sem.h (Arbeitskopie) @@ -65,6 +65,13 @@ int __rtai_sem_pkg_init(void); =20 void __rtai_sem_pkg_cleanup(void); =20 +int __rtai_sem_delete(SEM *sem); + +static inline int rt_sem_delete(SEM *sem) +{ + return __rtai_sem_delete(sem); +} + #ifdef __cplusplus } #endif @@ -73,6 +80,16 @@ void __rtai_sem_pkg_cleanup(void); =20 typedef RT_SEM_PLACEHOLDER SEM; =20 +#ifdef __cplusplus +extern "C" { +#endif + +int rt_sem_delete(SEM *sem); + +#ifdef __cplusplus +} +#endif + #endif /* __KERNEL__ || __XENO_SIM__ */ =20 #ifdef __cplusplus @@ -83,8 +100,6 @@ void rt_typed_sem_init(SEM *sem, int value, int type); =20 -int rt_sem_delete(SEM *sem); - int rt_sem_signal(SEM *sem); =20 int rt_sem_wait(SEM *sem); Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- ChangeLog (Revision 1589) +++ ChangeLog (Arbeitskopie) @@ -1,3 +1,9 @@ +2006-09-12 Jan Kiszka + + * include/rtai/{sem.h,task.h}, ksrc/skins/rtai/{sem.c,task.c}, + ksrc/skins/rtai/Kconfig: Resolve naming conflict with native skin + and relax dependencies. + 2006-09-11 Philippe Gerum =20 * ksrc: Define -D__IN_XENOMAI__ when compiling the kernel support. Index: ksrc/skins/rtai/Kconfig =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- ksrc/skins/rtai/Kconfig (Revision 1589) +++ ksrc/skins/rtai/Kconfig (Arbeitskopie) @@ -1,5 +1,5 @@ config XENO_SKIN_RTAI - depends on XENO_OPT_NUCLEUS && !XENO_SKIN_NATIVE + depends on XENO_OPT_NUCLEUS tristate "RTAI emulator" default n help @@ -32,6 +32,3 @@ config XENO_OPT_RTAI_SHM help =09 SHM are Shared Memory objects across RTAI tasks. - -comment "RTAI emulator unavailable, disable native API or build it as mo= dule" - depends on XENO_SKIN_NATIVE =3D y Index: ksrc/skins/rtai/task.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- ksrc/skins/rtai/task.c (Revision 1589) +++ ksrc/skins/rtai/task.c (Arbeitskopie) @@ -140,7 +140,7 @@ int rt_task_init(RT_TASK *task, return err ? -EINVAL : 0; } =20 -int rt_task_resume(RT_TASK *task) +int __rtai_task_resume(RT_TASK *task) { int err =3D 0; spl_t s; @@ -166,7 +166,7 @@ int rt_task_resume(RT_TASK *task) return err; } =20 -int rt_task_suspend(RT_TASK *task) +int __rtai_task_suspend(RT_TASK *task) { int err =3D 0; spl_t s; @@ -197,7 +197,7 @@ int rt_task_suspend(RT_TASK *task) return err; } =20 -int rt_task_delete(RT_TASK *task) +int __rtai_task_delete(RT_TASK *task) { int err =3D 0; spl_t s; @@ -289,15 +289,15 @@ int rt_task_make_periodic(RT_TASK *task, return err; } =20 -void rt_task_wait_period(void) +void __rtai_task_wait_period(void) { xnpod_wait_thread_period(NULL); } =20 EXPORT_SYMBOL(rt_task_init); -EXPORT_SYMBOL(rt_task_resume); -EXPORT_SYMBOL(rt_task_suspend); -EXPORT_SYMBOL(rt_task_delete); +EXPORT_SYMBOL(__rtai_task_resume); +EXPORT_SYMBOL(__rtai_task_suspend); +EXPORT_SYMBOL(__rtai_task_delete); EXPORT_SYMBOL(rt_task_make_periodic_relative_ns); EXPORT_SYMBOL(rt_task_make_periodic); -EXPORT_SYMBOL(rt_task_wait_period); +EXPORT_SYMBOL(__rtai_task_wait_period); Index: ksrc/skins/rtai/sem.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- ksrc/skins/rtai/sem.c (Revision 1589) +++ ksrc/skins/rtai/sem.c (Arbeitskopie) @@ -45,7 +45,7 @@ void rt_typed_sem_init(SEM * sem, int va sem->magic =3D RTAI_SEM_MAGIC; } =20 -int rt_sem_delete(SEM * sem) +int __rtai_sem_delete(SEM * sem) { int err =3D 0, rc; spl_t s; @@ -209,7 +209,7 @@ void __rtai_sem_pkg_cleanup(void) } =20 EXPORT_SYMBOL(rt_typed_sem_init); -EXPORT_SYMBOL(rt_sem_delete); +EXPORT_SYMBOL(__rtai_sem_delete); EXPORT_SYMBOL(rt_sem_signal); EXPORT_SYMBOL(rt_sem_wait); EXPORT_SYMBOL(rt_sem_wait_if); --------------090505010607030308060303-- --------------enig6C7A8F03429F69D9CD17F88C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFBmAZniDOoMHTA+kRApR1AJ4jwFT56m/2FP+IUkA6UWBDFzGBogCcCnsc aoMlfF8eTUhGnuhOQU88ERE= =P0V3 -----END PGP SIGNATURE----- --------------enig6C7A8F03429F69D9CD17F88C--