From f6f57aa81c7c90f974521fbc5a63d39ed385d43e Mon Sep 17 00:00:00 2001 From: Alex Stewart Date: Wed, 26 Aug 2015 13:19:53 -0700 Subject: [PATCH] More app_main fixups from object code comparisons --- core/app_main.c | 7 ++++--- core/include/sdk_internal.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/app_main.c b/core/app_main.c index ae8fa07..8d5a2b9 100644 --- a/core/app_main.c +++ b/core/app_main.c @@ -82,7 +82,7 @@ xTaskHandle sdk_xWatchDogTaskHandle; static void IRAM get_otp_mac_address(uint8_t *buf); static void IRAM set_spi0_divisor(uint32_t divisor); -static void IRAM default_putc(uint8_t c); +static int IRAM default_putc(uint8_t c); static void IRAM default_putc1(uint8_t c); static void zero_bss(void); static void init_networking(uint8_t *phy_info, uint8_t *mac_addr); @@ -167,9 +167,10 @@ void IRAM sdk_user_fatal_exception_handler(void) { } // .Lfunc003 -- .text+0x1d0 -static void IRAM default_putc(uint8_t c) { +static int IRAM default_putc(uint8_t c) { while (FIELD2VAL(UART_STATUS_TXFIFO_COUNT, UART(0).STATUS) > 125) {} UART(0).FIFO = c; + return 0; } // .Lfunc004 -- .text+0x1f4 @@ -467,7 +468,7 @@ static void user_start_phase2(void) { free(phy_info); tcpip_init(NULL, NULL); sdk_wdt_init(); - xTaskCreate(sdk_user_init_task, (signed char *)"uiT", 1024, 0, 14, sdk_xUserTaskHandle); + xTaskCreate(sdk_user_init_task, (signed char *)"uiT", 1024, 0, 14, &sdk_xUserTaskHandle); } // .Lfunc010 -- .irom0.text+0x710 diff --git a/core/include/sdk_internal.h b/core/include/sdk_internal.h index 6764094..9c4da3e 100644 --- a/core/include/sdk_internal.h +++ b/core/include/sdk_internal.h @@ -141,7 +141,7 @@ struct sdk_g_ic_saved_st { uint32_t _unknown288; uint8_t _unknown28c; - uint8_t _unknown290[28]; + uint8_t _unknown28d[31]; uint8_t _unknown2ac[64]; uint8_t _unknonwn2ec;