From 7178bcc48bc3377c4027e362ba217e9f3815cea5 Mon Sep 17 00:00:00 2001 From: mrwastl 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/t6963c.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'glcddrivers/t6963c.c') diff --git a/glcddrivers/t6963c.c b/glcddrivers/t6963c.c index de3a59f..671d4f3 100644 --- a/glcddrivers/t6963c.c +++ b/glcddrivers/t6963c.c @@ -108,10 +108,8 @@ const unsigned char kSerialCDLO = 0x04; // cDriverT6963C::cDriverT6963C(cDriverConfig * config) -: config(config) +: cDriver(config) { - oldConfig = new cDriverConfig(*config); - port = new cParallelPort(); //width = config->width; @@ -126,7 +124,6 @@ cDriverT6963C::cDriverT6963C(cDriverConfig * config) cDriverT6963C::~cDriverT6963C() { delete port; - delete oldConfig; } int cDriverT6963C::Init() @@ -397,7 +394,7 @@ void cDriverT6963C::SetPixel(int x, int y, uint32_t data) //int cols = (width + 6 - 1 ) / 6; int col = x / 6; - if (data == GLCD::cColor::White) + if (data == GRAPHLCD_White) newLCD[col][y] |= (1 << pos); else newLCD[col][y] &= ( 0x3F ^ (1 << pos) ); @@ -412,7 +409,7 @@ void cDriverT6963C::SetPixel(int x, int y, uint32_t data) pos = 7 - pos; // reverse bit position } - if (data == GLCD::cColor::White) + if (data == GRAPHLCD_White) newLCD[x / 8][y] |= (1 << pos); else newLCD[x / 8][y] &= ( 0xFF ^ (1 << pos) ); -- cgit v1.2.3