/*#*
*#* $Log$
+ *#* Revision 1.11 2005/04/11 19:10:28 bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.10 2005/03/01 23:26:45 bernie
+ *#* Use new CPU-neutral program-memory API.
+ *#*
+ *#* 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.
*#*
#ifndef MWARE_GFX_H
#define MWARE_GFX_H
-#include <compiler.h>
-#include <config.h>
+#include <cfg/config.h>
+#include <cfg/compiler.h>
+#include <cfg/cpu.h>
/*! Common type for coordinates expressed in pixel units */
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);
-#if CPU_AVR
- #include <avr/pgmspace.h>
- extern void gfx_blit_P(Bitmap *bm, const prog_uchar *raster);
-#endif /* CPU_AVR */
+#if CPU_HARVARD
+ #include <mware/pgm.h>
+ extern void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster);
+#endif
#if CONFIG_GFX_VCOORDS