Merge remote-tracking branch 'refs/remotes/espressif/master'

Author: shekharsorot

Makefile

@@ -20,6 +20,8 @@ else
     OBJDUMP = xtensa-esp108-elf-objdump
 endif
 
+BIN_PATH ?= $(SDK_PATH)/bin
+
 LD_FILE = $(LDDIR)/eagle.pro.v7.ld
 BIN_NAME = user
 
@@ -96,8 +98,15 @@ $$(IMAGEODIR)/$(1).out: $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1)) $$(DEPENDS_
 	$$(CC) $$(LDFLAGS) $$(if $$(LINKFLAGS_$(1)),$$(LINKFLAGS_$(1)),$$(LINKFLAGS_DEFAULT) $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1))) -o $$@ 
 endef
 
+define CheckBinPath
+if test ! -d $(BIN_PATH); then \
+echo "BIN_PATH : $(BIN_PATH) not EXIST, creat it!";	\
+mkdir -p $(BIN_PATH);	\
+fi;
+endef
+
 $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
-	@mkdir -p $(BINODIR)
+	@$(CheckBinPath)
 
 	@$(RM) -r $(BIN_PATH)/$(BIN_NAME).S $(BIN_PATH)/$(BIN_NAME).dump
 

README.md

@@ -66,6 +66,7 @@ export BIN_PATH=~/Workspace/ESP32_BIN
 
 Step 6. Start to compile files
 ```
+cd ~/Workspace/project_template
 make clean
 make
 ```

bin/boot.bin

@@ -0,0 +1 @@
+Just for test purpose.

bin/ssc/README.md

@@ -0,0 +1,118 @@
+#############################################################
+# Required variables for each makefile
+# Discard this section from all parent makefiles
+# Expected variables (with automatic defaults):
+#   CSRCS (all "C" files in the dir)
+#   SUBDIRS (all subdirs with a Makefile)
+#   GEN_LIBS - list of libs to be generated ()
+#   GEN_IMAGES - list of object file images to be generated ()
+#   GEN_BINS - list of binaries to be generated ()
+#   COMPONENTS_xxx - a list of libs/objs in the form
+#     subdir/lib to be extracted and rolled up into
+#     a generated lib/image xxx.a ()
+#
+TARGET = eagle
+#FLAVOR = release
+FLAVOR = debug
+
+#EXTRA_CCFLAGS += -u
+
+ifndef PDIR # {
+GEN_IMAGES= eagle.app.v7.out
+GEN_BINS= eagle.app.v7.bin
+SPECIAL_MKTARGETS=$(APP_MKTARGETS)
+SUBDIRS=    \
+    user
+
+endif # } PDIR
+
+LDDIR = $(SDK_PATH)/ld
+
+CCFLAGS += -Os
+
+TARGET_LDFLAGS =    \
+    -nostdlib       \
+    -Wl,-EL         \
+    --longcalls     \
+    --text-section-literals
+
+ifeq ($(FLAVOR),debug)
+    TARGET_LDFLAGS += -g -O2
+endif
+
+ifeq ($(FLAVOR),release)
+    TARGET_LDFLAGS += -g -O0
+endif
+
+COMPONENTS_eagle.app.v7 =   \
+    user/libuser.a
+
+LINKFLAGS_eagle.app.v7 =    \
+    -L$(SDK_PATH)/lib       \
+    -nostdlib               \
+    -T$(LD_FILE)            \
+    -Wl,--no-check-sections \
+    -u call_user_start      \
+    -Wl,-static             \
+    -Wl,--start-group       \
+    -lc                     \
+    -lgcc                   \
+    -lhal                   \
+    -lm                     \
+    -lcrypto                \
+    -lfreertos              \
+    -llwip                  \
+    -lmain                  \
+    -lnet80211              \
+    -lphy                   \
+    -lpp                    \
+    -lrtc                   \
+    -lwpa                   \
+    $(DEP_LIBS_eagle.app.v7)\
+    -Wl,--end-group
+
+DEPENDS_eagle.app.v7 = $(LD_FILE)
+
+#############################################################
+# Configuration i.e. compile options etc.
+# Target specific stuff (defines etc.) goes in here!
+# Generally values applying to a tree are captured in the
+#   makefile at its root level - these are then overridden
+#   for a subtree within the makefile rooted therein
+#
+
+#UNIVERSAL_TARGET_DEFINES =     \
+
+# Other potential configuration flags include:
+#	-DTXRX_TXBUF_DEBUG
+#	-DTXRX_RXBUF_DEBUG
+#	-DWLAN_CONFIG_CCX
+CONFIGURATION_DEFINES =	-DICACHE_FLASH
+
+DEFINES +=      \
+    $(UNIVERSAL_TARGET_DEFINES) \
+    $(CONFIGURATION_DEFINES)
+
+DDEFINES +=     \
+    $(UNIVERSAL_TARGET_DEFINES) \
+    $(CONFIGURATION_DEFINES)
+
+
+#############################################################
+# Recursion Magic - Don't touch this!!
+#
+# Each subtree potentially has an include directory
+#   corresponding to the common APIs applicable to modules
+#   rooted at that subtree. Accordingly, the INCLUDE PATH
+#   of a module can only contain the include directories up
+#   its parent path, and not its siblings
+#
+# Required for each makefile to inherit from the parent
+#
+
+INCLUDES := $(INCLUDES) -I $(PDIR)include
+sinclude $(SDK_PATH)/Makefile
+
+.PHONY: FORCE
+FORCE:
+

bin/ssc/irom0_flash.bin

@@ -0,0 +1,4 @@
+# HOWTO #
+run:
+./make_lib.sh driver
+libdriver.a will be generated in $SDK_PATH/lib

bin/ssc/irom1.bin

@@ -32,7 +32,6 @@
 #include "gpio.h"
 #include <stdio.h>
 
-#define os_printf printf
 #define IIS_RX_BUF_LEN  512  //unit Byte
 #define IIS_TX_BUF_LEN  512  //unit Byte
 #define n  2
@@ -155,7 +154,7 @@ void copyarray(uint8 *dest, uint8 *src, uint32 nbyte)
 
 //create DMA buffer descriptors, unit of either size or length here is byte.
 //More details in I2S documents.
-void creat_one_link(uint8 own, uint8 eof, uint8 sub_sof, uint16 size, uint16 length,
+void create_one_link(uint8 own, uint8 eof, uint8 sub_sof, uint16 size, uint16 length,
                     uint32 *buf_ptr, struct sdio_queue *nxt_ptr, struct sdio_queue *i2s_queue)
 {
     unsigned int link_data0;
@@ -441,7 +440,7 @@ void slc_isr(void *para)
         if (READ_PERI_REG(I2S_TX_EOF_DES_ADDR) == (((uint32)&i2s_tx_queue1))) {
             //load out data in the buff
             if (tx_cnt < 4 * n) {
-                ets_memcpy((uint8 *)i2s_tx_test + IIS_TX_BUF_LEN * tx_cnt, (uint8 *)i2s_tx_buff1, IIS_TX_BUF_LEN);
+                memcpy((uint8 *)i2s_tx_test + IIS_TX_BUF_LEN * tx_cnt, (uint8 *)i2s_tx_buff1, IIS_TX_BUF_LEN);
             }
 
             //reset DMA discrpiter
@@ -451,7 +450,7 @@ void slc_isr(void *para)
             i2s_tx_queue1.datalen = 0;
         } else if (READ_PERI_REG(I2S_TX_EOF_DES_ADDR) == (((uint32)&i2s_tx_queue2))) {
             if (tx_cnt < 4 * n) {
-                ets_memcpy((uint8 *)i2s_tx_test + IIS_TX_BUF_LEN * tx_cnt, (uint8 *)i2s_tx_buff2, IIS_TX_BUF_LEN);
+                memcpy((uint8 *)i2s_tx_test + IIS_TX_BUF_LEN * tx_cnt, (uint8 *)i2s_tx_buff2, IIS_TX_BUF_LEN);
             }
 
             i2s_tx_queue2.next_link_ptr = (uint32)(&i2s_tx_queue3);
@@ -460,7 +459,7 @@ void slc_isr(void *para)
             i2s_tx_queue2.datalen = 0;
         } else if (READ_PERI_REG(I2S_TX_EOF_DES_ADDR) == (((uint32)&i2s_tx_queue3))) {
             if (tx_cnt < 4 * n) {
-                ets_memcpy((uint8 *)i2s_tx_test + IIS_TX_BUF_LEN * tx_cnt, (uint8 *)i2s_tx_buff3, IIS_TX_BUF_LEN);
+                memcpy((uint8 *)i2s_tx_test + IIS_TX_BUF_LEN * tx_cnt, (uint8 *)i2s_tx_buff3, IIS_TX_BUF_LEN);
             }
 
             i2s_tx_queue3.next_link_ptr = (uint32)(&i2s_tx_queue1);
@@ -508,12 +507,12 @@ void i2s_test(void)
     //size of the I2S FIFO.
     //Note:At the receiver side,the number of the DMAs can not be smaller than 3 which is limited by the
     //hardware.
-    creat_one_link(1, 0, 0, IIS_TX_BUF_LEN, 0, i2s_tx_buff1, &i2s_tx_queue2, &i2s_tx_queue1);
-    creat_one_link(1, 0, 0, IIS_TX_BUF_LEN, 0, i2s_tx_buff2, &i2s_tx_queue3, &i2s_tx_queue2);
-    creat_one_link(1, 0, 0, IIS_TX_BUF_LEN, 0, i2s_tx_buff3, &i2s_tx_queue1, &i2s_tx_queue3);
+    create_one_link(1, 0, 0, IIS_TX_BUF_LEN, 0, i2s_tx_buff1, &i2s_tx_queue2, &i2s_tx_queue1);
+    create_one_link(1, 0, 0, IIS_TX_BUF_LEN, 0, i2s_tx_buff2, &i2s_tx_queue3, &i2s_tx_queue2);
+    create_one_link(1, 0, 0, IIS_TX_BUF_LEN, 0, i2s_tx_buff3, &i2s_tx_queue1, &i2s_tx_queue3);
 
-    creat_one_link(1, 1, 0, IIS_RX_BUF_LEN, IIS_RX_BUF_LEN, i2s_rx_buff1, &i2s_rx_queue2, &i2s_rx_queue1);
-    creat_one_link(1, 1, 0, IIS_RX_BUF_LEN, IIS_RX_BUF_LEN, i2s_rx_buff2, &i2s_rx_queue1, &i2s_rx_queue2);
+    create_one_link(1, 1, 0, IIS_RX_BUF_LEN, IIS_RX_BUF_LEN, i2s_rx_buff1, &i2s_rx_queue2, &i2s_rx_queue1);
+    create_one_link(1, 1, 0, IIS_RX_BUF_LEN, IIS_RX_BUF_LEN, i2s_rx_buff2, &i2s_rx_queue1, &i2s_rx_queue2);
 
     os_printf("================DMA descripter built==============\r\n");
 

driver_lib/Makefile

@@ -29,6 +29,7 @@
 
 #include "espressif/esp_common.h"
 #include "uart.h"
+#include "gpio.h"
 #include <stdio.h>
 
 enum {
@@ -276,9 +277,9 @@ void UART_intr_handler_register(void *fn, void *arg)
 void UART_SetPrintPort(UART_Port uart_no)
 {
     if (uart_no == 1) {
-        ets_install_putc1(uart1_write_char);
+        os_install_putc1(uart1_write_char);
     } else {
-        ets_install_putc1(uart0_write_char);
+        os_install_putc1(uart0_write_char);
     }
 }
 
@@ -310,7 +311,7 @@ void UART_IntrConfig(UART_Port uart_no,  UART_IntrConfTypeDef *pUARTIntrConf)
 
     uint32 reg_val = 0;
     UART_ClearIntrStatus(uart_no, UART_INTR_MASK);
-    reg_val = READ_PERI_REG(UART_CONF1(uart_no)) & ~((UART_RX_FLOW_THRHD << UART_RX_FLOW_THRHD_S) | UART_RX_FLOW_EN) ;
+    reg_val = READ_PERI_REG(UART_CONF1(uart_no));
 
     reg_val |= ((pUARTIntrConf->UART_IntrEnMask & UART_RXFIFO_TOUT_INT_ENA) ?
                 ((((pUARTIntrConf->UART_RX_TimeOutIntrThresh)&UART_RX_TOUT_THRHD) << UART_RX_TOUT_THRHD_S) | UART_RX_TOUT_EN) : 0);
@@ -334,15 +335,15 @@ LOCAL void uart0_rx_intr_handler(void *para)
     uint8 uart_no = UART0;//UartDev.buff_uart_no;
     uint8 fifo_len = 0;
     uint8 buf_idx = 0;
-
+    //BaseType_t xHigherPriorityTaskWoken;
     uint32 uart_intr_status = READ_PERI_REG(UART_INT_ST(uart_no)) ;
 
     while (uart_intr_status != 0x0) {
         if (UART_FRM_ERR_INT_ST == (uart_intr_status & UART_FRM_ERR_INT_ST)) {
-            ets_printf("FRM_ERR\r\n");
+            os_printf_isr("FRM_ERR\r\n");
             WRITE_PERI_REG(UART_INT_CLR(uart_no), UART_FRM_ERR_INT_CLR);
         } else if (UART_RXFIFO_FULL_INT_ST == (uart_intr_status & UART_RXFIFO_FULL_INT_ST)) {
-            ets_printf("full\r\n");
+            os_printf_isr("full\r\n");
             fifo_len = (READ_PERI_REG(UART_STATUS(UART0)) >> UART_RXFIFO_CNT_S)&UART_RXFIFO_CNT;
             buf_idx = 0;
 
@@ -352,8 +353,13 @@ LOCAL void uart0_rx_intr_handler(void *para)
             }
 
             WRITE_PERI_REG(UART_INT_CLR(UART0), UART_RXFIFO_FULL_INT_CLR);
+            //CLEAR_PERI_REG_MASK(UART_INT_ENA(UART0), UART_RXFIFO_FULL_INT_ENA|UART_RXFIFO_TOUT_INT_ENA);
+            //xQueueSendFromISR(QueUart,(&fifo_len),&xHigherPriorityTaskWoken) ;
+	     // portEND_SWITCHING_ISR(xHigherPriorityTaskWoken);
+		//os_printf_isr("uart interrupt\n");
+		 
         } else if (UART_RXFIFO_TOUT_INT_ST == (uart_intr_status & UART_RXFIFO_TOUT_INT_ST)) {
-            ets_printf("tout\r\n");
+            os_printf_isr("tout\r\n");
             fifo_len = (READ_PERI_REG(UART_STATUS(UART0)) >> UART_RXFIFO_CNT_S)&UART_RXFIFO_CNT;
             buf_idx = 0;
 
@@ -364,12 +370,12 @@ LOCAL void uart0_rx_intr_handler(void *para)
 
             WRITE_PERI_REG(UART_INT_CLR(UART0), UART_RXFIFO_TOUT_INT_CLR);
         } else if (UART_TXFIFO_EMPTY_INT_ST == (uart_intr_status & UART_TXFIFO_EMPTY_INT_ST)) {
-            ets_printf("empty\n\r");
+            os_printf_isr("empty\n\r");
             WRITE_PERI_REG(UART_INT_CLR(uart_no), UART_TXFIFO_EMPTY_INT_CLR);
             CLEAR_PERI_REG_MASK(UART_INT_ENA(UART0), UART_TXFIFO_EMPTY_INT_ENA);
         } else if (UART_RXFIFO_OVF_INT_ST  == (READ_PERI_REG(UART_INT_ST(uart_no)) & UART_RXFIFO_OVF_INT_ST)) {
             WRITE_PERI_REG(UART_INT_CLR(uart_no), UART_RXFIFO_OVF_INT_CLR);
-            ets_printf("RX OVF!!\r\n");
+            os_printf_isr("RX OVF!!\r\n");
         } else {
             //skip
         }