Enable -std=gnu11 for user dir

This commit is contained in:
devsaurus 2016-03-24 00:06:09 +01:00
parent 280f3497bd
commit 8bc2e8aa19
5 changed files with 8 additions and 1 deletions

View File

@ -86,6 +86,8 @@ typedef struct
uint32_t segment_size; uint32_t segment_size;
} ICACHE_STORE_TYPEDEF_ATTR SPIFlashInfo; } ICACHE_STORE_TYPEDEF_ATTR SPIFlashInfo;
SpiFlashOpResult SPIRead(uint32_t src_addr, uint32_t *des_addr, uint32_t size);
uint32_t flash_detect_size_byte(void); uint32_t flash_detect_size_byte(void);
uint32_t flash_safe_get_size_byte(void); uint32_t flash_safe_get_size_byte(void);
uint16_t flash_safe_get_sec_num(void); uint16_t flash_safe_get_sec_num(void);

View File

@ -15,6 +15,7 @@ ifndef PDIR
GEN_LIBS = libuser.a GEN_LIBS = libuser.a
endif endif
STD_CFLAGS=-std=gnu11 -Wimplicit
############################################################# #############################################################
# Configuration i.e. compile options etc. # Configuration i.e. compile options etc.

View File

@ -3,3 +3,4 @@
#include <xtensa/corebits.h> #include <xtensa/corebits.h>
void load_non_32_wide_handler (struct exception_frame *ef, uint32_t cause) TEXT_SECTION_ATTR; void load_non_32_wide_handler (struct exception_frame *ef, uint32_t cause) TEXT_SECTION_ATTR;
void __real__xtos_set_exception_handler (uint32_t cause, exception_handler_fn fn);

View File

@ -13,6 +13,7 @@
#include "c_string.h" #include "c_string.h"
#include "c_stdlib.h" #include "c_stdlib.h"
#include "flash_fs.h" #include "flash_fs.h"
#include "flash_api.h"
#include "user_interface.h" #include "user_interface.h"
#include "user_exceptions.h" #include "user_exceptions.h"
#include "user_modules.h" #include "user_modules.h"
@ -69,7 +70,7 @@ void TEXT_SECTION_ATTR user_start_trampoline (void)
* terse and not as readable as one might like. * terse and not as readable as one might like.
*/ */
SPIFlashInfo sfi; SPIFlashInfo sfi;
SPIRead (0, &sfi, sizeof (sfi)); // Cache read not enabled yet, safe to use SPIRead (0, (uint32_t *)(&sfi), sizeof (sfi)); // Cache read not enabled yet, safe to use
if (sfi.size < 2) // Compensate for out-of-order 4mbit vs 2mbit values if (sfi.size < 2) // Compensate for out-of-order 4mbit vs 2mbit values
sfi.size ^= 1; sfi.size ^= 1;
uint32_t flash_end_addr = (256 * 1024) << sfi.size; uint32_t flash_end_addr = (256 * 1024) << sfi.size;

View File

@ -10,6 +10,8 @@ int os_printf_plus(const char *format, ...) __attribute__ ((format (printf, 1,
void NmiTimSetFunc(void (*func)(void)); void NmiTimSetFunc(void (*func)(void));
void call_user_start(void);
#include_next "osapi.h" #include_next "osapi.h"
#endif #endif