aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/chibios/printf.c
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core/common/chibios/printf.c')
-rw-r--r--tmk_core/common/chibios/printf.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/tmk_core/common/chibios/printf.c b/tmk_core/common/chibios/printf.c
index 3a81acd31..17c1e6341 100644
--- a/tmk_core/common/chibios/printf.c
+++ b/tmk_core/common/chibios/printf.c
@@ -96,8 +96,8 @@ static int a2d(char ch) {
96 return -1; 96 return -1;
97} 97}
98 98
99static char a2i(char ch, char** src, int base, int* nump) { 99static char a2i(char ch, const char** src, int base, int* nump) {
100 char* p = *src; 100 const char* p = *src;
101 int num = 0; 101 int num = 0;
102 int digit; 102 int digit;
103 while ((digit = a2d(ch)) >= 0) { 103 while ((digit = a2d(ch)) >= 0) {
@@ -119,7 +119,7 @@ static void putchw(void* putp, putcf putf, int n, char z, char* bf) {
119 while ((ch = *bf++)) putf(putp, ch); 119 while ((ch = *bf++)) putf(putp, ch);
120} 120}
121 121
122void tfp_format(void* putp, putcf putf, char* fmt, va_list va) { 122void tfp_format(void* putp, putcf putf, const char* fmt, va_list va) {
123 // This used to handle max of 12, but binary support jumps this to at least 32 123 // This used to handle max of 12, but binary support jumps this to at least 32
124 char bf[36]; 124 char bf[36];
125 125
@@ -211,19 +211,23 @@ void init_printf(void* putp, void (*putf)(void*, char)) {
211 stdout_putp = putp; 211 stdout_putp = putp;
212} 212}
213 213
214void tfp_printf(char* fmt, ...) { 214int tfp_printf(const char* fmt, ...) {
215 va_list va; 215 va_list va;
216 va_start(va, fmt); 216 va_start(va, fmt);
217 tfp_format(stdout_putp, stdout_putf, fmt, va); 217 tfp_format(stdout_putp, stdout_putf, fmt, va);
218 va_end(va); 218 va_end(va);
219
220 return 1;
219} 221}
220 222
221static void putcp(void* p, char c) { *(*((char**)p))++ = c; } 223static void putcp(void* p, char c) { *(*((char**)p))++ = c; }
222 224
223void tfp_sprintf(char* s, char* fmt, ...) { 225int tfp_sprintf(char* s, const char* fmt, ...) {
224 va_list va; 226 va_list va;
225 va_start(va, fmt); 227 va_start(va, fmt);
226 tfp_format(&s, putcp, fmt, va); 228 tfp_format(&s, putcp, fmt, va);
227 putcp(&s, 0); 229 putcp(&s, 0);
228 va_end(va); 230 va_end(va);
231
232 return 1;
229} 233}