andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-12-30 12:03:15 -05:00
parent 474b99ba60
commit d031de3a2d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -206,9 +206,4 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->injectionPins[3] = GPIO_UNASSIGNED;
engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->warningPeriod = 0;
}

11
firmware/util/loggingcentral.cpp
View File

@ -69,7 +69,9 @@ void scheduleLogging(Logging *logging) {
* this method should always be invoked from the same thread!
*/
char * swapOutputBuffers(int *actualOutputBufferSize) {
#if EFI_ENABLE_ASSERTS || defined(__DOXYGEN__)
int expectedOutputSize;
#endif /* EFI_ENABLE_ASSERTS */
{ // start of critical section
lockOutputBuffer();
/**
@ -77,7 +79,7 @@ char * swapOutputBuffers(int *actualOutputBufferSize) {
*/
char *temp = outputBuffer;
#if EFI_ENABLE_ASSERTS
#if EFI_ENABLE_ASSERTS || defined(__DOXYGEN__)
expectedOutputSize = accumulatedSize;
#endif /* EFI_ENABLE_ASSERTS */
outputBuffer = accumulationBuffer;
@ -90,7 +92,12 @@ char * swapOutputBuffers(int *actualOutputBufferSize) {
} // end of critical section
*actualOutputBufferSize = efiStrlen(outputBuffer);
efiAssert(*actualOutputBufferSize == expectedOutputSize, "out constr", NULL);
#if EFI_ENABLE_ASSERTS || defined(__DOXYGEN__)
if (*actualOutputBufferSize != expectedOutputSize) {
firmwareError(OBD_PCM_Processor_Fault, "out constr %d/%d", *actualOutputBufferSize, expectedOutputSize);
return NULL;
}
#endif /* EFI_ENABLE_ASSERTS */
return outputBuffer;
}