alvierahman90/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Short term fix for conflicting types for 'tfp_printf' (#8157)

Browse Source
This commit is contained in:
Joel Challis 2020-03-01 18:46:40 +00:00 committed by GitHub
parent 629950e51b
commit e7fb873ee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tmk_core/common/chibios/printf.c
View File

@ -96,8 +96,8 @@ static int a2d(char ch) {
return -1; return -1;
} }
static char a2i(char ch, char** src, int base, int* nump) { static char a2i(char ch, const char** src, int base, int* nump) {
char* p = *src; const char* p = *src;
int num = 0; int num = 0;
int digit; int digit;
while ((digit = a2d(ch)) >= 0) { while ((digit = a2d(ch)) >= 0) {
@ -119,7 +119,7 @@ static void putchw(void* putp, putcf putf, int n, char z, char* bf) {
while ((ch = *bf++)) putf(putp, ch); while ((ch = *bf++)) putf(putp, ch);
} }
void tfp_format(void* putp, putcf putf, char* fmt, va_list va) { void tfp_format(void* putp, putcf putf, const char* fmt, va_list va) {
// This used to handle max of 12, but binary support jumps this to at least 32 // This used to handle max of 12, but binary support jumps this to at least 32
char bf[36]; char bf[36];
@ -211,19 +211,23 @@ void init_printf(void* putp, void (*putf)(void*, char)) {
stdout_putp = putp; stdout_putp = putp;
} }
void tfp_printf(char* fmt, ...) { int tfp_printf(const char* fmt, ...) {
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
tfp_format(stdout_putp, stdout_putf, fmt, va); tfp_format(stdout_putp, stdout_putf, fmt, va);
va_end(va); va_end(va);
return 1;
} }
static void putcp(void* p, char c) { *(*((char**)p))++ = c; } static void putcp(void* p, char c) { *(*((char**)p))++ = c; }
void tfp_sprintf(char* s, char* fmt, ...) { int tfp_sprintf(char* s, const char* fmt, ...) {
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
tfp_format(&s, putcp, fmt, va); tfp_format(&s, putcp, fmt, va);
putcp(&s, 0); putcp(&s, 0);
va_end(va); va_end(va);
return 1;
} }

6
tmk_core/common/chibios/printf.h
View File

@ -99,10 +99,10 @@ regs Kusti, 23.10.2004
void init_printf(void* putp, void (*putf)(void*, char)); void init_printf(void* putp, void (*putf)(void*, char));
void tfp_printf(char* fmt, ...); int tfp_printf(const char* fmt, ...);
void tfp_sprintf(char* s, char* fmt, ...); int tfp_sprintf(char* s, const char* fmt, ...);
void tfp_format(void* putp, void (*putf)(void*, char), char* fmt, va_list va); void tfp_format(void* putp, void (*putf)(void*, char), const char* fmt, va_list va);
#define printf tfp_printf #define printf tfp_printf
#define sprintf tfp_sprintf #define sprintf tfp_sprintf