core: adapt to Makefile.submodule

Makefile.pseudomodules

@@ -3,9 +3,7 @@ PSEUDOMODULES += conn
 PSEUDOMODULES += conn_ip
 PSEUDOMODULES += conn_tcp
 PSEUDOMODULES += conn_udp
-PSEUDOMODULES += core_msg
-PSEUDOMODULES += core_mbox
-PSEUDOMODULES += core_thread_flags
+PSEUDOMODULES += core_%
 PSEUDOMODULES += emb6_router
 PSEUDOMODULES += gnrc_ipv6_default
 PSEUDOMODULES += gnrc_ipv6_router

core/Makefile

@@ -1 +1,7 @@
+# exclude submodule sources from *.c wildcard source selection
+SRC := $(filter-out mbox.c msg.c thread_flags.c,$(wildcard *.c))
+
+# enable submodules
+SUBMODULES := 1
+
 include $(RIOTBASE)/Makefile.base

core/mbox.c

@@ -28,8 +28,6 @@
 #define ENABLE_DEBUG (0)
 #include "debug.h"
 
-#ifdef MODULE_CORE_MBOX
-
 static void _wake_waiter(thread_t *thread, unsigned irqstate)
 {
     sched_set_status(thread, STATUS_PENDING);
@@ -122,5 +120,3 @@ int _mbox_get(mbox_t *mbox, msg_t *msg, int blocking)
         return 0;
     }
 }
-
-#endif /* MODULE_CORE_MBOX */

core/msg.c

@@ -34,8 +34,6 @@
 #include "debug.h"
 #include "thread.h"
 
-#ifdef MODULE_CORE_MSG
-
 static int _msg_receive(msg_t *m, int block);
 static int _msg_send(msg_t *m, kernel_pid_t target_pid, bool block, unsigned state);
 
@@ -409,5 +407,3 @@ void msg_queue_print(void)
 
     irq_restore(state);
 }
-
-#endif /* MODULE_CORE_MSG */

core/thread_flags.c

@@ -26,7 +26,6 @@
 #define ENABLE_DEBUG (0)
 #include "debug.h"
 
-#ifdef MODULE_CORE_THREAD_FLAGS
 static thread_flags_t _thread_flags_clear_atomic(thread_t *thread, thread_flags_t mask)
 {
     unsigned state = irq_disable();
@@ -133,4 +132,3 @@ void thread_flags_set(thread_t *thread, thread_flags_t mask)
         irq_restore(state);
     }
 }
-#endif /* MODULE_CORE_THREAD_FLAGS */