From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 13 Aug 2008 10:42:23 +0000 (+0000)
Subject: Use new header locations everywhere
X-Git-Tag: 2.0.0~298
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=6eb6ebb5ae5953a27977f0ef66a36344462b949a;p=bertos.git

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 f24fcd1f..22e255b2 100644
--- 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 f67d4c5e..ec2b31f7 100644
--- 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 02c04894..907610c7 100644
--- 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 6726f210..902ccc2f 100644
--- 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 d49da30a..955ab8eb 100644
--- 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 d5db5dec..3fac0c72 100644
--- 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 1783eb49..7caac605 100644
--- 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 cc061f99..c022c3c6 100644
--- 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 ac90ff03..37ae5ff9 100644
--- 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 d6275207..9bff9bb5 100644
--- 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 53fa53b2..ac1b5e92 100644
--- 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 a09aa8b5..d74c2235 100644
--- 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 a71dfb68..380b8c34 100644
--- 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 09a51a78..6c1ddd45 100644
--- 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 3ac257a8..3822df59 100644
--- 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 8a2320ac..50a63ed7 100644
--- 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 f975921a..481674e1 100644
--- 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 ec03da22..d75bd645 100644
--- 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 603b11de..cc1a3794 100644
--- 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 dfdb5df4..da10433d 100644
--- 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 bcd29cce..0ca2407d 100644
--- 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 4108d835..dd1755a5 100644
--- 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 ea9a509d..853eda96 100644
--- 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 dd3259cc..63c90d21 100644
--- 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 651f07bd..bd5afcc3 100644
--- 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 1f9ee791..9630d3b3 100644
--- 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 444c5326..0b6a556d 100644
--- 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 6a79eec3..54ba7be1 100644
--- 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 dfb7976a..bdb29af7 100644
--- 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 0c0e39c7..cbea0612 100644
--- 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 99fcfd71..865fbfd4 100644
--- 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 7ca135c8..e970c7d6 100644
--- 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 0d42b8c2..57dc6cf9 100644
--- 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 a82a9725..f6798327 100644
--- 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 428c779a..c790dc5f 100644
--- 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 63f369ac..fb50a278 100644
--- 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 7ae238be..be1a912a 100644
--- 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>