Use new header locations everywhere

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

diff --git a/bertos/algo/md2.c b/bertos/algo/md2.c
index f24fcd1f7d80633fdffbc7e9b0c5a3b124168150..22e255b2f3ad78783f7e0e5bba0fd9e34b6d14b4 100644 (file)
--- a/bertos/algo/md2.c
+++ b/bertos/algo/md2.c
@@ -39,7 +39,7 @@
  * to md2_perm function you must chanche CONFIG_MD2_STD_PERM defined in
  * appconfig.h.
  * If you need to store array in program memory you must define
- * a macro _PROGMEM (for more info see mware/pgm.h).
+ * a macro _PROGMEM (for more info see cpu/pgm.h).
  *
  *
  * \version $Id$
@@ -92,7 +92,7 @@
 #include <cfg/compiler.h>
 #include <cfg/debug.h>        //ASSERT()
 #include <cfg/macros.h>       //MIN(), countof(), ROTR();
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 
 
 #if CONFIG_MD2_STD_PERM

diff --git a/bertos/algo/tea.c b/bertos/algo/tea.c
index f67d4c5e7ffd9df6e0e1c3f57d13d2237910b156..ec2b31f7c94570448952905416bafb85e77b9e6e 100644 (file)
--- a/bertos/algo/tea.c
+++ b/bertos/algo/tea.c
@@ -78,7 +78,7 @@
  *#*/
 
 #include "tea.h"
-#include <mware/byteorder.h>
+#include <cpu/byteorder.h>
 
 static uint32_t tea_func(uint32_t *in, uint32_t *sum, uint32_t *k)
 {

diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h
index 02c0489460bc30ce008a3ea797d40d7c14467a0e..907610c75a9d7b92138e0a40d84d6ada59eb8539 100644 (file)
--- a/bertos/cfg/debug.h
+++ b/bertos/cfg/debug.h
@@ -129,7 +129,7 @@
        void __init_wall(long *wall, int size);
 
        #if CPU_HARVARD
-               #include <mware/pgm.h>
+               #include <cpu/pgm.h>
                void kputs_P(const char *PROGMEM str);
                void kprintf_P(const char *PROGMEM fmt, ...) FORMAT(__printf__, 1, 2);
                int __bassert_P(const char *PROGMEM cond, const char *PROGMEM file, int line);

diff --git a/bertos/cpu/arm/drv/ser_at91.c b/bertos/cpu/arm/drv/ser_at91.c
index 6726f21039d4747c764283d0be1bfcbb7305a327..902ccc2f6ff692546cc09d41ea89a3e72937c48c 100644 (file)
--- a/bertos/cpu/arm/drv/ser_at91.c
+++ b/bertos/cpu/arm/drv/ser_at91.c
@@ -52,7 +52,7 @@
 #include <drv/ser.h>
 #include <drv/ser_p.h>
 
-#include <mware/fifobuf.h>
+#include <struct/fifobuf.h>
 
 
 #define SERIRQ_PRIORITY 4 ///< default priority for serial irqs.

diff --git a/bertos/cpu/avr/drv/ser_avr.c b/bertos/cpu/avr/drv/ser_avr.c
index d49da30a76d9d200c127a25f3a88c567a764c68f..955ab8ebc0c52bc7fee8057ddad5de9e2fb341c8 100644 (file)
--- a/bertos/cpu/avr/drv/ser_avr.c
+++ b/bertos/cpu/avr/drv/ser_avr.c
@@ -51,7 +51,7 @@
 #include <drv/ser_p.h>
 #include <drv/timer.h>
 
-#include <mware/fifobuf.h>
+#include <struct/fifobuf.h>
 
 #include <avr/io.h>
 

diff --git a/bertos/cpu/pgm.h b/bertos/cpu/pgm.h
index d5db5dec1a7e7c909c1243cc9dfab1d1fa251063..3fac0c72c584eb7ffc72005115e54f592fc560c2 100644 (file)
--- a/bertos/cpu/pgm.h
+++ b/bertos/cpu/pgm.h
@@ -43,7 +43,7 @@
  * \note This module contains code ripped out from avr-libc,
  *       which is distributed under a 3-clause BSD license.
  *
- * \version $Id:$
+ * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 #ifndef MWARE_PGM_H

diff --git a/bertos/drv/eeprom.c b/bertos/drv/eeprom.c
index 1783eb4964f4e4b6de1a60234f17d99d76d34b3b..7caac605ff3981b405d79a60e8693ac33e80219b 100644 (file)
--- a/bertos/drv/eeprom.c
+++ b/bertos/drv/eeprom.c
@@ -52,7 +52,7 @@
 
 #include <drv/wdt.h>
 
-#include <mware/byteorder.h> // cpu_to_be16()
+#include <cpu/byteorder.h> // cpu_to_be16()
 
 #include <string.h>  // memset()
 

diff --git a/bertos/drv/kbd.h b/bertos/drv/kbd.h
index cc061f99659ef410d52380baa3c3dd7603294d7e..c022c3c61d3a716a7b8cfb8660ea47dbba2a33c4 100644 (file)
--- a/bertos/drv/kbd.h
+++ b/bertos/drv/kbd.h
@@ -47,7 +47,7 @@
 #include "cfg/cfg_kbd.h" // CONFIG_KBD_OBSERVER
 #include <cfg/compiler.h>
 
-#include <mware/list.h>
+#include <struct/list.h>
 
 /**
  * \name Keyboard polling modes.

diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c
index ac90ff038d8f9955b3e26874f9cca4c10d663ce9..37ae5ff98630591bdf64f7971a9c487a2efbc68b 100644 (file)
--- a/bertos/drv/kdebug.c
+++ b/bertos/drv/kdebug.c
@@ -48,7 +48,7 @@
 #include <cpu/types.h>
 
 #include <mware/formatwr.h> /* for _formatted_write() */
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 
 #ifdef _DEBUG
 

diff --git a/bertos/drv/lcd_text.c b/bertos/drv/lcd_text.c
index d62752078640d9f09ccd21da8b895da60a503be5..9bff9bb55f2fd476258140c2413868cbe8aa0420 100644 (file)
--- a/bertos/drv/lcd_text.c
+++ b/bertos/drv/lcd_text.c
@@ -46,7 +46,7 @@
 #include <drv/timer.h> // timer_delay()
 
 #include <mware/formatwr.h> // _formatted_write()
-#include <mware/list.h> // LIST_EMPTY()
+#include <struct/list.h> // LIST_EMPTY()
 
 #include <string.h> // strlen()
 

diff --git a/bertos/drv/lcd_text.h b/bertos/drv/lcd_text.h
index 53fa53b29b9eaa17b59eeae24cf4ce4ddf1b1abb..ac1b5e9251a4295aca0ac62e9beacabb5f5b4335 100644 (file)
--- a/bertos/drv/lcd_text.h
+++ b/bertos/drv/lcd_text.h
@@ -71,7 +71,7 @@
 
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
-#include <mware/list.h>
+#include <struct/list.h>
 
 #include <stdarg.h> // vprintf()
 

diff --git a/bertos/drv/ser.h b/bertos/drv/ser.h
index a09aa8b52d241c1182997bbdd0eb9f503aee2870..d74c2235e94c3d70d31c9a249aad508c9c279bce 100644 (file)
--- a/bertos/drv/ser.h
+++ b/bertos/drv/ser.h
@@ -41,7 +41,7 @@
 #define DRV_SER_H
 
 #include <kern/kfile.h>
-#include <mware/fifobuf.h>
+#include <struct/fifobuf.h>
 #include <cfg/compiler.h>
 
 #if OS_HOSTED

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index a71dfb68a852e5dd2eaabec288347299472b2849..380b8c34c1df69df680f516ff223e536af333a8f 100644 (file)
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -63,7 +63,7 @@
 #include <cfg/debug.h>
 #include <cfg/compiler.h>
 
-#include <mware/list.h>
+#include <struct/list.h>
 
 
 extern volatile ticks_t _clock;

diff --git a/bertos/dt/dnotifier.c b/bertos/dt/dnotifier.c
index 09a51a786089181ee2178eb56813c909bcc87274..6c1ddd45daed459c183fe5294b93624dfdde487f 100644 (file)
--- a/bertos/dt/dnotifier.c
+++ b/bertos/dt/dnotifier.c
@@ -42,7 +42,7 @@
 
 #include <dt/dtag.h>
 #include <dt/dnotifier.h>
-#include <mware/list.h>
+#include <struct/list.h>
 
 /**
  * Default update used to notify target: notify all trasparently all

diff --git a/bertos/dt/dnotifier.h b/bertos/dt/dnotifier.h
index 3ac257a8ffd46c9cb628063633d5b7a8b89d3a63..3822df59883bdcf4f5df0467ef3cd15faecb8a96 100644 (file)
--- a/bertos/dt/dnotifier.h
+++ b/bertos/dt/dnotifier.h
@@ -42,7 +42,7 @@
 #include <cfg/debug.h>
 
 #include <dt/dtag.h>
-#include <mware/list.h>
+#include <struct/list.h>
 
 //Fwd declaretion.
 struct DNotifier;

diff --git a/bertos/emul/ser_posix.c b/bertos/emul/ser_posix.c
index 8a2320ac9e8da52c9a6377df533cabbf9312aafa..50a63ed775d98ca012e79a633bdc31867a8a141a 100644 (file)
--- a/bertos/emul/ser_posix.c
+++ b/bertos/emul/ser_posix.c
@@ -44,7 +44,7 @@
 #include <drv/ser.h>
 #include <drv/ser_p.h>
 
-#include <mware/fifobuf.h>
+#include <struct/fifobuf.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/bertos/fs/battfs.c b/bertos/fs/battfs.c
index f975921a98a99dd265ad64e8b1dda6574e1001f9..481674e1e0f73c931578546357f2ce37603826a6 100644 (file)
--- a/bertos/fs/battfs.c
+++ b/bertos/fs/battfs.c
@@ -45,7 +45,7 @@
 #if 0
 #include <cfg/debug.h>
 #include <cfg/macros.h> /* MIN, MAX */
-#include <mware/byteorder.h> /* cpu_to_xx */
+#include <cpu/byteorder.h> /* cpu_to_xx */
 
 
 #include <string.h> /* memset, memmove */

diff --git a/bertos/fs/battfs.h b/bertos/fs/battfs.h
index ec03da223727cd5c9deab8be739667c9f57c2016..d75bd6452fc941c26e74c1f2aa6d4a248d4e56bf 100644 (file)
--- a/bertos/fs/battfs.h
+++ b/bertos/fs/battfs.h
@@ -44,7 +44,7 @@
 #include <cfg/compiler.h> // uintXX_t; STATIC_ASSERT
 #include <cpu/types.h> // CPU_BITS_PER_CHAR
 #include <algo/rotating_hash.h>
-#include <mware/list.h>
+#include <struct/list.h>
 #include <kern/kfile.h>
 
 typedef uint16_t fill_t;    ///< Type for keeping trace of space filled inside a page

diff --git a/bertos/gfx/font.h b/bertos/gfx/font.h
index 603b11de7f091a76d98942a5b70e6786b3763e6b..cc1a3794cee2fc61ea3779b5524a01bed7bdc95a 100644 (file)
--- a/bertos/gfx/font.h
+++ b/bertos/gfx/font.h
@@ -42,7 +42,7 @@
 #define GFX_FONT_H
 
 #include <cfg/compiler.h>  /* uint8_t */
-#include <mware/pgm.h>     /* PROGMEM */
+#include <cpu/pgm.h>     /* PROGMEM */
 
 typedef struct Font
 {

diff --git a/bertos/gfx/gfx.h b/bertos/gfx/gfx.h
index dfdb5df4b89482e5b4b18b39f756c54c53330829..da10433dc10b887a56140839b320e035b595ece5 100644 (file)
--- a/bertos/gfx/gfx.h
+++ b/bertos/gfx/gfx.h
@@ -182,7 +182,7 @@ void gfx_lineTo     (Bitmap *bm, coord_t x,  coord_t y);
 void gfx_setClipRect(Bitmap *bm, coord_t xmin, coord_t ymin, coord_t xmax, coord_t ymax);
 
 #if CPU_HARVARD
-       #include <mware/pgm.h>
+       #include <cpu/pgm.h>
        void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster);
 #endif
 

diff --git a/bertos/gfx/text.h b/bertos/gfx/text.h
index bcd29ccecf78cf253a903122952651c68b3e7901..0ca2407d6b031daf57683109221ad1729d674aca 100644 (file)
--- a/bertos/gfx/text.h
+++ b/bertos/gfx/text.h
@@ -106,7 +106,7 @@ int text_widthf(struct Bitmap *bm, const char * fmt, ...) FORMAT(__printf__, 2,
 
 /* Text formatting functions for program-memory strings (mware/text_format.c) */
 #if CPU_HARVARD
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 int text_puts_P(const char * PROGMEM str, struct Bitmap *bm);
 int text_vprintf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap);
 int text_printf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...) FORMAT(__printf__, 2, 3);

diff --git a/bertos/gfx/win.c b/bertos/gfx/win.c
index 4108d835a04ce203c1b179c70379f21ae601cb66..dd1755a55761428a487d71acaf49ad8d352976d0 100644 (file)
--- a/bertos/gfx/win.c
+++ b/bertos/gfx/win.c
@@ -66,7 +66,7 @@
  *#*/
 
 #include "win.h"
-#include <mware/list.h>
+#include <struct/list.h>
 
 /**
  * Map the contents of all child-windows into the bitmap of \a w.

diff --git a/bertos/gfx/win.h b/bertos/gfx/win.h
index ea9a509db5887eb139659103c6d95141e42671b0..853eda96b80e0d6c9939e44d6032044345b697fb 100644 (file)
--- a/bertos/gfx/win.h
+++ b/bertos/gfx/win.h
@@ -59,7 +59,7 @@
 #ifndef GFX_WIN_H
 #define GFX_WIN_H
 
-#include <mware/list.h> /* Node, List */
+#include <struct/list.h> /* Node, List */
 #include <gfx/gfx.h>    /* coord_t */
 
 

diff --git a/bertos/gui/leveledit.c b/bertos/gui/leveledit.c
index dd3259cca081431acca9614499060efcfb2ec68e..63c90d21ff931b5c3412f81191d9e64b2f43d338 100644 (file)
--- a/bertos/gui/leveledit.c
+++ b/bertos/gui/leveledit.c
@@ -46,7 +46,7 @@
 
 #include <gui/levelbar.h>
 
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 
 #include <gfx/text.h>
 #include <gfx/font.h>

diff --git a/bertos/icons/logo.c b/bertos/icons/logo.c
index 651f07bd77395f4c309b222d8be0bbf38aa357fb..bd5afcc375a80288574d0f6d85abbd98521862f2 100644 (file)
--- a/bertos/icons/logo.c
+++ b/bertos/icons/logo.c
@@ -1,7 +1,7 @@
 
 #include "logo.h"
 #include <cfg/compiler.h>
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 
 /**
  * BeRTOS logo

diff --git a/bertos/kern/monitor.c b/bertos/kern/monitor.c
index 1f9ee7919acd1032afda8724ad3b459f884b567b..9630d3b392669fda4ad778578708d5221e3f96d5 100644 (file)
--- a/bertos/kern/monitor.c
+++ b/bertos/kern/monitor.c
@@ -42,7 +42,7 @@
 #if CONFIG_KERN_MONITOR
 
 #include "proc_p.h"
-#include <mware/list.h>
+#include <struct/list.h>
 #include <drv/timer.h>
 #include <kern/proc.h>
 #include <cpu/frame.h> /* CPU_STACK_GROWS_UPWARD */

diff --git a/bertos/kern/msg.h b/bertos/kern/msg.h
index 444c53265aafe954970a554d184e27a028edbf00..0b6a556d3718c2e7e3e764e0d30eb3561f2e42dc 100644 (file)
--- a/bertos/kern/msg.h
+++ b/bertos/kern/msg.h
@@ -180,7 +180,7 @@
 #define KERN_MSG_H
 
 #include <mware/event.h>
-#include <mware/list.h>
+#include <struct/list.h>
 #include <kern/proc.h>
 
 typedef struct MsgPort

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 6a79eec30d6048194f359f40458e3d8943b39e2d..54ba7be187014ac3527c169b8aea1ce735e1dce8 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -45,7 +45,7 @@
 
 #include <cpu/types.h>        /* for cpu_stack_t */
 
-#include <mware/list.h>
+#include <struct/list.h>
 
 typedef struct Process
 {

diff --git a/bertos/kern/sem.h b/bertos/kern/sem.h
index dfb7976a4de0f9b1f7552de3de9e6ca10b909c30..bdb29af724556f631ccb92bc36c3c2d64254f742 100644 (file)
--- a/bertos/kern/sem.h
+++ b/bertos/kern/sem.h
@@ -44,7 +44,7 @@
 #define KERN_SEM_H
 
 #include <cfg/compiler.h>
-#include <mware/list.h>
+#include <struct/list.h>
 
 /* Fwd decl */
 struct Process;

diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c
index 0c0e39c7d85ff7a990f5e488c183c8e08327de84..cbea0612db029878b7ed6902f227bba44db25610 100644 (file)
--- a/bertos/mware/formatwr.c
+++ b/bertos/mware/formatwr.c
@@ -82,7 +82,7 @@
 #include "cfg/cfg_formatwr.h"  /* CONFIG_ macros */
 #include <cfg/debug.h>         /* ASSERT */
 
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 #include <mware/hex.h>
 
 #ifndef CONFIG_PRINTF_N_FORMATTER

diff --git a/bertos/mware/formatwr.h b/bertos/mware/formatwr.h
index 99fcfd7104957bc2075be761f686ea4463e7a389..865fbfd4daff018beaafb583b71053fc1e5473ef 100644 (file)
--- a/bertos/mware/formatwr.h
+++ b/bertos/mware/formatwr.h
@@ -68,7 +68,7 @@ _formatted_write(
        va_list ap);
 
 #if CPU_HARVARD
-       #include <mware/pgm.h>
+       #include <cpu/pgm.h>
        int _formatted_write_P(
                const char * PROGMEM format,
                void put_char_func(char c, void *user_data),

diff --git a/bertos/mware/observer.h b/bertos/mware/observer.h
index 7ca135c8ad959bad7f4ab7d025b429638bb56007..e970c7d605f1e0135549b0dea59ce2d944961b70 100644 (file)
--- a/bertos/mware/observer.h
+++ b/bertos/mware/observer.h
@@ -38,7 +38,7 @@
 #ifndef MWARE_OBSERVER_H
 #define MWARE_OBSERVER_H
 
-#include <mware/list.h>
+#include <struct/list.h>
 
 /**
  *

diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c
index 0d42b8c21faa83ec0a3ee2d95387d9202d2adc5d..57dc6cf960b9bf2608fcda2e3634ae7b0c098cc3 100644 (file)
--- a/bertos/mware/parser.c
+++ b/bertos/mware/parser.c
@@ -60,7 +60,7 @@
 #include "cfg/cfg_parser.h"
 
 #include <drv/ser.h>
-#include <mware/hashtable.h>
+#include <struct/hashtable.h>
 
 #include <stdlib.h> // atol(), NULL
 #include <string.h> // strchr(), strcmp()

diff --git a/bertos/mware/sprintf.c b/bertos/mware/sprintf.c
index a82a9725d3d3f9b0bbce2c6d89415bdcc1118d67..f67983270f8aec51214f69f54d1b9b278ad2d8ab 100644 (file)
--- a/bertos/mware/sprintf.c
+++ b/bertos/mware/sprintf.c
@@ -37,7 +37,7 @@
  */
 
 #include <mware/formatwr.h>
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 #include <cfg/compiler.h>
 
 #include <stdio.h>

diff --git a/bertos/mware/sprintf_test.c b/bertos/mware/sprintf_test.c
index 428c779ad385a71b97f9546b60432d3ab89da6b0..c790dc5f27ce38484909f941fa22780873a3cfcb 100644 (file)
--- a/bertos/mware/sprintf_test.c
+++ b/bertos/mware/sprintf_test.c
@@ -41,7 +41,7 @@
 #include <cfg/test.h>
 #include <cfg/debug.h>
 
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 
 #include <stdio.h>
 

diff --git a/bertos/net/pocketbus.c b/bertos/net/pocketbus.c
index 63f369ac97193e59f5962d2e9fcbd24f24acc488..fb50a278cf1f7bcd6948ca657fab779aa51b75fd 100644 (file)
--- a/bertos/net/pocketbus.c
+++ b/bertos/net/pocketbus.c
@@ -83,7 +83,7 @@
 
 #include <kern/kfile.h>
 
-#include <mware/byteorder.h>
+#include <cpu/byteorder.h>
 
 #include <string.h>
 

diff --git a/bertos/net/pocketcmd.c b/bertos/net/pocketcmd.c
index 7ae238be6311f8842da3b52b0730a3dee672f7a0..be1a912aec5f3a274d07aaa1ab0201ad77ac7ce9 100644 (file)
--- a/bertos/net/pocketcmd.c
+++ b/bertos/net/pocketcmd.c
@@ -64,7 +64,7 @@
 
 #include <drv/timer.h>
 
-#include <mware/byteorder.h>
+#include <cpu/byteorder.h>
 
 #include <string.h>