Add interface definition for platform-specific storage of configuration data; Modify NxWM unit test to use these interfaces, if available, to save and restore touchscreen calibration data.

ChangeLog.txt

@@ -709,5 +709,6 @@
 
 	* apps/platform:  A new home for board-specific application code
 	  (2013-10-30).
-
+	* apps/include/platform/configdata.h:  Define an interface that can be
-
+	  used to manage platform-specific storage of configuration data
+	  (2013-10-30).

NxWidgets/Kconfig

@@ -567,15 +567,15 @@ config NXWM_CUSTOM_STARTWINDOW_ICON
 	bool "Custom Start Window Icon"
 	default n
 	---help---
-		Select to override the default Start Window Icon: NxWM::g_playBitmap
+		Select to override the default Start Window Icon: NxWM::g_playBitmap24x24
 
 if NXWM_CUSTOM_STARTWINDOW_ICON
 
 config NXWM_STARTWINDOW_ICON
 	string "StartWindow Icon"
-	default "NxWM::g_playBitmap"
+	default "NxWM::g_playBitmap24x24"
 	---help---
-		The glyph to use as the start window icon.  Default: NxWM::g_playBitmap
+		The glyph to use as the start window icon.  Default: NxWM::g_playBitmap24x24
 
 endif # NXWM_CUSTOM_STARTWINDOW_ICON
 
@@ -741,6 +741,16 @@ config NXWM_TOUCHSCREEN_LISTENERSTACK
 	---help---
 		Touchscreen listener thread stack size.  Default 1024
 
+config NXWM_TOUSCHCREEN_CONFIGDATA
+	bool "Touchscreen configuration data"
+	default n
+	depends on PLATFORM_CONFIGDATA
+	---help---
+		If the architecture supports retention of configuration data, then
+		you may select this option to save touchscreen configuration data.
+		Otherwise, the touchscreen calibration must be performed each time
+		that you boot the system.
+
 endif # NXWM_TOUCHSCREEN
 endmenu # NxWM Touchscreen Configuration
 

include/platform/configdata.h

@@ -0,0 +1,164 @@
+/****************************************************************************
+ * apps/include/platform/configdata.h
+ *
+ *   Copyright (C) 2013 Gregory Nutt.  All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_INCLUDE_PLATFORM_CONFIGDATA_H
+#define __APPS_INCLUDE_PLATFORM_CONFIGDATA_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+
+#ifdef CONFIG_PLATFORM_CONFIGDATA
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+/* This enumeration identifies classes of configuration data */
+
+enum config_data_e
+{
+  /* Product identification */
+
+  CONFIGDATA_SERIALNUMBER = 0,  /* Product serial number */
+
+  /* Prduct networking configuration */
+
+  CONFIGDATA_MACADDRESS,        /* Assigned MAC address */
+  CONFIGDATA_IPADDRESS,         /* Configured IP address */
+  CONFIGDATA_NETMASK,           /* Configured network mask */
+  CONFIGDATA_DIPADDR,           /* Configured default router address */
+
+  /* GUI configuration */
+
+  CONFIGDATA_TSCALIBRATION,     /* Measured touchscreen calibration data */
+  CONFIGDATA_OTHER              /* Other configuration data */
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#els
+
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: platform_setconfig
+ *
+ * Description:
+ *   Save platform-specific configuration data
+ *
+ * Input Parameter:
+ *   id         - Defines the class of configuration data
+ *   instance   - Defines which instance of configuration data.  For example,
+ *                if a board has two networks, then there would be two MAC
+ *                addresses:  instance 0 and instance 1
+ *   configdata - The new configuration data to be saved
+ *   datalen    - The size of the configuration data in bytes.
+ *
+ * Returned Value:
+ *   This is an end-user function, so it follows the normal convention:
+ *   Returns the OK (zero) on success. On failure, it.returns -1 (ERROR) and
+ *   sets errno appropriately.
+ *
+ *   Values for the errno would include:
+ *
+ *     EINVAL - The configdata point is invalid
+ *     ENOSYS - The request ID/instance is not supported on this platform
+ *
+ *   Other errors may be returned from lower level drivers on failure to
+ *   write to the underlying media (if applicable)
+ *
+ ****************************************************************************/
+
+int platform_setconfig(enum config_data_e id, int instance,
+                       FAR const uint8_t *configdata, size_t datalen);
+
+/****************************************************************************
+ * Name: platform_getconfig
+ *
+ * Description:
+ *   Get platform-specific configuration data
+ *
+ * Input Parameter:
+ *   id         - Defines the class of configuration data
+ *   instance   - Defines which instance of configuration data.  For example,
+ *                if a board has two networks, then there would be two MAC
+ *                addresses:  instance 0 and instance 1
+ *   configdata - The user provided location to return the configuration data
+ *   datalen    - The expected size of the configuration data to be returned.
+ *
+ * Returned Value:
+ *   This is an end-user function, so it follows the normal convention:
+ *   Returns the OK (zero) on success. On failure, it.returns -1 (ERROR) and
+ *   sets errno appropriately.
+ *
+ *   Values for the errno would include:
+ *
+ *     EINVAL - The configdata point is invalid
+ *     ENOSYS - The request ID/instance is not supported on this platform
+ *
+ *   Other errors may be returned from lower level drivers on failure to
+ *   read from the underlying media (if applicable)
+ *
+ ****************************************************************************/
+
+int platform_getconfig(enum config_data_e id, int instance,
+                       FAR uint8_t *configdata, size_t datalen);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* CONFIG_PLATFORM_CONFIGDATA */
+#endif /* __APPS_INCLUDE_PLATFORM_CONFIGDATA_H */

platform/Kconfig

@@ -3,4 +3,15 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+config PLATFORM_CONFIGDATA
+	bool "Platform configuration data"
+	default n
+	---help---
+		Set this option if the platform retention of configuration data.
+		This storage mechanism is platform dependent and must be implemented
+		in the platform specific directory under apps/platform/.  The
+		storage mechanism is not visible to applications so underlying non-
+		volatile storage can be used:  A file, EEPROM, hardcoded values in
+		FLASH, etc.
+
 source "$APPSDIR/platform/mikroe-stm32f4/Kconfig"