Missing file that I forgot to add in the last commit

3 files changed, 305 insertions, 0 deletions

diff --git a/apps/platform/mikroe-stm32f4/mikroe_configdata.c b/apps/platform/mikroe-stm32f4/mikroe_configdata.c
new file mode 100644
index 000000000..5147a95c9
--- /dev/null
+++ b/apps/platform/mikroe-stm32f4/mikroe_configdata.c
@@ -0,0 +1,260 @@
+/************************************************************************************
+ * apps/platform/mikroe-stm32f4/mikroe_configdata.c
+ *
+ *   Copyright (C) 2012-2013 Ken Pettit. All rights reserved.
+ *   Author: Ken Pettit <pettitkd@gmail.com>
+ *
+ * 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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <apps/platform/configdata.h>
+
+#ifdef CONFIG_PLATFORM_CONFIGDATA
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Function Prototypes
+ ************************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * 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)
+{
+#ifdef CONFIG_MIKROE_STM32F4_CONFIGDATA_FS
+  FILE*   fd;
+#endif
+
+  switch (id)
+    {
+      case CONFIGDATA_TSCALIBRATION:
+
+#ifdef CONFIG_MIKROE_STM32F4_CONFIGDATA_FS
+        /* Save config data in a file on the filesystem.  Try to open
+         * the file. */
+
+        if ((fd = fopen(CONFIG_MIKROE_STM32F4_CONFIGDATA_FILENAME, "w+")) == NULL)
+          {
+            /* Error opening the file */
+            set_errno(ENOENT);
+            return -1;
+          }
+
+        /* Write data to the file.  For now, we only support one entry, but
+         * may / will expand it later.
+         */
+
+        fwrite(&id, sizeof(id), 1, fd);
+        fwrite(&instance, sizeof(instance), 1, fd);
+        fwrite(configdata, 1, datalen, fd);
+
+        /* CLose the file and exit */
+
+        fclose(fd);
+        return OK;
+
+#elif CONFIG_MIKROE_STM32F4_CONFIGDATA_PART 
+#  error This configuration not supported yet!
+#elif CONFIG_MIKROE_STM32F4_CONFIGDATA_ROM 
+
+        /* We are reading from a read-only system, so nothing to do. */
+
+        return OK;
+
+#else
+        break;
+#endif
+
+      default:
+        break;
+    }
+
+  set_errno(ENOSYS);
+  return -1;
+}
+
+/****************************************************************************
+ * 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 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_getconfig(enum config_data_e id, int instance,
+                       FAR uint8_t *configdata, size_t datalen)
+{
+#ifdef CONFIG_MIKROE_STM32F4_CONFIGDATA_FS
+  FILE*   fd;
+  size_t  bytes;
+  enum    config_data_e saved_id;
+  int     saved_instance;
+#elif CONFIG_MIKROE_STM32F4_CONFIGDATA_ROM 
+  static const uint8_t touch_cal_data[] = {
+      0x9a, 0x2f, 0x00, 0x00, 
+      0x40, 0xbc, 0x69, 0xfe, 0x70, 0x2e, 0x00,
+      0x00, 0xb8, 0x2d, 0xdb, 0xff };
+#endif
+
+  switch (id)
+    {
+      case CONFIGDATA_TSCALIBRATION:
+
+#ifdef CONFIG_MIKROE_STM32F4_CONFIGDATA_FS
+        /* Load config data fram a file on the filesystem.  Try to open
+         * the file. */
+
+        if ((fd = fopen(CONFIG_MIKROE_STM32F4_CONFIGDATA_FILENAME, "r")) == NULL)
+          {
+            /* Error opening the file */
+            set_errno(ENOENT);
+            return -1;
+          }
+
+        /* Write data to the file.  For now, we only support one entry, but
+         * may / will expand it later.
+         */
+
+        bytes = fread(&saved_id, sizeof(saved_id), 1, fd);
+        bytes += fread(&saved_instance, sizeof(saved_instance), 1, fd);
+        bytes += fread(configdata, 1, datalen, fd);
+        if (bytes != sizeof(saved_id) + sizeof(saved_instance) + datalen)
+          {
+            /* Error!  Not enough data in the file */
+            set_errno(EINVAL);
+            fclose(fd);
+            return -1;
+          }
+
+        /* Close the file and exit */
+
+        fclose(fd);
+        return OK;
+
+        /* Save config data in a file on the filesystem */
+
+        return OK;
+
+#elif CONFIG_MIKROE_STM32F4_CONFIGDATA_ROM 
+
+        memcpy(configdata, touch_cal_data, datalen);
+        return OK;
+
+#else
+        break;
+#endif
+
+      default:
+        break;
+    }
+
+  set_errno(ENOSYS);
+  return -1;
+}
+
+#endif /* CONFIG_PLATFORM_CONFIGDATA */
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_boot.c b/nuttx/configs/sama5d3x-ek/src/sam_boot.c
index c57b7df06..a1efeeb98 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_boot.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_boot.c
@@ -121,3 +121,30 @@ void sam_boardinitialize(void)
   up_ledinit();
 #endif
 }
+
+/****************************************************************************
+ * Name: board_initialize
+ *
+ * Description:
+ *   If CONFIG_BOARD_INITIALIZE is selected, then an additional
+ *   initialization call will be performed in the boot-up sequence to a
+ *   function called board_initialize().  board_initialize() will be
+ *   called immediately after up_intiialize() is called and just before the
+ *   initial application is started.  This additional initialization phase
+ *   may be used, for example, to initialize board-specific device drivers.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_BOARD_INITIALIZE
+void board_initialize(void)
+{
+  /* Perform NSH initialization here instead of from the NSH.  This
+   * alternative NSH initialization is necessary when NSH is ran in user-space
+   * but the initialization function must run in kernel space.
+   */
+
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
+  (void)nsh_archinitialize();
+#endif
+}
+#endif /* CONFIG_BOARD_INITIALIZE */
diff --git a/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h b/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h
index 14b1f5f02..655a2393a 100644
--- a/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h
+++ b/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h
@@ -654,6 +654,24 @@ void weak_function sam_netinitialize(void);
 void up_ledinit(void);
 #endif
 
+/************************************************************************************
+ * Name: nsh_archinitialize
+ *
+ * Description:
+ *   Perform architecture specific initialization for NSH.
+ *
+ *   CONFIG_NSH_ARCHINIT=y :
+ *     Called from the NSH library
+ *
+ *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && CONFIG_NSH_ARCHINIT=n :
+ *     Called from board_initialize().
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_NSH_LIBRARY
+int nsh_archinitialize(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H */