Change the way that the flash filesystem base address is handled

in preparation for supporting 1MB or maybe even 512KB modules.

Author: David Betz

parallax/cgiprop.c

@@ -83,15 +83,15 @@ int ICACHE_FLASH_ATTR cgiPropInit()
     os_timer_arm(&resetButtonTimer, RESET_BUTTON_SAMPLE_INTERVAL, 1);
 
     int ret;
-    if ((ret = roffs_mount(FLASH_FILESYSTEM_BASE)) != 0) {
+    if ((ret = roffs_mount(roffs_base_address())) != 0) {
         os_printf("Mounting flash filesystem failed: %d\n", ret);
         os_printf("Attempting to format...");
-        if ((ret = roffs_format(FLASH_FILESYSTEM_BASE)) != 0) {
+        if ((ret = roffs_format(roffs_base_address())) != 0) {
             os_printf("Error formatting filesystem: %d\n", ret);
             return -1;
         }
         os_printf("Flash filesystem formatted.\n");
-        if ((ret = roffs_mount(FLASH_FILESYSTEM_BASE)) != 0) {
+        if ((ret = roffs_mount(roffs_base_address())) != 0) {
             os_printf("Mounting newly formatted flash filesystem failed: %d\n", ret);
             return -1;
         }

parallax/httpdroffs.c

@@ -118,11 +118,11 @@ int ICACHE_FLASH_ATTR cgiRoffsFormat(HttpdConnData *connData)
 {
     if (connData->conn == NULL)
         return HTTPD_CGI_DONE;
-    if (roffs_format(FLASH_FILESYSTEM_BASE) != 0) {
+    if (roffs_format(roffs_base_address()) != 0) {
         httpdSendResponse(connData, 400, "Error formatting filesystem\r\n", -1);
         return HTTPD_CGI_DONE;
     }
-    if (roffs_mount(FLASH_FILESYSTEM_BASE) != 0) {
+    if (roffs_mount(roffs_base_address()) != 0) {
         httpdSendResponse(connData, 400, "Error mounting newly formatted flash filesystem\r\n", -1);
         return HTTPD_CGI_DONE;
     }

parallax/roffs.c

@@ -29,6 +29,9 @@ Connector to let httpd use the espfs filesystem to serve the files in it.
 
 #include "roffsformat.h"
 
+// default filesystem base address in flash
+#define FLASH_FILESYSTEM_BASE   0x100000
+
 // open file structure
 struct ROFFS_FILE_STRUCT {
     uint32_t header;
@@ -48,6 +51,11 @@ static int readFlash(uint32_t addr, void *buf, int size);
 static int writeFlash(uint32_t addr, void *buf, int size);
 static int updateFlash(uint32_t addr, void *buf, int size);
 
+uint32_t roffs_base_address(void)
+{
+    return FLASH_FILESYSTEM_BASE;
+}
+
 int ICACHE_FLASH_ATTR roffs_mount(uint32_t flashAddress)
 {
 	RoFsHeader testHeader;

parallax/roffs.h

@@ -22,14 +22,13 @@ Connector to let httpd use the espfs filesystem to serve the files in it.
 
 #include <esp8266.h>
 
-#define FLASH_FILESYSTEM_BASE   0x100000
-
 /* must match definitions in roffsformat.h */
 #define ROFFS_FLAG_GZIP (1<<1)
 
 #include "roffsformat.h"
 typedef struct ROFFS_FILE_STRUCT ROFFS_FILE;
 
+uint32_t roffs_base_address(void);
 int roffs_mount(uint32_t flashAddress);
 int roffs_format(uint32_t flashAddress);
 ROFFS_FILE *roffs_open(const char *fileName);