Fix header guards and includes for new location of gfx module.

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

diff --git a/gfx/charts.c b/gfx/charts.c
index 945070db873a37bc74ebe21c0528d0888a4072a9..79b178c01dde3a84b5e5069c23d0495ad80f5514 100755 (executable)
--- a/gfx/charts.c
+++ b/gfx/charts.c
@@ -26,6 +26,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -46,7 +49,7 @@
  *#*
  *#*/
 
-#include "charts.h"
+#include <gfx/charts.h>
 #include <mware/gfx.h>
 
 

diff --git a/gfx/charts.h b/gfx/charts.h
index 468af79b0c96e6bcf99bb010737a3b35e5a6bd7c..af9ee6ddfdb0ec2b11b11b457c368bca97653664 100755 (executable)
--- a/gfx/charts.h
+++ b/gfx/charts.h
@@ -18,6 +18,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -37,10 +40,10 @@
  *#* Import simple chart drawing code.
  *#*
  *#*/
-#ifndef MWARE_CHARTS_H
-#define MWARE_CHARTS_H
+#ifndef GFX_CHARTS_H
+#define GFX_CHARTS_H
 
-#include <mware/gfx.h> /* vcoord_t */
+#include <gfx/gfx.h>    /* vcoord_t */
 #include <cfg/config.h> /* CONFIG_ stuff */
 
 /*!
@@ -80,4 +83,4 @@ void chart_drawAxis(Bitmap *bm);
 void chart_drawCurve(Bitmap *bm, const chart_y_t *curve_y, int curve_cnt);
 void chart_drawDots(Bitmap *bm, const chart_x_t *dots_x, const chart_y_t *dots_y, int cnt);
 
-#endif /* MWARE_CHARTS_H */
+#endif /* GFX_CHARTS_H */

diff --git a/gfx/font.c b/gfx/font.c
index fe7988fecd6b31e27dc2a0c827c273d1e2058a54..934f851a2aa549bf235bc002bcd922b2a195286c 100755 (executable)
--- a/gfx/font.c
+++ b/gfx/font.c
@@ -1,8 +1,8 @@
 /*!
  * \file
  * <!--
- * Copyright (C) 2001 Bernardo Innocenti <bernie@codewiz.org>
- * Copyright (C) 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2001 Bernardo Innocenti <bernie@codewiz.org>
  * This file is part of DevLib - See README.devlib for information.
  * -->
  *
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -35,22 +38,6 @@
  *#*
  *#* Revision 1.1  2004/05/23 15:43:16  bernie
  *#* Import mware modules.
- *#*
- *#* Revision 1.5  2004/03/24 15:48:53  bernie
- *#* Remove Copyright messages from Doxygen output
- *#*
- *#* Revision 1.4  2004/03/03 18:30:17  bernie
- *#* Substitute left triangle glyph with left arrow
- *#*
- *#* Revision 1.3  2004/02/28 14:48:33  aleph
- *#* Improve arrow glyphs
- *#*
- *#* Revision 1.2  2004/01/13 12:15:28  aleph
- *#* Move font table in program memory; add font.h
- *#*
- *#* Revision 1.1  2004/01/07 23:31:54  aleph
- *#* Add text routines
- *#*
  *#*/
 
 #include "font.h"

diff --git a/gfx/font.h b/gfx/font.h
index 049db533b02da79fbbfb58a457b77d6daf4fbfd3..1f5d2780aeaf2b22b127cd0ec7286fc7e533b2de 100755 (executable)
--- a/gfx/font.h
+++ b/gfx/font.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -42,8 +45,8 @@
  *#* Move font table in program memory; add font.h
  *#*
  *#*/
-#ifndef MWARE_FONT_H
-#define MWARE_FONT_H
+#ifndef GFX_FONT_H
+#define GFX_FONT_H
 
 #include <cfg/compiler.h> /* uint8_t */
 #include <mware/pgm.h> /* PROGMEM */
@@ -56,7 +59,7 @@
 #define FONT_HEIGHT  8
 /* \} */
 
-/*! Font table */
+/*! Font table. */
 extern const PROGMEM uint8_t font[256 * FONT_WIDTH];
 
-#endif /* MWARE_FONT_H */
+#endif /* GFX_FONT_H */

diff --git a/gfx/gfx.c b/gfx/gfx.c
index aa0e56e7ed5de4896509d13b262cbdcb12d87033..82b69c34b85861c4fa5574ace5427bd98518496c 100755 (executable)
--- a/gfx/gfx.c
+++ b/gfx/gfx.c
@@ -1,7 +1,7 @@
 /*!
  * \file
  * <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
  * This file is part of DevLib - See README.devlib for information.
  * -->
@@ -16,6 +16,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -27,33 +30,9 @@
  *#*
  *#* Revision 1.12  2005/03/01 23:26:45  bernie
  *#* Use new CPU-neutral program-memory API.
- *#*
- *#* Revision 1.11  2004/12/08 08:06:16  bernie
- *#* Remove done todo.
- *#*
- *#* Revision 1.10  2004/11/01 15:14:07  bernie
- *#* Update to current coding conventions.
- *#*
- *#* Revision 1.9  2004/10/21 10:58:33  bernie
- *#* Add a TODO item.
- *#*
- *#* Revision 1.8  2004/09/20 03:29:22  bernie
- *#* Relax assertion.
- *#*
- *#* Revision 1.7  2004/09/14 21:01:08  bernie
- *#* Rename rectangle drawing functions; Unify filled/cleared implementations.
- *#*
- *#* Revision 1.4  2004/08/24 16:53:10  bernie
- *#* Use new-style config macros.
- *#*
- *#* Revision 1.3  2004/08/04 03:16:59  bernie
- *#* Switch to new DevLib CONFIG_ convention.
- *#*
- *#* Revision 1.2  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
  *#*/
 
-#include "gfx.h"
+#include <gfx/gfx.h>
 #include <cfg/config.h>  /* CONFIG_GFX_CLIPPING */
 #include <cfg/debug.h>
 #include <cfg/cpu.h>     /* CPU_HARVARD */

diff --git a/gfx/gfx.h b/gfx/gfx.h
index 788bd69f3acf7577886481ed62c2d2128a6bd143..af8f6a9aa6b92edd69bea66f9844726378f2eb7b 100755 (executable)
--- a/gfx/gfx.h
+++ b/gfx/gfx.h
@@ -1,6 +1,6 @@
 /*!
  * \file
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
  * This file is part of DevLib - See README.devlib for information.
  *
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -28,31 +31,10 @@
  *#*
  *#* Revision 1.9  2005/01/20 18:46:31  aleph
  *#* Fix progmem includes.
- *#*
- *#* Revision 1.8  2004/11/01 15:14:07  bernie
- *#* Update to current coding conventions.
- *#*
- *#* Revision 1.7  2004/09/20 03:29:06  bernie
- *#* Conditionalize AVR-specific code.
- *#*
- *#* Revision 1.6  2004/09/14 21:01:08  bernie
- *#* Rename rectangle drawing functions; Unify filled/cleared implementations.
- *#*
- *#* Revision 1.4  2004/08/10 07:00:16  bernie
- *#* Add missing header.
- *#*
- *#* Revision 1.3  2004/08/04 03:16:59  bernie
- *#* Switch to new DevLib CONFIG_ convention.
- *#*
- *#* Revision 1.2  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.1  2004/05/23 15:43:16  bernie
- *#* Import mware modules.
  *#*/
 
-#ifndef MWARE_GFX_H
-#define MWARE_GFX_H
+#ifndef GFX_GFX_H
+#define GFX_GFX_H
 
 #include <cfg/config.h>
 #include <cfg/compiler.h>
@@ -120,4 +102,4 @@ extern coord_t gfx_transformY(Bitmap *bm, vcoord_t y);
 extern void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2);
 #endif /* CONFIG_GFX_VCOORDS */
 
-#endif /* MWARE_GFX_H */
+#endif /* GFX_GFX_H */

diff --git a/gfx/text.c b/gfx/text.c
index 084e9511f9b84495bbf20010d3eeba1514efbe9c..3e9806015d492af0a8535880e595ec5e3b993f0f 100755 (executable)
--- a/gfx/text.c
+++ b/gfx/text.c
@@ -1,7 +1,7 @@
 /*!
  * \file
  * <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
  * This file is part of DevLib - See README.devlib for information.
  * -->
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -73,9 +76,9 @@
  *#* documentation fixes
  *#*/
 
-#include "gfx.h"
-#include "font.h"
-#include "text.h"
+#include <gfx/gfx.h>
+#include <gfx/font.h>
+#include <gfx/text.h>
 
 #include <cfg/debug.h>
 

diff --git a/gfx/text.h b/gfx/text.h
index d131e0144db0185b4771d4d5fd001cc5797d971f..a064e8c99b441ce6530370e9a701bcbcdb69da70 100755 (executable)
--- a/gfx/text.h
+++ b/gfx/text.h
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -50,8 +53,8 @@
  *#*
  *#*/
 
-#ifndef MWARE_TEXT_H
-#define MWARE_TEXT_H
+#ifndef GFX_TEXT_H
+#define GFX_TEXT_H
 
 #include <cfg/compiler.h>
 #include <cfg/macros.h> /* BV() */
@@ -122,4 +125,4 @@ int text_vwidthf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap);
 int text_widthf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...);
 #endif /* CPU_HARVARD */
 
-#endif /* MWARE_TEXT_H */
+#endif /* GFX_TEXT_H */

diff --git a/gfx/text_format.c b/gfx/text_format.c
index 36dfec37a1698945d59a6a739d96d74e46426e21..c56eea6b4e9f1cb7f155afdf6deb62f64333c89c 100755 (executable)
--- a/gfx/text_format.c
+++ b/gfx/text_format.c
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -56,10 +59,11 @@
  *#*
  *#*/
 
-#include "text.h"
-#include "formatwr.h" /* _formatted_write() */
-#include "font.h"
-#include "gfx.h"
+#include <gfx/text.h>
+#include <gfx/font.h>
+#include <gfx/gfx.h>
+#include <mware/formatwr.h> /* _formatted_write() */
+
 #include <stdio.h> /* vsprintf() */
 #include <stdarg.h>
 #include <string.h> /* strlen() */