Merge branch 'master' into examples

Author: d-a-v

bootloaders/eboot/Makefile

@@ -17,11 +17,13 @@ AR := $(XTENSA_TOOLCHAIN)xtensa-lx106-elf-ar
 LD := $(XTENSA_TOOLCHAIN)xtensa-lx106-elf-gcc
 OBJDUMP := $(XTENSA_TOOLCHAIN)xtensa-lx106-elf-objdump
 
-
+INC += -I../../tools/sdk/include
 CFLAGS += -std=gnu99
 
 CFLAGS += -O0 -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals
 
+CFLAGS += $(INC)
+
 LDFLAGS	+= -nostdlib -Wl,--no-check-sections -umain
 
 LD_SCRIPT := -Teboot.ld

bootloaders/eboot/eboot.elf

@@ -8,15 +8,19 @@
 #ifndef FLASH_H
 #define FLASH_H
 
+
+/* The geometry defines are placed in the sdk. The .h was factored out for reuse by eboot here.
+ * Beware: this means that eboot has an external dependency.
+ * The following .h is placed in tools/sdk/includes
+ */
+#include <spi_flash_geometry.h>
+
 int SPIEraseBlock(uint32_t block);
 int SPIEraseSector(uint32_t sector);
 int SPIRead(uint32_t addr, void *dest, size_t size);
 int SPIWrite(uint32_t addr, void *src, size_t size);
 int SPIEraseAreaEx(const uint32_t start, const uint32_t size);
 
-#define FLASH_SECTOR_SIZE 0x1000
-#define FLASH_BLOCK_SIZE 0x10000
-#define APP_START_OFFSET 0x1000
 
 typedef struct {
     unsigned char       magic;
@@ -25,7 +29,7 @@ typedef struct {
     /* SPI Flash Interface (0 = QIO, 1 = QOUT, 2 = DIO, 0x3 = DOUT) */
     unsigned char       flash_mode;
 
-    /* High four bits: 0 = 512K, 1 = 256K, 2 = 1M, 3 = 2M, 4 = 4M, 
+    /* High four bits: 0 = 512K, 1 = 256K, 2 = 1M, 3 = 2M, 4 = 4M, 8 = 8M, 9 = 16M
        Low four bits:  0 = 40MHz, 1= 26MHz, 2 = 20MHz, 0xf = 80MHz */
     unsigned char		flash_size_freq;
 

bootloaders/eboot/flash.h

@@ -22,7 +22,7 @@
 #include "flash_utils.h"
 #include "eboot_command.h"
 #include <memory>
-#include <interrupts.h>
+#include "interrupts.h"
 #include "MD5Builder.h"
 #include "umm_malloc/umm_malloc.h"
 #include "cont.h"
@@ -132,9 +132,43 @@ uint64_t EspClass::deepSleepMax()
 
 }
 
+/* 
+Layout of RTC Memory is as follows:
+Ref: Espressif doc 2C-ESP8266_Non_OS_SDK_API_Reference, section 3.3.23 (system_rtc_mem_write)
+
+|<------system data (256 bytes)------->|<-----------------user data (512 bytes)--------------->|
+
+SDK function signature:   
+bool	system_rtc_mem_read	(
+				uint32	des_addr,	
+				void	*	src_addr,	
+				uint32	save_size
+)   
+
+The system data section can't be used by the user, so:
+des_addr must be >=64 (i.e.: 256/4) and <192 (i.e.: 768/4)
+src_addr is a pointer to data
+save_size is the number of bytes to write
+
+For the method interface:
+offset is the user block number (block size is 4 bytes) must be >= 0 and <128
+data is a pointer to data, 4-byte aligned
+size is number of bytes in the block pointed to by data
+
+Same for write
+
+Note: If the Updater class is in play, e.g.: the application uses OTA, the eboot
+command will be stored into the first 128 bytes of user data, then it will be
+retrieved by eboot on boot. That means that user data present there will be lost.
+Ref: 
+- discussion in PR #5330.
+- https://github.com/esp8266/esp8266-wiki/wiki/Memory-Map#memmory-mapped-io-registers
+- Arduino/bootloaders/eboot/eboot_command.h RTC_MEM definition
+*/
+
 bool EspClass::rtcUserMemoryRead(uint32_t offset, uint32_t *data, size_t size)
 {
-    if (size + offset > 512) {
+    if (offset * 4 + size > 512 || size == 0) {
         return false;
     } else {
         return system_rtc_mem_read(64 + offset, data, size);
@@ -143,13 +177,15 @@ bool EspClass::rtcUserMemoryRead(uint32_t offset, uint32_t *data, size_t size)
 
 bool EspClass::rtcUserMemoryWrite(uint32_t offset, uint32_t *data, size_t size)
 {
-    if (size + offset > 512) {
+    if (offset * 4 + size > 512 || size == 0) {
         return false;
     } else {
         return system_rtc_mem_write(64 + offset, data, size);
     }
 }
 
+
+
 extern "C" void __real_system_restart_local();
 void EspClass::reset(void)
 {

cores/esp8266/Esp.cpp

@@ -34,10 +34,10 @@ class MD5Builder {
     void add(const uint8_t * data, const uint16_t len);
     void add(const char * data){ add((const uint8_t*)data, strlen(data)); }
     void add(char * data){ add((const char*)data); }
-    void add(const String data){ add(data.c_str()); }
+    void add(const String& data){ add(data.c_str()); }
     void addHexString(const char * data);
     void addHexString(char * data){ addHexString((const char*)data); }
-    void addHexString(const String data){ addHexString(data.c_str()); }
+    void addHexString(const String& data){ addHexString(data.c_str()); }
     bool addStream(Stream & stream, const size_t maxLen);
     void calculate(void);
     void getBytes(uint8_t * output);

cores/esp8266/MD5Builder.h

@@ -113,18 +113,18 @@ bool i2s_rx_is_empty() {
   return _i2s_is_empty( rx );
 }
 
-static int16_t _i2s_available(const i2s_state_t *ch) {
+static uint16_t _i2s_available(const i2s_state_t *ch) {
   if (!ch) {
     return 0;
   }
   return (SLC_BUF_CNT - ch->slc_queue_len) * SLC_BUF_LEN;
 }
 
-int16_t i2s_available(){
+uint16_t i2s_available(){
   return _i2s_available( tx );
 }
 
-int16_t i2s_rx_available(){
+uint16_t i2s_rx_available(){
   return _i2s_available( rx );
 }
 
@@ -331,6 +331,74 @@ bool i2s_write_lr(int16_t left, int16_t right){
   return i2s_write_sample(sample);
 }
 
+// writes a buffer of frames into the DMA memory, returns the amount of frames written
+// A frame is just a int16_t for mono, for stereo a frame is two int16_t, one for each channel.
+static uint16_t _i2s_write_buffer(int16_t *frames, uint16_t frame_count, bool mono, bool nb) {
+    uint16_t frames_written=0;
+
+    while(frame_count>0) {
+   
+        // make sure we have room in the current buffer
+        if (tx->curr_slc_buf_pos==SLC_BUF_LEN || tx->curr_slc_buf==NULL) {
+            // no room in the current buffer? if there are no buffers available then exit
+            if (tx->slc_queue_len == 0)
+            {
+                if (nb) {
+                    // if nonblocking just return the number of frames written so far
+                    break;
+                }
+                else {
+                    while (1) {
+                        if (tx->slc_queue_len > 0) {
+                          break;
+                        } else {
+                          optimistic_yield(10000);
+                        }
+                    }
+                }
+            }
+            
+            // get a new buffer
+            ETS_SLC_INTR_DISABLE();
+            tx->curr_slc_buf = (uint32_t *)i2s_slc_queue_next_item(tx);
+            ETS_SLC_INTR_ENABLE();
+            tx->curr_slc_buf_pos=0;
+        }       
+
+        //space available in the current buffer
+        uint16_t	available = SLC_BUF_LEN - tx->curr_slc_buf_pos;
+
+        uint16_t fc = (available < frame_count) ? available : frame_count;
+
+        if (mono) {
+            for(uint16_t i=0;i<fc;i++){
+                uint16_t v = (uint16_t)(*frames++);
+                tx->curr_slc_buf[tx->curr_slc_buf_pos++] = (v << 16) | v;               
+            }                
+        }
+        else
+        {        
+            for(uint16_t i=0;i<fc;i++){
+                uint16_t v1 = (uint16_t)(*frames++);
+                uint16_t v2 = (uint16_t)(*frames++);
+                tx->curr_slc_buf[tx->curr_slc_buf_pos++] = (v1 << 16) | v2;
+            }
+        }        
+        
+        frame_count -= fc;
+        frames_written += fc;
+    }
+    return frames_written;
+}
+
+uint16_t i2s_write_buffer_mono_nb(int16_t *frames, uint16_t frame_count) { return _i2s_write_buffer(frames, frame_count, true, true); }
+
+uint16_t i2s_write_buffer_mono(int16_t *frames, uint16_t frame_count) { return _i2s_write_buffer(frames, frame_count, true, false); }
+
+uint16_t i2s_write_buffer_nb(int16_t *frames, uint16_t frame_count) { return _i2s_write_buffer(frames, frame_count, false, true); }
+
+uint16_t i2s_write_buffer(int16_t *frames, uint16_t frame_count) { return _i2s_write_buffer(frames, frame_count, false, false); }
+
 bool i2s_read_sample(int16_t *left, int16_t *right, bool blocking) {
   if (!rx) {
     return false;

cores/esp8266/core_esp8266_i2s.c

@@ -21,39 +21,17 @@
 #ifndef FLASH_UTILS_H
 #define FLASH_UTILS_H
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int SPIEraseBlock(uint32_t block);
-int SPIEraseSector(uint32_t sector);
-int SPIRead(uint32_t addr, void *dest, size_t size);
-int SPIWrite(uint32_t addr, void *src, size_t size);
-int SPIEraseAreaEx(const uint32_t start, const uint32_t size);
-
-#define FLASH_SECTOR_SIZE 0x1000
-#define FLASH_BLOCK_SIZE 0x10000
-#define APP_START_OFFSET 0x1000
-
-typedef struct {
-    unsigned char       magic;
-    unsigned char       num_segments;
-
-    /* SPI Flash Interface (0 = QIO, 1 = QOUT, 2 = DIO, 0x3 = DOUT) */
-    unsigned char       flash_mode;
-
-    /* High four bits: 0 = 512K, 1 = 256K, 2 = 1M, 3 = 2M, 4 = 4M, 8 = 8M, 9 = 16M
-       Low four bits:  0 = 40MHz, 1= 26MHz, 2 = 20MHz, 0xf = 80MHz */
-    unsigned char		flash_size_freq;
-
-    uint32_t            entry;
-} image_header_t;
-
+/* Definitions are placed in eboot. Include them here rather than duplicate them.
+ * Also, prefer to have eboot standalone as much as possible and have the core depend on it
+ * rather than have eboot depend on the core.
+ */
+#include <../../bootloaders/eboot/flash.h>
 
-typedef struct {
-    uint32_t            address;
-    uint32_t            size;
-} section_header_t;
 
 #ifdef __cplusplus
 }

cores/esp8266/flash_utils.h

@@ -54,11 +54,18 @@ bool i2s_is_full();//returns true if DMA is full and can not take more bytes (ov
 bool i2s_is_empty();//returns true if DMA is empty (underflow)
 bool i2s_rx_is_full();
 bool i2s_rx_is_empty();
-int16_t i2s_available();// returns the number of samples than can be written before blocking
-int16_t i2s_rx_available();// returns the number of samples than can be written before blocking
+uint16_t i2s_available();// returns the number of samples than can be written before blocking
+uint16_t i2s_rx_available();// returns the number of samples than can be written before blocking
 void i2s_set_callback(void (*callback) (void));
 void i2s_rx_set_callback(void (*callback) (void));
 
+// writes a buffer of frames into the DMA memory, returns the amount of frames written
+// A frame is just a int16_t for mono, for stereo a frame is two int16_t, one for each channel.
+uint16_t i2s_write_buffer_mono(int16_t *frames, uint16_t frame_count);
+uint16_t i2s_write_buffer_mono_nb(int16_t *frames, uint16_t frame_count);
+uint16_t i2s_write_buffer(int16_t *frames, uint16_t frame_count);
+uint16_t i2s_write_buffer_nb(int16_t *frames, uint16_t frame_count); 
+
 #ifdef __cplusplus
 }
 #endif

cores/esp8266/i2s.h

@@ -487,7 +487,7 @@ bool ESP8266WiFiSTAClass::hostname(const char* aHostname) {
  * @param aHostname max length:32
  * @return ok
  */
-bool ESP8266WiFiSTAClass::hostname(String aHostname) {
+bool ESP8266WiFiSTAClass::hostname(const String& aHostname) {
     return hostname((char*) aHostname.c_str());
 }
 

libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp

@@ -71,7 +71,7 @@ class ESP8266WiFiSTAClass {
         String hostname();
         bool hostname(char* aHostname);
         bool hostname(const char* aHostname);
-        bool hostname(String aHostname);
+        bool hostname(const String& aHostname);
 
         // STA WiFi info
         wl_status_t status();