From 5e2515ed3229eaf608fe5135db2d473694bf600f Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 9 Dec 2010 01:59:18 +0000 Subject: Fix LCD fixes git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3167 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/drivers/lcd/nokia6100.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nuttx/drivers/lcd/nokia6100.c') diff --git a/nuttx/drivers/lcd/nokia6100.c b/nuttx/drivers/lcd/nokia6100.c index 36e92007c..008fd297b 100755 --- a/nuttx/drivers/lcd/nokia6100.c +++ b/nuttx/drivers/lcd/nokia6100.c @@ -474,7 +474,7 @@ static struct nokia_dev_s g_lcddev = * P4: 0: Dispersion P40= 1: Non-dispersion */ -#if CONFIG_NOKIA6100_BPP == 12 +#if 1 // CONFIG_NOKIA6100_BPP == 12 static const uint8_t g_disctl[] = { S1D15G10_DISCTL, /* Display control */ @@ -543,9 +543,9 @@ static const uint8_t g_datctl[] = 0, /* RGB->RGB */ #endif #if CONFIG_NOKIA6100_BPP == 8 - DATCTL_16GRAY_A /* Selects 16-bit color, Type A */ -#elif CONFIG_NOKIA6100_BPP == 12 DATCTL_8GRAY /* Selects 8-bit color */ +#elif CONFIG_NOKIA6100_BPP == 12 + DATCTL_16GRAY_A /* Selects 16-bit color, Type A */ #else # error "16-bit mode not yet implemented" #endif -- cgit v1.2.3