Naming convention fixes; Partial merge from Grillo.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@597 38d2e660-2303-0410-9eaa-f027e97ec537

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$
+ *#* 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.
  *#*
@@ -189,6 +192,9 @@
 #define LCD_CMD_RESET       0xE2
 /*@}*/
 
+MOD_DEFINE(lcd)
+
+
 /* 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.
  */
-void lcd_setpwm(int duty)
+void lcd_setPwm(int duty)
 {
        ASSERT(duty >= LCD_MIN_PWM);
        ASSERT(duty <= LCD_MAX_PWM);
@@ -387,7 +393,7 @@ static void lcd_clear(void)
 }
 
 
-static void lcd_writeraster(const uint8_t *raster)
+static void lcd_writeRaster(const uint8_t *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
 
-static void lcd_refresh_softint(void)
+static void lcd_refreshSoftint(void)
 {
        lcd_blit_bitmap(&lcd_bitmap);
        timer_add(lcd_refresh_timer);
@@ -439,6 +448,8 @@ static void lcd_refresh_softint(void)
  */
 void lcd_init(void)
 {
+       MOD_CHECK(timer);
+
        // 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 */
+
+       MOD_INIT(lcd);
 }

diff --git a/drv/lcd_gfx.h b/drv/lcd_gfx.h
index 3bff2ee15467a3c397fa2ad08cc1fe47751d954c..98cdfe1eed13ae829e601ed3d6afa7be46aac83b 100755 (executable)
--- a/drv/lcd_gfx.h
+++ b/drv/lcd_gfx.h
@@ -16,6 +16,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.5  2006/04/27 05:40:11  bernie
+ *#* Naming convention fixes; Partial merge from project_grl.
+ *#*
  *#* Revision 1.4  2006/02/15 09:13:16  bernie
  *#* Switch to BITMAP_FMT_PLANAR_V_LSB.
  *#*
@@ -47,7 +50,7 @@ struct Bitmap;
 extern struct Bitmap lcd_bitmap;
 
 void lcd_init(void);
-void lcd_setpwm(int duty);
-void lcd_blit_bitmap(struct Bitmap *bm);
+void lcd_setPwm(int duty);
+void lcd_blitBitmap(struct Bitmap *bm);
 
 #endif /* LCD_GFX_H */