update nffs to mynewt 1.0.0

Author: hathach

cores/nRF5/nrf52_flash.c

@@ -34,6 +34,7 @@
 */
 /**************************************************************************/
 
+#include <assert.h>
 #include "Arduino.h"
 #include "nrf52_flash.h"
 
@@ -69,6 +70,24 @@ static void print_write_after(uint32_t address, uint32_t count)
 
 #endif
 
+static int nrf52_flash_sector_info(void *dev, int idx, uint32_t *address, uint32_t *sz);
+
+static const struct hal_flash_funcs nrf52k_flash_funcs = {
+    .hff_read         = nrf52k_flash_read,
+    .hff_write        = nrf52_flash_write,
+    .hff_erase_sector = nrf52_flash_erase_sector,
+    .hff_sector_info  = nrf52_flash_sector_info,
+    .hff_init         = nrf52_flash_init
+};
+
+const struct hal_flash nrf52k_flash_dev = {
+    .hf_itf        = &nrf52k_flash_funcs,
+    .hf_base_addr  = 0x00000000,
+    .hf_size       = 512 * 1024,	/* XXX read from factory info? */
+    .hf_sector_cnt = 128,	        /* XXX read from factory info? */
+    .hf_align      = 1
+};
+
 static SemaphoreHandle_t _evt_sem = NULL;
 static volatile uint32_t _op_result;
 
@@ -78,14 +97,16 @@ void hal_flash_event_cb(uint32_t event)
   xSemaphoreGive(_evt_sem);
 }
 
-int nrf52_flash_init(void)
+int nrf52_flash_init(const struct hal_flash *dev)
 {
+  (void) dev;
   _evt_sem = xSemaphoreCreateCounting(10, 0);
   return (_evt_sem != NULL) ? 0 : 1;
 }
 
-int nrf52_flash_erase_sector(uint32_t sector_address)
+int nrf52_flash_erase_sector(const struct hal_flash *dev, uint32_t sector_address)
 {
+  (void) dev;
   uint32_t err;
 
 #if CFG_DEBUG_NFFS
@@ -124,8 +145,10 @@ static int write_and_wait(uint32_t addr, uint32_t const * const data, uint32_t s
   return (_op_result == NRF_EVT_FLASH_OPERATION_SUCCESS ) ? 0 : (-1);
 }
 
-int nrf52_flash_write(uint32_t address, const void *src, uint32_t num_bytes)
+int nrf52_flash_write(const struct hal_flash *dev, uint32_t address, const void *src, uint32_t num_bytes)
 {
+  (void) dev;
+
 #if CFG_DEBUG_NFFS
   const uint32_t _num  = num_bytes;
   const uint32_t _addr = address;
@@ -235,3 +258,32 @@ int nrf52_flash_write(uint32_t address, const void *src, uint32_t num_bytes)
   return 0;
 }
 
+int nrf52k_flash_read(const struct hal_flash *dev, uint32_t address, void *dst, uint32_t num_bytes)
+{
+  (void) dev;
+  memcpy(dst, (void *)address, num_bytes);
+  return 0;
+}
+
+static int nrf52_flash_sector_info(void *dev, int idx, uint32_t *address, uint32_t *sz)
+{
+  (void) dev;
+  assert(idx < nrf52k_flash_dev.hf_sector_cnt);
+  *address = idx * NRF52K_FLASH_SECTOR_SZ;
+  *sz = NRF52K_FLASH_SECTOR_SZ;
+  return 0;
+}
+
+
+const struct hal_flash *
+hal_bsp_flash_dev(uint8_t id)
+{
+  /*
+   * Internal flash mapped to id 0.
+   */
+  if (id != 0) {
+    return NULL;
+  }
+  return &nrf52k_flash_dev;
+}
+

cores/nRF5/nrf52_flash.h

@@ -37,16 +37,21 @@
 #define NRF52_FLASH_H_
 
 #include <stdint.h>
+#include <hal/hal_flash_int.h>
 
 #ifdef __cplusplus
  extern "C" {
 #endif
 
 #define NRF52K_FLASH_SECTOR_SZ	4096
 
-int nrf52_flash_init(void);
-int nrf52_flash_erase_sector(uint32_t sector_address);
-int nrf52_flash_write(uint32_t address, const void *src, uint32_t num_bytes);
+// const struct hal_flash*  dev is required for nffs flash interface but not used
+// by nrf52_flash, just simply pass NULL when invoked
+
+int nrf52_flash_init(const struct hal_flash *dev);
+int nrf52_flash_erase_sector(const struct hal_flash *dev, uint32_t sector_address);
+int nrf52_flash_write(const struct hal_flash *dev, uint32_t address, const void *src, uint32_t num_bytes);
+int nrf52k_flash_read(const struct hal_flash *dev, uint32_t address, void *dst, uint32_t num_bytes);
 
 #ifdef __cplusplus
  }

libraries/nffs/library.properties

@@ -1,10 +1,10 @@
 name=Newtron Flash Filesystem
-version=0.1.0
+version=1.0.0
 author=Apache Software Foundation
 maintainer=Adafruit <[email protected]>
 sentence=Newtron Flash Filesystem
 paragraph=Newtron Flash Filesystem
 category=Communication
-url=https://github.com/adafruit/Adafruit_nRF52_Arduino
+url=http://mynewt.apache.org/latest/os/modules/fs/nffs/nffs
 architectures=*
 includes=NewtNffs.h

libraries/nffs/src/Nffs.cpp

@@ -37,8 +37,7 @@
 
 #include "syscfg/syscfg.h"
 #include "hal/hal_flash.h"
-
-#define NFFS_AREA_MAX    8
+#include "flash_map/flash_map.h"
 
 ApacheNffs Nffs;
 
@@ -54,20 +53,21 @@ bool ApacheNffs::begin(void)
   if (_initialized) return true;
   _initialized = true;
 
-  // Init flash
-  nrf52_flash_init();
+  // Init flash map (required before accessing flash API)
+  flash_map_init();
 
   /* Initialize nffs's internal state. */
   errnum = nffs_init();
   VERIFY_STATUS( errnum, false );
 
   /* Convert the set of flash blocks we intend to use for nffs into an array
-   * of nffs area descriptors.
+   * of nffs area descriptors. Number of descriptor must be larger than
+   * number of sectors for nffs a.k.a 7
    */
-  struct nffs_area_desc descs[NFFS_AREA_MAX + 1];
-  int cnt = NFFS_AREA_MAX;
+  struct nffs_area_desc descs[NFFS_SECTOR_NUM + 1];
+  int cnt = NFFS_SECTOR_NUM;
 
-  errnum = nffs_misc_desc_from_flash_area( MYNEWT_VAL(NFFS_FLASH_AREA), &cnt, descs);
+  errnum = nffs_misc_desc_from_flash_area( FLASH_AREA_NFFS, &cnt, descs);
   VERIFY_STATUS( errnum, false );
 
   /* Attempt to restore an existing nffs file system from flash. */
@@ -78,18 +78,19 @@ bool ApacheNffs::begin(void)
   {
     PRINT_MESS("No FS detected, format");
     errnum = nffs_format(descs);
-    VERIFY_STATUS( errnum, false );
   }
 
+  VERIFY_STATUS( errnum, false );
+
   return true;
 }
 
 bool ApacheNffs::format(void)
 {
-  struct nffs_area_desc descs[NFFS_AREA_MAX + 1];
-  int cnt = NFFS_AREA_MAX;
+  struct nffs_area_desc descs[NFFS_SECTOR_NUM + 1];
+  int cnt = NFFS_SECTOR_NUM;
 
-  errnum = nffs_misc_desc_from_flash_area( MYNEWT_VAL(NFFS_FLASH_AREA), &cnt, descs);
+  errnum = nffs_misc_desc_from_flash_area( FLASH_AREA_NFFS, &cnt, descs);
   VERIFY_STATUS( errnum, false );
 
   errnum = nffs_format(descs);

libraries/nffs/src/fs/nffs/src/nffs.c

@@ -26,7 +26,7 @@
 //#include "sysflash/sysflash.h"
 //#include "bsp/bsp.h"
 #include "hal/hal_flash.h"
-//#include "flash_map/flash_map.h"
+#include "flash_map/flash_map.h"
 #include "os/os_mempool.h"
 #include "os/os_mutex.h"
 #include "os/os_malloc.h"

libraries/nffs/src/fs/nffs/src/nffs_misc.c

@@ -25,22 +25,6 @@
 #include "nffs/nffs.h"
 #include "nffs_priv.h"
 
-static const struct flash_area sysflash_map_dfl =
-{
-    .fa_id        = 0,
-    .fa_device_id = 0,
-    .fa_off       = 0x6D000,
-    .fa_size      = 7*4096, /* 28 kB */
-};
-
-static int
-flash_area_open(uint8_t id, const struct flash_area **fap)
-{
-  (void) id;
-  *fap = &sysflash_map_dfl;
-  return 0;
-}
-
 /**
  * Determines if the file system contains a valid root directory.  For the root
  * directory to be valid, it must be present and have the following traits:
@@ -489,7 +473,7 @@ nffs_misc_desc_from_flash_area(int id, int *cnt, struct nffs_area_desc *nad)
 
     hf = hal_bsp_flash_dev(fa->fa_device_id);
     for (i = 0; i < hf->hf_sector_cnt; i++) {
-        hf->hf_itf->hff_sector_info(i, &start, &size);
+        hf->hf_itf->hff_sector_info(hf, i, &start, &size);
         if (start >= fa->fa_off && start < fa->fa_off + fa->fa_size) {
             if (first_idx == -1) {
                 first_idx = i;
@@ -507,7 +491,7 @@ nffs_misc_desc_from_flash_area(int id, int *cnt, struct nffs_area_desc *nad)
 
     move_on = 1;
     for (i = first_idx, j = 0; i < last_idx + 1; i++) {
-        hf->hf_itf->hff_sector_info(i, &start, &size);
+        hf->hf_itf->hff_sector_info(hf, i, &start, &size);
         if (move_on) {
             nad[j].nad_flash_id = fa->fa_device_id;
             nad[j].nad_offset = start;

libraries/nffs/src/hw/hal/include/hal/hal_bsp.h

@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef __HAL_BSP_H_
+#define __HAL_BSP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <inttypes.h>
+
+#if 0
+/*
+ * Initializes BSP; registers flash_map with the system.
+ */
+void hal_bsp_init(void);
+#endif
+
+/*
+ * Return pointer to flash device structure, given BSP specific
+ * flash id.
+ */
+struct hal_flash;
+const struct hal_flash *hal_bsp_flash_dev(uint8_t flash_id);
+
+#if 0
+/*
+ * Grows heap by given amount. XXX giving space back not implemented.
+ */
+void *_sbrk(int incr);
+
+/*
+ * Report which memory areas should be included inside a coredump.
+ */
+struct hal_bsp_mem_dump {
+    void *hbmd_start;
+    uint32_t hbmd_size;
+};
+
+const struct hal_bsp_mem_dump *hal_bsp_core_dump(int *area_cnt);
+
+/*
+ * Get unique HW identifier/serial number for platform.
+ * Returns the number of bytes filled in.
+ */
+#define HAL_BSP_MAX_ID_LEN  32
+int hal_bsp_hw_id(uint8_t *id, int max_len);
+
+#define HAL_BSP_POWER_ON (1)
+#define HAL_BSP_POWER_WFI (2)
+#define HAL_BSP_POWER_SLEEP (3)
+#define HAL_BSP_POWER_DEEP_SLEEP (4)
+#define HAL_BSP_POWER_OFF (5)
+#define HAL_BSP_POWER_PERUSER (128)
+
+int hal_bsp_power_state(int state);
+
+/* Returns priority of given interrupt number */
+uint32_t hal_bsp_get_nvic_priority(int irq_num, uint32_t pri);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

libraries/nffs/src/hw/hal/include/hal/hal_flash.h

@@ -26,17 +26,15 @@ extern "C" {
 
 #include <inttypes.h>
 
+int hal_flash_ioctl(uint8_t flash_id, uint32_t cmd, void *args);
 int hal_flash_read(uint8_t flash_id, uint32_t address, void *dst,
   uint32_t num_bytes);
 int hal_flash_write(uint8_t flash_id, uint32_t address, const void *src,
   uint32_t num_bytes);
 int hal_flash_erase_sector(uint8_t flash_id, uint32_t sector_address);
 int hal_flash_erase(uint8_t flash_id, uint32_t address, uint32_t num_bytes);
 uint8_t hal_flash_align(uint8_t flash_id);
-int nrf52_flash_init(void);
-
-struct hal_flash;
-const struct hal_flash *hal_bsp_flash_dev(uint8_t flash_id);
+int hal_flash_init(void);
 
 #ifdef __cplusplus
 }

libraries/nffs/src/hw/hal/include/hal/hal_flash_int.h

@@ -29,20 +29,26 @@ extern "C" {
 /*
  * API that flash driver has to implement.
  */
+struct hal_flash;
+
 struct hal_flash_funcs {
-//    int (*hff_read)(uint32_t address, void *dst, uint32_t num_bytes);
-//    int (*hff_write)(uint32_t address, const void *src, uint32_t num_bytes);
-//    int (*hff_erase_sector)(uint32_t sector_address);
-    int (*hff_sector_info)(int idx, uint32_t *address, uint32_t *size);
-//    int (*hff_init)(void);
+    int (*hff_read)(const struct hal_flash *dev, uint32_t address, void *dst,
+            uint32_t num_bytes);
+    int (*hff_write)(const struct hal_flash *dev, uint32_t address,
+            const void *src, uint32_t num_bytes);
+    int (*hff_erase_sector)(const struct hal_flash *dev,
+            uint32_t sector_address);
+    int (*hff_sector_info)(const struct hal_flash *dev, int idx,
+            uint32_t *address, uint32_t *size);
+    int (*hff_init)(const struct hal_flash *dev);
 };
 
 struct hal_flash {
     const struct hal_flash_funcs *hf_itf;
     uint32_t hf_base_addr;
     uint32_t hf_size;
     int hf_sector_cnt;
-    int hf_align;		/* Alignment requirement. 1 if unrestricted. */
+    int hf_align;       /* Alignment requirement. 1 if unrestricted. */
 };
 
 /*