RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

cpu/esp: fix conflicts after rebase

Browse Source
This commit is contained in:
Gunar Schorcht 2019-09-05 12:16:03 +02:00 committed by Schorcht
parent 3c47cc571f
commit 5521a6c39d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpu/esp32/syscalls.c
View File

@ -236,7 +236,7 @@ void heap_stats(void)
size_t _alloc = hinfo.total_allocated_bytes;
printf("heap: %u (used %u free %u) [bytes]\n",
_free + _alloc, _alloc, _free);
(unsigned)(_free + _alloc), (unsigned)_alloc, (unsigned)_free);
}
#else /* MODULE_ESP_IDF_HEAP */
@ -271,9 +271,8 @@ unsigned int IRAM get_free_heap_size (void)
void heap_stats(void)
{
printf("heap: %u (used %u free %u)\n",
&_eheap - &_sheap, &_eheap - &_sheap - get_free_heap_size(),
get_free_heap_size());
printf("heap: %u (used %u free %u)\n", (unsigned)(&_eheap - &_sheap),
&_eheap - &_sheap - get_free_heap_size(), get_free_heap_size());
}
#endif /* MODULE_ESP_IDF_HEAP */

2
cpu/esp8266/syscalls.c
View File

@ -341,8 +341,6 @@ void heap_stats(void)
get_free_heap_size());
}
#endif /* MODULE_ESP_SDK */
int _rename_r (struct _reent *r, const char* old, const char* new)
{
DEBUG("%s: system function does not exist\n", __func__);