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

Merge pull request #523 from ourairquality/reclaim-wdev-bss

Browse source 
Reclaim a chunk of unused dram in the wdev bss area, 8000 bytes.
This commit is contained in:
Ruslan V. Uss 2017-12-28 06:48:16 +05:00 committed by GitHub
commit e5e902589c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/app_main.c
View file

@ -135,6 +135,8 @@ static void IRAM default_putc(char c) {
} }
void init_newlib_locks(void); void init_newlib_locks(void);
extern uint8_t sdk_wDevCtrl[];
void nano_malloc_insert_chunk(void *start, size_t size);
// .text+0x258 // .text+0x258
void IRAM sdk_user_start(void) { void IRAM sdk_user_start(void) {
@ -203,6 +205,15 @@ void IRAM sdk_user_start(void) {
Cache_Read_Enable(0, 0, 1); Cache_Read_Enable(0, 0, 1);
zero_bss(); zero_bss();
sdk_os_install_putc1(default_putc); sdk_os_install_putc1(default_putc);
/* HACK Reclaim a region of unused bss from wdev.o. This would not be
* necessary if the source code to wdev were available, and then it would
* not be a fragmented area, but the extra memory is desparately needed and
* it is in very useful dram. */
nano_malloc_insert_chunk((void *)(sdk_wDevCtrl + 0x2190), 8000);
init_newlib_locks();
if (cksum_magic == 0xffffffff) { if (cksum_magic == 0xffffffff) {
// No checksum required // No checksum required
} else if ((cksum_magic == 0x55aa55aa) && } else if ((cksum_magic == 0x55aa55aa) &&
@ -225,7 +236,6 @@ void IRAM sdk_user_start(void) {
status = sysparam_init(sysparam_addr, 0); status = sysparam_init(sysparam_addr, 0);
} }
} }
init_newlib_locks();
if (status != SYSPARAM_OK) { if (status != SYSPARAM_OK) {
printf("WARNING: Could not initialize sysparams (%d)!\n", status); printf("WARNING: Could not initialize sysparams (%d)!\n", status);
} }

8
core/newlib_syscalls.c
View file

@ -61,6 +61,14 @@ IRAM void *_sbrk_r (struct _reent *r, ptrdiff_t incr)
return (caddr_t) prev_heap_end; return (caddr_t) prev_heap_end;
} }
/* Insert a disjoint region into the nano malloc pool. Create a malloc chunk,
* filling the size as newlib nano malloc expects, and then free it. */
void nano_malloc_insert_chunk(void *start, size_t size) {
*(uint32_t *)start = size;
free(start + sizeof(size_t));
}
/* syscall implementation for stdio write to UART */ /* syscall implementation for stdio write to UART */
__attribute__((weak)) ssize_t _write_stdout_r(struct _reent *r, int fd, const void *ptr, size_t len ) __attribute__((weak)) ssize_t _write_stdout_r(struct _reent *r, int fd, const void *ptr, size_t len )
{ {