X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fgfx.c;h=0172b5a1c89ef29c5fee72bec9d01574c6a04521;hb=f0b17a9c87759111590def09fa813e04829941c2;hp=2a4d8ef95af168ab340cc92e2d0f7c42055c14b9;hpb=6f315cf6724c0f3f2733bd1443294a83aa3698cd;p=bertos.git

diff --git a/mware/gfx.c b/mware/gfx.c
index 2a4d8ef9..0172b5a1 100755
--- a/mware/gfx.c
+++ b/mware/gfx.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -16,6 +16,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.14  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* 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.
  *#*
@@ -42,10 +51,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>
 
@@ -107,13 +116,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);
 }