From 5a27171ca29b78d1e280075958bdd6d42e1552c6 Mon Sep 17 00:00:00 2001
From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 20 May 2010 16:47:21 +0000
Subject: [PATCH] Comply to new api.
git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3755 38d2e660-2303-0410-9eaa-f027e97ec537
---
bertos/drv/lcd_32122a.c | 5 +++--
bertos/drv/lcd_32122a.h | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/bertos/drv/lcd_32122a.c b/bertos/drv/lcd_32122a.c
index 7c3499de..b46ee0b7 100644
--- a/bertos/drv/lcd_32122a.c
+++ b/bertos/drv/lcd_32122a.c
@@ -291,7 +291,7 @@ void lcd_32122_setPwm(int duty)
/**
* Update the LCD display with data from the provided bitmap.
*/
-void lcd_32122_blitBitmap(Bitmap *bm)
+void lcd_32122_blitBitmap(const Bitmap *bm)
{
lcd_32122_writeRaster(bm->raster);
}
@@ -320,7 +320,8 @@ void lcd_32122_init(void)
lcd_32122_clear();
lcd_32122_setPwm(LCD_DEF_PWM);
- gfx_bitmapInit(&lcd_bitmap, lcd_raster, LCD_WIDTH, LCD_HEIGHT); gfx_bitmapClear(&lcd_bitmap);
+ gfx_bitmapInit(&lcd_bitmap, lcd_raster, LCD_WIDTH, LCD_HEIGHT);
+ gfx_bitmapClear(&lcd_bitmap);
#if CONFIG_LCD_SOFTINT_REFRESH
/* Init IRQ driven LCD refresh */
diff --git a/bertos/drv/lcd_32122a.h b/bertos/drv/lcd_32122a.h
index e6c040ad..ed9b1b5e 100644
--- a/bertos/drv/lcd_32122a.h
+++ b/bertos/drv/lcd_32122a.h
@@ -49,13 +49,13 @@
#define LCD_WIDTH 122
#define LCD_HEIGHT 32
+#include <gfx/gfx.h> /* Bitmap */
+
#warning __FILTER_NEXT_WARNING__
#warning this drive is untested..
-extern struct Bitmap lcd_bitmap;
-
void lcd_32122_init(void);
void lcd_32122_setPwm(int duty);
-void lcd_32122_blitBitmap(struct Bitmap *bm);
+void lcd_32122_blitBitmap(const Bitmap *bm);
#endif /* DRV_LCD_32122A_H */
--
2.34.1