From a778f0c7e076b4bab911945ee2630d767448d147 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 15 May 2010 12:40:59 +0000
Subject: NX for 4bpp

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2671 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/lm3s6965-ek/nx/defconfig  | 8 ++++----
 nuttx/configs/lm3s6965-ek/src/up_oled.c | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'nuttx/configs')

diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index cbc62fa32..14e7338c8 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -560,15 +560,15 @@ CONFIG_NX_DISABLE_8BPP=y
 CONFIG_NX_DISABLE_16BPP=y
 CONFIG_NX_DISABLE_24BPP=y
 CONFIG_NX_DISABLE_32BPP=y
-CONFIG_NX_PACKEDMSFIRST=n
+CONFIG_NX_PACKEDMSFIRST=y
 CONFIG_NX_LCDDRIVER=y
 CONFIG_LCD_MAXPOWER=1
 CONFIG_LCD_MAXCONTRAST=255
 CONFIG_NX_MOUSE=y
 CONFIG_NX_KBD=y
 #CONFIG_NXTK_BORDERWIDTH=4
-#CONFIG_NXTK_BORDERCOLOR1
-#CONFIG_NXTK_BORDERCOLOR2
+CONFIG_NXTK_BORDERCOLOR1=6
+CONFIG_NXTK_BORDERCOLOR2=4
 CONFIG_NXTK_AUTORAISE=n
 CONFIG_NXFONT_SANS=y
 CONFIG_NXFONTS_CHARBITS=7
@@ -697,7 +697,7 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 #   nx_eventnotify().  Default: 4
 CONFIG_EXAMPLES_NX_VPLANE=0
 CONFIG_EXAMPLES_NX_DEVNO=0
-CONFIG_EXAMPLES_NX_BGCOLOR=4
+CONFIG_EXAMPLES_NX_BGCOLOR=2
 CONFIG_EXAMPLES_NX_COLOR1=10
 CONFIG_EXAMPLES_NX_COLOR2=12
 CONFIG_EXAMPLES_NX_TBCOLOR=8
diff --git a/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/up_oled.c
index 8c442b0ec..e79b08b34 100755
--- a/nuttx/configs/lm3s6965-ek/src/up_oled.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_oled.c
@@ -47,6 +47,9 @@
 #include <nuttx/spi.h>
 #include <nuttx/p14201.h>
 
+#include "lm3s_internal.h"
+#include "lm3s6965ek_internal.h"
+
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
@@ -63,7 +66,7 @@
  *
  ************************************************************************************/
 
-void weak_function lm3s_oledinitialize(void);
+void lm3s_oledinitialize(void)
 {
   FAR struct spi_dev_s *spi;
   int ret;
-- 
cgit v1.2.3