Use cfg instead appconfig in bertos modules. Reformat. Remove CVS logs.

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

diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h
index 2b85e5f3f28c538f0bf8a8f30db46c8b45274ea1..6bd64e071ddd67b022a3e3541c53d99451a9a241 100644 (file)
--- a/bertos/cfg/debug.h
+++ b/bertos/cfg/debug.h
@@ -40,13 +40,12 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-#ifndef CFG_DEBUG_H
-#define CFG_DEBUG_H
+#ifndef BERTOS_DEBUG_H
+#define BERTOS_DEBUG_H
 
 #include <cfg/os.h>
 #include <cfg/compiler.h>
 
-
 /*
  * Defaults for rarely used config stuff.
  */
@@ -310,4 +309,4 @@
 
 #endif /* _DEBUG */
 
-#endif /* CFG_DEBUG_H */
+#endif /* BERTOS_DEBUG_H */

diff --git a/bertos/cpu/arm/drv/adc_at91.c b/bertos/cpu/arm/drv/adc_at91.c
index 59fd1c6893b6f62a602ce48f41fb28f2efbec420..eed5fac6e97258f7e88088b7e958c57263b0b8c2 100644 (file)
--- a/bertos/cpu/arm/drv/adc_at91.c
+++ b/bertos/cpu/arm/drv/adc_at91.c
@@ -48,18 +48,17 @@
 
 #include "adc_at91.h"
 
-#include <drv/adc.h>
-
+#include <cfg/cfg_adc.h>
+#include <cfg/cfg_kern.h>
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 
-#include <io/arm.h>
+#include <drv/adc.h>
 
-#include "appconfig.h"
+#include <io/arm.h>
 
 #if CONFIG_KERNEL
        #include <cfg/module.h>
-       #include <config_kern.h>
        #include <kern/proc.h>
        #include <kern/signal.h>
 

diff --git a/bertos/cpu/arm/drv/adc_at91.h b/bertos/cpu/arm/drv/adc_at91.h
index 49f0de3197f987487a07204939da4b4f6b64a57e..5e9e7d26bc328339cbfb1f05fc5c378acdfc2a8c 100644 (file)
--- a/bertos/cpu/arm/drv/adc_at91.h
+++ b/bertos/cpu/arm/drv/adc_at91.h
@@ -41,10 +41,11 @@
 #ifndef DRV_ADC_AT91_H
 #define DRV_ADC_AT91_H
 
-#include <cfg/compiler.h>
-
 #include "hw_cpu.h"
-#include "appconfig.h"
+
+#include <cfg/cfg_adc.h>
+
+#include <cfg/compiler.h>
 
 /**
  * ADC config define.

diff --git a/bertos/cpu/arm/drv/kdebug_at91.c b/bertos/cpu/arm/drv/kdebug_at91.c
index 76c9136902f5a7c8daa1ad28e752c4eeacf3edd1..dbc618b262461ddf85b61f9d3af49c373cea62fc 100644 (file)
--- a/bertos/cpu/arm/drv/kdebug_at91.c
+++ b/bertos/cpu/arm/drv/kdebug_at91.c
@@ -37,10 +37,10 @@
  */
 
 #include "kdebug_at91.h"
-#include <hw_cpu.h>     /* for CLOCK_FREQ */
-#include <hw_ser.h>     /* Required for bus macros overrides */
+#include "hw_cpu.h"     /* for CLOCK_FREQ */
+#include "hw_ser.h"     /* Required for bus macros overrides */
 
-#include <appconfig.h>
+#include <cfg/cfg_debug.h>
 #include <cfg/macros.h> /* for BV(), DIV_ROUND */
 
 #include <io/arm.h>

diff --git a/bertos/cpu/arm/drv/pwm_at91.c b/bertos/cpu/arm/drv/pwm_at91.c
index 9bba617d1c8285cb69095e29fe24f1fbd215a7d2..142b9feb80668a37f4e08c34fbb5baac0974cc9a 100644 (file)
--- a/bertos/cpu/arm/drv/pwm_at91.c
+++ b/bertos/cpu/arm/drv/pwm_at91.c
@@ -41,8 +41,6 @@
 #include "pwm_at91.h"
 #include "hw_cpu.h"
 
-#include "appconfig.h"
-
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 

diff --git a/bertos/cpu/arm/drv/pwm_at91.h b/bertos/cpu/arm/drv/pwm_at91.h
index 753d859ffcaf98a9f0cccf00a7f8741d26ed3e37..76c8b940067191bfed5986f24c94014fb5aeb0db 100644 (file)
--- a/bertos/cpu/arm/drv/pwm_at91.h
+++ b/bertos/cpu/arm/drv/pwm_at91.h
@@ -48,7 +48,6 @@
 
 #include <io/arm.h>
 
-#include "appconfig.h"
 
 #define PWM_HW_MAX_PRESCALER_STEP         10
 #define PWM_HW_MAX_PERIOD             0xFFFF

diff --git a/bertos/cpu/arm/drv/pwm_test.c b/bertos/cpu/arm/drv/pwm_test.c
index a96e694152c56a7c7e60b6be0abb3d69c279bb11..1ab6d834ac110f6ae11ad17342aa083d305d3fd1 100644 (file)
--- a/bertos/cpu/arm/drv/pwm_test.c
+++ b/bertos/cpu/arm/drv/pwm_test.c
@@ -90,7 +90,7 @@
  * Setup all needed to test PWM on AT91
  *
  */
-int pwm_setup(void)
+int pwm_testSetup(void)
 {
        IRQ_ENABLE;
        kdbg_init();
@@ -107,13 +107,13 @@ int pwm_setup(void)
  * Test suit for genation of pwm waveform.
  *
  */
-int pwm_test(void)
+int pwm_testRun(void)
 {
 
        kputs("PWM test\n\n");
 
        kputs("Init pwm..");
-       pwm_setup();
+       pwm_testSetup();
        kputs("done.\n");
 
        PWM_TEST_CH_SET(0);
@@ -131,7 +131,7 @@ int pwm_test(void)
 /**
  *
  */
-int pwm_tearDown(void)
+int pwm_testTearDown(void)
 {
        /*    */
        return 0;
@@ -141,7 +141,7 @@ int pwm_tearDown(void)
 
 int main(void)
 {
-       pwm_test();
+       pwm_testRun();
 
 
 

diff --git a/bertos/cpu/arm/drv/ser_at91.c b/bertos/cpu/arm/drv/ser_at91.c
index bc1555c25c75434dd638cef0e2430f52c996f974..4ef27b61775fee44e3d89981903ea09ee03b20b2 100644 (file)
--- a/bertos/cpu/arm/drv/ser_at91.c
+++ b/bertos/cpu/arm/drv/ser_at91.c
@@ -41,9 +41,9 @@
 #include "hw_ser.h"  /* Required for bus macros overrides */
 #include "hw_cpu.h"  /* CLOCK_FREQ */
 
+#include <cfg/cfg_ser.h>
 #include <cfg/debug.h>
 
-#include <appconfig.h>
 
 #include <io/arm.h>
 

diff --git a/bertos/cpu/arm/drv/stepper_at91.c b/bertos/cpu/arm/drv/stepper_at91.c
index 4f41f10d55213dd0c57d18cf737f129da50e32d4..896959ebb060caa80392efdf8beef6a0fa0360cc 100644 (file)
--- a/bertos/cpu/arm/drv/stepper_at91.c
+++ b/bertos/cpu/arm/drv/stepper_at91.c
@@ -55,6 +55,7 @@
 
 #include "stepper_at91.h"
 
+#include <cfg/cfg_stepper.h>
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 
@@ -63,7 +64,6 @@
 
 #include <io/arm.h>
 
-#include "appconfig.h"
 
 /*
  * Delay to set C compare to clear output

diff --git a/bertos/cpu/arm/drv/stepper_at91_hw_test.c b/bertos/cpu/arm/drv/stepper_at91_hw_test.c
index f4214bc01ce2873ee0907ba74edda743df0d5bfc..321dde0c4f3d236bf7f92edd8250a8b69cd5f49c 100644 (file)
--- a/bertos/cpu/arm/drv/stepper_at91_hw_test.c
+++ b/bertos/cpu/arm/drv/stepper_at91_hw_test.c
@@ -39,6 +39,7 @@
 
 #include "stepper_at91.h"
 
+#include <cfg/cfg_stepper.h>
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 
@@ -47,7 +48,6 @@
 
 #include <io/arm.h>
 
-#include "appconfig.h"
 
 #warning FIXME:This test is incomplete.. you MUST review..
 

diff --git a/bertos/cpu/arm/drv/timer_at91.h b/bertos/cpu/arm/drv/timer_at91.h
index 87bccd1e5a79c57cecb924b3b52cc87fa481375f..c6979f9519d15b875a212f1d7fa8857986f99fb6 100644 (file)
--- a/bertos/cpu/arm/drv/timer_at91.h
+++ b/bertos/cpu/arm/drv/timer_at91.h
@@ -40,9 +40,10 @@
 #ifndef DRV_AT91_TIMER_H
 #define DRV_AT91_TIMER_H
 
-#include <appconfig.h>     /* CONFIG_TIMER */
-#include <cfg/compiler.h>  /* uint8_t */
-#include <hw_cpu.h>        /* CLOCK_FREQ */
+#include "hw_cpu.h"            /* CLOCK_FREQ */
+
+#include <cfg/cfg_timer.h>     /* CONFIG_TIMER */
+#include <cfg/compiler.h>      /* uint8_t */
 
 /**
  * \name Values for CONFIG_TIMER.

diff --git a/bertos/cpu/arm/drv/twi_at91.c b/bertos/cpu/arm/drv/twi_at91.c
index b0b84be5cb4bb7b4cb5f02ed3bced106e636d02c..6256558bf90e9dd0c3278951e9f58308e30f4e6c 100644 (file)
--- a/bertos/cpu/arm/drv/twi_at91.c
+++ b/bertos/cpu/arm/drv/twi_at91.c
@@ -39,6 +39,7 @@
 
 #include "twi_at91.h"
 
+#include <cfg/cfg_twi.h>
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
 #include <cfg/macros.h>

diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c
index 63a93f503e30dc9221eff94bb29ac32240e1f589..219aadffd43792717c73b97965d14abc8f532a18 100644 (file)
--- a/bertos/drv/kdebug.c
+++ b/bertos/drv/kdebug.c
@@ -39,9 +39,9 @@
  */
 
 #include <cfg/cfg_debug.h>
-
 #include <cfg/macros.h> /* for BV() */
 #include <cfg/debug.h>
+#include <cfg/os.h>
 
 #include <cpu/irq.h>
 #include <cpu/attr.h>

diff --git a/bertos/drv/mcp41.c b/bertos/drv/mcp41.c
index c8ddf0b79183423cbb945d426ea78834a45bf9e8..62b96fd7c2e72e2bdb5703a698b26277f9199cfc 100644 (file)
--- a/bertos/drv/mcp41.c
+++ b/bertos/drv/mcp41.c
@@ -36,12 +36,12 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include <drv/timer.h>
+#include "hw_mcp41.h"
 
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 
-#include <hw_mcp41.h>
+#include <drv/timer.h>
 #include <drv/mcp41.h>
 #include <drv/ser.h>
 

diff --git a/bertos/drv/mcp41.h b/bertos/drv/mcp41.h
index 266b539b6ddf8e5eca08092e85da2f42e65a4c47..e9dd60b62cfe340e2258c5c087c4d20f1ee8f4a4 100644 (file)
--- a/bertos/drv/mcp41.h
+++ b/bertos/drv/mcp41.h
@@ -40,8 +40,9 @@
 #ifndef DRV_MCP41_H
 #define DRV_MCP41_H
 
-#include <hw/mcp41_map.h>
+#include "mcp41_map.h"
 #include <cfg/compiler.h>
+
 #include <drv/ser.h>
 
 #define MCP41_WRITE_DATA 0x11

diff --git a/bertos/drv/ntc.c b/bertos/drv/ntc.c
index 2469c88f00ac61514814a8ecdf250d32fa463733..c148e7c05c52c25fc5ca31a68c95ac7e1bc01b42 100644 (file)
--- a/bertos/drv/ntc.c
+++ b/bertos/drv/ntc.c
@@ -43,24 +43,13 @@
  *
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.2  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.1  2005/11/04 17:59:47  bernie
- *#* Import into DevLib.
- *#*
- *#* Revision 1.1  2005/05/24 09:17:58  batt
- *#* Move drivers to top-level.
- *#*/
-
-#include <drv/ntc.h>
-#include <hw_ntc.h>
-#include <ntc_map.h>
+#include "hw_ntc.h"
+#include "ntc_map.h"
 
 #include <cfg/debug.h>
 
+#include <drv/ntc.h>
+
 DB(bool ntc_initialized;)
 
 /**

diff --git a/bertos/drv/pwm.h b/bertos/drv/pwm.h
index 58c4ee5ae5794530dc3d31e52302cd85ea0441f7..2648b01f5c618facb4f0a9362197011e533c3279 100644 (file)
--- a/bertos/drv/pwm.h
+++ b/bertos/drv/pwm.h
@@ -56,6 +56,13 @@ void pwm_setFrequency(PwmDev dev, pwm_freq_t freq);
 void pwm_enable(PwmDev dev, bool state);
 void pwm_init(void);
 
-void pwm_test(void);
+/**
+ * Test function prototypes.
+ *
+ * See pwm_test.c for implemntation of these functions.
+ */
+int pwm_testRun(void);
+int pwm_testSetup(void);
+int pwm_testTearDown(void);
 
 #endif /* DRV_PWM_H */

diff --git a/bertos/drv/tc520.c b/bertos/drv/tc520.c
index 791823f0d15a82bfba090bc7d99a0d7cae205e9a..7f63a07df305132fed1a6c4189919649916fa2e6 100644 (file)
--- a/bertos/drv/tc520.c
+++ b/bertos/drv/tc520.c
@@ -38,14 +38,15 @@
  * \author Marco Benelli <marco@develer.com>
  */
 
-#include <drv/tc520.h>
-#include <drv/timer.h>
 
-#include <hw_tc520.h>
+#include "hw_tc520.h"
 
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 
+#include <drv/tc520.h>
+#include <drv/timer.h>
+
 #warning FIXME:This implementation is obsolete. Refactor with KFile interface.
 
 #if 0

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index 4ddf06057503ff1370c59a7907810566a898a780..ca0605a792f8f9d92624ff403809943dabbca984 100644 (file)
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -41,6 +41,7 @@
 
 #include <cfg/cfg_timer.h>
 #include <cfg/cfg_wdt.h>
+#include <cfg/cfg_kern.h>
 #include <cfg/os.h>
 #include <cfg/debug.h>
 #include <cfg/module.h>
@@ -74,7 +75,6 @@
 #endif
 
 #if CONFIG_KERNEL
-       #include <config_kern.h>
        #if CONFIG_KERN_PREEMPTIVE
                #include <hw/switch.h>
        #endif

diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c
index ac8e45e1d44fb90ace02d5718998ca2eeff65ab3..a00d951914a440c3e1fe6b4e56267150a5b62e5a 100644 (file)
--- a/bertos/gui/menu.c
+++ b/bertos/gui/menu.c
@@ -41,8 +41,7 @@
 
 #include "menu.h"
 
-#include <appconfig.h>
-
+#include <cfg/cfg_gfx.h>
 #include <cfg/compiler.h>
 #include <cfg/debug.h>