Merge pull request #845 from mehlis/sem-to-posix

posix: move posix semaphore in posix module

Makefile.dep

@@ -16,6 +16,42 @@ ifneq (,$(filter pnet,$(USEMODULE)))
 	endif
 endif
 
+ifneq (,$(filter destiny,$(USEMODULE)))
+    ifeq (,$(filter sixlowpan,$(USEMODULE)))
+        USEMODULE += sixlowpan
+    endif
+    ifeq (,$(filter net_help,$(USEMODULE)))
+        USEMODULE += net_help
+    endif
+    ifeq (,$(filter vtimer,$(USEMODULE)))
+        USEMODULE += vtimer
+    endif
+endif
+
+ifneq (,$(filter sixlowborder,$(USEMODULE)))
+    ifeq (,$(filter sixlowpan,$(USEMODULE)))
+        USEMODULE += sixlowpan
+    endif
+endif
+
+ifneq (,$(filter sixlowpan,$(USEMODULE)))
+    ifeq (,$(filter ieee802154,$(USEMODULE)))
+        USEMODULE += ieee802154
+    endif
+    ifeq (,$(filter net_help,$(USEMODULE)))
+        USEMODULE += net_help
+    endif
+    ifeq (,$(filter net_if,$(USEMODULE)))
+        USEMODULE += net_if
+    endif
+    ifeq (,$(filter posix, $(USEMODULE)))
+        USEMODULE += posix
+    endif
+    ifeq (,$(filter vtimer, $(USEMODULE)))
+        USEMODULE += vtimer
+    endif
+endif
+
 ifneq (,$(filter posix,$(USEMODULE)))
 	ifeq (,$(filter uart0,$(USEMODULE)))
 		USEMODULE += uart0
@@ -73,42 +109,6 @@ ifneq (,$(filter at86rf231,$(USEMODULE)))
 	endif
 endif
 
-ifneq (,$(filter destiny,$(USEMODULE)))
-	ifeq (,$(filter sixlowpan,$(USEMODULE)))
-		USEMODULE += sixlowpan
-	endif
-	ifeq (,$(filter net_help,$(USEMODULE)))
-		USEMODULE += net_help
-	endif
-	ifeq (,$(filter vtimer,$(USEMODULE)))
-		USEMODULE += vtimer
-	endif
-endif
-
-ifneq (,$(filter sixlowborder,$(USEMODULE)))
-	ifeq (,$(filter sixlowpan,$(USEMODULE)))
-		USEMODULE += sixlowpan
-	endif
-endif
-
-ifneq (,$(filter sixlowpan,$(USEMODULE)))
-	ifeq (,$(filter ieee802154,$(USEMODULE)))
-		USEMODULE += ieee802154
-	endif
-	ifeq (,$(filter net_help,$(USEMODULE)))
-		USEMODULE += net_help
-	endif
-	ifeq (,$(filter net_if,$(USEMODULE)))
-		USEMODULE += net_if
-	endif
-	ifeq (,$(filter semaphore, $(USEMODULE)))
-		USEMODULE += semaphore
-	endif
-	ifeq (,$(filter vtimer, $(USEMODULE)))
-		USEMODULE += vtimer
-	endif
-endif
-
 ifneq (,$(filter vtimer,$(USEMODULE)))
 	ifeq (,$(filter timex,$(USEMODULE)))
 		USEMODULE += timex

sys/Makefile

@@ -93,9 +93,6 @@ endif
 ifneq (,$(filter hashes,$(USEMODULE)))
     DIRS += hashes
 endif
-ifneq (,$(filter semaphore,$(USEMODULE)))
-    DIRS += semaphore
-endif
 ifneq (,$(filter ccn_lite,$(USEMODULE)))
     DIRS += net/ccn_lite
 endif

sys/posix/semaphore.c

@@ -1,18 +1,22 @@
 /**
  * Semaphore implemenation
  *
- * Copyright (C) 2013  INRIA.
+ * Copyright (C) 2013 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.
  *
- * @ingroup sixlowpan
+ * @ingroup posix
+ *
  * @{
+ *
  * @file    semaphore.c
  * @brief   Implementation of semaphores with priority queues
+ *
  * @author  Christian Mehlis <mehlis@inf.fu-berlin.de>
  * @author  René Kijewski <kijewski@inf.fu-berlin.de>
+ *
  * @}
  */
 

sys/semaphore/Makefile

@@ -1,3 +0,0 @@
-MODULE = semaphore
-
-include $(RIOTBASE)/Makefile.base

tests/test_posix_semaphore/Makefile

@@ -0,0 +1,8 @@
+export PROJECT = test_posix_semaphore
+include ../Makefile.tests_common
+
+USEMODULE += posix 
+
+export INCLUDES += -I$(RIOTBASE)/sys/posix/include
+
+include $(RIOTBASE)/Makefile.include

tests/test_semaphore/Makefile

@@ -1,6 +0,0 @@
-export PROJECT = test_semaphore
-include ../Makefile.tests_common
-
-USEMODULE += semaphore
-
-include $(RIOTBASE)/Makefile.include