Switch to new kernel config files.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2420 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/arm/drv/adc_at91.c b/bertos/cpu/arm/drv/adc_at91.c
index b98e129025ea699195f501be839f617548f68856..46ba341370ceb03e1bd4f2e9acbb4b406ee5d4ae 100644 (file)
--- a/bertos/cpu/arm/drv/adc_at91.c
+++ b/bertos/cpu/arm/drv/adc_at91.c
@@ -50,7 +50,8 @@
 #include <cpu/irq.h>
 
 #include "cfg/cfg_adc.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 

diff --git a/bertos/cpu/avr/drv/adc_avr.c b/bertos/cpu/avr/drv/adc_avr.c
index 33beeca39acad872e9c60739af403f8f3a968472..8c3217e73c5551fed554d6bf71ae735335eb9852 100644 (file)
--- a/bertos/cpu/avr/drv/adc_avr.c
+++ b/bertos/cpu/avr/drv/adc_avr.c
@@ -42,7 +42,8 @@
 #include "adc_avr.h"
 
 #include "cfg/cfg_adc.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 

diff --git a/bertos/drv/dataflash_hwtest.c b/bertos/drv/dataflash_hwtest.c
index 05426fef6c75a2bdfd243ad098b9ade84a2d82df..8c46215008b3230b42432b5fc03a49792d698501 100644 (file)
--- a/bertos/drv/dataflash_hwtest.c
+++ b/bertos/drv/dataflash_hwtest.c
@@ -50,7 +50,7 @@
 
 #include "hw/hw_dataflash.h"
 #include "cfg/cfg_dataflash.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
 
 #include <cfg/test.h>
 #include <cfg/debug.h>

diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c
index f0f06ddd72ad16677ab71c881982879d2d3a87cf..bd27486b189beea4bdf3a8506beb5936a1d6949c 100644 (file)
--- a/bertos/drv/ser.c
+++ b/bertos/drv/ser.c
@@ -56,7 +56,7 @@
 #include "ser_p.h"
 
 #include "cfg/cfg_ser.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
 #include <cfg/debug.h>
 
 #include <mware/formatwr.h>

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index 4b1ad9ee2d5dea8e213570eeb1c59fc400290fa6..a92460bdf07620a1d6c18976886d390e01909562 100644 (file)
--- a/bertos/kern/preempt.c
+++ b/bertos/kern/preempt.c
@@ -44,7 +44,7 @@
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
 
 #if CONFIG_KERN_PREEMPT
 
@@ -61,7 +61,7 @@
 #include <cfg/depend.h>    // CONFIG_DEPEND()
 
 // Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_PREEMPT,    CONFIG_KERN_SCHED && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
+CONFIG_DEPEND(CONFIG_KERN_PREEMPT, CONFIG_KERN && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
 
 MOD_DEFINE(preempt)
 

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 26bac5e1c47c0bf55f68f69decbe351ee2a8be28..9a1e410b11ffc60cb74df36ff4f07f95a6515a22 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -41,7 +41,8 @@
 #include "proc.h"
 
 #include "cfg/cfg_arch.h"  // ARCH_EMUL
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_monitor.h"
 #include <cfg/macros.h>    // ROUND_UP2
 #include <cfg/module.h>
 #include <cfg/depend.h>    // CONFIG_DEPEND()
@@ -57,12 +58,6 @@
 
 #include <string.h>           /* memset() */
 
-// Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_SIGNALS,    CONFIG_KERN_SCHED);
-CONFIG_DEPEND(CONFIG_KERN_SEMAPHORES, CONFIG_KERN_SIGNALS);
-CONFIG_DEPEND(CONFIG_KERN_MONITOR,    CONFIG_KERN_SCHED);
-
-
 /*
  * The scheduer tracks ready processes by enqueuing them in the
  * ready list.

diff --git a/bertos/kern/proc.h b/bertos/kern/proc.h
index abd68fc67c9218a4ff2216eba384912a5d87eccc..b270d4069d52ab43540aa9e46d80947978d20d07 100644 (file)
--- a/bertos/kern/proc.h
+++ b/bertos/kern/proc.h
@@ -42,7 +42,9 @@
 #ifndef KERN_PROC_H
 #define KERN_PROC_H
 
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_monitor.h"
+
 #include <cfg/compiler.h>
 
 #if CONFIG_KERN_PREEMPT

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index d99d5fc187d6090eea283304d43c3a49e881d1e5..b148057c4a02fc256a5ade9505ef9986d246b34e 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -40,7 +40,10 @@
 #ifndef KERN_PROC_P_H
 #define KERN_PROC_P_H
 
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
+#include "cfg/cfg_monitor.h"
+
 #include <cfg/compiler.h>
 
 #include <cpu/types.h>        /* for cpu_stack_t */

diff --git a/bertos/kern/signal.c b/bertos/kern/signal.c
index a22249429d885ed5dd62119773e3dd94e79c2fff..f9b013bfb664d18e1999572f471de584d6685db2 100644 (file)
--- a/bertos/kern/signal.c
+++ b/bertos/kern/signal.c
@@ -100,8 +100,9 @@
 
 #include "signal.h"
 
-#include <cfg/cfg_timer.h>
+#include "cfg/cfg_timer.h"
 #include <cfg/debug.h>
+#include <cfg/depend.h>
 
 #include <cpu/irq.h>
 #include <kern/proc.h>
@@ -110,6 +111,9 @@
 
 #if CONFIG_KERN_SIGNALS
 
+// Check config dependencies
+CONFIG_DEPEND(CONFIG_KERN_SIGNALS, CONFIG_KERN);
+
 /**
  * Check if any of the signals in \a sigs has occurred and clear them.
  *

diff --git a/bertos/mware/event.h b/bertos/mware/event.h
index e76385ad87729b992b94c3952634384b71e0b29b..74a467937ae802b1cffdadf5eac0ce67ad2c93de 100644 (file)
--- a/bertos/mware/event.h
+++ b/bertos/mware/event.h
@@ -43,7 +43,8 @@
 #define KERN_EVENT_H
 
 #include <cfg/compiler.h>
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 
 #if CONFIG_KERN
        #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS