Specific the directory for all hw and cfg module. Use double quote for cfg and hw...

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

diff --git a/bertos/algo/md2.h b/bertos/algo/md2.h
index b06e07583ca7517b111833d98cc9cef940afeadb..51be84889e509d8d560389d0b841d12bb35d2169 100644 (file)
--- a/bertos/algo/md2.h
+++ b/bertos/algo/md2.h
@@ -46,7 +46,7 @@
 #ifndef ALGO_MD2_H
 #define ALGO_MD2_H
 
-#include <cfg/cfg_md2.h>
+#include "cfg/cfg_md2.h"
 #include <cfg/compiler.h>
 
 #define NUM_COMPUTE_ROUNDS 18                        ///< Number of compute rounds.

diff --git a/bertos/algo/ramp.h b/bertos/algo/ramp.h
index b1fe716fba0104c3f141355449aea2367a5bb08f..202441f4c0736ca604b4b87e96e77bd543070b4c 100644 (file)
--- 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 <cfg/compiler.h>
-#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 fd0a96fd8d7c4e56db3d750f0346338949d93967..2c4faf67b6f6e7d2ab005d9217d3edde47c26af5 100644 (file)
--- a/bertos/algo/randpool.h
+++ b/bertos/algo/randpool.h
@@ -40,7 +40,7 @@
 #ifndef ALGO_RANDPOOL_H
 #define ALGO_RANDPOOL_H
 
-#include <cfg/cfg_randpool.h>
+#include "cfg/cfg_randpool.h"
 #include <cfg/compiler.h>
 
 

diff --git a/bertos/cfg/cfg_debug.h b/bertos/cfg/cfg_debug.h
index 539772af6e47a363e0ac4c125c501d26ce978d41..25b25858b2fdfcceb13932035292a75d0a064bb0 100644 (file)
--- 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 dd950b82f8f0651cc799f314215ff1c870594f81..eecc5139db0a14946ff25d73e1ceb77d5ce9bb93 100644 (file)
--- 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 <cfg/cfg_arch.h>  /* 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 347846dcf213a976783e50e300e86b648bfddc35..6dad0a0ce7bad59f5eb28551fba67573840cc32d 100644 (file)
--- 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 6bd64e071ddd67b022a3e3541c53d99451a9a241..658ecf1d4c620a28d7b59123c2ec70ffe3ff8c08 100644 (file)
--- 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 <bernie@develer.com>
- */
+                * \author Bernardo Innocenti <bernie@develer.com>
+                */
 
 #ifndef BERTOS_DEBUG_H
 #define BERTOS_DEBUG_H
@@ -46,9 +46,9 @@
 #include <cfg/os.h>
 #include <cfg/compiler.h>
 
-/*
- * 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 <crtdbg.h>
-       #endif
+                       // MSVC specific: Enable memory allocation debug
+                       #if defined(_MSC_VER)
+                               #include <crtdbg.h>
+                       #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 <cfg/cfg_debug.h>   /* CONFIG_KDEBUG_ASSERT_NO_TEXT */
+                       #include "cfg/cfg_debug.h"   /* CONFIG_KDEBUG_ASSERT_NO_TEXT */
        #include <cpu/attr.h>        /* 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 eed5fac6e97258f7e88088b7e958c57263b0b8c2..d8cea88a7c4c467c1d1113eda189dfb60e056524 100644 (file)
--- 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 <cfg/cfg_adc.h>
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_adc.h"
+#include "cfg/cfg_kern.h"
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 

diff --git a/bertos/cpu/arm/drv/adc_at91.h b/bertos/cpu/arm/drv/adc_at91.h
index 5e9e7d26bc328339cbfb1f05fc5c378acdfc2a8c..fb0ec1d64aad65047137b64f7db3dae84fd10b2d 100644 (file)
--- 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 <cfg/cfg_adc.h>
+#include "cfg/cfg_adc.h"
 
 #include <cfg/compiler.h>
 

diff --git a/bertos/cpu/arm/drv/kdebug_at91.c b/bertos/cpu/arm/drv/kdebug_at91.c
index dbc618b262461ddf85b61f9d3af49c373cea62fc..b6ec8b199ac457ba71ebcf04f28338ab90b0313d 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/hw_cpu.h"     /* for CLOCK_FREQ */
+#include "hw/hw_ser.h"     /* Required for bus macros overrides */
 
-#include <cfg/cfg_debug.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 142b9feb80668a37f4e08c34fbb5baac0974cc9a..013241103939e0aef1224da4f2736c6f7fcf3ab5 100644 (file)
--- 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 <cfg/macros.h>
 #include <cfg/debug.h>

diff --git a/bertos/cpu/arm/drv/ser_at91.c b/bertos/cpu/arm/drv/ser_at91.c
index 4ef27b61775fee44e3d89981903ea09ee03b20b2..a58c7dd9d1a52c5b49099fd491617110c3cffeb2 100644 (file)
--- a/bertos/cpu/arm/drv/ser_at91.c
+++ b/bertos/cpu/arm/drv/ser_at91.c
@@ -38,10 +38,10 @@
  * \author Daniele Basile <asterix@develer.com>
  */
 
-#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 <cfg/cfg_ser.h>
+#include "cfg/cfg_ser.h"
 #include <cfg/debug.h>
 
 

diff --git a/bertos/cpu/arm/drv/stepper_at91.c b/bertos/cpu/arm/drv/stepper_at91.c
index 896959ebb060caa80392efdf8beef6a0fa0360cc..d6fc286d7866c50b6855d2699a6f90cfe1d0e926 100644 (file)
--- 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 <cfg/cfg_stepper.h>
+#include "cfg/cfg_stepper.h"
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 

diff --git a/bertos/cpu/arm/drv/stepper_at91_hw_test.c b/bertos/cpu/arm/drv/stepper_at91_hw_test.c
index 321dde0c4f3d236bf7f92edd8250a8b69cd5f49c..d40da0841139985d03641345aeb432ab9172a63d 100644 (file)
--- 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 <cfg/cfg_stepper.h>
+#include "cfg/cfg_stepper.h"
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 

diff --git a/bertos/cpu/arm/drv/timer_at91.h b/bertos/cpu/arm/drv/timer_at91.h
index c6979f9519d15b875a212f1d7fa8857986f99fb6..e7e4f1850c723c127621c1af23656e266dab1fbe 100644 (file)
--- 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 <cfg/cfg_timer.h>     /* CONFIG_TIMER */
+#include "cfg/cfg_timer.h"     /* CONFIG_TIMER */
 #include <cfg/compiler.h>      /* uint8_t */
 
 /**

diff --git a/bertos/cpu/arm/drv/twi_at91.c b/bertos/cpu/arm/drv/twi_at91.c
index 6256558bf90e9dd0c3278951e9f58308e30f4e6c..a3b2bf73096575eaaae756744aee2303498ba345 100644 (file)
--- 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 <cfg/cfg_twi.h>
+#include "cfg/cfg_twi.h"
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
 #include <cfg/macros.h>

diff --git a/bertos/cpu/arm/hw/crtat91sam7_rom.S b/bertos/cpu/arm/hw/crtat91sam7_rom.S
index a889680dd6f5b280bef89bf2836090a4cb17a7e5..c7706d73ffbaa9135af0751d6e7c4d67ec47b3d1 100644 (file)
--- 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 <cpu/detect.h>
 
 

diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h
index 48d22601621c5a6a0e2f56548fd518bf69554adf..3fd3b18fbde5d84f3a43a4dc02b764a9e012351a 100644 (file)
--- a/bertos/cpu/attr.h
+++ b/bertos/cpu/attr.h
@@ -43,9 +43,9 @@
 
 #include "detect.h"
 
-#include <cfg/cfg_attr.h>      /* CONFIG_FAST_MEM */
+#include "cfg/cfg_attr.h"      /* CONFIG_FAST_MEM */
 #include <cfg/compiler.h>      /* for uintXX_t */
-#include <cfg/cfg_arch.h>   /* 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 ec131745290da92da4c6a682b866df408098d0fd..fd8525d697d2ad35fa9ff8fa4c52f6e0204dd40d 100644 (file)
--- 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 <cfg/cfg_adc.h>
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_adc.h"
+#include "cfg/cfg_kern.h"
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 

diff --git a/bertos/cpu/avr/drv/kdebug_avr.c b/bertos/cpu/avr/drv/kdebug_avr.c
index 3e1bdfda3936b08a18bc9da6810e5066835ffa97..34c1de9879490b283a1b176c042dbe46f2221bc7 100644 (file)
--- a/bertos/cpu/avr/drv/kdebug_avr.c
+++ b/bertos/cpu/avr/drv/kdebug_avr.c
@@ -39,10 +39,10 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#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 <cfg/cfg_debug.h>
+#include "cfg/cfg_debug.h"
 #include <cfg/macros.h> /* for BV(), DIV_ROUND */
 
 #include <cpu/types.h>
@@ -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 6a85a76f0b2d300cb5096da6bc53afdc563efd71..7ffe72b8fa4576f9c55edcc08ec22bad94bc2e29 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 <cfg/cfg_lcd.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 93dd51371dcd32b5fe06ab2c2d6916649ce288d4..b88a0f934458f343e5cde72f5dd385600d3bb2d9 100644 (file)
--- 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 f37841c6aa7d3212acf020927f47d79edba92c7a..cf47c09e47a386d76c11d79375b061f5c54d3be5 100644 (file)
--- a/bertos/cpu/avr/drv/ser_avr.c
+++ b/bertos/cpu/avr/drv/ser_avr.c
@@ -61,10 +61,10 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#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 <cfg/cfg_ser.h>
+#include "cfg/cfg_ser.h"
 
 #include <cfg/macros.h> /* DIV_ROUND */
 #include <cfg/debug.h>

diff --git a/bertos/cpu/avr/drv/ser_simple_avr.c b/bertos/cpu/avr/drv/ser_simple_avr.c
index 6fc1cb231ffa6782f6bc789d621606ee0eae9d5c..8cd92712bcfed11e4d6bf6c7bf7b32a7629a075e 100644 (file)
--- a/bertos/cpu/avr/drv/ser_simple_avr.c
+++ b/bertos/cpu/avr/drv/ser_simple_avr.c
@@ -45,7 +45,7 @@
 #include <cfg/compiler.h>
 #include <appconfig.h>
 #include <cfg/macros.h> /* BV() */
-#include "hw_cpu.h"
+#include "hw/hw_cpu.h"
 
 #include <avr/io.h>
 

diff --git a/bertos/cpu/avr/drv/sipo.h b/bertos/cpu/avr/drv/sipo.h
index 4c0fdfa650e9c49d853302cff640f4e9a9596465..ab57908b76aaf9b0c4a887955a477905f5ef740c 100644 (file)
--- 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 <avr/io.h>
 

diff --git a/bertos/cpu/avr/drv/stepper_avr.c b/bertos/cpu/avr/drv/stepper_avr.c
index 87c7389ba072e717fd6d06abc33c32c984f83952..3babc73d7eaddfa32670577ff726b70aa8bd7659 100644 (file)
--- 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 <cfg/cfg_stepper.h>
+#include "cfg/cfg_stepper.h"
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 

diff --git a/bertos/cpu/avr/drv/timer_avr.h b/bertos/cpu/avr/drv/timer_avr.h
index de46d1b7fb124f65b4fb2de15ee881a7541fe46e..a8ea3da95e8db7dddbeabe639eb89f518b94c2b5 100644 (file)
--- 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 <cfg/cfg_timer.h>     /* CONFIG_TIMER */
+#include "cfg/cfg_timer.h"     /* CONFIG_TIMER */
 #include <cfg/compiler.h>  /* uint8_t */
 #include <cfg/macros.h>    /* DIV_ROUND */
 

diff --git a/bertos/cpu/avr/drv/timer_simple_avr.c b/bertos/cpu/avr/drv/timer_simple_avr.c
index 877bbad9c387d78fafd6085401cfcbf364791e99..c9c208c2b679e458629a852824668b9f5630f1cf 100644 (file)
--- 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 <drv/wdt.h>
 #include <cfg/compiler.h>

diff --git a/bertos/cpu/avr/drv/twi_avr.c b/bertos/cpu/avr/drv/twi_avr.c
index 69f0ff998bdaca33b56a732afe918210d4f77794..b55065307c2f5a6a25eee94e5a589eb1006d065b 100644 (file)
--- 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 <cfg/cfg_twi.h>
+#include "cfg/cfg_twi.h"
 #include <cfg/debug.h>
 #include <cfg/macros.h> // BV()
 

diff --git a/bertos/drv/buzzer.c b/bertos/drv/buzzer.c
index 218c0d285f5e4af0e98265f0dbf1ed49092d8937..a57af7a04a201bfbcf621312d0b137bf5c941e69 100644 (file)
--- 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 <drv/timer.h>
 
 #include <mware/event.h>

diff --git a/bertos/drv/buzzerled.c b/bertos/drv/buzzerled.c
index 9648ef67c976b4a58cc0c90aa5e4e92a50018a05..000e7c984c717a7e657b04c5afe2751e72d734c2 100644 (file)
--- 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 <cfg/cfg_buzzerled.h>
+#include "cfg/cfg_buzzerled.h"
 #include <drv/timer.h>
 
 static struct Timer timers[CONFIG_NUM_BLDS];

diff --git a/bertos/drv/buzzerled.h b/bertos/drv/buzzerled.h
index c5c97d96bcd2721606e5750bfecf0b3912d8d620..acc2a42d402001e97b1dee9cbd274056e45b0085 100644 (file)
--- 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 1df0083e7a95c0c9150d929c653b13e552b916a2..13efee976628951685e44c42a83c2af5fae1d436 100644 (file)
--- 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 <algo/pid_control.h>
 

diff --git a/bertos/drv/dc_motor.h b/bertos/drv/dc_motor.h
index 289a1bd37642c0e4eae8597442f198b8c850ccf2..1a50d48aa8819b98e8b2f8e71c58589814793809 100644 (file)
--- 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 <cfg/cfg_dc_motor.h>
+#include "cfg/cfg_dc_motor.h"
 #include <cfg/macros.h>
 
 #include <algo/pid_control.h>

diff --git a/bertos/drv/eeprom.c b/bertos/drv/eeprom.c
index 835c1cc5ec6d4c5b48a864ccf1b3785e99db6eee..8210971b9e6c2f49561b115d434596cea67f27cf 100644 (file)
--- a/bertos/drv/eeprom.c
+++ b/bertos/drv/eeprom.c
@@ -40,7 +40,7 @@
 
 #include "eeprom.h"
 
-#include <cfg/cfg_eeprom.h>  // CONFIG_EEPROM_VERIFY
+#include "cfg/cfg_eeprom.h"  // CONFIG_EEPROM_VERIFY
 #include <cfg/macros.h>  // MIN()
 #include <cfg/debug.h>
 

diff --git a/bertos/drv/eeprom.h b/bertos/drv/eeprom.h
index f8233a6a4c6ec325a900d0b148b61bbc7153ab93..daa61b9aa1f3d9c625ad8da1e47306a5c4705aaa 100644 (file)
--- a/bertos/drv/eeprom.h
+++ b/bertos/drv/eeprom.h
@@ -42,7 +42,7 @@
 #ifndef DRV_EEPROM_H
 #define DRV_EEPROM_H
 
-#include <cfg/cfg_eeprom.h>
+#include "cfg/cfg_eeprom.h"
 #include <cfg/compiler.h>
 
 /**

diff --git a/bertos/drv/flash25.c b/bertos/drv/flash25.c
index 529804d3ffecf783bee436fe545e626dfa97824b..25d9ac618f91040e40a58abd9912080e4bf69a1c 100644 (file)
--- 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 <cfg/macros.h>
 #include <cfg/debug.h>

diff --git a/bertos/drv/flash25.h b/bertos/drv/flash25.h
index 09579c0ef2af0423c165ad018ab50cf354860fab..82b403f3cb22a008eb032443885e2b3c958f4bec 100644 (file)
--- a/bertos/drv/flash25.h
+++ b/bertos/drv/flash25.h
@@ -42,7 +42,7 @@
 #define DRV_FLASH25_H
 
 #include <cfg/compiler.h>
-#include <cfg/cfg_flash25.h>
+#include "cfg/cfg_flash25.h"
 
 #include <kern/kfile.h>
 

diff --git a/bertos/drv/kbd.c b/bertos/drv/kbd.c
index cc623c6a82e6e04210af5c0371dd0231d3276620..d592f069df8731a3739d721fdaccc382ea86eb98 100644 (file)
--- a/bertos/drv/kbd.c
+++ b/bertos/drv/kbd.c
@@ -41,9 +41,9 @@
  *
  */
 
-#include "hw_kbd.h"
+#include "hw/hw_kbd.h"
 
-#include <cfg/cfg_kbd.h>
+#include "cfg/cfg_kbd.h"
 #include <cfg/debug.h>
 #include <cfg/module.h>
 

diff --git a/bertos/drv/kbd.h b/bertos/drv/kbd.h
index f73487522ee1491079ac04eef1878a39372fa3f7..733baa8961dc37929cd47205b5b8d9ea118baa27 100644 (file)
--- 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 <cfg/cfg_kbd.h> // CONFIG_KBD_OBSERVER
+#include "cfg/cfg_kbd.h" // CONFIG_KBD_OBSERVER
 #include <cfg/compiler.h>
 
 #include <mware/list.h>

diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c
index 219aadffd43792717c73b97965d14abc8f532a18..f75f18334f43384b5650dd8818692076606ffab7 100644 (file)
--- a/bertos/drv/kdebug.c
+++ b/bertos/drv/kdebug.c
@@ -38,7 +38,7 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#include <cfg/cfg_debug.h>
+#include "cfg/cfg_debug.h"
 #include <cfg/macros.h> /* for BV() */
 #include <cfg/debug.h>
 #include <cfg/os.h>

diff --git a/bertos/drv/lcd_hd44.c b/bertos/drv/lcd_hd44.c
index f5d225ffb883ded720b4c1c062a307a42b4ced7b..af834f6acee358311b04fc90531218564c99b206 100644 (file)
--- a/bertos/drv/lcd_hd44.c
+++ b/bertos/drv/lcd_hd44.c
@@ -37,10 +37,11 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#include "hw_lcd.h"
 #include "lcd_hd44.h"
 
-#include <cfg/cfg_arch.h>
+#include "hw/hw_lcd.h"
+
+#include "cfg/cfg_arch.h"
 
 #include <drv/timer.h>
 

diff --git a/bertos/drv/lcd_hd44.h b/bertos/drv/lcd_hd44.h
index 42f149f32c0c7c2f27b6e0f6197578568fd585e9..04fccea61b52beff930f405a4ff964d8a3c69d64 100644 (file)
--- 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 <cfg/cfg_lcd.h>
+#include "cfg/cfg_lcd.h"
 #include <cfg/compiler.h> /* For stdint types */
 
 /**

diff --git a/bertos/drv/lcd_hd44_test.c b/bertos/drv/lcd_hd44_test.c
index f430f1367889c83276c8995092829b7a8bf519bc..48ec04d4259e0d0c7e9b4ca762dddf75dee5dfbb 100644 (file)
--- a/bertos/drv/lcd_hd44_test.c
+++ b/bertos/drv/lcd_hd44_test.c
@@ -37,9 +37,10 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#include "hw_lcd.h"
 #include "lcd_hd44.h"
 
+#include "hw/hw_lcd.h"
+
 #include <drv/timer.h>
 
 void lcd_hw_test(void)

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

diff --git a/bertos/drv/ntc.c b/bertos/drv/ntc.c
index c148e7c05c52c25fc5ca31a68c95ac7e1bc01b42..cc74e306250867d74631b9034085971b1e879973 100644 (file)
--- 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 <cfg/debug.h>
 

diff --git a/bertos/drv/phase.c b/bertos/drv/phase.c
index b56aa61d3807121d3382395f8613201860a82ea6..e88fd08371e517e5ccc3aabe50df9b3751b5728c 100644 (file)
--- a/bertos/drv/phase.c
+++ b/bertos/drv/phase.c
@@ -37,7 +37,7 @@
  */
 
 
-#include "hw_phase.h"
+#include "hw/hw_phase.h"
 
 #include <cfg/macros.h>
 #include <cfg/compiler.h>

diff --git a/bertos/drv/ser.c b/bertos/drv/ser.c
index 0a6705a7bd97352bc213eddcf0159ad9c424ea9b..558c1ba342018e36e0dbe8d6fc79def2ed3d70e2 100644 (file)
--- a/bertos/drv/ser.c
+++ b/bertos/drv/ser.c
@@ -55,8 +55,8 @@
 #include "wdt.h"
 #include "ser_p.h"
 
-#include <cfg/cfg_ser.h>
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_ser.h"
+#include "cfg/cfg_kern.h"
 #include <cfg/debug.h>
 
 #include <mware/formatwr.h>

diff --git a/bertos/drv/ser.h b/bertos/drv/ser.h
index 239a751e9815e1385a4cee8ecaffe1a670b5f18d..c560aa5c58927d496eb013477ea7921e0ea63154 100644 (file)
--- a/bertos/drv/ser.h
+++ b/bertos/drv/ser.h
@@ -72,7 +72,7 @@
        #include CPU_HEADER(ser)
 #endif
 
-#include <cfg/cfg_ser.h>
+#include "cfg/cfg_ser.h"
 
 
 

diff --git a/bertos/drv/spi_bitbang.c b/bertos/drv/spi_bitbang.c
index 2a6184499ed77a803199bd34b27d8e3dacc672f1..0d50bc76b5a536621d30e3d2db70316bc35d207b 100644 (file)
--- 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 <cfg/cfg_spi_bitbang.h>
+#include "cfg/cfg_spi_bitbang.h"
 #include <cfg/module.h>
 
 #include <cpu/irq.h>

diff --git a/bertos/drv/spi_bitbang.h b/bertos/drv/spi_bitbang.h
index d770105b1b3963c683db682ec0d42d584a69a5cc..b892aca98673ac688dc405fdc0721c86c9f20279 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 <cfg/cfg_spi_bitbang.h>
+#include "cfg/cfg_spi_bitbang.h"
 
 #include <cfg/compiler.h>
 

diff --git a/bertos/drv/stepper.c b/bertos/drv/stepper.c
index aa03681014d39a94b9a06dc84f7ae1e4fc57b2db..3e4fc7b9dbe9c48bb5085d3f5fe3512199041cf6 100644 (file)
--- 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 <cfg/cfg_stepper.h>
+#include "cfg/cfg_stepper.h"
 #include <cfg/debug.h>
 
 #include <kern/proc.h>

diff --git a/bertos/drv/tc520.c b/bertos/drv/tc520.c
index 7f63a07df305132fed1a6c4189919649916fa2e6..f285f850ac1b597ec5c46e450b5a935d74ba905d 100644 (file)
--- a/bertos/drv/tc520.c
+++ b/bertos/drv/tc520.c
@@ -39,7 +39,7 @@
  */
 
 
-#include "hw_tc520.h"
+#include "hw/hw_tc520.h"
 
 #include <cfg/macros.h>
 #include <cfg/compiler.h>

diff --git a/bertos/drv/thermo.c b/bertos/drv/thermo.c
index cfc1014f2211000002e4277df1ab3c9bbc2a2572..3a535fb98ef4b4888cc2594d6b9c2b346a8ede96 100644 (file)
--- 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 <cfg/module.h>
 #include <cfg/macros.h>

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index ca0605a792f8f9d92624ff403809943dabbca984..81f87942716989f62d3fe375a8e59dfd50993597 100644 (file)
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -39,9 +39,9 @@
 
 #include "timer.h"
 
-#include <cfg/cfg_timer.h>
-#include <cfg/cfg_wdt.h>
-#include <cfg/cfg_kern.h>
+#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>

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index 76f4f31f95a59bb9e7a63a4438fb701515ca05ee..3d03c78112a2f078b470559f3ca1da109add1786 100644 (file)
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -59,7 +59,7 @@
        #include CPU_HEADER(timer)
 #endif
 
-#include <cfg/cfg_timer.h>
+#include "cfg/cfg_timer.h"
 #include <cfg/debug.h>
 #include <cfg/compiler.h>
 

diff --git a/bertos/drv/wdt.h b/bertos/drv/wdt.h
index 4b1e6a914f0b1643948ede16276145811f15b14e..791856ee5fc4d7604b08c38f2ec32afae387ce43 100644 (file)
--- a/bertos/drv/wdt.h
+++ b/bertos/drv/wdt.h
@@ -40,9 +40,9 @@
 #ifndef DRV_WDT_H
 #define DRV_WDT_H
 
-#include <cfg/cfg_wdt.h>
+#include "cfg/cfg_wdt.h"
 #include <cfg/compiler.h> // INLINE
-#include <cfg/cfg_arch.h>
+#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 ad081db12501030ad49a1ef04ca4c1321a060283..29ab59db00bb5769ae5e13654ebd127ce43bba7d 100644 (file)
--- 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 <cfg/module.h>
 
-#include <appconfig.h>
-#if CONFIG_KERNEL
-       #include <config_kern.h>
-#endif
 
 
 #include <cstdlib> // std::exit()

diff --git a/bertos/emul/ser_posix.c b/bertos/emul/ser_posix.c
index 221739e711cfe2a544104332a4306a0b437dfbfa..5118305956bcc7ebd3f717de67d3d15a474020fa 100644 (file)
--- a/bertos/emul/ser_posix.c
+++ b/bertos/emul/ser_posix.c
@@ -36,7 +36,7 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-#include <appconfig.h>
+#include "cfg/cfg_ser.h"
 
 #include <cfg/debug.h>
 #include <cfg/compiler.h>

diff --git a/bertos/gfx/bitmap.c b/bertos/gfx/bitmap.c
index 294e9c23ccad4cac07051314852e95131e5b5954..0ff8d69cefe5366ed11183db30f86c752ea5d634 100644 (file)
--- a/bertos/gfx/bitmap.c
+++ b/bertos/gfx/bitmap.c
@@ -40,7 +40,7 @@
 #include "gfx.h"
 #include "gfx_p.h"
 
-#include <cfg/cfg_gfx.h>  /* CONFIG_GFX_CLIPPING */
+#include "cfg/cfg_gfx.h"  /* CONFIG_GFX_CLIPPING */
 #include <cfg/macros.h>   /* MIN() */
 #include <cfg/debug.h>    /* ASSERT() */
 

diff --git a/bertos/gfx/charts.h b/bertos/gfx/charts.h
index ecc7f309be69218830c7e1621462e5e6bb11932b..4dad1cecd8e0724ab223842669141552813c3705 100644 (file)
--- a/bertos/gfx/charts.h
+++ b/bertos/gfx/charts.h
@@ -44,7 +44,7 @@
 #ifndef GFX_CHARTS_H
 #define GFX_CHARTS_H
 
-#include <cfg/cfg_gfx.h> /* CONFIG_ stuff */
+#include "cfg/cfg_gfx.h" /* CONFIG_ stuff */
 
 #include <gfx/gfx.h>   /* vcoord_t */
 

diff --git a/bertos/gfx/gfx.h b/bertos/gfx/gfx.h
index 38ce8902e28d3a5e0408ee6de4db5a89308cd835..176421f0172275e77e23e503e1a2c308271efa56 100644 (file)
--- a/bertos/gfx/gfx.h
+++ b/bertos/gfx/gfx.h
@@ -15,7 +15,7 @@
 #ifndef GFX_GFX_H
 #define GFX_GFX_H
 
-#include <cfg/cfg_gfx.h>    /* CONFIG_GFX_* */
+#include "cfg/cfg_gfx.h"    /* CONFIG_GFX_* */
 #include <cfg/compiler.h>
 
 #include <cpu/attr.h>       /* CPU_HARVARD */

diff --git a/bertos/gfx/line.c b/bertos/gfx/line.c
index a878c1569efa28bd6706bfd375f5c9db9ffd99cc..598c0dfcdfff4bb1e0551375f9bbb73257b2070c 100644 (file)
--- a/bertos/gfx/line.c
+++ b/bertos/gfx/line.c
@@ -42,7 +42,7 @@
 #include "gfx.h"
 #include "gfx_p.h"
 
-#include <cfg/cfg_gfx.h>   /* CONFIG_GFX_CLIPPING */
+#include "cfg/cfg_gfx.h"   /* CONFIG_GFX_CLIPPING */
 #include <cfg/debug.h>   /* ASSERT() */
 #include <cfg/macros.h>  /* SWAP() */
 

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

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

diff --git a/bertos/hw/hw_dataflash.c b/bertos/hw/hw_dataflash.c
index bbc1b469b8c712136172a5918173930c8d63463b..844dd9220ab6092b73abd40ca1b49de9528554db 100644 (file)
--- a/bertos/hw/hw_dataflash.c
+++ b/bertos/hw/hw_dataflash.c
@@ -36,7 +36,7 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include "hw_dataflash.h"
+#include "hw/hw_dataflash.h"
 
 #include <cfg/compiler.h>
 #include <cfg/module.h>

diff --git a/bertos/hw/hw_kbd.h b/bertos/hw/hw_kbd.h
index 6522adb4a95a05811778bdcd75ea136104c702a7..e116d44bdb1e5b68b58a360b78188c904413bc38 100644 (file)
--- 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 <cfg/macros.h>
 

diff --git a/bertos/hw/hw_lcd.h b/bertos/hw/hw_lcd.h
index 4d63652add77ee8750dc1515c3b966a0e36cc2bc..416b7e9942c194274534c7fda5c9df5dea4dece6 100644 (file)
--- 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 <cfg/cfg_lcd.h>  /* CONFIG_LCD_4BIT */
+#include "cfg/cfg_lcd.h"  /* CONFIG_LCD_4BIT */
 #include <cfg/macros.h>   /* BV() */
 #include <cfg/debug.h>
 

diff --git a/bertos/hw/hw_mcp41.c b/bertos/hw/hw_mcp41.c
index ff2bc846c5f21681b4e88dd7b587b163e2b0805a..dc2a051cedadb818d516c894f9a93f69d725600a 100644 (file)
--- a/bertos/hw/hw_mcp41.c
+++ b/bertos/hw/hw_mcp41.c
@@ -35,7 +35,7 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include "hw_mcp41.h"
+#include "hw/hw_mcp41.h"
 
 #include <cfg/macros.h>
 #include <cfg/compiler.h>

diff --git a/bertos/hw/hw_phase.c b/bertos/hw/hw_phase.c
index c3e9ac97c25bd5d8f12eaf9b3b4d123387afb1a1..54509ef306cdc7f02249ea69ea71da7e52ddea74 100644 (file)
--- 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 77038cd899addfad0c65c22dee04642ca24bb78b..12146ca0c60009d1a7fb9a8ed25b2d96193bc85b 100644 (file)
--- 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 <cfg/macros.h>
 

diff --git a/bertos/kern/kfile.c b/bertos/kern/kfile.c
index a053fc23bca6bb2beab80fa4a5fbfd8770434320..3d664e538c6335d8e5665961ae2702ef9809600a 100644 (file)
--- a/bertos/kern/kfile.c
+++ b/bertos/kern/kfile.c
@@ -42,7 +42,7 @@
 
 #include "kfile.h"
 
-#include <cfg/cfg_kfile.h>
+#include "cfg/cfg_kfile.h"
 #include <cfg/debug.h>
 
 #include <mware/formatwr.h>

diff --git a/bertos/kern/kfile.h b/bertos/kern/kfile.h
index 52f7991c88b75bf5112c65a0c26cdf2499ef70e2..dc8a30413219a5cdcd993e81e5e5da507cd1d0b3 100644 (file)
--- 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 b01ba4469c3dfdd5f43359d4f707b602005abe01..526ccf622e776f90c138723721fa401d780273fa 100644 (file)
--- a/bertos/kern/kfile_test.c
+++ b/bertos/kern/kfile_test.c
@@ -42,7 +42,7 @@
 
 #include "kfile.h"
 
-#include <cfg/cfg_kfile.h>
+#include "cfg/cfg_kfile.h"
 #include <cfg/debug.h>
 
 #include <mware/formatwr.h>

diff --git a/bertos/kern/monitor.h b/bertos/kern/monitor.h
index 9e569a1de57382db721f7d5ce4b5101b0fd95c29..0c705a4aed1b75dcb0cd5d687a2ab5e58de6f4bd 100644 (file)
--- a/bertos/kern/monitor.h
+++ b/bertos/kern/monitor.h
@@ -40,7 +40,7 @@
 #ifndef KERN_MONITOR_H
 #define KERN_MONITOR_H
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_kern.h"
 
 #include <cpu/types.h>
 

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 0d17074119378b1da2526001168f72b6018cd160..4d8a6fb7ba2f8383ef10bd9b0beb4e08bf86eeee 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -44,7 +44,7 @@
 #include "proc_p.h"
 #include "proc.h"
 
-#include <cfg/cfg_arch.h>  /* ARCH_EMUL */
+#include "cfg/cfg_arch.h"  /* ARCH_EMUL */
 #include <cfg/debug.h>
 #include <cfg/module.h>
 #include <cfg/macros.h>       /* ABS() */

diff --git a/bertos/kern/proc.h b/bertos/kern/proc.h
index d6109e35da4211e20c1387ff9ef04bb986518504..37415f3de9d5ab7b7ae0bd047530d8d3f41523fa 100644 (file)
--- a/bertos/kern/proc.h
+++ b/bertos/kern/proc.h
@@ -40,7 +40,7 @@
 #ifndef KERN_PROC_H
 #define KERN_PROC_H
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_kern.h"
 #include <cfg/compiler.h>
 
 #include <cpu/irq.h>

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 77fca314f0719f8ae9548d39cd899a04afc14545..c0b2bdc5bfe7ae4683fb4ec6c71e01bf47dd2853 100644 (file)
--- 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 <cfg/cfg_kern.h>
+#include "cfg/cfg_kern.h"
 #include <cfg/compiler.h>
 
 #include <cpu/types.h>        /* for cpu_stack_t */

diff --git a/bertos/mware/event.h b/bertos/mware/event.h
index 5fa996c684222c5654984d26522a4e68941bde82..a357bb18e6ad7e1ae7523e8aad83fe4a697fa2a6 100644 (file)
--- a/bertos/mware/event.h
+++ b/bertos/mware/event.h
@@ -45,7 +45,7 @@
 #define KERN_EVENT_H
 
 #include <cfg/compiler.h>
-#include <cfg/cfg_kern.h>
+#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 b87a904cbe5c0e5fa65df69c33c957fc7b584af0..0a36cee8d5daca793250c0c42463ae93d1ea2343 100644 (file)
--- a/bertos/mware/formatwr.c
+++ b/bertos/mware/formatwr.c
@@ -79,7 +79,7 @@
 
 #include "formatwr.h"
 
-#include <cfg/cfg_formatwr.h>  /* CONFIG_ macros */
+#include "cfg/cfg_formatwr.h"  /* CONFIG_ macros */
 #include <cfg/debug.h>         /* ASSERT */
 
 #include <mware/pgm.h>

diff --git a/bertos/mware/formatwr.h b/bertos/mware/formatwr.h
index c7ea1a8b46b7d0cd2b15378264d635d7646d8230..99fcfd7104957bc2075be761f686ea4463e7a389 100644 (file)
--- a/bertos/mware/formatwr.h
+++ b/bertos/mware/formatwr.h
@@ -38,7 +38,7 @@
 #ifndef MWARE_FORMATWR_H
 #define MWARE_FORMATWR_H
 
-#include <cfg/cfg_formatwr.h>
+#include "cfg/cfg_formatwr.h"
 
 #include <cpu/attr.h>    /* CPU_HARVARD */
 

diff --git a/bertos/mware/heap.h b/bertos/mware/heap.h
index 0d8f7778cb643223d6e28961a2e9405eb1c90d32..7865476a5f59089ff2fd31b38880a52e0138489e 100644 (file)
--- a/bertos/mware/heap.h
+++ b/bertos/mware/heap.h
@@ -46,7 +46,7 @@
 #ifndef MWARE_HEAP_H
 #define MWARE_HEAP_H
 
-#include <cfg/cfg_heap.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 1fc45d78c4ffa670459ccad21d59807d137057ab..593bb5947a395a43e9b34d2e5520646bfc99181d 100644 (file)
--- a/bertos/mware/parser.c
+++ b/bertos/mware/parser.c
@@ -57,7 +57,7 @@
 
 #include "parser.h"
 
-#include <cfg/cfg_parser.h>
+#include "cfg/cfg_parser.h"
 
 #include <drv/ser.h>
 #include <mware/hashtable.h>

diff --git a/bertos/net/pocketbus.h b/bertos/net/pocketbus.h
index eb32d5630ad96be0da76503922a7fb88fb452177..ed970cd94ec8ef9f64e78edbaab27f886dbf9b9c 100644 (file)
--- a/bertos/net/pocketbus.h
+++ b/bertos/net/pocketbus.h
@@ -39,7 +39,7 @@
 #ifndef NET_POCKETBUS_H
 #define NET_POCKETBUS_H
 
-#include <cfg/cfg_pocketbus.h>        /* for CONFIG_POCKETBUS_BUFLEN */
+#include "cfg/cfg_pocketbus.h"        /* for CONFIG_POCKETBUS_BUFLEN */
 #include <cfg/compiler.h>
 
 #include <algo/rotating_hash.h>

diff --git a/bertos/net/xmodem.c b/bertos/net/xmodem.c
index dd1adebe5e3b2eebdde4bff588b1db41037a007c..382e47eb21c96c43def630fb9c09bb6979aaf839 100644 (file)
--- a/bertos/net/xmodem.c
+++ b/bertos/net/xmodem.c
@@ -48,7 +48,7 @@
 #include "xmodem.h"
 
 #include <cfg/debug.h>
-#include <cfg/cfg_xmodem.h>
+#include "cfg/cfg_xmodem.h"
 
 #include <drv/ser.h>
 

diff --git a/bertos/verstag.h b/bertos/verstag.h
index 7ca373380f395d11888339a92fa79ba2f6fd8b78..78387b20094ba110a570cc35b05991bc50630795 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/cfg_arch.h>
+       #include "cfg/cfg_arch.h"
 #endif
 
 #define APP_NAME "Appname"