j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Various app_main.c bug fixes

Browse source
This commit is contained in:
Alex Stewart 2015-08-25 17:22:38 -07:00
parent c16dd2ef23
commit aa7f305e16
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/app_main.c
View file

@ -43,8 +43,8 @@ void user_init(void);
#define halt() while (1) {} #define halt() while (1) {}
extern uint32_t *_bss_start; extern uint32_t _bss_start;
extern uint32_t *_bss_end; extern uint32_t _bss_end;
// .Ldata003 -- .irom.text+0x0 // .Ldata003 -- .irom.text+0x0
static const uint8_t IROM default_phy_info[PHY_INFO_SIZE] = { static const uint8_t IROM default_phy_info[PHY_INFO_SIZE] = {
@ -150,7 +150,7 @@ static void IRAM set_spi0_divisor(uint32_t divisor) {
} }
// .text+0x148 // .text+0x148
void sdk_user_fatal_exception_handler(void) { void IRAM sdk_user_fatal_exception_handler(void) {
if (!sdk_NMIIrqIsOn) { if (!sdk_NMIIrqIsOn) {
vPortEnterCritical(); vPortEnterCritical();
do { do {
@ -263,17 +263,17 @@ void IRAM sdk_user_start(void) {
} }
// .text+0x3a8 // .text+0x3a8
void vApplicationStackOverflowHook(xTaskHandle task, char *task_name) { void IRAM vApplicationStackOverflowHook(xTaskHandle task, char *task_name) {
printf("\"%s\"(stack_size = %lu) overflow the heap_size.\n", task_name, uxTaskGetStackHighWaterMark(task)); printf("\"%s\"(stack_size = %lu) overflow the heap_size.\n", task_name, uxTaskGetStackHighWaterMark(task));
} }
// .text+0x3d8 // .text+0x3d8
void vApplicationIdleHook(void) { void IRAM vApplicationIdleHook(void) {
printf("idle %lu\n", WDEV.SYS_TIME); printf("idle %lu\n", WDEV.SYS_TIME);
} }
// .text+0x404 // .text+0x404
void vApplicationTickHook(void) { void IRAM vApplicationTickHook(void) {
printf("tick %lu\n", WDEV.SYS_TIME); printf("tick %lu\n", WDEV.SYS_TIME);
} }
@ -281,7 +281,7 @@ void vApplicationTickHook(void) {
static void zero_bss(void) { static void zero_bss(void) {
uint32_t *addr; uint32_t *addr;
for (addr = _bss_start; addr < _bss_end; addr++) { for (addr = &_bss_start; addr < &_bss_end; addr++) {
*addr = 0; *addr = 0;
} }
} }
@ -299,12 +299,12 @@ static void init_networking(uint8_t *phy_info, uint8_t *mac_addr) {
sdk_lmacInit(); sdk_lmacInit();
sdk_wDev_Initialize(); sdk_wDev_Initialize();
sdk_pp_attach(); sdk_pp_attach();
sdk_ieee80211_ifattach(sdk_g_ic, mac_addr); sdk_ieee80211_ifattach(&sdk_g_ic, mac_addr);
_xt_isr_mask(1); _xt_isr_mask(1);
DPORT.DPORT0 = SET_FIELD(DPORT.DPORT0, DPORT_DPORT0_FIELD0, 1); DPORT.DPORT0 = SET_FIELD(DPORT.DPORT0, DPORT_DPORT0_FIELD0, 1);
sdk_pm_attach(); sdk_pm_attach();
sdk_phy_enable_agc(); sdk_phy_enable_agc();
sdk_cnx_attach(sdk_g_ic); sdk_cnx_attach(&sdk_g_ic);
sdk_wDevEnableRx(); sdk_wDevEnableRx();
} }

2
core/include/esp/dport_regs.h
View file

@ -53,7 +53,7 @@ _Static_assert(sizeof(struct DPORT_REGS) == 0x60, "DPORT_REGS is the wrong size"
/* Currently very little known about this register. The following is based on analysis of the startup code in the Espressif SDK: */ /* Currently very little known about this register. The following is based on analysis of the startup code in the Espressif SDK: */
#define DPORT_DPORT0_FIELD0_M 0x0000007f #define DPORT_DPORT0_FIELD0_M 0x0000001f
#define DPORT_DPORT0_FIELD0_S 0 #define DPORT_DPORT0_FIELD0_S 0
/* Details for INT_ENABLE register */ /* Details for INT_ENABLE register */

4
core/include/sdk_internal.h
View file

@ -207,9 +207,9 @@ _Static_assert(sizeof(struct sdk_g_ic_st) == 0x548, "sdk_g_ic_st is the wrong si
sdk_SpiFlashOpResult sdk_SPIRead(uint32_t src_addr, uint32_t *des_addr, uint32_t size); sdk_SpiFlashOpResult sdk_SPIRead(uint32_t src_addr, uint32_t *des_addr, uint32_t size);
sdk_SpiFlashOpResult sdk_SPIWrite(uint32_t des_addr, uint32_t *src_addr, uint32_t size); sdk_SpiFlashOpResult sdk_SPIWrite(uint32_t des_addr, uint32_t *src_addr, uint32_t size);
void sdk_cnx_attach(struct sdk_g_ic_st); void sdk_cnx_attach(struct sdk_g_ic_st *);
void sdk_ets_timer_init(void); void sdk_ets_timer_init(void);
void sdk_ieee80211_ifattach(struct sdk_g_ic_st, uint8_t *); void sdk_ieee80211_ifattach(struct sdk_g_ic_st *, uint8_t *);
void sdk_ieee80211_phy_init(enum sdk_phy_mode); void sdk_ieee80211_phy_init(enum sdk_phy_mode);
void sdk_lmacInit(void); void sdk_lmacInit(void);
void sdk_os_install_putc1( void (*func)(uint8_t) ); void sdk_os_install_putc1( void (*func)(uint8_t) );