projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doxygen fix.
[bertos.git]
/
drv
/
lcd_gfx.c
diff --git
a/drv/lcd_gfx.c
b/drv/lcd_gfx.c
index f2530298e6266c1e8920caed409bdd31f092c1ef..2054e41cc1a2a2f75030d95908519e23dddc3cd7 100755
(executable)
--- a/
drv/lcd_gfx.c
+++ b/
drv/lcd_gfx.c
@@
-16,6
+16,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.4 2006/04/27 05:40:11 bernie
+ *#* Naming convention fixes; Partial merge from project_grl.
+ *#*
*#* Revision 1.3 2006/02/10 12:35:31 bernie
*#* Enforce CONFIG_* definitions.
*#*
*#* Revision 1.3 2006/02/10 12:35:31 bernie
*#* Enforce CONFIG_* definitions.
*#*
@@
-189,6
+192,9
@@
#define LCD_CMD_RESET 0xE2
/*@}*/
#define LCD_CMD_RESET 0xE2
/*@}*/
+MOD_DEFINE(lcd)
+
+
/* Status flags */
#define LCDF_BUSY BV(7)
/* Status flags */
#define LCDF_BUSY BV(7)
@@
-364,7
+370,7
@@
static inline void lcd_write(uint8_t c, uint8_t chip)
/*!
* Set LCD contrast PWM.
*/
/*!
* Set LCD contrast PWM.
*/
-void lcd_set
p
wm(int duty)
+void lcd_set
P
wm(int duty)
{
ASSERT(duty >= LCD_MIN_PWM);
ASSERT(duty <= LCD_MAX_PWM);
{
ASSERT(duty >= LCD_MIN_PWM);
ASSERT(duty <= LCD_MAX_PWM);
@@
-387,7
+393,7
@@
static void lcd_clear(void)
}
}
-static void lcd_write
r
aster(const uint8_t *raster)
+static void lcd_write
R
aster(const uint8_t *raster)
{
uint8_t page, rows;
const uint8_t *right_raster;
{
uint8_t page, rows;
const uint8_t *right_raster;
@@
-413,16
+419,19
@@
static void lcd_writeraster(const uint8_t *raster)
}
}
}
}
-
-void lcd_blit_bitmap(Bitmap *bm)
+/**
+ * Update the LCD display with data from the provided bitmap.
+ */
+void lcd_blitBitmap(Bitmap *bm)
{
{
- lcd_writeraster(bm->raster);
+ MOD_CHECK(lcd);
+ lcd_writeRaster(bm->raster);
}
#if CONFIG_LCD_SOFTINT_REFRESH
}
#if CONFIG_LCD_SOFTINT_REFRESH
-static void lcd_refresh
_s
oftint(void)
+static void lcd_refresh
S
oftint(void)
{
lcd_blit_bitmap(&lcd_bitmap);
timer_add(lcd_refresh_timer);
{
lcd_blit_bitmap(&lcd_bitmap);
timer_add(lcd_refresh_timer);
@@
-439,6
+448,8
@@
static void lcd_refresh_softint(void)
*/
void lcd_init(void)
{
*/
void lcd_init(void)
{
+ MOD_CHECK(timer);
+
// FIXME: interrupts are already disabled when we get here?!?
cpuflags_t flags;
IRQ_SAVE_DISABLE(flags);
// FIXME: interrupts are already disabled when we get here?!?
cpuflags_t flags;
IRQ_SAVE_DISABLE(flags);
@@
-496,4
+507,6
@@
void lcd_init(void)
timer_add(lcd_refresh_timer);
#endif /* CONFIG_LCD_SOFTINT_REFRESH */
timer_add(lcd_refresh_timer);
#endif /* CONFIG_LCD_SOFTINT_REFRESH */
+
+ MOD_INIT(lcd);
}
}