From 11da44352fcd4d33b173c976db45293ac1a87cca Mon Sep 17 00:00:00 2001 From: asterix Date: Mon, 26 May 2008 20:48:17 +0000 Subject: [PATCH] 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 --- bertos/cpu/arm/drv/stepper_arm.c | 2 +- bertos/cpu/arm/drv/stepper_arm.h | 2 +- bertos/cpu/avr/drv/kdebug_avr.c | 2 +- bertos/cpu/avr/drv/lcd_32122a_avr.c | 2 +- bertos/cpu/avr/drv/pwm_avr.c | 2 -- bertos/cpu/avr/drv/pwm_avr.h | 2 -- bertos/cpu/avr/drv/ser_avr.c | 13 +++++++---- bertos/cpu/avr/drv/twi_avr.c | 8 ++++--- bertos/drv/buzzerled.c | 6 ++--- bertos/drv/dc_motor.h | 6 ++--- bertos/drv/kdebug.c | 8 +++---- bertos/drv/lcd_hd44.c | 2 +- bertos/drv/lcd_hd44_test.c | 2 +- bertos/drv/ser.c | 7 ++++-- bertos/drv/spi_bitbang.c | 2 ++ bertos/drv/spi_bitbang.h | 2 +- bertos/drv/stepper.c | 2 +- bertos/drv/timer.c | 11 +++++---- bertos/gfx/bitmap.c | 9 ++++---- bertos/gfx/charts.h | 36 ++--------------------------- bertos/gfx/gfx.h | 5 ++-- bertos/gfx/line.c | 2 +- bertos/gui/leveledit.c | 2 +- bertos/gui/menubar.h | 1 - bertos/kern/kfile.c | 4 +++- bertos/kern/kfile_test.c | 4 +++- bertos/kern/monitor.h | 3 ++- bertos/kern/proc.c | 16 +++++++------ bertos/kern/proc_p.h | 5 ++-- bertos/mware/formatwr.c | 6 +++-- bertos/mware/formatwr.h | 6 +++-- bertos/mware/heap.h | 11 ++++----- bertos/mware/parser.c | 2 +- bertos/verstag.h | 2 +- 34 files changed, 91 insertions(+), 104 deletions(-) diff --git a/bertos/cpu/arm/drv/stepper_arm.c b/bertos/cpu/arm/drv/stepper_arm.c index f39c5a22..d27402c0 100644 --- 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 544eb855..ab96e5d7 100644 --- 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 25a2cd09..3e1bdfda 100644 --- 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 +#include #include /* for BV(), DIV_ROUND */ #include diff --git a/bertos/cpu/avr/drv/lcd_32122a_avr.c b/bertos/cpu/avr/drv/lcd_32122a_avr.c index 431e6674..6a85a76f 100644 --- 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 #include /* BV() */ #include diff --git a/bertos/cpu/avr/drv/pwm_avr.c b/bertos/cpu/avr/drv/pwm_avr.c index cc1e07d6..93dd5137 100644 --- 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 0283269e..46bc2d24 100644 --- 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 #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 e9e1f5ec..f37841c6 100644 --- a/bertos/cpu/avr/drv/ser_avr.c +++ b/bertos/cpu/avr/drv/ser_avr.c @@ -61,19 +61,22 @@ * \author Stefano Fedrigo */ -#include -#include +#include "hw_ser.h" /* Required for bus macros overrides */ +#include "hw_cpu.h" /* CLOCK_FREQ */ -#include /* Required for bus macros overrides */ -#include /* CLOCK_FREQ */ -#include +#include #include /* DIV_ROUND */ #include + +#include +#include #include + #include #include + #if defined(__AVR_LIBC_VERSION__) && (__AVR_LIBC_VERSION__ >= 10400UL) #include #else diff --git a/bertos/cpu/avr/drv/twi_avr.c b/bertos/cpu/avr/drv/twi_avr.c index a31ff12c..69f0ff99 100644 --- 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 #include +#include // BV() + #include #include -#include // BV() -#include /* CLOCK_FREQ */ -#include #include diff --git a/bertos/drv/buzzerled.c b/bertos/drv/buzzerled.c index 1a22cf08..9648ef67 100644 --- a/bertos/drv/buzzerled.c +++ b/bertos/drv/buzzerled.c @@ -52,12 +52,12 @@ #include "buzzerled.h" -#include -#include - #warning FIXME:This drive is obsolete, you must refactor it. #if 0 +#include +#include + 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 9aac6548..289a1bd3 100644 --- a/bertos/drv/dc_motor.h +++ b/bertos/drv/dc_motor.h @@ -42,15 +42,15 @@ #include "hw_dc_motor.h" +#include +#include + #include #include #include #include -#include - -#include "appconfig.h" /** * Define status bit for DC motor device. diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c index 3b2c18bd..63a93f50 100644 --- a/bertos/drv/kdebug.c +++ b/bertos/drv/kdebug.c @@ -38,14 +38,14 @@ * \author Stefano Fedrigo */ -#include -#include -#include +#include #include /* for BV() */ #include -#include +#include +#include +#include #include /* for _formatted_write() */ #include diff --git a/bertos/drv/lcd_hd44.c b/bertos/drv/lcd_hd44.c index 2949bb73..f5d225ff 100644 --- 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 -#include #include #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 a84c156c..f430f136 100644 --- 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 -#include void lcd_hw_test(void) { diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c index 0838bc15..0a6705a7 100644 --- 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 + +#include +#include #include -#include + +#include #include /* memset */ diff --git a/bertos/drv/spi_bitbang.c b/bertos/drv/spi_bitbang.c index f0251316..2a618449 100644 --- 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 #include + #include void spi_assertSS(void) diff --git a/bertos/drv/spi_bitbang.h b/bertos/drv/spi_bitbang.h index adbfedcb..d770105b 100644 --- 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 +#include #include diff --git a/bertos/drv/stepper.c b/bertos/drv/stepper.c index 1dd562f9..aa036810 100644 --- a/bertos/drv/stepper.c +++ b/bertos/drv/stepper.c @@ -28,7 +28,7 @@ #include -#include +#include CPU_HEADER(stepper) #include // memset diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c index 0e756dbb..4ddf0605 100644 --- a/bertos/drv/timer.c +++ b/bertos/drv/timer.c @@ -39,14 +39,15 @@ #include "timer.h" -#include -#include -#include - +#include +#include #include #include #include -#include + +#include +#include +#include /* * Include platform-specific binding code if we're hosted. diff --git a/bertos/gfx/bitmap.c b/bertos/gfx/bitmap.c index d4c447e6..294e9c23 100644 --- a/bertos/gfx/bitmap.c +++ b/bertos/gfx/bitmap.c @@ -40,10 +40,11 @@ #include "gfx.h" #include "gfx_p.h" -#include /* ASSERT() */ -#include /* CPU_HARVARD */ -#include /* MIN() */ -#include /* CONFIG_GFX_CLIPPING */ +#include /* CONFIG_GFX_CLIPPING */ +#include /* MIN() */ +#include /* ASSERT() */ + +#include /* CPU_HARVARD */ #include /* memset() */ diff --git a/bertos/gfx/charts.h b/bertos/gfx/charts.h index ce4bd883..ecc7f309 100644 --- a/bertos/gfx/charts.h +++ b/bertos/gfx/charts.h @@ -41,44 +41,12 @@ * \author Bernardo Innocenti */ -/*#* - *#* $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 /* CONFIG_ stuff */ + #include /* vcoord_t */ -#include /* 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 a852c54d..38ce8902 100644 --- a/bertos/gfx/gfx.h +++ b/bertos/gfx/gfx.h @@ -15,10 +15,11 @@ #ifndef GFX_GFX_H #define GFX_GFX_H +#include /* CONFIG_GFX_* */ #include -#include /* CPU_HARVARD */ -#include /* CONFIG_GFX_* */ +#include /* CPU_HARVARD */ + /** * \name Known pixel formats for bitmap representation. diff --git a/bertos/gfx/line.c b/bertos/gfx/line.c index f3909b15..a878c156 100644 --- a/bertos/gfx/line.c +++ b/bertos/gfx/line.c @@ -42,9 +42,9 @@ #include "gfx.h" #include "gfx_p.h" +#include /* CONFIG_GFX_CLIPPING */ #include /* ASSERT() */ #include /* SWAP() */ -#include /* 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 7f74cad7..0bac895a 100644 --- a/bertos/gui/leveledit.c +++ b/bertos/gui/leveledit.c @@ -38,7 +38,7 @@ #include "leveledit.h" -#include +#include #include /* MAX() */ #include diff --git a/bertos/gui/menubar.h b/bertos/gui/menubar.h index 8541eae8..a4bd9a20 100644 --- a/bertos/gui/menubar.h +++ b/bertos/gui/menubar.h @@ -41,7 +41,6 @@ #ifndef MWARE_MENUBAR_H #define MWARE_MENUBAR_H -#include #include /** Predefined labels ids */ diff --git a/bertos/kern/kfile.c b/bertos/kern/kfile.c index 1ec32664..a053fc23 100644 --- a/bertos/kern/kfile.c +++ b/bertos/kern/kfile.c @@ -41,10 +41,12 @@ #include "kfile.h" -#include +#include #include + #include + #include /* diff --git a/bertos/kern/kfile_test.c b/bertos/kern/kfile_test.c index 20da9ec9..b01ba446 100644 --- a/bertos/kern/kfile_test.c +++ b/bertos/kern/kfile_test.c @@ -41,10 +41,12 @@ #include "kfile.h" -#include +#include #include + #include + #include #warning TODO:Refactor this module.. diff --git a/bertos/kern/monitor.h b/bertos/kern/monitor.h index 95bbb6db..9e569a1d 100644 --- a/bertos/kern/monitor.h +++ b/bertos/kern/monitor.h @@ -40,8 +40,9 @@ #ifndef KERN_MONITOR_H #define KERN_MONITOR_H +#include + #include -#include #if CONFIG_KERN_MONITOR diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c index ee10198c..0d170741 100644 --- 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 + +#include /* ARCH_EMUL */ +#include +#include +#include /* ABS() */ + #include #include #include -#include -#include -#include /* ARCH_EMUL */ -#include /* ABS() */ -#include /* memset() */ +#include + +#include /* memset() */ /** * CPU dependent context switching routines. diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h index 8fbb0ed0..77fca314 100644 --- 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 #include + #include /* for cpu_stack_t */ + #include -#include -#include typedef struct Process { diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c index 6353e1f1..b87a904c 100644 --- a/bertos/mware/formatwr.c +++ b/bertos/mware/formatwr.c @@ -78,10 +78,12 @@ #include "formatwr.h" + +#include /* CONFIG_ macros */ +#include /* ASSERT */ + #include #include -#include /* ASSERT */ -#include /* 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 5854bd4a..c7ea1a8b 100644 --- a/bertos/mware/formatwr.h +++ b/bertos/mware/formatwr.h @@ -38,10 +38,12 @@ #ifndef MWARE_FORMATWR_H #define MWARE_FORMATWR_H -#include /* va_list */ -#include +#include + #include /* CPU_HARVARD */ +#include /* va_list */ + /** * \name _formatted_write() configuration * \{ diff --git a/bertos/mware/heap.h b/bertos/mware/heap.h index f02a7d55..0d8f7778 100644 --- a/bertos/mware/heap.h +++ b/bertos/mware/heap.h @@ -33,21 +33,20 @@ * * \brief Heap subsystem (public interface). * - * \version $Id$ - * - * \author Bernardo Innocenti - * * \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 + * */ #ifndef MWARE_HEAP_H #define MWARE_HEAP_H -#include - +#include #include struct _MemChunk; diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c index 976e5ed2..1fc45d78 100644 --- a/bertos/mware/parser.c +++ b/bertos/mware/parser.c @@ -57,7 +57,7 @@ #include "parser.h" -#include "appconfig.h" +#include #include #include diff --git a/bertos/verstag.h b/bertos/verstag.h index 756f72aa..7ca37338 100644 --- a/bertos/verstag.h +++ b/bertos/verstag.h @@ -42,7 +42,7 @@ #define BERTOS_VERSTAG_H #ifndef CFG_ARCH_CONFIG_H - #include + #include #endif #define APP_NAME "Appname" -- 2.25.1