From 4269db73a059998387c48650e80d683859d461ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Tue, 26 Apr 2016 09:48:52 +0200
Subject: [PATCH] refactor semaphore: move into separate file

---
 src/platforms/px4_posix.h | 45 +--------------------
 src/platforms/px4_sem.h   | 84 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 44 deletions(-)
 create mode 100644 src/platforms/px4_sem.h

diff --git a/src/platforms/px4_posix.h b/src/platforms/px4_posix.h
index 7a92bf7acf..c3d2eb8233 100644
--- a/src/platforms/px4_posix.h
+++ b/src/platforms/px4_posix.h
@@ -44,7 +44,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
-#include <semaphore.h>
 #include <stdint.h>
 
 #if defined(__PX4_QURT)
@@ -53,50 +52,8 @@
 #include <sys/types.h>
 #endif
 
-/* Semaphore handling */
+#include "px4_sem.h"
 
-#ifdef __PX4_DARWIN
-
-__BEGIN_DECLS
-
-typedef struct {
-	pthread_mutex_t lock;
-	pthread_cond_t wait;
-	int value;
-} px4_sem_t;
-
-__EXPORT int		px4_sem_init(px4_sem_t *s, int pshared, unsigned value);
-__EXPORT int		px4_sem_wait(px4_sem_t *s);
-__EXPORT int		px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime);
-__EXPORT int		px4_sem_post(px4_sem_t *s);
-__EXPORT int		px4_sem_getvalue(px4_sem_t *s, int *sval);
-__EXPORT int		px4_sem_destroy(px4_sem_t *s);
-
-__END_DECLS
-
-#else
-
-__BEGIN_DECLS
-
-typedef sem_t px4_sem_t;
-
-#define px4_sem_init	 sem_init
-#define px4_sem_wait	 sem_wait
-#define px4_sem_post	 sem_post
-#define px4_sem_getvalue sem_getvalue
-#define px4_sem_destroy	 sem_destroy
-
-#ifdef __PX4_QURT
-__EXPORT int		px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime);
-#else
-#define px4_sem_timedwait	 sem_timedwait
-#endif
-
-__END_DECLS
-
-#endif
-
-//###################################
 
 #ifdef __PX4_NUTTX
 
diff --git a/src/platforms/px4_sem.h b/src/platforms/px4_sem.h
new file mode 100644
index 0000000000..00b4f5db4e
--- /dev/null
+++ b/src/platforms/px4_sem.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+ *
+ *   Copyright (c) 2016 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/**
+ * @file px4_sem.h
+ *
+ * Synchronization primitive: Semaphore
+ */
+
+#pragma once
+
+#include <semaphore.h>
+
+
+#ifdef __PX4_DARWIN
+
+__BEGIN_DECLS
+
+typedef struct {
+	pthread_mutex_t lock;
+	pthread_cond_t wait;
+	int value;
+} px4_sem_t;
+
+__EXPORT int		px4_sem_init(px4_sem_t *s, int pshared, unsigned value);
+__EXPORT int		px4_sem_wait(px4_sem_t *s);
+__EXPORT int		px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime);
+__EXPORT int		px4_sem_post(px4_sem_t *s);
+__EXPORT int		px4_sem_getvalue(px4_sem_t *s, int *sval);
+__EXPORT int		px4_sem_destroy(px4_sem_t *s);
+
+__END_DECLS
+
+#else
+
+__BEGIN_DECLS
+
+typedef sem_t px4_sem_t;
+
+#define px4_sem_init	 sem_init
+#define px4_sem_wait	 sem_wait
+#define px4_sem_post	 sem_post
+#define px4_sem_getvalue sem_getvalue
+#define px4_sem_destroy	 sem_destroy
+
+#ifdef __PX4_QURT
+__EXPORT int		px4_sem_timedwait(px4_sem_t *sem, const struct timespec *abstime);
+#else
+#define px4_sem_timedwait	 sem_timedwait
+#endif
+
+__END_DECLS
+
+#endif