better code location

This commit is contained in:
rusefi 2018-08-31 21:27:41 -04:00
parent f292c4ccb2
commit 351d36f9c0
1 changed files with 5 additions and 5 deletions

View File

@ -2,7 +2,7 @@
* @file datalogging.cpp * @file datalogging.cpp
* @brief Buffered console output stream code * @brief Buffered console output stream code
* *
* Here we have a memory buffer and method related to * Here we have a memory buffer and methods related to
* printing messages into this buffer. The purpose of the * printing messages into this buffer. The purpose of the
* buffer is to allow fast, non-blocking, thread-safe logging. * buffer is to allow fast, non-blocking, thread-safe logging.
* *
@ -92,6 +92,10 @@ void appendFast(Logging *logging, const char *text) {
// todo: look into chsnprintf once on Chibios 3 // todo: look into chsnprintf once on Chibios 3
static void vappendPrintfI(Logging *logging, const char *fmt, va_list arg) { static void vappendPrintfI(Logging *logging, const char *fmt, va_list arg) {
if (!intermediateLoggingBufferInited) {
firmwareError(CUSTOM_ERR_BUFF_INIT_ERROR, "intermediateLoggingBufferInited not inited!");
return;
}
intermediateLoggingBuffer.eos = 0; // reset intermediateLoggingBuffer.eos = 0; // reset
efiAssertVoid(CUSTOM_ERR_6603, getRemainingStack(chThdGetSelfX()) > 128, "lowstck#1b"); efiAssertVoid(CUSTOM_ERR_6603, getRemainingStack(chThdGetSelfX()) > 128, "lowstck#1b");
chvprintf((BaseSequentialStream *) &intermediateLoggingBuffer, fmt, arg); chvprintf((BaseSequentialStream *) &intermediateLoggingBuffer, fmt, arg);
@ -104,10 +108,6 @@ static void vappendPrintfI(Logging *logging, const char *fmt, va_list arg) {
*/ */
static void vappendPrintf(Logging *logging, const char *fmt, va_list arg) { static void vappendPrintf(Logging *logging, const char *fmt, va_list arg) {
efiAssertVoid(CUSTOM_ERR_6604, getRemainingStack(chThdGetSelfX()) > 128, "lowstck#5b"); efiAssertVoid(CUSTOM_ERR_6604, getRemainingStack(chThdGetSelfX()) > 128, "lowstck#5b");
if (!intermediateLoggingBufferInited) {
firmwareError(CUSTOM_ERR_BUFF_INIT_ERROR, "intermediateLoggingBufferInited not inited!");
return;
}
int wasLocked = lockAnyContext(); int wasLocked = lockAnyContext();
vappendPrintfI(logging, fmt, arg); vappendPrintfI(logging, fmt, arg);
if (!wasLocked) { if (!wasLocked) {