X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fgfx.c;h=8f1174520e9df1856e2c3180b55318b992b8f5f4;hb=b4e1c52676ca63fb01e49a26a3411838e5277d6a;hp=b250e25f0852a9b411dc2f04bf1538c359639d1a;hpb=0ae1a254c74788c7e22f22dcfe9be5a02ec6b270;p=bertos.git

diff --git a/mware/gfx.c b/mware/gfx.c
index b250e25f..8f117452 100755
--- a/mware/gfx.c
+++ b/mware/gfx.c
@@ -12,12 +12,19 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  * \brief General pourpose graphics routines
- *
- * \todo Rename functions to match the coding-standard.
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.13  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* 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.
  *#*
@@ -41,10 +48,10 @@
  *#*/
 
 #include "gfx.h"
-#include "config.h"  /* CONFIG_GFX_CLIPPING */
-#include <debug.h>
-#include <cpu.h>     /* CPU_HARVARD */
-#include <macros.h>  /* SWAP() */
+#include <cfg/config.h>  /* CONFIG_GFX_CLIPPING */
+#include <cfg/debug.h>
+#include <cfg/cpu.h>     /* CPU_HARVARD */
+#include <cfg/macros.h>  /* SWAP() */
 
 #include <string.h>
 
@@ -106,13 +113,16 @@ void gfx_bitmapClear(Bitmap *bm)
 
 
 #if CPU_HARVARD
+
+#include <avr/pgmspace.h> /* FIXME: memcpy_P() */
+
 /*!
  * Copy a raster picture located in program memory in the bitmap.
  * The size of the raster to copy *must* be the same of the raster bitmap.
  *
  * \note This function does \b not update the current pen position
  */
-void gfx_blit_P(Bitmap *bm, const prog_uchar *raster)
+void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster)
 {
 	memcpy_P(bm->raster, raster, (bm->height / 8) * bm->width);
 }