feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Update IDF to 65acd99 (#358)

Browse Source 
* Update IDF to 65acd99

* Update platformio and arduino build paths and libs

* Update esptool binaries
This commit is contained in:
Me No Dev
2017-05-06 20:29:12 +03:00
committed by GitHub
parent 450df7e3f8
commit 376961d168
221 changed files with 14441 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/sdk/include/lwip/lwip/memp.h
View File

@ -71,7 +71,7 @@ extern const struct memp_desc* const memp_pools[MEMP_MAX];
#include "lwip/mem.h"
#define memp_init()
#if ESP_CNT_DEBUG
#if ESP_STATS_MEM
static inline void* memp_malloc(int type)
{
ESP_CNT_MEM_MALLOC_INC(type);

2
tools/sdk/include/lwip/lwip/priv/memp_priv.h
View File

@ -140,7 +140,7 @@ struct memp_desc {
#endif /* MEMP_MEM_MALLOC */
};
#if (ESP_CNT_DEBUG == 1)
#if (ESP_STATS_MEM == 1)
extern uint32_t g_lwip_mem_cnt[MEMP_MAX][2];
#define ESP_CNT_MEM_MALLOC_INC(type) g_lwip_mem_cnt[type][0]++
#define ESP_CNT_MEM_FREE_INC(type) g_lwip_mem_cnt[type][1]++

12
tools/sdk/include/lwip/lwip/stats.h
View File

@ -282,7 +282,7 @@ struct stats_ {
#if MIB2_STATS
struct stats_mib2 mib2;
#endif
#if ESP_STATS
#if ESP_STATS_DROP
struct stats_esp esp;
#endif
};
@ -458,12 +458,12 @@ void stats_init(void);
#define MIB2_STATS_INC(x)
#endif
#if ESP_STATS
#define ESP_STATS_INC(x) STATS_INC(x)
#define ESP_STATS_DISPLAY() stats_display_esp(&lwip_stats.esp);
#if ESP_STATS_DROP
#define ESP_STATS_DROP_INC(x) STATS_INC(x)
#define ESP_STATS_DROP_DISPLAY() stats_display_esp(&lwip_stats.esp);
#else
#define ESP_STATS_INC(x)
#define ESP_STATS_DISPLAY()
#define ESP_STATS_DROP_INC(x)
#define ESP_STATS_DROP_DISPLAY()
#endif
/* Display of statistics */

21
tools/sdk/include/lwip/lwip/tcp.h
View File

@ -310,8 +310,29 @@ struct tcp_pcb {
u8_t snd_scale;
u8_t rcv_scale;
#endif
#if ESP_STATS_TCP
#define ESP_STATS_TCP_ARRAY_SIZE 20
u16_t retry_cnt[TCP_MAXRTX];
u16_t rto_cnt[ESP_STATS_TCP_ARRAY_SIZE];
#endif
};
#if ESP_STATS_TCP
#define ESP_STATS_TCP_PCB(_pcb) do {\
if ((_pcb)->unacked) {\
(_pcb)->retry_cnt[(_pcb)->nrtx]++;\
if ((_pcb)->rto < ESP_STATS_TCP_ARRAY_SIZE) {\
(_pcb)->rto_cnt[(_pcb)->rto]++;\
} else {\
(_pcb)->rto_cnt[ESP_STATS_TCP_ARRAY_SIZE-1] ++;\
}\
}\
} while(0)
#else
#define ESP_STATS_TCP_PCB(pcb)
#endif
struct tcp_pcb_listen {
/* Common members of all PCB types */
IP_PCB;