From 7178bcc48bc3377c4027e362ba217e9f3815cea5 Mon Sep 17 00:00:00 2001
From: mrwastl <mrwastl@users.sourceforge.net>
Date: Fri, 16 Sep 2011 17:59:04 +0200
Subject: move config/oldConfig + it's initialisation to base class cDriver;
 libglcddrivers.so no longer link-dependent on libglcdgraphics.so

---
 glcddrivers/avrctl.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'glcddrivers/avrctl.c')

diff --git a/glcddrivers/avrctl.c b/glcddrivers/avrctl.c
index 1f5d155..2261d95 100644
--- a/glcddrivers/avrctl.c
+++ b/glcddrivers/avrctl.c
@@ -51,10 +51,8 @@ const int kBufferHeight = 128;
 
 
 cDriverAvrCtl::cDriverAvrCtl(cDriverConfig * config)
-:   config(config)
+:   cDriver(config)
 {
-    oldConfig = new cDriverConfig(*config);
-
     port = new cSerialPort();
 
     //width = config->width;
@@ -65,7 +63,6 @@ cDriverAvrCtl::cDriverAvrCtl(cDriverConfig * config)
 cDriverAvrCtl::~cDriverAvrCtl()
 {
     delete port;
-    delete oldConfig;
 }
 
 int cDriverAvrCtl::Init()
@@ -190,7 +187,7 @@ void cDriverAvrCtl::SetPixel(int x, int y, uint32_t data)
     }
 
     int offset = 7 - (y % 8);
-    if (data == GLCD::cColor::White)
+    if (data == GRAPHLCD_White)
         newLCD[x][y / 8] |= (1 << offset);
     else
         newLCD[x][y / 8] &= ( 0xFF ^ (1 << offset) );
-- 
cgit v1.2.3