From 0bcdedbffc877361ca13ee4db2e5f4ebc87e9876 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 30 Nov 2008 20:09:14 +0000
Subject: [PATCH] X reports 24 bpp depth, but wants 32 bpp size pixels

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1363 42af7a65-404d-4744-a932-0658087f49c3
---
 configs/sim/README.txt       | 12 +++++++++---
 configs/sim/nx/defconfig     |  8 ++++++++
 configs/sim/nx/defconfig-x11 | 14 +++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/configs/sim/README.txt b/configs/sim/README.txt
index aed86deff10..39f6d7a63f0 100644
--- a/configs/sim/README.txt
+++ b/configs/sim/README.txt
@@ -42,10 +42,16 @@ nx
   CONFIG_SIM_FBBPP    - Pixel depth in bits
 
   NOTES:
-  - If CONFIG_SIM_X11FB is selected then CONFIG_SIM_FBBPP must
-    match the resolution of the display.
+  - If CONFIG_SIM_X11FB is selected then the following are
+    needed
+
+      CONFIG_SIM_FBBPP (must match the resolution of the display).
+      CONFIG_FB_CMAP=y
+
+    My system has 24-bit color, but packed into 32-bit words so
+    the correct seeting of CONFIG_SIM_FBBPP is 32.
   - For whatever value of CONFIG_SIM_FBBPP is selected, then
-    the corresponing CONFIG_NXGLIB_DISABLE_*BPP setting must
+    the corresponidng CONFIG_NXGLIB_DISABLE_*BPP setting must
     not be disabled.
   - The default in defconfig is to use a generic memory buffer
     for the framebuffer.  defconfig-x11 is an example with X11
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 33e7732bbd9..1d79f7e9c7b 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -224,6 +224,14 @@ CONFIG_MAX_WDOGPARMS=4
 CONFIG_PREALLOC_WDOGS=32
 CONFIG_PREALLOC_TIMERS=8
 
+#
+# Framebuffer driver options
+CONFIG_FB_CMAP=n
+CONFIG_FB_HWCURSOR=n
+CONFIG_FB_HWCURSORIMAGE=n
+#CONFIG_FB_HWCURSORSIZE
+#CONFIG_FB_TRANSPARENCY
+
 #
 # FAT filesystem configuration
 # CONFIG_FS_FAT - Enable FAT filesystem support
diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11
index be2feabbc6d..472d9073b5a 100644
--- a/configs/sim/nx/defconfig-x11
+++ b/configs/sim/nx/defconfig-x11
@@ -54,7 +54,7 @@ CONFIG_ARCH_BOARD_SIM=y
 CONFIG_SIM_X11FB=y
 CONFIG_SIM_FBWIDTH=480
 CONFIG_SIM_FBHEIGHT=240
-CONFIG_SIM_FBBPP=24
+CONFIG_SIM_FBBPP=32
 
 #
 # General OS setup
@@ -224,6 +224,14 @@ CONFIG_MAX_WDOGPARMS=4
 CONFIG_PREALLOC_WDOGS=32
 CONFIG_PREALLOC_TIMERS=8
 
+#
+# Framebuffer driver options
+CONFIG_FB_CMAP=y
+CONFIG_FB_HWCURSOR=n
+CONFIG_FB_HWCURSORIMAGE=n
+#CONFIG_FB_HWCURSORSIZE
+#CONFIG_FB_TRANSPARENCY
+
 #
 # FAT filesystem configuration
 # CONFIG_FS_FAT - Enable FAT filesystem support
@@ -330,8 +338,8 @@ CONFIG_NXGLIB_DISABLE_2BPP=y
 CONFIG_NXGLIB_DISABLE_4BPP=y
 CONFIG_NXGLIB_DISABLE_8BPP=y
 CONFIG_NXGLIB_DISABLE_16BPP=y
-CONFIG_NXGLIB_DISABLE_24BPP=n
-CONFIG_NXGLIB_DISABLE_32BPP=y
+CONFIG_NXGLIB_DISABLE_24BPP=y
+CONFIG_NXGLIB_DISABLE_32BPP=n
 CONFIG_NXGL_PACKEDMSFIRST=n
 CONFIG_NX_MOUSE=n
 CONFIG_NX_KBD=n