From 8ad32012ab9e048a4f2a0bd62f0f26e3cc183757 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 17 Oct 2013 12:07:14 -0600
Subject: [PATCH] New touchscreen scaling algorithm for the case where measured
 X values vary with y position (and vice versa)

---
 configs/sama5d3x-ek/nxwm/defconfig | 39 ++++++++++++++++++++----------
 drivers/wireless/Kconfig           |  3 ---
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index cc03cafad6..403cc986fe 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -607,7 +607,7 @@ CONFIG_NUNGET_CHARS=2
 CONFIG_LIB_HOMEDIR="/"
 # CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
-# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -867,7 +867,7 @@ CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
 CONFIG_NXWM=y
 
 #
-# General settings
+# NxWM General settings
 #
 # CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
 CONFIG_NXWM_UNITTEST=y
@@ -879,6 +879,16 @@ CONFIG_NXWM_UNITTEST=y
 # CONFIG_NXWM_CUSTOM_EDGECOLORS is not set
 # CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
 
+#
+# Background Image
+#
+# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
+CONFIG_NXWM_BACKGROUND_IMAGE="NXWidgets::g_nuttxBitmap320x320"
+
+#
+# NxWM Taskbar Configuration
+#
+
 #
 # Horizontal and vertical spacing of icons in the task bar
 #
@@ -896,23 +906,17 @@ CONFIG_NXWM_TASKBAR_ICONHEIGHT=42
 # CONFIG_NXWM_TASKBAR_NO_BORDER is not set
 
 #
-# Tool Bar Configuration
+# NxWM Toolbar Configuration
 #
 # CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
 
 #
-# Background Image
-#
-# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
-CONFIG_NXWM_BACKGROUND_IMAGE="NXWidgets::g_nuttxBitmap320x320"
-
-#
-# Application Window Configuration
+# NxWM Application Window Configuration
 #
 # CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
 
 #
-# Start Window Configuration
+# NxWM Start Window Configuration
 #
 
 #
@@ -935,6 +939,10 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
 # CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
+
+#
+# NxWM Touchscreen Configuration
+#
 CONFIG_NXWM_TOUCHSCREEN=y
 
 #
@@ -945,6 +953,10 @@ CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100
 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596
+
+#
+# NxWM Keyboard Configuration
+#
 CONFIG_NXWM_KEYBOARD=y
 
 #
@@ -957,7 +969,7 @@ CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100
 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024
 
 #
-# Calibration display settings
+# NxWM Calibration display settings
 #
 CONFIG_NXWM_CALIBRATION_MARGIN=80
 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
@@ -967,13 +979,14 @@ CONFIG_NXWM_CALIBRATION_FONTID=5
 CONFIG_NXWM_CALIBRATION_AVERAGE=y
 CONFIG_NXWM_CALIBRATION_NSAMPLES=4
 CONFIG_NXWM_CALIBRATION_DISCARD_MINMAX=y
+CONFIG_NXWM_CALIBRATION_ANISOTROPIC=y
 # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024
 
 #
-# Hex Calculator display settings
+# NxWM Hex Calculator display settings
 #
 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set
 # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set
diff --git a/drivers/wireless/Kconfig b/drivers/wireless/Kconfig
index bb2b366f7e..1413c8d341 100644
--- a/drivers/wireless/Kconfig
+++ b/drivers/wireless/Kconfig
@@ -13,9 +13,7 @@ menuconfig WL_CC3000
 	default n
 	select SPI
 
-if WL_CC3000
 source drivers/wireless/cc3000/Kconfig
-endif
 
 config WL_NRF24L01
 	bool "nRF24l01+ transceiver support"
@@ -24,7 +22,6 @@ config WL_NRF24L01
 	---help---
 		This options adds driver support for the Nordic nRF24L01+ chip.
 
-
 if WL_NRF24L01
 
 config WL_NRF24L01_DFLT_ADDR_WIDTH