[Xenomai-git] Frederik Bayart : debian: drop xeno-config from -dev package
Module: xenomai-3 Branch: next Commit: 6e77fe2b8d3fc65cf83ed469da7253303707e9a2 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=6e77fe2b8d3fc65cf83ed469da7253303707e9a2 Author: Frederik Bayart Date: Mon Jun 22 19:52:29 2015 +0200 debian: drop xeno-config from -dev package --- debian/rules |3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index f91a621..8b871a4 100755 --- a/debian/rules +++ b/debian/rules @@ -64,6 +64,9 @@ install: build for f in $(CURDIR)/kernel/cobalt/udev/*.rules ; do \ cat $$f >> $(CURDIR)/debian/libxenomai1/etc/udev/xenomai.rules ; \ done + # xeno-config should be only in xenomai-runtime + rm -f $(CURDIR)/debian/libxenomai-dev/usr/bin/xeno-config + rm -f $(CURDIR)/debian/libxenomai-dev/usr/share/man/man1/xeno-config.1 install -m 644 debian/libxenomai1.modprobe $(CURDIR)/debian/libxenomai1/etc/modprobe.d/xenomai.conf # remove empty directory rm -rf $(CURDIR)/debian/xenomai-doc/usr/share/doc/xenomai-doc/ps ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/udd: fix documentation
Module: xenomai-3
Branch: next
Commit: 831a40791c6d15a057288b5116d3cac9231b80c9
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=831a40791c6d15a057288b5116d3cac9231b80c9
Author: Philippe Gerum
Date: Mon Jun 22 14:18:10 2015 +0200
cobalt/udd: fix documentation
---
include/cobalt/kernel/rtdm/udd.h |5 +++--
kernel/drivers/udd/udd.c |7 +--
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/include/cobalt/kernel/rtdm/udd.h b/include/cobalt/kernel/rtdm/udd.h
index 3838f6b..aa9e838 100644
--- a/include/cobalt/kernel/rtdm/udd.h
+++ b/include/cobalt/kernel/rtdm/udd.h
@@ -65,8 +65,9 @@
#define UDD_IRQ_NONE 0
/**
* IRQ directly managed from the mini-driver on top of the UDD
- * core. The mini-driver is in charge of notifying the Cobalt threads
- * waiting for IRQ events by calling the udd_notify_event() service.
+ * core. The mini-driver is in charge of attaching the handler(s) to
+ * the IRQ(s) it manages, notifying the Cobalt threads waiting for IRQ
+ * events by calling the udd_notify_event() service.
*/
#define UDD_IRQ_CUSTOM (-1)
/** @} */
diff --git a/kernel/drivers/udd/udd.c b/kernel/drivers/udd/udd.c
index d0ca846..6f12235 100644
--- a/kernel/drivers/udd/udd.c
+++ b/kernel/drivers/udd/udd.c
@@ -181,11 +181,6 @@ static int udd_irq_handler(rtdm_irq_t *irqh)
struct udd_device *udd;
int ret;
- /*
-* CAUTION: irqh might live outside of the udd_device struct
-* (i.e. UDD_IRQ_CUSTOM), so we can't assume the latter is
-* the container of the former.
-*/
udd = rtdm_irq_get_arg(irqh, struct udd_device);
ret = udd->ops.interrupt(udd);
if (ret == RTDM_IRQ_HANDLED)
@@ -495,7 +490,7 @@ EXPORT_SYMBOL_GPL(udd_unregister_device);
*
* @coretags{coreirq-only}
*
- * @note In case the ref udd_irq_handler "IRQ handler" from the
+ * @note In case the @ref udd_irq_handler "IRQ handler" from the
* mini-driver requested the UDD core not to re-enable the interrupt
* line, the application may later request the unmasking by issuing
* the UDD_RTIOC_IRQEN ioctl(2) command. Writing a non-zero integer to
___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : scripts/xeno-config: fix include directives for compat mode
Module: xenomai-3 Branch: next Commit: 54cb4842b0225efa9a9bb54a0aa19c9106cc1637 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=54cb4842b0225efa9a9bb54a0aa19c9106cc1637 Author: Philippe Gerum Date: Mon Jun 22 16:39:57 2015 +0200 scripts/xeno-config: fix include directives for compat mode --- scripts/xeno-config-cobalt.in |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/xeno-config-cobalt.in b/scripts/xeno-config-cobalt.in index c6e51d1..7b623db 100644 --- a/scripts/xeno-config-cobalt.in +++ b/scripts/xeno-config-cobalt.in @@ -198,7 +198,10 @@ if test x$do_cflags = xy; then test x$compat = xy && cflags="-I$XENO_INCLUDE_DIR/trank -D__XENO_COMPAT__ $cflags" for skin in $skin_list; do case "$skin" in - posix|cobalt|rtdm) + posix|rtdm) + test x$compat = xy && cflags="$cflags -I$XENO_INCLUDE_DIR/trank/posix" + ;; + cobalt) ;; vxworks|psos|alchemy|smokey) cflags="$cflags -I$XENO_INCLUDE_DIR/$skin" ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : doc: hint about licensing terms
Module: xenomai-3 Branch: next Commit: f4a54b173db71a182d9826852a94b20f6095b411 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=f4a54b173db71a182d9826852a94b20f6095b411 Author: Philippe Gerum Date: Mon Jun 22 11:00:22 2015 +0200 doc: hint about licensing terms --- README | 13 + 1 file changed, 13 insertions(+) diff --git a/README b/README index 019b58d..8f8d0a4 100644 --- a/README +++ b/README @@ -59,3 +59,16 @@ https://xenomai.org/installing-xenomai-3-x/ http://download.gna.org/xenomai/ Source tarballs are self-contained and ready for building. + +Licensing terms +=== + +Source files which implement the Xenomai software system generally +include a copyright notice and license header. In absence of license +header in a particular file, the terms and conditions stated by the +COPYING or LICENSE file present in the top-level directory of the +relevant package apply. + +For instance, lib/cobalt/COPYING states the licensing terms and +conditions applicable to the source files present in the hierarchy +rooted at lib/cobalt. ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
