rename cpuXXX_t to cpu_XXX_t

[bertos.git] / bertos / cpu / avr / drv / lcd_32122a_avr.c

diff --git a/bertos/cpu/avr/drv/lcd_32122a_avr.c b/bertos/cpu/avr/drv/lcd_32122a_avr.c
index 431e6674fb3a57772a1162028ce776500a660bd0..2f27d45401e7396f55f6ad5f730a08d614f1438f 100644 (file)
--- a/bertos/cpu/avr/drv/lcd_32122a_avr.c
+++ b/bertos/cpu/avr/drv/lcd_32122a_avr.c
@@ -27,7 +27,7 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2001 Bernardo Innocenti <bernie@codewiz.org>
+ * Copyright 2001 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
@@ -35,14 +35,14 @@
  *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  */
 
 #include "lcd_32122a_avr.h"
 
-#include "appconfig.h"
+#include "cfg/cfg_lcd.h"
 
 #include <cfg/macros.h> /* BV() */
 #include <cfg/debug.h>
@@ -59,6 +59,8 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
+#warning TODO:Refactor this module. Split code to hw file.
+
 /* Configuration sanity checks */
 #if !defined(CONFIG_LCD_SOFTINT_REFRESH) || (CONFIG_LCD_SOFTINT_REFRESH != 0 && CONFIG_LCD_SOFTINT_REFRESH != 1)
        #error CONFIG_LCD_SOFTINT_REFRESH must be defined to either 0 or 1
@@ -354,7 +356,6 @@ static inline uint8_t lcd_32122_read(uint8_t chip)
        return data;
 }
 
-
 static inline void lcd_32122_write(uint8_t c, uint8_t chip)
 {
        WAIT_LCD;
@@ -382,19 +383,6 @@ static inline void lcd_32122_write(uint8_t c, uint8_t chip)
        //LCD_DB_IN;
 }
 
-
-/**
- * Set LCD contrast PWM.
- */
-void lcd_32122_setPwm(int duty)
-{
-       ASSERT(duty >= LCD_MIN_PWM);
-       ASSERT(duty <= LCD_MAX_PWM);
-
-       OCR3C = duty;
-}
-
-
 static void lcd_32122_clear(void)
 {
        uint8_t page, j;
@@ -435,16 +423,6 @@ static void lcd_32122_writeRaster(const uint8_t *raster)
        }
 }
 
-/**
- * Update the LCD display with data from the provided bitmap.
- */
-void lcd_32122_blitBitmap(Bitmap *bm)
-{
-       MOD_CHECK(lcd);
-       lcd_32122_writeRaster(bm->raster);
-}
-
-
 #if CONFIG_LCD_SOFTINT_REFRESH
 
 static void lcd_32122_refreshSoftint(void)
@@ -455,6 +433,26 @@ static void lcd_32122_refreshSoftint(void)
 
 #endif /* CONFIG_LCD_SOFTINT_REFRESH */
 
+/**
+ * Set LCD contrast PWM.
+ */
+void lcd_32122_setPwm(int duty)
+{
+       ASSERT(duty >= LCD_MIN_PWM);
+       ASSERT(duty <= LCD_MAX_PWM);
+
+       OCR3C = duty;
+}
+
+/**
+ * Update the LCD display with data from the provided bitmap.
+ */
+void lcd_32122_blitBitmap(Bitmap *bm)
+{
+       MOD_CHECK(lcd);
+       lcd_32122_writeRaster(bm->raster);
+}
+
 
 /**
  * Initialize LCD subsystem.
@@ -467,7 +465,7 @@ void lcd_32122_init(void)
        MOD_CHECK(timer);
 
        // FIXME: interrupts are already disabled when we get here?!?
-       cpuflags_t flags;
+       cpu_flags_t flags;
        IRQ_SAVE_DISABLE(flags);
 
        PORTB |= BV(LCD_PB_A0);
@@ -508,7 +506,7 @@ void lcd_32122_init(void)
        IRQ_RESTORE(flags);
 
        lcd_32122_clear();
-       lcd_32122_setpwm(LCD_DEF_PWM);
+       lcd_32122_setPwm(LCD_DEF_PWM);
 
        gfx_bitmapInit(&lcd_bitmap, lcd_raster, LCD_WIDTH, LCD_HEIGHT);
        gfx_bitmapClear(&lcd_bitmap);
@@ -526,3 +524,4 @@ void lcd_32122_init(void)
 
        MOD_INIT(lcd);
 }
+