projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doxygen fixes.
[bertos.git]
/
mware
/
font.h
diff --git
a/mware/font.h
b/mware/font.h
index a9226d35f455ce17d2e1e9f4ad98eb10f08b6c15..cdc0142a2500b5c687fe6586ca5176830bde8a4b 100755
(executable)
--- a/
mware/font.h
+++ b/
mware/font.h
@@
-1,8
+1,8
@@
/*!
* \file
* <!--
/*!
* \file
* <!--
- * Copyright 2003,
2004
Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See
devlib/README
for information.
+ * Copyright 2003,
2004, 2005
Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See
README.devlib
for information.
* -->
*
* \version $Id$
* -->
*
* \version $Id$
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.5 2005/03/01 23:26:45 bernie
+ *#* Use new CPU-neutral program-memory API.
+ *#*
+ *#* Revision 1.4 2004/12/31 16:42:55 bernie
+ *#* Sanitize for non-Harvard processors.
+ *#*
*#* Revision 1.3 2004/08/25 14:12:09 rasky
*#* Aggiornato il comment block dei log RCS
*#*
*#* Revision 1.3 2004/08/25 14:12:09 rasky
*#* Aggiornato il comment block dei log RCS
*#*
@@
-30,16
+36,21
@@
*#* Move font table in program memory; add font.h
*#*
*#*/
*#* Move font table in program memory; add font.h
*#*
*#*/
-#ifndef FONT_H
-#define FONT_H
+#ifndef
MWARE_
FONT_H
+#define
MWARE_
FONT_H
-#include "avr/pgmspace.h"
+#include <compiler.h> /* uint8_t */
+#include <mware/pgm.h> /* PROGMEM */
-/* Font size (in pixel) */
-#define FONT_WIDTH 6
-#define FONT_HEIGHT 8
+/*!
+ * \name Font size (in pixel)
+ * \{
+ */
+#define FONT_WIDTH 6
+#define FONT_HEIGHT 8
+/* \} */
/*! Font table */
/*! Font table */
-extern const
prog_uchar
font[256 * FONT_WIDTH];
+extern const
PROGMEM uint8_t
font[256 * FONT_WIDTH];
-#endif /* FONT_H */
+#endif /*
MWARE_
FONT_H */