/*#*
*#* $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.
*#*
*#*/
#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>
#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);
}