From b0c536ad873bb29ed977417a6a5b1aa586414d3b Mon Sep 17 00:00:00 2001
From: batt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 25 Mar 2009 16:04:39 +0000
Subject: [PATCH] Switch to new kernel config files.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2420 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/cpu/arm/drv/adc_at91.c | 3 ++-
 bertos/cpu/avr/drv/adc_avr.c  | 3 ++-
 bertos/drv/dataflash_hwtest.c | 2 +-
 bertos/drv/ser.c              | 2 +-
 bertos/kern/preempt.c         | 4 ++--
 bertos/kern/proc.c            | 9 ++-------
 bertos/kern/proc.h            | 4 +++-
 bertos/kern/proc_p.h          | 5 ++++-
 bertos/kern/signal.c          | 6 +++++-
 bertos/mware/event.h          | 3 ++-
 10 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/bertos/cpu/arm/drv/adc_at91.c b/bertos/cpu/arm/drv/adc_at91.c
index b98e1290..46ba3413 100644
--- 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 33beeca3..8c3217e7 100644
--- 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 05426fef..8c462150 100644
--- 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 f0f06ddd..bd27486b 100644
--- 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 4b1ad9ee..a92460bd 100644
--- 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 26bac5e1..9a1e410b 100644
--- 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 abd68fc6..b270d406 100644
--- 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 d99d5fc1..b148057c 100644
--- 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 a2224942..f9b013bf 100644
--- 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 e76385ad..74a46793 100644
--- 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
-- 
2.25.1