X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffonts%2Ffixed6x8.c;h=ea37b2346362cc580b9ab88e9e7cdccbe3f1c93d;hb=84876adb8515eb684c3f076ae9763ca765205951;hp=98a2934a6cf9695fd3191304cc0fc190eda9e5b6;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/fonts/fixed6x8.c b/bertos/fonts/fixed6x8.c
index 98a2934a..ea37b234 100644
--- a/bertos/fonts/fixed6x8.c
+++ b/bertos/fonts/fixed6x8.c
@@ -31,50 +31,15 @@
  *
  * -->
  *
+ * \brief Font 8x6 IBM-PC 8bit
+ *
  * \version $Id$
  *
  * \author Bernardo Innocenti <bernie@develer.com>
  *
- * \brief Font 8x6 IBM-PC 8bit
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.2  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.1  2006/05/27 22:30:22  bernie
- *#* Move 6x8 font to fonts/.
- *#*
- *#* 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/11/04 16:20:02  bernie
- *#* Fix reference to README.devlib in header.
- *#*
- *#* Revision 1.5  2005/01/08 09:20:38  bernie
- *#* Add missing type in declaration.
- *#*
- *#* 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.
- *#*/
-
-#include "font.h"
+#include <gfx/font.h>
 
 static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
 {
@@ -368,6 +333,8 @@ static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* ÿ */
 };
 
+
+#ifndef default_font
 struct Font default_font =
 {
 	/* .glyph = */  default_font_glyphs,
@@ -375,3 +342,4 @@ struct Font default_font =
 	/* .height = */ 8
 };
 
+#endif