From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 4 Aug 2004 03:16:59 +0000 (+0000)
Subject: Switch to new DevLib CONFIG_ convention.
X-Git-Tag: 1.0.0~1135
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=8e24523eec86d49e69b628c6ed29dc226615aa42;p=bertos.git

Switch to new DevLib CONFIG_ convention.


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

diff --git a/mware/gfx.c b/mware/gfx.c
index d03e0a22..f4b0da33 100755
--- a/mware/gfx.c
+++ b/mware/gfx.c
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -334,7 +337,7 @@ void gfx_SetClipRect(Bitmap *bm, coord_t minx, coord_t miny, coord_t maxx, coord
 }
 
 
-#ifdef CONFIG_LCD_VCOORDS
+#if CONFIG_GFX_VCOORDS
 /*!
  * Imposta gli estremi del sistema di coordinate cartesiane rispetto
  * al rettangolo di clipping della bitmap.
@@ -383,4 +386,4 @@ void gfx_VDrawLine(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y
 		gfx_TransformX(bm, x1), gfx_TransformY(bm, y1),
 		gfx_TransformY(bm, x2), gfx_TransformY(bm, y2));
 }
-#endif /* CONFIG_LCD_VCOORDS */
+#endif /* CONFIG_GFX_VCOORDS */
diff --git a/mware/gfx.h b/mware/gfx.h
index d2df953e..eb5c29bc 100755
--- a/mware/gfx.h
+++ b/mware/gfx.h
@@ -14,6 +14,9 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -34,27 +37,27 @@
  *
  */
 
-#ifndef GFX_H
-#define GFX_H
+#ifndef MWARE_GFX_H
+#define MWARE_GFX_H
 
-#include "compiler.h"
-#include <avr/pgmspace.h>
+#include <compiler.h>
 
 
 /*! Common type for coordinates expressed in pixel units */
 typedef int coord_t;
 
-#ifdef CONFIG_LCD_VCOORDS
+#if CONFIG_GFX_VCOORDS
 /*! Common type for coordinates expressed in logical units */
 typedef float vcoord_t;
-#endif /* CONFIG_LCD_VCOORDS */
+#endif /* CONFIG_GFX_VCOORDS */
 
 
 typedef struct Rect { coord_t xmin, ymin, xmax, ymax; } Rect;
 
 
-/*! Control structure to draw in a bitmap */
-
+/*!
+ * Control structure to draw in a bitmap
+ */
 typedef struct Bitmap
 {
 	uint8_t *raster;        /*!< Pointer to byte array to hold the data */
@@ -63,11 +66,15 @@ typedef struct Bitmap
 
 	Rect cr;                /*!< Clip drawing inside this rectangle */
 
-#ifdef CONFIG_LCD_VCOORDS
-	/*! Logical coordinate system */
+#if CONFIG_GFX_VCOORDS
+	/*!
+	 * \name Logical coordinate system
+	 * \{
+	 */
 	vcoord_t orgX, orgY;
 	vcoord_t scaleX, scaleY;
-#endif /* CONFIG_LCD_VCOORDS */
+	/*\}*/
+#endif /* CONFIG_GFX_VCOORDS */
 
 } Bitmap;
 
@@ -84,11 +91,11 @@ extern void gfx_MoveTo(Bitmap *bm, coord_t x, coord_t y);
 extern void gfx_LineTo(Bitmap *bm, coord_t x, coord_t y);
 extern void gfx_SetClipRect(Bitmap *bm, coord_t xmin, coord_t ymin, coord_t xmax, coord_t ymax);
 
-#ifdef CONFIG_LCD_VCOORDS
+#if CONFIG_GFX_VCOORDS
 extern void gfx_SetViewRect(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2);
 extern coord_t gfx_TransformX(Bitmap *bm, vcoord_t x);
 extern coord_t gfx_TransformY(Bitmap *bm, vcoord_t y);
 extern void gfx_VDrawLine(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2);
-#endif /* CONFIG_LCD_VCOORDS */
+#endif /* CONFIG_GFX_VCOORDS */
 
-#endif /* GFX_H */
+#endif /* MWARE_GFX_H */