Module: xenomai-forge
Branch: master
Commit: 5b30f2b9bcc8884aa654208936125f5cd84994ed
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=5b30f2b9bcc8884aa654208936125f5cd84994ed
Author: Philippe Gerum <r...@xenomai.org>
Date: Mon Jan 2 17:20:33 2012 +0100
lib/cobalt: group internal declarations
---
include/asm-generic/bits/Makefile.am | 1 -
include/asm-generic/bits/Makefile.in | 1 -
include/asm-generic/bits/sigshadow.h | 8 --------
lib/cobalt/clock.c | 3 +--
lib/cobalt/cond.c | 2 --
lib/cobalt/internal.c | 2 --
lib/cobalt/internal.h | 4 ++++
lib/cobalt/mq.c | 3 +--
lib/cobalt/mutex.c | 3 +--
lib/cobalt/select.c | 21 +++++++++++++++++++--
lib/cobalt/semaphore.c | 3 +--
lib/cobalt/sigshadow.c | 1 -
lib/cobalt/thread.c | 4 +---
lib/cobalt/timer.c | 3 +--
14 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/include/asm-generic/bits/Makefile.am
b/include/asm-generic/bits/Makefile.am
index c5fcd7b..3b84f8d 100644
--- a/include/asm-generic/bits/Makefile.am
+++ b/include/asm-generic/bits/Makefile.am
@@ -5,5 +5,4 @@ includesub_HEADERS = \
current.h \
pod.h \
shadow.h \
- sigshadow.h \
timeconv.h
diff --git a/include/asm-generic/bits/Makefile.in
b/include/asm-generic/bits/Makefile.in
index c46f6e4..fc4ac9a 100644
--- a/include/asm-generic/bits/Makefile.in
+++ b/include/asm-generic/bits/Makefile.in
@@ -246,7 +246,6 @@ includesub_HEADERS = \
current.h \
pod.h \
shadow.h \
- sigshadow.h \
timeconv.h
all: all-am
diff --git a/include/asm-generic/bits/sigshadow.h
b/include/asm-generic/bits/sigshadow.h
deleted file mode 100644
index b0c7644..0000000
--- a/include/asm-generic/bits/sigshadow.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _XENO_ASM_GENERIC_BITS_SIGSHADOW_H
-#define _XENO_ASM_GENERIC_BITS_SIGSHADOW_H
-
-void xeno_sigshadow_install_once(void);
-
-int xeno_sigwinch_handler(int sig, siginfo_t *si, void *ctxt);
-
-#endif /* _XENO_ASM_GENERIC_BITS_SIGSHADOW_H */
diff --git a/lib/cobalt/clock.c b/lib/cobalt/clock.c
index 4fa1160..dcef856 100644
--- a/lib/cobalt/clock.c
+++ b/lib/cobalt/clock.c
@@ -27,8 +27,7 @@
#include <asm-generic/xenomai/timeconv.h>
#include <sys/types.h>
#include <nucleus/vdso.h>
-
-extern int __cobalt_muxid;
+#include "internal.h"
static xnsysinfo_t __cobalt_sysinfo;
diff --git a/lib/cobalt/cond.c b/lib/cobalt/cond.c
index 0f34dce..9a6d2d6 100644
--- a/lib/cobalt/cond.c
+++ b/lib/cobalt/cond.c
@@ -24,8 +24,6 @@
#include <asm-generic/bits/current.h>
#include "internal.h"
-extern int __cobalt_muxid;
-
extern unsigned long xeno_sem_heap[2];
static inline unsigned long *cond_get_signalsp(struct __shadow_cond *shadow)
diff --git a/lib/cobalt/internal.c b/lib/cobalt/internal.c
index 0b87f6a..0a6faeb 100644
--- a/lib/cobalt/internal.c
+++ b/lib/cobalt/internal.c
@@ -28,8 +28,6 @@
#include <asm-generic/bits/current.h>
#include "internal.h"
-extern int __cobalt_muxid;
-
extern unsigned long xeno_sem_heap[2];
void __cobalt_thread_harden(void)
diff --git a/lib/cobalt/internal.h b/lib/cobalt/internal.h
index 9b37bdf..cf497cd 100644
--- a/lib/cobalt/internal.h
+++ b/lib/cobalt/internal.h
@@ -4,6 +4,10 @@
#include <pthread.h>
#include <asm-generic/bits/current.h>
+void xeno_sigshadow_install_once(void);
+
+extern int __cobalt_muxid;
+
struct cobalt_threadstat;
struct cobalt_monitor_shadow;
diff --git a/lib/cobalt/mq.c b/lib/cobalt/mq.c
index 927cbf9..5875caa 100644
--- a/lib/cobalt/mq.c
+++ b/lib/cobalt/mq.c
@@ -23,8 +23,7 @@
#include <cobalt/syscall.h>
#include <pthread.h>
#include <mqueue.h>
-
-extern int __cobalt_muxid;
+#include "internal.h"
mqd_t __wrap_mq_open(const char *name, int oflags, ...)
{
diff --git a/lib/cobalt/mutex.c b/lib/cobalt/mutex.c
index 14fd454..92ae8cf 100644
--- a/lib/cobalt/mutex.c
+++ b/lib/cobalt/mutex.c
@@ -23,8 +23,7 @@
#include <cobalt/syscall.h>
#include <kernel/cobalt/mutex.h>
#include <asm-generic/bits/current.h>
-
-extern int __cobalt_muxid;
+#include "internal.h"
int __wrap_pthread_mutexattr_init(pthread_mutexattr_t *attr)
{
diff --git a/lib/cobalt/select.c b/lib/cobalt/select.c
index 36c93b2..95d94a7 100644
--- a/lib/cobalt/select.c
+++ b/lib/cobalt/select.c
@@ -1,9 +1,26 @@
+/*
+ * Copyright (C) 2010 Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
#include <errno.h>
#include <pthread.h>
#include <cobalt/syscall.h>
#include <sys/select.h>
-
-extern int __cobalt_muxid;
+#include "internal.h"
int __wrap_select (int __nfds, fd_set *__restrict __readfds,
fd_set *__restrict __writefds,
diff --git a/lib/cobalt/semaphore.c b/lib/cobalt/semaphore.c
index 9153f6d..e199850 100644
--- a/lib/cobalt/semaphore.c
+++ b/lib/cobalt/semaphore.c
@@ -24,8 +24,7 @@
#include <kernel/cobalt/sem.h>
#include <cobalt/syscall.h>
#include <semaphore.h>
-
-extern int __cobalt_muxid;
+#include "internal.h"
int __wrap_sem_init(sem_t *sem, int pshared, unsigned value)
{
diff --git a/lib/cobalt/sigshadow.c b/lib/cobalt/sigshadow.c
index 51bb659..a4c23ca 100644
--- a/lib/cobalt/sigshadow.c
+++ b/lib/cobalt/sigshadow.c
@@ -3,7 +3,6 @@
#include <execinfo.h>
#include <asm/xenomai/syscall.h>
-#include <asm-generic/xenomai/bits/sigshadow.h>
static struct sigaction xeno_saved_sigshadow_action;
diff --git a/lib/cobalt/thread.c b/lib/cobalt/thread.c
index e4e871e..568ab0a 100644
--- a/lib/cobalt/thread.c
+++ b/lib/cobalt/thread.c
@@ -27,10 +27,8 @@
#include <semaphore.h>
#include <cobalt/syscall.h>
#include <asm-generic/bits/current.h>
-#include <asm-generic/bits/sigshadow.h>
#include <asm-generic/stack.h>
-
-extern int __cobalt_muxid;
+#include "internal.h"
static pthread_attr_ex_t default_attr_ex;
diff --git a/lib/cobalt/timer.c b/lib/cobalt/timer.c
index ddd291d..20ed84f 100644
--- a/lib/cobalt/timer.c
+++ b/lib/cobalt/timer.c
@@ -19,8 +19,7 @@
#include <errno.h>
#include <cobalt/syscall.h>
#include <time.h>
-
-extern int __cobalt_muxid;
+#include "internal.h"
int __wrap_timer_create(clockid_t clockid,
const struct sigevent *__restrict__ evp,
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
