From cef933d22df4d6f5bed9ec776ef2a0f92e1ab857 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Fri, 31 Mar 2017 15:58:02 +0200 Subject: [PATCH] Fixes for our chprint on ChibiOS 3.x --- os/hal/lib/streams/chprintf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/os/hal/lib/streams/chprintf.c b/os/hal/lib/streams/chprintf.c index af19e6da7..1e009d9e1 100644 --- a/os/hal/lib/streams/chprintf.c +++ b/os/hal/lib/streams/chprintf.c @@ -100,7 +100,7 @@ char *ftoa(char *p, double num, unsigned long precision) { #endif #include "error_handling.h" -int getRemainingStack(Thread *otp); +int getRemainingStack(thread_t *otp); /** * @brief System formatted output function. @@ -129,7 +129,7 @@ int getRemainingStack(Thread *otp); void chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) { char *p, *s, c, filler; int i, precision, width; - bool_t is_long, left_align; + bool is_long, left_align; long l; #if CHPRINTF_USE_FLOAT float f; @@ -138,7 +138,7 @@ void chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) { char tmpbuf[MAX_FILLER + 1]; #endif - efiAssertVoid(getRemainingStack(chThdSelf()) > 64, "lowstck#1c"); + efiAssertVoid(getRemainingStack(chThdGetSelfX()) > 64, "lowstck#1c"); while (TRUE) { @@ -272,7 +272,7 @@ unsigned_common: } while (++width != 0); } if (i > 0) { - chSequentialStreamWrite(chp, (uint8_t*)s, i); + chSequentialStreamWrite(chp, (uint8_t*)s, i); } s += i;