projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modularize hardware access; Port to new timer interface.
[bertos.git]
/
mware
/
gfx.c
diff --git
a/mware/gfx.c
b/mware/gfx.c
index 2a4d8ef95af168ab340cc92e2d0f7c42055c14b9..8f1174520e9df1856e2c3180b55318b992b8f5f4 100755
(executable)
--- a/
mware/gfx.c
+++ b/
mware/gfx.c
@@
-16,6
+16,12
@@
/*#*
*#* $Log$
/*#*
*#* $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.11 2004/12/08 08:06:16 bernie
*#* Remove done todo.
*#*
@@
-42,10
+48,10
@@
*#*/
#include "gfx.h"
*#*/
#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 <c
fg/c
pu.h> /* CPU_HARVARD */
+#include <
cfg/
macros.h> /* SWAP() */
#include <string.h>
#include <string.h>
@@
-107,13
+113,16
@@
void gfx_bitmapClear(Bitmap *bm)
#if CPU_HARVARD
#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
*/
/*!
* 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 p
rog_uchar
*raster)
+void gfx_blit_P(Bitmap *bm, const p
gm_uint8_t
*raster)
{
memcpy_P(bm->raster, raster, (bm->height / 8) * bm->width);
}
{
memcpy_P(bm->raster, raster, (bm->height / 8) * bm->width);
}