X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Flcd_gfx.c;h=f2530298e6266c1e8920caed409bdd31f092c1ef;hb=20d3c79024c12bb366270c0c1fdda53c4c55e734;hp=9a25cf094bb41cb315abe06fae814a689a6df901;hpb=9411f259330967f9ad4e0cccd98ef37e811ba257;p=bertos.git

diff --git a/drv/lcd_gfx.c b/drv/lcd_gfx.c
index 9a25cf09..f2530298 100755
--- a/drv/lcd_gfx.c
+++ b/drv/lcd_gfx.c
@@ -16,6 +16,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2006/02/10 12:35:31  bernie
+ *#* Enforce CONFIG_* definitions.
+ *#*
+ *#* Revision 1.2  2006/01/23 23:11:27  bernie
+ *#* Use RASTER_SIZE() to compute... err... the raster size.
+ *#*
  *#* Revision 1.1  2006/01/16 03:50:57  bernie
  *#* Import into DevLib.
  *#*
@@ -34,7 +40,16 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
-#ifdef CONFIG_LCD_SOFTINT_REFRESH
+/* 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
+#endif
+#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
+#endif
+
+
+#if CONFIG_LCD_SOFTINT_REFRESH
 
 	/*! Interval between softint driven lcd refresh */
 #	define LCD_REFRESH_INTERVAL 20  /* 20ms -> 50fps */
@@ -177,7 +192,7 @@
 /* Status flags */
 #define LCDF_BUSY BV(7)
 
-#ifdef CONFIG_LCD_WAIT
+#if CONFIG_LCD_WAIT
 /*!
  * \code
  *      __              __
@@ -222,14 +237,14 @@
  * as required by the LCD driver.
  */
 DECLARE_WALL(wall_before_raster, WALL_SIZE)
-static uint8_t lcd_raster[LCD_WIDTH * ((LCD_HEIGHT + 7) / 8)];
+static uint8_t lcd_raster[RASTER_SIZE(LCD_WIDTH, LCD_HEIGHT)];
 DECLARE_WALL(wall_after_raster, WALL_SIZE)
 
 /*! Default LCD bitmap */
 struct Bitmap lcd_bitmap;
 
 
-#ifdef CONFIG_LCD_SOFTINT_REFRESH
+#if CONFIG_LCD_SOFTINT_REFRESH
 
 /*! Timer for regular LCD refresh */
 static Timer *lcd_refresh_timer;
@@ -405,7 +420,7 @@ void lcd_blit_bitmap(Bitmap *bm)
 }
 
 
-#ifdef CONFIG_LCD_SOFTINT_REFRESH
+#if CONFIG_LCD_SOFTINT_REFRESH
 
 static void lcd_refresh_softint(void)
 {
@@ -471,7 +486,7 @@ void lcd_init(void)
 	gfx_bitmapInit(&lcd_bitmap, lcd_raster, LCD_WIDTH, LCD_HEIGHT);
 	gfx_bitmapClear(&lcd_bitmap);
 
-#ifdef CONFIG_LCD_SOFTINT_REFRESH
+#if CONFIG_LCD_SOFTINT_REFRESH
 
 	/* Init IRQ driven LCD refresh */
 	lcd_refresh_timer = timer_new();