From 0d2eed195727251f5fbfe8b0822751fbb3c3edc3 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@rightscale.com>
Date: Wed, 19 Aug 2015 19:13:55 -0700
Subject: [PATCH] cgiflash cleanup

---
 user/cgiflash.c | 24 ------------------------
 user/config.c   |  4 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/user/cgiflash.c b/user/cgiflash.c
index 85aaf97..57c45b4 100644
--- a/user/cgiflash.c
+++ b/user/cgiflash.c
@@ -31,30 +31,6 @@ static char* ICACHE_FLASH_ATTR check_header(void *buf) {
 	return NULL;
 }
 
-#if 0
-//===== Cgi that reads the SPI flash. Assumes 512KByte flash.
-int ICACHE_FLASH_ATTR cgiReadFlash(HttpdConnData *connData) {
-	int *pos=(int *)&connData->cgiData;
-	if (connData->conn==NULL) {
-		//Connection aborted. Clean up.
-		return HTTPD_CGI_DONE;
-	}
-
-	if (*pos==0) {
-		os_printf("Start flash download.\n");
-		httpdStartResponse(connData, 200);
-		httpdHeader(connData, "Content-Type", "application/bin");
-		httpdEndHeaders(connData);
-		*pos=0x40200000;
-		return HTTPD_CGI_MORE;
-	}
-	//Send 1K of flash per call. We will get called again if we haven't sent 512K yet.
-	espconn_sent(connData->conn, (uint8 *)(*pos), 1024);
-	*pos+=1024;
-	if (*pos>=0x40200000+(512*1024)) return HTTPD_CGI_DONE; else return HTTPD_CGI_MORE;
-}
-#endif
-
 //===== Cgi to query which firmware needs to be uploaded next
 int ICACHE_FLASH_ATTR cgiGetFirmwareNext(HttpdConnData *connData) {
 	if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
diff --git a/user/config.c b/user/config.c
index 0200919..6c6cf91 100644
--- a/user/config.c
+++ b/user/config.c
@@ -90,7 +90,7 @@ void ICACHE_FLASH_ATTR configWipe(void) {
   spi_flash_erase_sector((FLASH_ADDR+FLASH_SECT)>>12);
 }
 
-static uint32_t ICACHE_FLASH_ATTR selectPrimary(FlashFull *fc0, FlashFull *fc1);
+static int ICACHE_FLASH_ATTR selectPrimary(FlashFull *fc0, FlashFull *fc1);
 
 bool ICACHE_FLASH_ATTR configRestore(void) {
   FlashFull ff0, ff1;
@@ -112,7 +112,7 @@ bool ICACHE_FLASH_ATTR configRestore(void) {
   return true;
 }
 
-static uint32_t ICACHE_FLASH_ATTR selectPrimary(FlashFull *ff0, FlashFull *ff1) {
+static int ICACHE_FLASH_ATTR selectPrimary(FlashFull *ff0, FlashFull *ff1) {
   // check CRC of ff0
   uint16_t crc = ff0->fc.crc;
   ff0->fc.crc = 0;