From c22fe24a0da896a52dbc3882390ec18a440ef56a Mon Sep 17 00:00:00 2001 From: asterix Date: Tue, 27 May 2008 16:36:05 +0000 Subject: [PATCH] Specific the directory for all hw and cfg module. Use double quote for cfg and hw include. Various fix. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1398 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/algo/md2.h | 2 +- bertos/algo/ramp.h | 3 +- bertos/algo/randpool.h | 2 +- bertos/cfg/cfg_debug.h | 2 +- bertos/cfg/cfg_kern.h | 2 +- bertos/cfg/cfg_kfile.h | 2 +- bertos/cfg/debug.h | 114 +++++++++++----------- bertos/cpu/arm/drv/adc_at91.c | 4 +- bertos/cpu/arm/drv/adc_at91.h | 4 +- bertos/cpu/arm/drv/kdebug_at91.c | 6 +- bertos/cpu/arm/drv/pwm_at91.c | 2 +- bertos/cpu/arm/drv/ser_at91.c | 6 +- bertos/cpu/arm/drv/stepper_at91.c | 2 +- bertos/cpu/arm/drv/stepper_at91_hw_test.c | 2 +- bertos/cpu/arm/drv/timer_at91.h | 4 +- bertos/cpu/arm/drv/twi_at91.c | 2 +- bertos/cpu/arm/hw/crtat91sam7_rom.S | 2 +- bertos/cpu/attr.h | 4 +- bertos/cpu/avr/drv/adc_avr.c | 4 +- bertos/cpu/avr/drv/kdebug_avr.c | 12 +-- bertos/cpu/avr/drv/lcd_32122a_avr.c | 2 +- bertos/cpu/avr/drv/pwm_avr.c | 2 +- bertos/cpu/avr/drv/ser_avr.c | 6 +- bertos/cpu/avr/drv/ser_simple_avr.c | 2 +- bertos/cpu/avr/drv/sipo.h | 2 +- bertos/cpu/avr/drv/stepper_avr.c | 2 +- bertos/cpu/avr/drv/timer_avr.h | 4 +- bertos/cpu/avr/drv/timer_simple_avr.c | 2 +- bertos/cpu/avr/drv/twi_avr.c | 4 +- bertos/drv/buzzer.c | 2 +- bertos/drv/buzzerled.c | 2 +- bertos/drv/buzzerled.h | 2 +- bertos/drv/dc_motor.c | 2 +- bertos/drv/dc_motor.h | 4 +- bertos/drv/eeprom.c | 2 +- bertos/drv/eeprom.h | 2 +- bertos/drv/flash25.c | 2 +- bertos/drv/flash25.h | 2 +- bertos/drv/kbd.c | 4 +- bertos/drv/kbd.h | 4 +- bertos/drv/kdebug.c | 2 +- bertos/drv/lcd_hd44.c | 5 +- bertos/drv/lcd_hd44.h | 2 +- bertos/drv/lcd_hd44_test.c | 3 +- bertos/drv/mcp41.c | 2 +- bertos/drv/ntc.c | 4 +- bertos/drv/phase.c | 2 +- bertos/drv/ser.c | 4 +- bertos/drv/ser.h | 2 +- bertos/drv/spi_bitbang.c | 4 +- bertos/drv/spi_bitbang.h | 2 +- bertos/drv/stepper.c | 6 +- bertos/drv/tc520.c | 2 +- bertos/drv/thermo.c | 2 +- bertos/drv/timer.c | 6 +- bertos/drv/timer.h | 2 +- bertos/drv/wdt.h | 4 +- bertos/emul/emul.cpp | 29 +----- bertos/emul/ser_posix.c | 2 +- bertos/gfx/bitmap.c | 2 +- bertos/gfx/charts.h | 2 +- bertos/gfx/gfx.h | 2 +- bertos/gfx/line.c | 2 +- bertos/gui/leveledit.c | 2 +- bertos/gui/menu.c | 2 +- bertos/hw/hw_dataflash.c | 2 +- bertos/hw/hw_kbd.h | 2 +- bertos/hw/hw_lcd.h | 2 +- bertos/hw/hw_mcp41.c | 2 +- bertos/hw/hw_phase.c | 2 +- bertos/hw/hw_stepper.h | 2 +- bertos/kern/kfile.c | 2 +- bertos/kern/kfile.h | 2 +- bertos/kern/kfile_test.c | 2 +- bertos/kern/monitor.h | 2 +- bertos/kern/proc.c | 2 +- bertos/kern/proc.h | 2 +- bertos/kern/proc_p.h | 2 +- bertos/mware/event.h | 2 +- bertos/mware/formatwr.c | 2 +- bertos/mware/formatwr.h | 2 +- bertos/mware/heap.h | 2 +- bertos/mware/parser.c | 2 +- bertos/net/pocketbus.h | 2 +- bertos/net/xmodem.c | 2 +- bertos/verstag.h | 2 +- 86 files changed, 177 insertions(+), 197 deletions(-) diff --git a/bertos/algo/md2.h b/bertos/algo/md2.h index b06e0758..51be8488 100644 --- a/bertos/algo/md2.h +++ b/bertos/algo/md2.h @@ -46,7 +46,7 @@ #ifndef ALGO_MD2_H #define ALGO_MD2_H -#include +#include "cfg/cfg_md2.h" #include #define NUM_COMPUTE_ROUNDS 18 ///< Number of compute rounds. diff --git a/bertos/algo/ramp.h b/bertos/algo/ramp.h index b1fe716f..202441f4 100644 --- a/bertos/algo/ramp.h +++ b/bertos/algo/ramp.h @@ -49,8 +49,9 @@ #ifndef ALGO_RAMP_H #define ALGO_RAMP_H +#include "hw/hw_stepper.h" + #include -#include "hw_stepper.h" /** * Define whether the ramp will use floating point calculation within ramp_evaluate(). diff --git a/bertos/algo/randpool.h b/bertos/algo/randpool.h index fd0a96fd..2c4faf67 100644 --- a/bertos/algo/randpool.h +++ b/bertos/algo/randpool.h @@ -40,7 +40,7 @@ #ifndef ALGO_RANDPOOL_H #define ALGO_RANDPOOL_H -#include +#include "cfg/cfg_randpool.h" #include diff --git a/bertos/cfg/cfg_debug.h b/bertos/cfg/cfg_debug.h index 539772af..25b25858 100644 --- a/bertos/cfg/cfg_debug.h +++ b/bertos/cfg/cfg_debug.h @@ -44,6 +44,6 @@ #define CONFIG_KDEBUG_PORT 0 /// Baud-rate for the kdebug console. -#define CONFIG_KDEBUG_BAUDRATE 19200 +#define CONFIG_KDEBUG_BAUDRATE 115200 #endif /* CFG_DEBUG_H */ diff --git a/bertos/cfg/cfg_kern.h b/bertos/cfg/cfg_kern.h index dd950b82..eecc5139 100644 --- a/bertos/cfg/cfg_kern.h +++ b/bertos/cfg/cfg_kern.h @@ -41,7 +41,7 @@ #ifndef CFG_KERN_H #define CFG_KERN_H -#include /* ARCH_EMUL */ +#include "cfg/cfg_arch.h" /* ARCH_EMUL */ /** * Multithreading kernel. diff --git a/bertos/cfg/cfg_kfile.h b/bertos/cfg/cfg_kfile.h index 347846dc..6dad0a0c 100644 --- a/bertos/cfg/cfg_kfile.h +++ b/bertos/cfg/cfg_kfile.h @@ -41,7 +41,7 @@ #define CFG_KFILE_H /// TODO: -#define CONFIG_KFILE_GETS 0 +#define CONFIG_KFILE_GETS 1 #endif /* CFG_KFILE_H */ diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h index 6bd64e07..658ecf1d 100644 --- a/bertos/cfg/debug.h +++ b/bertos/cfg/debug.h @@ -37,8 +37,8 @@ * diagnostic messages to a serial terminal or a JTAG debugger. * * \version $Id$ - * \author Bernardo Innocenti - */ + * \author Bernardo Innocenti + */ #ifndef BERTOS_DEBUG_H #define BERTOS_DEBUG_H @@ -46,9 +46,9 @@ #include #include -/* - * Defaults for rarely used config stuff. - */ + /* + * Defaults for rarely used config stuff. + */ #ifndef CONFIG_KDEBUG_DISABLE_TRACE #define CONFIG_KDEBUG_DISABLE_TRACE 0 #endif @@ -58,67 +58,67 @@ #endif #if defined(__doxygen__) - /** - * Preprocessor symbol defined only for debug builds. - * - * The build infrastructure must arrange for _DEBUG to - * be predefined for all the source files being compiled. - * - * This is compatible with the MSVC convention for the - * default Debug and Release project targets. - */ - #define _DEBUG 1 + /** + * Preprocessor symbol defined only for debug builds. + * + * The build infrastructure must arrange for _DEBUG to + * be predefined for all the source files being compiled. + * + * This is compatible with the MSVC convention for the + * default Debug and Release project targets. + */ + #define _DEBUG 1 #endif #ifdef _DEBUG - // STLport specific: enable extra checks - #define __STL_DEBUG 1 + // STLport specific: enable extra checks + #define __STL_DEBUG 1 - // MSVC specific: Enable memory allocation debug - #if defined(_MSC_VER) - #include - #endif + // MSVC specific: Enable memory allocation debug + #if defined(_MSC_VER) + #include + #endif - /* - * On UNIX systems the extabilished practice is to define - * NDEBUG for release builds and nothing for debug builds. - */ - #ifdef NDEBUG - #undef NDEBUG - #endif + /* + * On UNIX systems the extabilished practice is to define + * NDEBUG for release builds and nothing for debug builds. + */ + #ifdef NDEBUG + #undef NDEBUG + #endif - /** - * This macro duplicates the old MSVC trick of redefining - * THIS_FILE locally to avoid the overhead of many duplicate - * strings in ASSERT(). - */ - #ifndef THIS_FILE - #define THIS_FILE __FILE__ - #endif + /** + * This macro duplicates the old MSVC trick of redefining + * THIS_FILE locally to avoid the overhead of many duplicate + * strings in ASSERT(). + */ + #ifndef THIS_FILE + #define THIS_FILE __FILE__ + #endif - /** - * This macro can be used to conditionally exclude one or more - * statements conditioned on \c _DEBUG, avoiding the clutter - * of ifdef/endif pairs. - * - * \code - * struct FooBar - * { - * int foo; - * bool bar; - * DB(int ref_count;) // Track number of users - * - * void release() - * { - * DB(--ref_count;) - * } - * }; - * \endcode - */ - #define DB(x) x + /** + * This macro can be used to conditionally exclude one or more + * statements conditioned on \c _DEBUG, avoiding the clutter + * of ifdef/endif pairs. + * + * \code + * struct FooBar + * { + * int foo; + * bool bar; + * DB(int ref_count;) // Track number of users + * + * void release() + * { + * DB(--ref_count;) + * } + * }; + * \endcode + */ + #define DB(x) x - #include /* CONFIG_KDEBUG_ASSERT_NO_TEXT */ + #include "cfg/cfg_debug.h" /* CONFIG_KDEBUG_ASSERT_NO_TEXT */ #include /* CPU_HARVARD */ /* These are implemented in drv/kdebug.c */ diff --git a/bertos/cpu/arm/drv/adc_at91.c b/bertos/cpu/arm/drv/adc_at91.c index eed5fac6..d8cea88a 100644 --- a/bertos/cpu/arm/drv/adc_at91.c +++ b/bertos/cpu/arm/drv/adc_at91.c @@ -48,8 +48,8 @@ #include "adc_at91.h" -#include -#include +#include "cfg/cfg_adc.h" +#include "cfg/cfg_kern.h" #include #include diff --git a/bertos/cpu/arm/drv/adc_at91.h b/bertos/cpu/arm/drv/adc_at91.h index 5e9e7d26..fb0ec1d6 100644 --- a/bertos/cpu/arm/drv/adc_at91.h +++ b/bertos/cpu/arm/drv/adc_at91.h @@ -41,9 +41,9 @@ #ifndef DRV_ADC_AT91_H #define DRV_ADC_AT91_H -#include "hw_cpu.h" +#include "hw/hw_cpu.h" -#include +#include "cfg/cfg_adc.h" #include diff --git a/bertos/cpu/arm/drv/kdebug_at91.c b/bertos/cpu/arm/drv/kdebug_at91.c index dbc618b2..b6ec8b19 100644 --- 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/hw_cpu.h" /* for CLOCK_FREQ */ +#include "hw/hw_ser.h" /* Required for bus macros overrides */ -#include +#include "cfg/cfg_debug.h" #include /* for BV(), DIV_ROUND */ #include diff --git a/bertos/cpu/arm/drv/pwm_at91.c b/bertos/cpu/arm/drv/pwm_at91.c index 142b9feb..01324110 100644 --- a/bertos/cpu/arm/drv/pwm_at91.c +++ b/bertos/cpu/arm/drv/pwm_at91.c @@ -39,7 +39,7 @@ */ #include "pwm_at91.h" -#include "hw_cpu.h" +#include "hw/hw_cpu.h" #include #include diff --git a/bertos/cpu/arm/drv/ser_at91.c b/bertos/cpu/arm/drv/ser_at91.c index 4ef27b61..a58c7dd9 100644 --- a/bertos/cpu/arm/drv/ser_at91.c +++ b/bertos/cpu/arm/drv/ser_at91.c @@ -38,10 +38,10 @@ * \author Daniele Basile */ -#include "hw_ser.h" /* Required for bus macros overrides */ -#include "hw_cpu.h" /* CLOCK_FREQ */ +#include "hw/hw_ser.h" /* Required for bus macros overrides */ +#include "hw/hw_cpu.h" /* CLOCK_FREQ */ -#include +#include "cfg/cfg_ser.h" #include diff --git a/bertos/cpu/arm/drv/stepper_at91.c b/bertos/cpu/arm/drv/stepper_at91.c index 896959eb..d6fc286d 100644 --- a/bertos/cpu/arm/drv/stepper_at91.c +++ b/bertos/cpu/arm/drv/stepper_at91.c @@ -55,7 +55,7 @@ #include "stepper_at91.h" -#include +#include "cfg/cfg_stepper.h" #include #include diff --git a/bertos/cpu/arm/drv/stepper_at91_hw_test.c b/bertos/cpu/arm/drv/stepper_at91_hw_test.c index 321dde0c..d40da084 100644 --- a/bertos/cpu/arm/drv/stepper_at91_hw_test.c +++ b/bertos/cpu/arm/drv/stepper_at91_hw_test.c @@ -39,7 +39,7 @@ #include "stepper_at91.h" -#include +#include "cfg/cfg_stepper.h" #include #include diff --git a/bertos/cpu/arm/drv/timer_at91.h b/bertos/cpu/arm/drv/timer_at91.h index c6979f95..e7e4f185 100644 --- a/bertos/cpu/arm/drv/timer_at91.h +++ b/bertos/cpu/arm/drv/timer_at91.h @@ -40,9 +40,9 @@ #ifndef DRV_AT91_TIMER_H #define DRV_AT91_TIMER_H -#include "hw_cpu.h" /* CLOCK_FREQ */ +#include "hw/hw_cpu.h" /* CLOCK_FREQ */ -#include /* CONFIG_TIMER */ +#include "cfg/cfg_timer.h" /* CONFIG_TIMER */ #include /* uint8_t */ /** diff --git a/bertos/cpu/arm/drv/twi_at91.c b/bertos/cpu/arm/drv/twi_at91.c index 6256558b..a3b2bf73 100644 --- a/bertos/cpu/arm/drv/twi_at91.c +++ b/bertos/cpu/arm/drv/twi_at91.c @@ -39,7 +39,7 @@ #include "twi_at91.h" -#include +#include "cfg/cfg_twi.h" #include #include #include diff --git a/bertos/cpu/arm/hw/crtat91sam7_rom.S b/bertos/cpu/arm/hw/crtat91sam7_rom.S index a889680d..c7706d73 100644 --- a/bertos/cpu/arm/hw/crtat91sam7_rom.S +++ b/bertos/cpu/arm/hw/crtat91sam7_rom.S @@ -70,7 +70,7 @@ * */ -#include "hw_cpu.h" +#include "hw/hw_cpu.h" #include diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h index 48d22601..3fd3b18f 100644 --- a/bertos/cpu/attr.h +++ b/bertos/cpu/attr.h @@ -43,9 +43,9 @@ #include "detect.h" -#include /* CONFIG_FAST_MEM */ +#include "cfg/cfg_attr.h" /* CONFIG_FAST_MEM */ #include /* for uintXX_t */ -#include /* ARCH_EMUL */ +#include "cfg/cfg_arch.h" /* ARCH_EMUL */ /** diff --git a/bertos/cpu/avr/drv/adc_avr.c b/bertos/cpu/avr/drv/adc_avr.c index ec131745..fd8525d6 100644 --- a/bertos/cpu/avr/drv/adc_avr.c +++ b/bertos/cpu/avr/drv/adc_avr.c @@ -37,8 +37,8 @@ #include "adc_avr.h" -#include -#include +#include "cfg/cfg_adc.h" +#include "cfg/cfg_kern.h" #include #include diff --git a/bertos/cpu/avr/drv/kdebug_avr.c b/bertos/cpu/avr/drv/kdebug_avr.c index 3e1bdfda..34c1de98 100644 --- a/bertos/cpu/avr/drv/kdebug_avr.c +++ b/bertos/cpu/avr/drv/kdebug_avr.c @@ -39,10 +39,10 @@ * \author Francesco Sacchi */ -#include "hw_cpu.h" /* for CLOCK_FREQ */ -#include "hw_ser.h" /* Required for bus macros overrides */ +#include "hw/hw_cpu.h" /* for CLOCK_FREQ */ +#include "hw/hw_ser.h" /* Required for bus macros overrides */ -#include +#include "cfg/cfg_debug.h" #include /* for BV(), DIV_ROUND */ #include @@ -54,7 +54,7 @@ /* * Support for special bus policies or external transceivers - * on UART0 (to be overridden in "hw_ser.h"). + * on UART0 (to be overridden in "hw/hw_ser.h"). * * HACK: if we don't set TXEN, kdbg disables the transmitter * after each output statement until the serial driver @@ -117,7 +117,7 @@ /* * Support for special bus policies or external transceivers - * on UART1 (to be overridden in "hw_ser.h"). + * on UART1 (to be overridden in "hw/hw_ser.h"). * * HACK: if we don't set TXEN, kdbg disables the transmitter * after each output statement until the serial driver @@ -159,7 +159,7 @@ * Special debug port for BitBanged Serial see below for details... */ #elif CONFIG_KDEBUG_PORT == 666 - #include "hw_ser.h" + #include "hw/hw_ser.h" #define KDBG_WAIT_READY() do { /*nop*/ } while(0) #define KDBG_WRITE_CHAR(c) _kdebug_bitbang_putchar((c)) #define KDBG_MASK_IRQ(old) do { IRQ_SAVE_DISABLE((old)); } while(0) diff --git a/bertos/cpu/avr/drv/lcd_32122a_avr.c b/bertos/cpu/avr/drv/lcd_32122a_avr.c index 6a85a76f..7ffe72b8 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 +#include "cfg/cfg_lcd.h" #include /* BV() */ #include diff --git a/bertos/cpu/avr/drv/pwm_avr.c b/bertos/cpu/avr/drv/pwm_avr.c index 93dd5137..b88a0f93 100644 --- a/bertos/cpu/avr/drv/pwm_avr.c +++ b/bertos/cpu/avr/drv/pwm_avr.c @@ -40,7 +40,7 @@ #include "pwm_avr.h" -#include "hw_cpu.h" +#include "hw/hw_cpu.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/ser_avr.c b/bertos/cpu/avr/drv/ser_avr.c index f37841c6..cf47c09e 100644 --- a/bertos/cpu/avr/drv/ser_avr.c +++ b/bertos/cpu/avr/drv/ser_avr.c @@ -61,10 +61,10 @@ * \author Stefano Fedrigo */ -#include "hw_ser.h" /* Required for bus macros overrides */ -#include "hw_cpu.h" /* CLOCK_FREQ */ +#include "hw/hw_ser.h" /* Required for bus macros overrides */ +#include "hw/hw_cpu.h" /* CLOCK_FREQ */ -#include +#include "cfg/cfg_ser.h" #include /* DIV_ROUND */ #include diff --git a/bertos/cpu/avr/drv/ser_simple_avr.c b/bertos/cpu/avr/drv/ser_simple_avr.c index 6fc1cb23..8cd92712 100644 --- a/bertos/cpu/avr/drv/ser_simple_avr.c +++ b/bertos/cpu/avr/drv/ser_simple_avr.c @@ -45,7 +45,7 @@ #include #include #include /* BV() */ -#include "hw_cpu.h" +#include "hw/hw_cpu.h" #include diff --git a/bertos/cpu/avr/drv/sipo.h b/bertos/cpu/avr/drv/sipo.h index 4c0fdfa6..ab57908b 100644 --- a/bertos/cpu/avr/drv/sipo.h +++ b/bertos/cpu/avr/drv/sipo.h @@ -41,7 +41,7 @@ #ifndef SIPO_H #define SIPO_H -#include "hw_sipo.h" +#include "hw/hw_sipo.h" #include diff --git a/bertos/cpu/avr/drv/stepper_avr.c b/bertos/cpu/avr/drv/stepper_avr.c index 87c7389b..3babc73d 100644 --- a/bertos/cpu/avr/drv/stepper_avr.c +++ b/bertos/cpu/avr/drv/stepper_avr.c @@ -40,7 +40,7 @@ #include "stepper_avr.h" -#include +#include "cfg/cfg_stepper.h" #include #include diff --git a/bertos/cpu/avr/drv/timer_avr.h b/bertos/cpu/avr/drv/timer_avr.h index de46d1b7..a8ea3da9 100644 --- a/bertos/cpu/avr/drv/timer_avr.h +++ b/bertos/cpu/avr/drv/timer_avr.h @@ -43,9 +43,9 @@ #ifndef DRV_TIMER_AVR_H #define DRV_TIMER_AVR_H -#include "hw_cpu.h" /* CLOCK_FREQ */ +#include "hw/hw_cpu.h" /* CLOCK_FREQ */ -#include /* CONFIG_TIMER */ +#include "cfg/cfg_timer.h" /* CONFIG_TIMER */ #include /* uint8_t */ #include /* DIV_ROUND */ diff --git a/bertos/cpu/avr/drv/timer_simple_avr.c b/bertos/cpu/avr/drv/timer_simple_avr.c index 877bbad9..c9c208c2 100644 --- a/bertos/cpu/avr/drv/timer_simple_avr.c +++ b/bertos/cpu/avr/drv/timer_simple_avr.c @@ -40,7 +40,7 @@ #warning FIXME:This module is obsolete, yuo must refactor it. #if 0 -#include "hw_cpu.h" +#include "hw/hw_cpu.h" #include "timer_simple_avr.h" #include #include diff --git a/bertos/cpu/avr/drv/twi_avr.c b/bertos/cpu/avr/drv/twi_avr.c index 69f0ff99..b5506530 100644 --- a/bertos/cpu/avr/drv/twi_avr.c +++ b/bertos/cpu/avr/drv/twi_avr.c @@ -40,9 +40,9 @@ #include "twi_avr.h" -#include "hw_cpu.h" /* CLOCK_FREQ */ +#include "hw/hw_cpu.h" /* CLOCK_FREQ */ -#include +#include "cfg/cfg_twi.h" #include #include // BV() diff --git a/bertos/drv/buzzer.c b/bertos/drv/buzzer.c index 218c0d28..a57af7a0 100644 --- a/bertos/drv/buzzer.c +++ b/bertos/drv/buzzer.c @@ -42,7 +42,7 @@ #include "buzzer.h" -#include "hw_buzzer.h" +#include "hw/hw_buzzer.h" #include #include diff --git a/bertos/drv/buzzerled.c b/bertos/drv/buzzerled.c index 9648ef67..000e7c98 100644 --- a/bertos/drv/buzzerled.c +++ b/bertos/drv/buzzerled.c @@ -55,7 +55,7 @@ #warning FIXME:This drive is obsolete, you must refactor it. #if 0 -#include +#include "cfg/cfg_buzzerled.h" #include static struct Timer timers[CONFIG_NUM_BLDS]; diff --git a/bertos/drv/buzzerled.h b/bertos/drv/buzzerled.h index c5c97d96..acc2a42d 100644 --- a/bertos/drv/buzzerled.h +++ b/bertos/drv/buzzerled.h @@ -50,7 +50,7 @@ * an enumarator for each device, plus a special symbol NUM_BLDS containing the * number of devices. */ -#include "hw_buzzerled.h" +#include "hw/hw_buzzerled.h" /* Include hw-level implementation. This allows inlining of bld_set, which in turns diff --git a/bertos/drv/dc_motor.c b/bertos/drv/dc_motor.c index 1df0083e..13efee97 100644 --- a/bertos/drv/dc_motor.c +++ b/bertos/drv/dc_motor.c @@ -41,7 +41,7 @@ */ #include "dc_motor.h" -#include "hw_dc_motor.h" +#include "hw/hw_dc_motor.h" #include diff --git a/bertos/drv/dc_motor.h b/bertos/drv/dc_motor.h index 289a1bd3..1a50d48a 100644 --- a/bertos/drv/dc_motor.h +++ b/bertos/drv/dc_motor.h @@ -40,9 +40,9 @@ #ifndef DRV_DC_MOTOR_H #define DRV_DC_MOTOR_H -#include "hw_dc_motor.h" +#include "hw/hw_dc_motor.h" -#include +#include "cfg/cfg_dc_motor.h" #include #include diff --git a/bertos/drv/eeprom.c b/bertos/drv/eeprom.c index 835c1cc5..8210971b 100644 --- a/bertos/drv/eeprom.c +++ b/bertos/drv/eeprom.c @@ -40,7 +40,7 @@ #include "eeprom.h" -#include // CONFIG_EEPROM_VERIFY +#include "cfg/cfg_eeprom.h" // CONFIG_EEPROM_VERIFY #include // MIN() #include diff --git a/bertos/drv/eeprom.h b/bertos/drv/eeprom.h index f8233a6a..daa61b9a 100644 --- a/bertos/drv/eeprom.h +++ b/bertos/drv/eeprom.h @@ -42,7 +42,7 @@ #ifndef DRV_EEPROM_H #define DRV_EEPROM_H -#include +#include "cfg/cfg_eeprom.h" #include /** diff --git a/bertos/drv/flash25.c b/bertos/drv/flash25.c index 529804d3..25d9ac61 100644 --- a/bertos/drv/flash25.c +++ b/bertos/drv/flash25.c @@ -45,7 +45,7 @@ * We use a spi bus, thus include hardware specific definition. * If you use another channel you must redefine this macros. */ -#include "hw_spi.h" +#include "hw/hw_spi.h" #include #include diff --git a/bertos/drv/flash25.h b/bertos/drv/flash25.h index 09579c0e..82b403f3 100644 --- a/bertos/drv/flash25.h +++ b/bertos/drv/flash25.h @@ -42,7 +42,7 @@ #define DRV_FLASH25_H #include -#include +#include "cfg/cfg_flash25.h" #include diff --git a/bertos/drv/kbd.c b/bertos/drv/kbd.c index cc623c6a..d592f069 100644 --- a/bertos/drv/kbd.c +++ b/bertos/drv/kbd.c @@ -41,9 +41,9 @@ * */ -#include "hw_kbd.h" +#include "hw/hw_kbd.h" -#include +#include "cfg/cfg_kbd.h" #include #include diff --git a/bertos/drv/kbd.h b/bertos/drv/kbd.h index f7348752..733baa89 100644 --- a/bertos/drv/kbd.h +++ b/bertos/drv/kbd.h @@ -42,9 +42,9 @@ #ifndef DRV_KBD_H #define DRV_KBD_H -#include "kbd_map.h" +#include "hw/kbd_map.h" -#include // CONFIG_KBD_OBSERVER +#include "cfg/cfg_kbd.h" // CONFIG_KBD_OBSERVER #include #include diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c index 219aadff..f75f1833 100644 --- a/bertos/drv/kdebug.c +++ b/bertos/drv/kdebug.c @@ -38,7 +38,7 @@ * \author Stefano Fedrigo */ -#include +#include "cfg/cfg_debug.h" #include /* for BV() */ #include #include diff --git a/bertos/drv/lcd_hd44.c b/bertos/drv/lcd_hd44.c index f5d225ff..af834f6a 100644 --- a/bertos/drv/lcd_hd44.c +++ b/bertos/drv/lcd_hd44.c @@ -37,10 +37,11 @@ * \author Stefano Fedrigo */ -#include "hw_lcd.h" #include "lcd_hd44.h" -#include +#include "hw/hw_lcd.h" + +#include "cfg/cfg_arch.h" #include diff --git a/bertos/drv/lcd_hd44.h b/bertos/drv/lcd_hd44.h index 42f149f3..04fccea6 100644 --- a/bertos/drv/lcd_hd44.h +++ b/bertos/drv/lcd_hd44.h @@ -40,7 +40,7 @@ #ifndef DRV_LCD_HD44_H #define DRV_LCD_HD44_H -#include +#include "cfg/cfg_lcd.h" #include /* For stdint types */ /** diff --git a/bertos/drv/lcd_hd44_test.c b/bertos/drv/lcd_hd44_test.c index f430f136..48ec04d4 100644 --- a/bertos/drv/lcd_hd44_test.c +++ b/bertos/drv/lcd_hd44_test.c @@ -37,9 +37,10 @@ * \author Stefano Fedrigo */ -#include "hw_lcd.h" #include "lcd_hd44.h" +#include "hw/hw_lcd.h" + #include void lcd_hw_test(void) diff --git a/bertos/drv/mcp41.c b/bertos/drv/mcp41.c index 62b96fd7..6b06ba12 100644 --- a/bertos/drv/mcp41.c +++ b/bertos/drv/mcp41.c @@ -36,7 +36,7 @@ * \author Francesco Sacchi */ -#include "hw_mcp41.h" +#include "hw/hw_mcp41.h" #include #include diff --git a/bertos/drv/ntc.c b/bertos/drv/ntc.c index c148e7c0..cc74e306 100644 --- a/bertos/drv/ntc.c +++ b/bertos/drv/ntc.c @@ -43,8 +43,8 @@ * */ -#include "hw_ntc.h" -#include "ntc_map.h" +#include "hw/hw_ntc.h" +#include "hw/ntc_map.h" #include diff --git a/bertos/drv/phase.c b/bertos/drv/phase.c index b56aa61d..e88fd083 100644 --- a/bertos/drv/phase.c +++ b/bertos/drv/phase.c @@ -37,7 +37,7 @@ */ -#include "hw_phase.h" +#include "hw/hw_phase.h" #include #include diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c index 0a6705a7..558c1ba3 100644 --- a/bertos/drv/ser.c +++ b/bertos/drv/ser.c @@ -55,8 +55,8 @@ #include "wdt.h" #include "ser_p.h" -#include -#include +#include "cfg/cfg_ser.h" +#include "cfg/cfg_kern.h" #include #include diff --git a/bertos/drv/ser.h b/bertos/drv/ser.h index 239a751e..c560aa5c 100644 --- a/bertos/drv/ser.h +++ b/bertos/drv/ser.h @@ -72,7 +72,7 @@ #include CPU_HEADER(ser) #endif -#include +#include "cfg/cfg_ser.h" diff --git a/bertos/drv/spi_bitbang.c b/bertos/drv/spi_bitbang.c index 2a618449..0d50bc76 100644 --- a/bertos/drv/spi_bitbang.c +++ b/bertos/drv/spi_bitbang.c @@ -41,9 +41,9 @@ #include "spi_bitbang.h" -#include "hw_spi.h" +#include "hw/hw_spi.h" -#include +#include "cfg/cfg_spi_bitbang.h" #include #include diff --git a/bertos/drv/spi_bitbang.h b/bertos/drv/spi_bitbang.h index d770105b..b892aca9 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 "cfg/cfg_spi_bitbang.h" #include diff --git a/bertos/drv/stepper.c b/bertos/drv/stepper.c index aa036810..3e4fc7b9 100644 --- a/bertos/drv/stepper.c +++ b/bertos/drv/stepper.c @@ -18,10 +18,10 @@ #include "stepper.h" -#include "hw_stepper.h" -#include "hw_sensor.h" +#include "hw/hw_stepper.h" +#include "hw/hw_sensor.h" -#include +#include "cfg/cfg_stepper.h" #include #include diff --git a/bertos/drv/tc520.c b/bertos/drv/tc520.c index 7f63a07d..f285f850 100644 --- a/bertos/drv/tc520.c +++ b/bertos/drv/tc520.c @@ -39,7 +39,7 @@ */ -#include "hw_tc520.h" +#include "hw/hw_tc520.h" #include #include diff --git a/bertos/drv/thermo.c b/bertos/drv/thermo.c index cfc1014f..3a535fb9 100644 --- a/bertos/drv/thermo.c +++ b/bertos/drv/thermo.c @@ -39,7 +39,7 @@ */ #include "thermo_map.h" -#include "hw_thermo.h" +#include "hw/hw_thermo.h" #include #include diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c index ca0605a7..81f87942 100644 --- a/bertos/drv/timer.c +++ b/bertos/drv/timer.c @@ -39,9 +39,9 @@ #include "timer.h" -#include -#include -#include +#include "cfg/cfg_timer.h" +#include "cfg/cfg_wdt.h" +#include "cfg/cfg_kern.h" #include #include #include diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h index 76f4f31f..3d03c781 100644 --- a/bertos/drv/timer.h +++ b/bertos/drv/timer.h @@ -59,7 +59,7 @@ #include CPU_HEADER(timer) #endif -#include +#include "cfg/cfg_timer.h" #include #include diff --git a/bertos/drv/wdt.h b/bertos/drv/wdt.h index 4b1e6a91..791856ee 100644 --- a/bertos/drv/wdt.h +++ b/bertos/drv/wdt.h @@ -40,9 +40,9 @@ #ifndef DRV_WDT_H #define DRV_WDT_H -#include +#include "cfg/cfg_wdt.h" #include // INLINE -#include +#include "cfg/cfg_arch.h" /* Configury sanity check */ #if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1) diff --git a/bertos/emul/emul.cpp b/bertos/emul/emul.cpp index ad081db1..29ab59db 100644 --- a/bertos/emul/emul.cpp +++ b/bertos/emul/emul.cpp @@ -38,36 +38,13 @@ * \brief Qt-based emulator framework for embedded applications (implementation) */ -/*#* - *#* $Log$ - *#* Revision 1.6 2006/05/28 12:17:57 bernie - *#* Drop almost all the Qt3 cruft. - *#* - *#* Revision 1.5 2006/05/27 22:30:56 bernie - *#* Add some delay to slow things down. - *#* - *#* Revision 1.4 2006/02/24 01:35:40 bernie - *#* Update for new emulator. - *#* - *#* Revision 1.3 2006/02/20 02:00:40 bernie - *#* Port to Qt 4.1. - *#* - *#* Revision 1.2 2006/01/16 03:51:51 bernie - *#* Fix boilerplate. - *#* - *#* Revision 1.1 2006/01/16 03:37:12 bernie - *#* Add emulator skeleton. - *#* - *#*/ - #include "emul.h" #include "emulwin.h" + +#include "cfg/cfg_kern.h" + #include -#include -#if CONFIG_KERNEL - #include -#endif #include // std::exit() diff --git a/bertos/emul/ser_posix.c b/bertos/emul/ser_posix.c index 221739e7..51183059 100644 --- a/bertos/emul/ser_posix.c +++ b/bertos/emul/ser_posix.c @@ -36,7 +36,7 @@ * \author Bernardo Innocenti */ -#include +#include "cfg/cfg_ser.h" #include #include diff --git a/bertos/gfx/bitmap.c b/bertos/gfx/bitmap.c index 294e9c23..0ff8d69c 100644 --- a/bertos/gfx/bitmap.c +++ b/bertos/gfx/bitmap.c @@ -40,7 +40,7 @@ #include "gfx.h" #include "gfx_p.h" -#include /* CONFIG_GFX_CLIPPING */ +#include "cfg/cfg_gfx.h" /* CONFIG_GFX_CLIPPING */ #include /* MIN() */ #include /* ASSERT() */ diff --git a/bertos/gfx/charts.h b/bertos/gfx/charts.h index ecc7f309..4dad1cec 100644 --- a/bertos/gfx/charts.h +++ b/bertos/gfx/charts.h @@ -44,7 +44,7 @@ #ifndef GFX_CHARTS_H #define GFX_CHARTS_H -#include /* CONFIG_ stuff */ +#include "cfg/cfg_gfx.h" /* CONFIG_ stuff */ #include /* vcoord_t */ diff --git a/bertos/gfx/gfx.h b/bertos/gfx/gfx.h index 38ce8902..176421f0 100644 --- a/bertos/gfx/gfx.h +++ b/bertos/gfx/gfx.h @@ -15,7 +15,7 @@ #ifndef GFX_GFX_H #define GFX_GFX_H -#include /* CONFIG_GFX_* */ +#include "cfg/cfg_gfx.h" /* CONFIG_GFX_* */ #include #include /* CPU_HARVARD */ diff --git a/bertos/gfx/line.c b/bertos/gfx/line.c index a878c156..598c0dfc 100644 --- a/bertos/gfx/line.c +++ b/bertos/gfx/line.c @@ -42,7 +42,7 @@ #include "gfx.h" #include "gfx_p.h" -#include /* CONFIG_GFX_CLIPPING */ +#include "cfg/cfg_gfx.h" /* CONFIG_GFX_CLIPPING */ #include /* ASSERT() */ #include /* SWAP() */ diff --git a/bertos/gui/leveledit.c b/bertos/gui/leveledit.c index 0bac895a..10ef8762 100644 --- a/bertos/gui/leveledit.c +++ b/bertos/gui/leveledit.c @@ -38,7 +38,7 @@ #include "leveledit.h" -#include +#include "cfg/cfg_gfx.h" #include /* MAX() */ #include diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c index a00d9519..8241f1a0 100644 --- a/bertos/gui/menu.c +++ b/bertos/gui/menu.c @@ -41,7 +41,7 @@ #include "menu.h" -#include +#include "cfg/cfg_gfx.h" #include #include diff --git a/bertos/hw/hw_dataflash.c b/bertos/hw/hw_dataflash.c index bbc1b469..844dd922 100644 --- a/bertos/hw/hw_dataflash.c +++ b/bertos/hw/hw_dataflash.c @@ -36,7 +36,7 @@ * \author Francesco Sacchi */ -#include "hw_dataflash.h" +#include "hw/hw_dataflash.h" #include #include diff --git a/bertos/hw/hw_kbd.h b/bertos/hw/hw_kbd.h index 6522adb4..e116d44b 100644 --- a/bertos/hw/hw_kbd.h +++ b/bertos/hw/hw_kbd.h @@ -42,7 +42,7 @@ #ifndef HW_KBD_H #define HW_KBD_H -#include "kbd_map.h" +#include "hw/kbd_map.h" #include diff --git a/bertos/hw/hw_lcd.h b/bertos/hw/hw_lcd.h index 4d63652a..416b7e99 100644 --- a/bertos/hw/hw_lcd.h +++ b/bertos/hw/hw_lcd.h @@ -43,7 +43,7 @@ #ifndef HW_LCD_H #define HW_LCD_H -#include /* CONFIG_LCD_4BIT */ +#include "cfg/cfg_lcd.h" /* CONFIG_LCD_4BIT */ #include /* BV() */ #include diff --git a/bertos/hw/hw_mcp41.c b/bertos/hw/hw_mcp41.c index ff2bc846..dc2a051c 100644 --- a/bertos/hw/hw_mcp41.c +++ b/bertos/hw/hw_mcp41.c @@ -35,7 +35,7 @@ * \author Francesco Sacchi */ -#include "hw_mcp41.h" +#include "hw/hw_mcp41.h" #include #include diff --git a/bertos/hw/hw_phase.c b/bertos/hw/hw_phase.c index c3e9ac97..54509ef3 100644 --- a/bertos/hw/hw_phase.c +++ b/bertos/hw/hw_phase.c @@ -39,7 +39,7 @@ #ifndef HW_PHASE_H #define HW_PHASE_H -#include "hw_phase.h" +#include "hw/hw_phase.h" #warning TODO:This is an example implementation, you must implement it! diff --git a/bertos/hw/hw_stepper.h b/bertos/hw/hw_stepper.h index 77038cd8..12146ca0 100644 --- a/bertos/hw/hw_stepper.h +++ b/bertos/hw/hw_stepper.h @@ -41,7 +41,7 @@ #ifndef HW_STEPPER_H #define HW_STEPPER_H -#include "hw_cpu.h" +#include "hw/hw_cpu.h" #include diff --git a/bertos/kern/kfile.c b/bertos/kern/kfile.c index a053fc23..3d664e53 100644 --- a/bertos/kern/kfile.c +++ b/bertos/kern/kfile.c @@ -42,7 +42,7 @@ #include "kfile.h" -#include +#include "cfg/cfg_kfile.h" #include #include diff --git a/bertos/kern/kfile.h b/bertos/kern/kfile.h index 52f7991c..dc8a3041 100644 --- a/bertos/kern/kfile.h +++ b/bertos/kern/kfile.h @@ -96,7 +96,7 @@ struct KFile; typedef int32_t kfile_off_t; ///< KFile offset type, used by kfile_seek function. -typedef int32_t kfile_size_t; ///< KFile size type, used in kfile struct. +typedef uint32_t kfile_size_t; ///< KFile size type, used in kfile struct. /** * Costants for repositioning read/write file offset. diff --git a/bertos/kern/kfile_test.c b/bertos/kern/kfile_test.c index b01ba446..526ccf62 100644 --- a/bertos/kern/kfile_test.c +++ b/bertos/kern/kfile_test.c @@ -42,7 +42,7 @@ #include "kfile.h" -#include +#include "cfg/cfg_kfile.h" #include #include diff --git a/bertos/kern/monitor.h b/bertos/kern/monitor.h index 9e569a1d..0c705a4a 100644 --- a/bertos/kern/monitor.h +++ b/bertos/kern/monitor.h @@ -40,7 +40,7 @@ #ifndef KERN_MONITOR_H #define KERN_MONITOR_H -#include +#include "cfg/cfg_kern.h" #include diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c index 0d170741..4d8a6fb7 100644 --- a/bertos/kern/proc.c +++ b/bertos/kern/proc.c @@ -44,7 +44,7 @@ #include "proc_p.h" #include "proc.h" -#include /* ARCH_EMUL */ +#include "cfg/cfg_arch.h" /* ARCH_EMUL */ #include #include #include /* ABS() */ diff --git a/bertos/kern/proc.h b/bertos/kern/proc.h index d6109e35..37415f3d 100644 --- a/bertos/kern/proc.h +++ b/bertos/kern/proc.h @@ -40,7 +40,7 @@ #ifndef KERN_PROC_H #define KERN_PROC_H -#include +#include "cfg/cfg_kern.h" #include #include diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h index 77fca314..c0b2bdc5 100644 --- a/bertos/kern/proc_p.h +++ b/bertos/kern/proc_p.h @@ -41,7 +41,7 @@ #ifndef KERN_PROC_P_H #define KERN_PROC_P_H -#include +#include "cfg/cfg_kern.h" #include #include /* for cpu_stack_t */ diff --git a/bertos/mware/event.h b/bertos/mware/event.h index 5fa996c6..a357bb18 100644 --- a/bertos/mware/event.h +++ b/bertos/mware/event.h @@ -45,7 +45,7 @@ #define KERN_EVENT_H #include -#include +#include "cfg/cfg_kern.h" #if CONFIG_KERNEL #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c index b87a904c..0a36cee8 100644 --- a/bertos/mware/formatwr.c +++ b/bertos/mware/formatwr.c @@ -79,7 +79,7 @@ #include "formatwr.h" -#include /* CONFIG_ macros */ +#include "cfg/cfg_formatwr.h" /* CONFIG_ macros */ #include /* ASSERT */ #include diff --git a/bertos/mware/formatwr.h b/bertos/mware/formatwr.h index c7ea1a8b..99fcfd71 100644 --- a/bertos/mware/formatwr.h +++ b/bertos/mware/formatwr.h @@ -38,7 +38,7 @@ #ifndef MWARE_FORMATWR_H #define MWARE_FORMATWR_H -#include +#include "cfg/cfg_formatwr.h" #include /* CPU_HARVARD */ diff --git a/bertos/mware/heap.h b/bertos/mware/heap.h index 0d8f7778..7865476a 100644 --- a/bertos/mware/heap.h +++ b/bertos/mware/heap.h @@ -46,7 +46,7 @@ #ifndef MWARE_HEAP_H #define MWARE_HEAP_H -#include +#include "cfg/cfg_heap.h" #include struct _MemChunk; diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c index 1fc45d78..593bb594 100644 --- a/bertos/mware/parser.c +++ b/bertos/mware/parser.c @@ -57,7 +57,7 @@ #include "parser.h" -#include +#include "cfg/cfg_parser.h" #include #include diff --git a/bertos/net/pocketbus.h b/bertos/net/pocketbus.h index eb32d563..ed970cd9 100644 --- a/bertos/net/pocketbus.h +++ b/bertos/net/pocketbus.h @@ -39,7 +39,7 @@ #ifndef NET_POCKETBUS_H #define NET_POCKETBUS_H -#include /* for CONFIG_POCKETBUS_BUFLEN */ +#include "cfg/cfg_pocketbus.h" /* for CONFIG_POCKETBUS_BUFLEN */ #include #include diff --git a/bertos/net/xmodem.c b/bertos/net/xmodem.c index dd1adebe..382e47eb 100644 --- a/bertos/net/xmodem.c +++ b/bertos/net/xmodem.c @@ -48,7 +48,7 @@ #include "xmodem.h" #include -#include +#include "cfg/cfg_xmodem.h" #include diff --git a/bertos/verstag.h b/bertos/verstag.h index 7ca37338..78387b20 100644 --- a/bertos/verstag.h +++ b/bertos/verstag.h @@ -42,7 +42,7 @@ #define BERTOS_VERSTAG_H #ifndef CFG_ARCH_CONFIG_H - #include + #include "cfg/cfg_arch.h" #endif #define APP_NAME "Appname" -- 2.25.1