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

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

diff --git a/bertos/cpu/arm/drv/stepper_arm.c b/bertos/cpu/arm/drv/stepper_arm.c
index f39c5a22cc71638028a0c6921e9f6061b6492795..d27402c07751b8db93a37226a408663897bd772a 100644 (file)
--- a/bertos/cpu/arm/drv/stepper_arm.c
+++ b/bertos/cpu/arm/drv/stepper_arm.c
@@ -26,7 +26,7 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2007 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2008 Develer S.r.l. (http://www.develer.com/)
  *
  * -->
  *

diff --git a/bertos/cpu/arm/drv/stepper_arm.h b/bertos/cpu/arm/drv/stepper_arm.h
index 544eb85598bee58a7ce615a9d660f60feaba150e..ab96e5d798972bdabfd8d43a9c2b608468b52afd 100644 (file)
--- a/bertos/cpu/arm/drv/stepper_arm.h
+++ b/bertos/cpu/arm/drv/stepper_arm.h
@@ -26,7 +26,7 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2007 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2008 Develer S.r.l. (http://www.develer.com/)
  *
  * -->
  *

diff --git a/bertos/cpu/avr/drv/kdebug_avr.c b/bertos/cpu/avr/drv/kdebug_avr.c
index 25a2cd09996d9fe774cc0a1802742c353273adc0..3e1bdfda3936b08a18bc9da6810e5066835ffa97 100644 (file)
--- a/bertos/cpu/avr/drv/kdebug_avr.c
+++ b/bertos/cpu/avr/drv/kdebug_avr.c
@@ -42,7 +42,7 @@
 #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 <cpu/types.h>

diff --git a/bertos/cpu/avr/drv/lcd_32122a_avr.c b/bertos/cpu/avr/drv/lcd_32122a_avr.c
index 431e6674fb3a57772a1162028ce776500a660bd0..6a85a76f0b2d300cb5096da6bc53afdc563efd71 100644 (file)
--- a/bertos/cpu/avr/drv/lcd_32122a_avr.c
+++ b/bertos/cpu/avr/drv/lcd_32122a_avr.c
@@ -42,7 +42,7 @@
 
 #include "lcd_32122a_avr.h"
 
-#include "appconfig.h"
+#include <cfg/cfg_lcd.h>
 
 #include <cfg/macros.h> /* BV() */
 #include <cfg/debug.h>

diff --git a/bertos/cpu/avr/drv/pwm_avr.c b/bertos/cpu/avr/drv/pwm_avr.c
index cc1e07d6f9d4d66207f68095f8e5fcdc0fcb3908..93dd51371dcd32b5fe06ab2c2d6916649ce288d4 100644 (file)
--- a/bertos/cpu/avr/drv/pwm_avr.c
+++ b/bertos/cpu/avr/drv/pwm_avr.c
@@ -42,8 +42,6 @@
 #include "pwm_avr.h"
 #include "hw_cpu.h"
 
-#include "appconfig.h"
-
 #warning TODO:This is an exmple of implementation of PWM low level channel for AVR, implemnt it!
 
 /**

diff --git a/bertos/cpu/avr/drv/pwm_avr.h b/bertos/cpu/avr/drv/pwm_avr.h
index 0283269e6271c8c0aaef298e0352f554ecaa40fe..46bc2d24d3c43949638415e04003c507520e5d1e 100644 (file)
--- a/bertos/cpu/avr/drv/pwm_avr.h
+++ b/bertos/cpu/avr/drv/pwm_avr.h
@@ -43,8 +43,6 @@
 
 #include "pwm_map.h"
 
-#include "appconfig.h"
-
 #include <cpu/types.h>
 
 #define PWM_HW_MAX_PRESCALER_STEP         10

diff --git a/bertos/cpu/avr/drv/ser_avr.c b/bertos/cpu/avr/drv/ser_avr.c
index e9e1f5ec186907eb8033ed140c35fcb710eacfdd..f37841c6aa7d3212acf020927f47d79edba92c7a 100644 (file)
--- a/bertos/cpu/avr/drv/ser_avr.c
+++ b/bertos/cpu/avr/drv/ser_avr.c
@@ -61,19 +61,22 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#include <drv/ser.h>
-#include <drv/ser_p.h>
+#include "hw_ser.h"  /* Required for bus macros overrides */
+#include "hw_cpu.h"  /* CLOCK_FREQ */
 
-#include <hw_ser.h>  /* Required for bus macros overrides */
-#include <hw_cpu.h>  /* CLOCK_FREQ */
-#include <appconfig.h>
+#include <cfg/cfg_ser.h>
 
 #include <cfg/macros.h> /* DIV_ROUND */
 #include <cfg/debug.h>
+
+#include <drv/ser.h>
+#include <drv/ser_p.h>
 #include <drv/timer.h>
+
 #include <mware/fifobuf.h>
 
 #include <avr/io.h>
+
 #if defined(__AVR_LIBC_VERSION__) && (__AVR_LIBC_VERSION__ >= 10400UL)
        #include <avr/interrupt.h>
 #else

diff --git a/bertos/cpu/avr/drv/twi_avr.c b/bertos/cpu/avr/drv/twi_avr.c
index a31ff12c7474bddc493df21c26f5aa120d1342ed..69f0ff998bdaca33b56a732afe918210d4f77794 100644 (file)
--- a/bertos/cpu/avr/drv/twi_avr.c
+++ b/bertos/cpu/avr/drv/twi_avr.c
@@ -40,12 +40,14 @@
 
 #include "twi_avr.h"
 
+#include "hw_cpu.h"  /* CLOCK_FREQ */
+
+#include <cfg/cfg_twi.h>
 #include <cfg/debug.h>
+#include <cfg/macros.h> // BV()
+
 #include <cpu/detect.h>
 #include <cpu/irq.h>
-#include <cfg/macros.h> // BV()
-#include <hw_cpu.h>  /* CLOCK_FREQ */
-#include <appconfig.h>
 
 #include <compat/twi.h>
 

diff --git a/bertos/drv/buzzerled.c b/bertos/drv/buzzerled.c
index 1a22cf0852a89beb5dae6d906ef8a58b1a17585e..9648ef67c976b4a58cc0c90aa5e4e92a50018a05 100644 (file)
--- a/bertos/drv/buzzerled.c
+++ b/bertos/drv/buzzerled.c
@@ -52,12 +52,12 @@
 
 #include "buzzerled.h"
 
-#include <appconfig.h>
-#include <drv/timer.h>
-
 #warning FIXME:This drive is obsolete, you must refactor it.
 
 #if 0
+#include <cfg/cfg_buzzerled.h>
+#include <drv/timer.h>
+
 static struct Timer timers[CONFIG_NUM_BLDS];
 static bool timer_go[CONFIG_NUM_BLDS];
 

diff --git a/bertos/drv/dc_motor.h b/bertos/drv/dc_motor.h
index 9aac6548e3235461d1731c3363c1a59a91f21ead..289a1bd37642c0e4eae8597442f198b8c850ccf2 100644 (file)
--- a/bertos/drv/dc_motor.h
+++ b/bertos/drv/dc_motor.h
@@ -42,15 +42,15 @@
 
 #include "hw_dc_motor.h"
 
+#include <cfg/cfg_dc_motor.h>
+#include <cfg/macros.h>
+
 #include <algo/pid_control.h>
 
 #include <drv/pwm.h>
 #include <drv/timer.h>
 #include <drv/adc.h>
 
-#include <cfg/macros.h>
-
-#include "appconfig.h"
 
 /**
  * Define status bit for DC motor device.

diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c
index 3b2c18bd90671c6ffc76dfa73ca2d38c08dcaa4a..63a93f503e30dc9221eff94bb29ac32240e1f589 100644 (file)
--- a/bertos/drv/kdebug.c
+++ b/bertos/drv/kdebug.c
@@ -38,14 +38,14 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#include <cpu/irq.h>
-#include <cpu/attr.h>
-#include <cpu/types.h>
+#include <cfg/cfg_debug.h>
 
 #include <cfg/macros.h> /* for BV() */
 #include <cfg/debug.h>
 
-#include <appconfig.h>
+#include <cpu/irq.h>
+#include <cpu/attr.h>
+#include <cpu/types.h>
 
 #include <mware/formatwr.h> /* for _formatted_write() */
 #include <mware/pgm.h>

diff --git a/bertos/drv/lcd_hd44.c b/bertos/drv/lcd_hd44.c
index 2949bb738cb91832019ccc124788d815e34b3761..f5d225ffb883ded720b4c1c062a307a42b4ced7b 100644 (file)
--- a/bertos/drv/lcd_hd44.c
+++ b/bertos/drv/lcd_hd44.c
@@ -38,10 +38,10 @@
  */
 
 #include "hw_lcd.h"
+#include "lcd_hd44.h"
 
 #include <cfg/cfg_arch.h>
 
-#include <drv/lcd_hd44.h>
 #include <drv/timer.h>
 
 #if defined(LCD_READ_H) && defined(LCD_READ_L) && defined(LCD_WRITE_H) && defined(LCD_WRITE_L)

diff --git a/bertos/drv/lcd_hd44_test.c b/bertos/drv/lcd_hd44_test.c
index a84c156ce51b0523aa5cf9b4dfe75f655a0df4f6..f430f1367889c83276c8995092829b7a8bf519bc 100644 (file)
--- a/bertos/drv/lcd_hd44_test.c
+++ b/bertos/drv/lcd_hd44_test.c
@@ -38,9 +38,9 @@
  */
 
 #include "hw_lcd.h"
+#include "lcd_hd44.h"
 
 #include <drv/timer.h>
-#include <drv/lcd_hd44.h>
 
 void lcd_hw_test(void)
 {

diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c
index 0838bc1538855e6c58575d0c6107d16b2981c485..0a6705a7bd97352bc213eddcf0159ad9c424ea9b 100644 (file)
--- a/bertos/drv/ser.c
+++ b/bertos/drv/ser.c
@@ -54,9 +54,12 @@
 #include "ser.h"
 #include "wdt.h"
 #include "ser_p.h"
-#include <mware/formatwr.h>
+
+#include <cfg/cfg_ser.h>
+#include <cfg/cfg_kern.h>
 #include <cfg/debug.h>
-#include <appconfig.h>
+
+#include <mware/formatwr.h>
 
 #include <string.h> /* memset */
 

diff --git a/bertos/drv/spi_bitbang.c b/bertos/drv/spi_bitbang.c
index f025131658b36c65e9dde8ef8bc8f89859299441..2a6184499ed77a803199bd34b27d8e3dacc672f1 100644 (file)
--- a/bertos/drv/spi_bitbang.c
+++ b/bertos/drv/spi_bitbang.c
@@ -43,7 +43,9 @@
 #include "spi_bitbang.h"
 #include "hw_spi.h"
 
+#include <cfg/cfg_spi_bitbang.h>
 #include <cfg/module.h>
+
 #include <cpu/irq.h>
 
 void spi_assertSS(void)

diff --git a/bertos/drv/spi_bitbang.h b/bertos/drv/spi_bitbang.h
index adbfedcbd139b95e39d2b68fd7ab1d62df348e49..d770105b1b3963c683db682ec0d42d584a69a5cc 100644 (file)
--- a/bertos/drv/spi_bitbang.h
+++ b/bertos/drv/spi_bitbang.h
@@ -43,7 +43,7 @@
 #ifndef DRV_SPI_BITBANG_H
 #define DRV_SPI_BITBANG_H
 
-#include <appconfig.h>
+#include <cfg/cfg_spi_bitbang.h>
 
 #include <cfg/compiler.h>
 

diff --git a/bertos/drv/stepper.c b/bertos/drv/stepper.c
index 1dd562f97cddab84795d2042a401ee67fff1d831..aa03681014d39a94b9a06dc84f7ae1e4fc57b2db 100644 (file)
--- a/bertos/drv/stepper.c
+++ b/bertos/drv/stepper.c
@@ -28,7 +28,7 @@
 
 #include <algo/ramp.h>
 
-#include <drv/stepper_at91.h>
+#include CPU_HEADER(stepper)
 
 #include <string.h>  // memset
 

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index 0e756dbb6cb01c435062380cbd60536d0e165520..4ddf06057503ff1370c59a7907810566a898a780 100644 (file)
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -39,14 +39,15 @@
 
 #include "timer.h"
 
-#include <cpu/attr.h>
-#include <cpu/types.h>
-#include <cpu/irq.h>
-
+#include <cfg/cfg_timer.h>
+#include <cfg/cfg_wdt.h>
 #include <cfg/os.h>
 #include <cfg/debug.h>
 #include <cfg/module.h>
-#include <appconfig.h>
+
+#include <cpu/attr.h>
+#include <cpu/types.h>
+#include <cpu/irq.h>
 
 /*
  * Include platform-specific binding code if we're hosted.

diff --git a/bertos/gfx/bitmap.c b/bertos/gfx/bitmap.c
index d4c447e65e1440184d544cfa1d7de71d30db77b4..294e9c23ccad4cac07051314852e95131e5b5954 100644 (file)
--- a/bertos/gfx/bitmap.c
+++ b/bertos/gfx/bitmap.c
@@ -40,10 +40,11 @@
 #include "gfx.h"
 #include "gfx_p.h"
 
-#include <cfg/debug.h>  /* ASSERT() */
-#include <cpu/attr.h>   /* CPU_HARVARD */
-#include <cfg/macros.h> /* MIN() */
-#include <appconfig.h>  /* CONFIG_GFX_CLIPPING */
+#include <cfg/cfg_gfx.h>  /* CONFIG_GFX_CLIPPING */
+#include <cfg/macros.h>   /* MIN() */
+#include <cfg/debug.h>    /* ASSERT() */
+
+#include <cpu/attr.h>     /* CPU_HARVARD */
 
 #include <string.h>     /* memset() */
 

diff --git a/bertos/gfx/charts.h b/bertos/gfx/charts.h
index ce4bd88328b1647a03915ae9e732484a00cf3ac3..ecc7f309be69218830c7e1621462e5e6bb11932b 100644 (file)
--- a/bertos/gfx/charts.h
+++ b/bertos/gfx/charts.h
@@ -41,44 +41,12 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.5  2006/08/01 12:23:03  bernie
- *#* Indentation fix.
- *#*
- *#* Revision 1.4  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.3  2005/11/27 23:36:18  bernie
- *#* Use appconfig.h instead of cfg/config.h.
- *#*
- *#* Revision 1.2  2005/11/04 18:17:45  bernie
- *#* Fix header guards and includes for new location of gfx module.
- *#*
- *#* Revision 1.1  2005/11/04 18:11:35  bernie
- *#* Move graphics stuff from mware/ to gfx/.
- *#*
- *#* Revision 1.7  2005/11/04 16:20:02  bernie
- *#* Fix reference to README.devlib in header.
- *#*
- *#* Revision 1.6  2005/04/11 19:10:28  bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* Revision 1.5  2004/09/14 20:56:39  bernie
- *#* Make more generic and adapt to new gfx functions.
- *#*
- *#* Revision 1.3  2004/08/11 19:39:12  bernie
- *#* Use chart_x_t and chart_y_t for the input dataset.
- *#*
- *#* Revision 1.1  2004/08/04 03:16:30  bernie
- *#* Import simple chart drawing code.
- *#*
- *#*/
 #ifndef GFX_CHARTS_H
 #define GFX_CHARTS_H
 
+#include <cfg/cfg_gfx.h> /* CONFIG_ stuff */
+
 #include <gfx/gfx.h>   /* vcoord_t */
-#include <appconfig.h> /* CONFIG_ stuff */
 
 /**
  * \name Width/height of the small ticks drawn over the axes

diff --git a/bertos/gfx/gfx.h b/bertos/gfx/gfx.h
index a852c54d54318e8d72a6bc9f40a19fb20075038d..38ce8902e28d3a5e0408ee6de4db5a89308cd835 100644 (file)
--- a/bertos/gfx/gfx.h
+++ b/bertos/gfx/gfx.h
@@ -15,10 +15,11 @@
 #ifndef GFX_GFX_H
 #define GFX_GFX_H
 
+#include <cfg/cfg_gfx.h>    /* CONFIG_GFX_* */
 #include <cfg/compiler.h>
-#include <cpu/attr.h>   /* CPU_HARVARD */
 
-#include <appconfig.h> /* CONFIG_GFX_* */
+#include <cpu/attr.h>       /* CPU_HARVARD */
+
 
 /**
  * \name Known pixel formats for bitmap representation.

diff --git a/bertos/gfx/line.c b/bertos/gfx/line.c
index f3909b15337da90735ce947f7b567c4739339670..a878c1569efa28bd6706bfd375f5c9db9ffd99cc 100644 (file)
--- a/bertos/gfx/line.c
+++ b/bertos/gfx/line.c
@@ -42,9 +42,9 @@
 #include "gfx.h"
 #include "gfx_p.h"
 
+#include <cfg/cfg_gfx.h>   /* CONFIG_GFX_CLIPPING */
 #include <cfg/debug.h>   /* ASSERT() */
 #include <cfg/macros.h>  /* SWAP() */
-#include <appconfig.h>   /* CONFIG_GFX_CLIPPING */
 
 /* Configuration sanity checks */
 #if !defined(CONFIG_GFX_CLIPPING) || (CONFIG_GFX_CLIPPING != 0 && CONFIG_GFX_CLIPPING != 1)

diff --git a/bertos/gui/leveledit.c b/bertos/gui/leveledit.c
index 7f74cad76a631710055c7d1018dcc103d1bc84ed..0bac895a28d57d0ce4975574167c3ce832cad083 100644 (file)
--- a/bertos/gui/leveledit.c
+++ b/bertos/gui/leveledit.c
@@ -38,7 +38,7 @@
 
 #include "leveledit.h"
 
-#include <appconfig.h>
+#include <cfg/cfg_gfx.h>
 #include <cfg/macros.h> /* MAX() */
 
 #include <drv/kbd.h>

diff --git a/bertos/gui/menubar.h b/bertos/gui/menubar.h
index 8541eae86ad3d727eb73bd9c7774ead335c071cf..a4bd9a20e94f92c8e111c8cffb93a9b19407f297 100644 (file)
--- a/bertos/gui/menubar.h
+++ b/bertos/gui/menubar.h
@@ -41,7 +41,6 @@
 #ifndef MWARE_MENUBAR_H
 #define MWARE_MENUBAR_H
 
-#include <appconfig.h>
 #include <cfg/compiler.h>
 
 /** Predefined labels ids */

diff --git a/bertos/kern/kfile.c b/bertos/kern/kfile.c
index 1ec3266488e4970d1ec611c4d8e6594d4cd8a5b1..a053fc23bca6bb2beab80fa4a5fbfd8770434320 100644 (file)
--- a/bertos/kern/kfile.c
+++ b/bertos/kern/kfile.c
@@ -41,10 +41,12 @@
 
 
 #include "kfile.h"
-#include <appconfig.h>
 
+#include <cfg/cfg_kfile.h>
 #include <cfg/debug.h>
+
 #include <mware/formatwr.h>
+
 #include <string.h>
 
 /*

diff --git a/bertos/kern/kfile_test.c b/bertos/kern/kfile_test.c
index 20da9ec91057f100766cbeb88470d62ccf3943a6..b01ba4469c3dfdd5f43359d4f707b602005abe01 100644 (file)
--- a/bertos/kern/kfile_test.c
+++ b/bertos/kern/kfile_test.c
@@ -41,10 +41,12 @@
 
 
 #include "kfile.h"
-#include <appconfig.h>
 
+#include <cfg/cfg_kfile.h>
 #include <cfg/debug.h>
+
 #include <mware/formatwr.h>
+
 #include <string.h>
 
 #warning TODO:Refactor this module..

diff --git a/bertos/kern/monitor.h b/bertos/kern/monitor.h
index 95bbb6db9a752f18a7b11df8ad5f98b9a3a0f925..9e569a1de57382db721f7d5ce4b5101b0fd95c29 100644 (file)
--- a/bertos/kern/monitor.h
+++ b/bertos/kern/monitor.h
@@ -40,8 +40,9 @@
 #ifndef KERN_MONITOR_H
 #define KERN_MONITOR_H
 
+#include <cfg/cfg_kern.h>
+
 #include <cpu/types.h>
-#include <config_kern.h>
 
 #if CONFIG_KERN_MONITOR
 

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index ee10198c52f50606f70b1635640ef1dba680c07b..0d17074119378b1da2526001168f72b6018cd160 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -43,17 +43,19 @@
 
 #include "proc_p.h"
 #include "proc.h"
-//#include "hw.h"
-#include <mware/event.h>
+
+#include <cfg/cfg_arch.h>  /* ARCH_EMUL */
+#include <cfg/debug.h>
+#include <cfg/module.h>
+#include <cfg/macros.h>       /* ABS() */
+
 #include <cpu/irq.h>
 #include <cpu/types.h>
 #include <cpu/attr.h>
-#include <cfg/debug.h>
-#include <cfg/module.h>
-#include <cfg/arch_config.h>  /* ARCH_EMUL */
-#include <cfg/macros.h>  /* ABS() */
 
-#include <string.h> /* memset() */
+#include <mware/event.h>
+
+#include <string.h>           /* memset() */
 
 /**
  * CPU dependent context switching routines.

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 8fbb0ed0a723d8ddd5a440c09f8fb519f6c795a6..77fca314f0719f8ae9548d39cd899a04afc14545 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -41,11 +41,12 @@
 #ifndef KERN_PROC_P_H
 #define KERN_PROC_P_H
 
+#include <cfg/cfg_kern.h>
 #include <cfg/compiler.h>
+
 #include <cpu/types.h>        /* for cpu_stack_t */
+
 #include <mware/list.h>
-#include <config_kern.h>
-#include <appconfig.h>
 
 typedef struct Process
 {

diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c
index 6353e1f1347cdda23dd1e08389896b5d1c0dc130..b87a904cbe5c0e5fa65df69c33c957fc7b584af0 100644 (file)
--- a/bertos/mware/formatwr.c
+++ b/bertos/mware/formatwr.c
@@ -78,10 +78,12 @@
 
 
 #include "formatwr.h"
+
+#include <cfg/cfg_formatwr.h>  /* CONFIG_ macros */
+#include <cfg/debug.h>         /* ASSERT */
+
 #include <mware/pgm.h>
 #include <mware/hex.h>
-#include <cfg/debug.h> /* ASSERT */
-#include <appconfig.h> /* CONFIG_ macros */
 
 #ifndef CONFIG_PRINTF_N_FORMATTER
        /** Disable the arcane %n formatter. */

diff --git a/bertos/mware/formatwr.h b/bertos/mware/formatwr.h
index 5854bd4aa6d3123d6448cdc1b13ca7f4d9ea5aa3..c7ea1a8b46b7d0cd2b15378264d635d7646d8230 100644 (file)
--- a/bertos/mware/formatwr.h
+++ b/bertos/mware/formatwr.h
@@ -38,10 +38,12 @@
 #ifndef MWARE_FORMATWR_H
 #define MWARE_FORMATWR_H
 
-#include <stdarg.h> /* va_list */
-#include <appconfig.h>
+#include <cfg/cfg_formatwr.h>
+
 #include <cpu/attr.h>    /* CPU_HARVARD */
 
+#include <stdarg.h>      /* va_list */
+
 /**
  * \name _formatted_write() configuration
  * \{

diff --git a/bertos/mware/heap.h b/bertos/mware/heap.h
index f02a7d558fc3a87fd6c61e43214db5a97f988ac0..0d8f7778cb643223d6e28961a2e9405eb1c90d32 100644 (file)
--- a/bertos/mware/heap.h
+++ b/bertos/mware/heap.h
@@ -33,21 +33,20 @@
  *
  * \brief Heap subsystem (public interface).
  *
- * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
- *
  * \todo Heap memory could be defined as an array of MemChunk, and used
  * in this form also within the implementation. This would probably remove
  * memory alignment problems, and also some aliasing issues.
  *
+ * \version $Id$
+ *
+ * \author Bernardo Innocenti <bernie@develer.com>
+ *
  */
 
 #ifndef MWARE_HEAP_H
 #define MWARE_HEAP_H
 
-#include <appconfig.h>
-
+#include <cfg/cfg_heap.h>
 #include <cfg/compiler.h>
 
 struct _MemChunk;

diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c
index 976e5ed20ee86bca4997264d59e57d94c0d2fc75..1fc45d78c4ffa670459ccad21d59807d137057ab 100644 (file)
--- a/bertos/mware/parser.c
+++ b/bertos/mware/parser.c
@@ -57,7 +57,7 @@
 
 #include "parser.h"
 
-#include "appconfig.h"
+#include <cfg/cfg_parser.h>
 
 #include <drv/ser.h>
 #include <mware/hashtable.h>

diff --git a/bertos/verstag.h b/bertos/verstag.h
index 756f72aa6b3e79575f615360bae51a9dbf08d60a..7ca373380f395d11888339a92fa79ba2f6fd8b78 100644 (file)
--- a/bertos/verstag.h
+++ b/bertos/verstag.h
@@ -42,7 +42,7 @@
 #define BERTOS_VERSTAG_H
 
 #ifndef CFG_ARCH_CONFIG_H
-       #include <cfg/arch_config.h>
+       #include <cfg/cfg_arch.h>
 #endif
 
 #define APP_NAME "Appname"