X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgfx%2Ffont.h;h=4b28de697dfae1d2102ec31505daa290cade0483;hb=fb5863ca8d0db3ff2e84721f7c902b031157ebb0;hp=b62b0b7c05bae1dc5d8feb540a4cde0d5d97e38a;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/gfx/font.h b/bertos/gfx/font.h
index b62b0b7c..4b28de69 100644
--- a/bertos/gfx/font.h
+++ b/bertos/gfx/font.h
@@ -30,66 +30,18 @@
  *
  * -->
  *
- * \version $Id$
+ * \brief Font 8x6 IBM-PC 8bit
+ *
  *
  * \author Stefano Fedrigo <aleph@develer.com>
  *
- * \brief Font 8x6 IBM-PC 8bit
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.7  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.6  2006/05/27 22:31:34  bernie
- *#* Switch to a smaller default fount.
- *#*
- *#* Revision 1.5  2006/03/13 02:06:04  bernie
- *#* FONT_HAS_GLYPH(): New macro.
- *#*
- *#* Revision 1.4  2006/02/15 09:10:15  bernie
- *#* Implement prop fonts; Fix algo styles.
- *#*
- *#* Revision 1.3  2006/02/10 12:29:05  bernie
- *#* Add multiple font support in bitmaps.
- *#*
- *#* Revision 1.2  2005/11/04 18:17:45  bernie
- *#* Fix header guards and includes for new location of gfx module.
- *#*
- *#* Revision 1.1  2005/11/04 18:11:35  bernie
- *#* Move graphics stuff from mware/ to gfx/.
- *#*
- *#* Revision 1.6  2005/04/11 19:10:28  bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* 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.2  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.1  2004/05/23 15:43:16  bernie
- *#* Import mware modules.
- *#*
- *#* Revision 1.2  2004/03/24 15:48:53  bernie
- *#* Remove Copyright messages from Doxygen output
- *#*
- *#* Revision 1.1  2004/01/13 12:15:28  aleph
- *#* Move font table in program memory; add font.h
- *#*
- *#*/
 #ifndef GFX_FONT_H
 #define GFX_FONT_H
 
-#include <cfg/compiler.h> /* uint8_t */
-#include <mware/pgm.h> /* PROGMEM */
+#include <cfg/compiler.h>  /* uint8_t */
+#include <cpu/pgm.h>     /* PROGMEM */
 
 typedef struct Font
 {
@@ -99,7 +51,7 @@ typedef struct Font
 	 * Data is an array of at most 256 glyphs packed together.
 	 * Raster format must be the same of the bitmap.
 	 */
-	const PROGMEM uint8_t *glyph;
+	const pgm_uint8_t *glyph;
 
 	uint8_t width;     /**< Pixel width of character cell. */
 	uint8_t height;    /**< Pixel height of character cell. */
@@ -108,8 +60,8 @@ typedef struct Font
 	uint8_t last;      /**< Last encoded character in glyph array (inclusive). */
 
 	/** Array of glyph offsets in bytes. NULL for fixed-width fonts. */
-	const PROGMEM uint16_t *offset;
-	const PROGMEM uint8_t *widths;
+	const pgm_uint16_t *offset;
+	const pgm_uint8_t  *widths;
 
 } Font;