mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-19 23:22:16 +03:00
Merge remote-tracking branch 'esp8266/master'
This commit is contained in:
commit
397b3fd968
@ -52,10 +52,9 @@ int ICACHE_RAM_ATTR putchar(int c) {
|
||||
}
|
||||
|
||||
int ICACHE_RAM_ATTR printf(const char* format, ...) {
|
||||
int ret;
|
||||
va_list arglist;
|
||||
va_start(arglist, format);
|
||||
ret = ets_vprintf(format, arglist);
|
||||
int ret = ets_vprintf(ets_putc, format, arglist);
|
||||
va_end(arglist);
|
||||
return ret;
|
||||
}
|
||||
@ -79,7 +78,7 @@ int ICACHE_RAM_ATTR snprintf(char* buffer, size_t size, const char* format, ...)
|
||||
}
|
||||
|
||||
int ICACHE_RAM_ATTR vprintf(const char * format, va_list arg) {
|
||||
return ets_vprintf(format, arg);
|
||||
return ets_vprintf(ets_putc, format, arg);
|
||||
}
|
||||
|
||||
int ICACHE_RAM_ATTR vsnprintf(char * buffer, size_t size, const char * format, va_list arg) {
|
||||
|
@ -183,7 +183,8 @@ void ets_isr_attach(int intr, int_handler_t handler, void *arg);
|
||||
void ets_intr_lock();
|
||||
void ets_intr_unlock();
|
||||
int ets_vsnprintf(char * s, size_t n, const char * format, va_list arg) __attribute__ ((format (printf, 3, 0)));
|
||||
int ets_vprintf(const char * format, va_list arg) __attribute__ ((format (printf, 1, 0)));
|
||||
int ets_vprintf(int (*print_function)(int), const char * format, va_list arg) __attribute__ ((format (printf, 2, 0)));
|
||||
int ets_putc(int);
|
||||
bool ets_task(ETSTask task, uint8 prio, ETSEvent *queue, uint8 qlen);
|
||||
bool ets_post(uint8 prio, ETSSignal sig, ETSParam par);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user