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
/
text.c
diff --git
a/mware/text.c
b/mware/text.c
index 5def533fa011ee6ad51089fb9ee5ecf607043354..f84fe222743583e357dafe2ed1ee45d8c7ba4a2e 100755
(executable)
--- a/
mware/text.c
+++ b/
mware/text.c
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.12 2005/04/11 19:10:28 bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.11 2005/01/20 18:46:31 aleph
+ *#* Fix progmem includes.
+ *#*
*#* Revision 1.10 2005/01/08 09:20:12 bernie
*#* Really make it work on both architectures.
*#*
*#* Revision 1.10 2005/01/08 09:20:12 bernie
*#* Really make it work on both architectures.
*#*
@@
-65,7
+71,7
@@
#include "font.h"
#include "text.h"
#include "font.h"
#include "text.h"
-#include <debug.h>
+#include <
cfg/
debug.h>
/*!
/*!
@@
-156,11
+162,7
@@
static int text_putglyph(char c, struct Bitmap *bm)
/* Per ogni colonna di dot del glyph... */
for (i = 0; i < glyph_width; ++i)
{
/* Per ogni colonna di dot del glyph... */
for (i = 0; i < glyph_width; ++i)
{
- #if CPU_HARVARD
- dots = PGM_READ_CHAR(glyph);
- #else
- dots = *glyph;
- #endif
+ dots = PGM_READ_CHAR(glyph);
/* Advance to next column in glyph.
* Expand: advances only once every two columns
/* Advance to next column in glyph.
* Expand: advances only once every two columns
@@
-198,13
+200,7
@@
static int text_putglyph(char c, struct Bitmap *bm)
}
else /* No style: fast vanilla copy of glyph to line buffer */
while (glyph_width--)
}
else /* No style: fast vanilla copy of glyph to line buffer */
while (glyph_width--)
- {
- #if CPU_HARVARD
- *buf++ = PGM_READ_CHAR(glyph++);
- #else
- *buf++ = *glyph++;
- #endif
- }
+ *buf++ = PGM_READ_CHAR(glyph++);
return c;
}
return c;
}