From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 20 May 2010 16:49:05 +0000 (+0000)
Subject: Clean up and comply to new api.
X-Git-Tag: 2.5.0~160
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f2b95d2dc8b0763ca5265e80dcae8ffed6021742;p=bertos.git

Clean up and comply to new api.

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

diff --git a/bertos/drv/lcd_gfx_qt.cpp b/bertos/drv/lcd_gfx_qt.cpp
index b7a2e519..69ff66f4 100644
--- a/bertos/drv/lcd_gfx_qt.cpp
+++ b/bertos/drv/lcd_gfx_qt.cpp
@@ -30,7 +30,6 @@
  *
  * -->
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  *
  * \brief Custom control for graphics LCD emulation (implementation)
@@ -166,18 +165,18 @@ DECLARE_WALL(wall_before_raster, WALL_SIZE)
 static uint8_t lcd_raster[RAST_SIZE(EmulLCD::WIDTH, EmulLCD::HEIGHT)];
 DECLARE_WALL(wall_after_raster, WALL_SIZE)
 
-/** Default LCD bitmap */
-struct Bitmap lcd_bitmap;
 
-/*extern "C"*/ void lcd_init(void)
+
+
+/*extern "C"*/ void lcd_gfx_qt_init(Bitmap *lcd_bitmap)
 {
 	//FIXME INIT_WALL(wall_before_raster);
 	//FIXME INIT_WALL(wall_after_raster);
-	gfx_bitmapInit(&lcd_bitmap, lcd_raster, EmulLCD::WIDTH, EmulLCD::HEIGHT);
-	gfx_bitmapClear(&lcd_bitmap);
+	gfx_bitmapInit(lcd_bitmap, lcd_raster, EmulLCD::WIDTH, EmulLCD::HEIGHT);
+	gfx_bitmapClear(lcd_bitmap);
 }
 
-/*extern "C"*/ void lcd_blitBitmap(Bitmap *bm)
+/*extern "C"*/ void lcd_gfx_qt_blitBitmap(const	Bitmap *bm)
 {
 	//FIXME CHECK_WALL(wall_before_raster);
 	//FIXME CHECK_WALL(wall_after_raster);
diff --git a/bertos/drv/lcd_gfx_qt.h b/bertos/drv/lcd_gfx_qt.h
index f1bb4e93..9840f24c 100644
--- a/bertos/drv/lcd_gfx_qt.h
+++ b/bertos/drv/lcd_gfx_qt.h
@@ -30,7 +30,6 @@
  * All Rights Reserved.
  * -->
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  *
  * \brief Custom control for graphics LCD emulation (interface)
@@ -40,11 +39,14 @@
 #define DRV_LCD_GFX_QT_H
 
 // uint8_t
+#include <gfx/gfx.h>
 #include <cfg/compiler.h>
 
 #include <QtGui/QColor>
 #include <QtGui/QFrame>
 
+#define LCD_WIDTH	128
+
 // fwd decls
 class QSizePolicy;
 class QPaintEvent;
@@ -89,4 +91,8 @@ protected:
 	unsigned char raster[(WIDTH + 7 / 8) * HEIGHT];
 };
 
+
+void lcd_gfx_qt_init(Bitmap *lcd_bitmap);
+void lcd_gfx_qt_blitBitmap(const Bitmap *bm);
+
 #endif // DRV_LCD_GFX_QT_H