diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-30 17:16:58 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-30 17:16:58 -0600 |
| commit | 60e159c7232cb5e8b45d6302479753880611fc14 (patch) | |
| tree | b507cabf42fb87376090b370c8d36517821ff363 /NxWidgets | |
| parent | 34e0d08e49c7fc6e9f4434e811b151bdfb2c5f9e (diff) | |
| download | nuttx-60e159c7232cb5e8b45d6302479753880611fc14.tar.gz nuttx-60e159c7232cb5e8b45d6302479753880611fc14.tar.bz2 nuttx-60e159c7232cb5e8b45d6302479753880611fc14.zip | |
Fix typos introduced into NxWM configuration by an earlier check-in today
Diffstat (limited to 'NxWidgets')
| -rw-r--r-- | NxWidgets/Kconfig | 2 | ||||
| -rw-r--r-- | NxWidgets/UnitTests/nxwm/nxwm_main.cxx | 10 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/ccalibration.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index ae71bf997..0ee006aba 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -741,7 +741,7 @@ config NXWM_TOUCHSCREEN_LISTENERSTACK ---help--- Touchscreen listener thread stack size. Default 1024 -config NXWM_TOUSCHCREEN_CONFIGDATA +config NXWM_TOUCHSCREEN_CONFIGDATA bool "Touchscreen configuration data" default n depends on PLATFORM_CONFIGDATA diff --git a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx index 0787a6cba..167984b14 100644 --- a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx +++ b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx @@ -44,8 +44,8 @@ #include <cstdlib> #include <cunistd> -#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA -# include <arch/platform/configdata.h> +#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA +# include <apps/platform/configdata.h> #endif #include "ctaskbar.hxx" @@ -496,7 +496,7 @@ static bool createCalibration(void) } showTestCaseMemory("createCalibration: After creating CCalibration"); -#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA +#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA // Check if we have previously stored calibration data int ret = platform_getconfig(CONFIGDATA_TSCALIBRATION, 0, @@ -761,7 +761,7 @@ int nxwm_main(int argc, char *argv[]) } #ifdef CONFIG_NXWM_TOUCHSCREEN -#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA +#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA // There are two possibilies: (1) We started the calibration earlier and now // need to obtain the calibration data from the calibration process, or (2) // We have already obtained stored calibration data in which case, the calibration @@ -794,7 +794,7 @@ int nxwm_main(int argc, char *argv[]) } else { -#if 0 // ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA. Done in CCalibration +#if 0 // ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA. Done in CCalibration // Save the new calibration data so that we do not have to do this // again the next time we start up. diff --git a/NxWidgets/nxwm/src/ccalibration.cxx b/NxWidgets/nxwm/src/ccalibration.cxx index 562ef206e..74be1fd09 100644 --- a/NxWidgets/nxwm/src/ccalibration.cxx +++ b/NxWidgets/nxwm/src/ccalibration.cxx @@ -45,8 +45,8 @@ #include <assert.h> #include <debug.h> -#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA -# include <arch/platform/configdata.h> +#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA +# include <apps/platform/configdata.h> #endif #include "nxwmconfig.hxx" @@ -1103,7 +1103,7 @@ void CCalibration::finishCalibration(void) struct SCalibrationData caldata; if (createCalibrationData(caldata)) { -#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA +#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA // Save the new calibration data. The saved calibration // data may be used to avoided recalibrating in the future. |