From a0de463a3f948efd7a12687579ec478528f2e335 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sat, 22 Nov 2014 00:03:21 -0600
Subject: [PATCH] auto-sync

---
 firmware/console/tunerstudio/tunerstudio.cpp   |  4 ++--
 firmware/controllers/algo/accel_enrichment.cpp |  5 ++++-
 firmware/emulation/wave_analyzer.cpp           | 13 +++----------
 firmware/hw_layer/mmc_card.c                   |  4 ++--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/firmware/console/tunerstudio/tunerstudio.cpp b/firmware/console/tunerstudio/tunerstudio.cpp
index a55ff9bbad..535542eb06 100644
--- a/firmware/console/tunerstudio/tunerstudio.cpp
+++ b/firmware/console/tunerstudio/tunerstudio.cpp
@@ -94,7 +94,7 @@ static int ts_serail_ready(void) {
 }
 
 // this thread wants a bit extra stack
-static THD_WORKING_AREA(TS_WORKING_AREA, UTILITY_THREAD_STACK_SIZE + 200);
+static THD_WORKING_AREA(tsThreadStack, UTILITY_THREAD_STACK_SIZE + 200);
 
 static int tsCounter = 0;
 
@@ -526,7 +526,7 @@ void startTunerStudioConnectivity(void) {
 	addConsoleAction("tsinfo", printStats);
 	addConsoleActionI("set_ts_speed", setTsSpeed);
 
-	chThdCreateStatic(TS_WORKING_AREA, sizeof(TS_WORKING_AREA), NORMALPRIO, tsThreadEntryPoint, NULL);
+	chThdCreateStatic(tsThreadStack, sizeof(tsThreadStack), NORMALPRIO, tsThreadEntryPoint, NULL);
 }
 
 #endif /* EFI_TUNER_STUDIO */
diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp
index 966b3211cd..6b50cb9092 100644
--- a/firmware/controllers/algo/accel_enrichment.cpp
+++ b/firmware/controllers/algo/accel_enrichment.cpp
@@ -16,6 +16,9 @@
 
 EXTERN_ENGINE;
 
+#if EFI_PROD_CODE
+static THD_WORKING_AREA(aeThreadStack, UTILITY_THREAD_STACK_SIZE);
+#endif
 
 static AccelEnrichmemnt instance;
 
@@ -32,6 +35,7 @@ void AccelEnrichmemnt::updateDiffEnrichment(engine_configuration_s *engineConfig
 float AccelEnrichmemnt::getDiffEnrichment() {
 	return diffEnrichment;
 }
+
 AccelEnrichmemnt::AccelEnrichmemnt() {
 	for (int i = 0; i < 4; i++)
 		engineLoadD[i] = 0;
@@ -43,7 +47,6 @@ float getAccelEnrichment(void) {
 }
 
 #if EFI_PROD_CODE
-static THD_WORKING_AREA(aeThreadStack, UTILITY_THREAD_STACK_SIZE);
 
 static msg_t DiffEnrichmentThread(int param) {
 	chRegSetThreadName("Diff Enrichment");
diff --git a/firmware/emulation/wave_analyzer.cpp b/firmware/emulation/wave_analyzer.cpp
index b7b2be65da..66d34d1efa 100644
--- a/firmware/emulation/wave_analyzer.cpp
+++ b/firmware/emulation/wave_analyzer.cpp
@@ -27,10 +27,9 @@
 EXTERN_ENGINE;
 
 #define CHART_RESET_DELAY 1
+#define MAX_ICU_COUNT 5
 
-extern board_configuration_s *boardConfiguration;
-
-extern engine_configuration_s *engineConfiguration;
+extern WaveChart waveChart;
 
 /**
  * Difference between current 1st trigger event and previous 1st trigger event.
@@ -38,12 +37,10 @@ extern engine_configuration_s *engineConfiguration;
 static volatile uint32_t engineCycleDurationUs;
 static volatile uint64_t previousEngineCycleTimeUs = 0;
 
-#define MAX_ICU_COUNT 5
-
 static int waveReaderCount = 0;
 static WaveReader readers[MAX_ICU_COUNT];
-extern WaveChart waveChart;
 
+static THD_WORKING_AREA(waThreadStack, UTILITY_THREAD_STACK_SIZE);
 static Logging logger;
 
 static void ensureInitialized(WaveReader *reader) {
@@ -148,10 +145,6 @@ static void waTriggerEventListener(trigger_event_e ckpSignalType, uint32_t index
 	previousEngineCycleTimeUs = nowUs;
 }
 
-static THD_WORKING_AREA(waThreadStack, UTILITY_THREAD_STACK_SIZE);
-
-//static Logging logger;
-
 static msg_t waThread(void *arg) {
 	(void)arg;
 	chRegSetThreadName("Wave Analyzer");
diff --git a/firmware/hw_layer/mmc_card.c b/firmware/hw_layer/mmc_card.c
index 7e96dbb096..068e164ff8 100644
--- a/firmware/hw_layer/mmc_card.c
+++ b/firmware/hw_layer/mmc_card.c
@@ -26,7 +26,7 @@ extern board_configuration_s *boardConfiguration;
 
 #define PUSHPULLDELAY 500
 
-static THD_WORKING_AREA(tp_MMC_Monitor,UTILITY_THREAD_STACK_SIZE);		// MMC monitor thread
+static THD_WORKING_AREA(mmcThreadStack,UTILITY_THREAD_STACK_SIZE);		// MMC monitor thread
 
 /**
  * MMC driver instance.
@@ -260,7 +260,7 @@ void initMmcCard(void) {
 	mmcObjectInit(&MMCD1);
 	mmcStart(&MMCD1, &mmccfg);
 
-	chThdCreateStatic(tp_MMC_Monitor, sizeof(tp_MMC_Monitor), LOWPRIO, (tfunc_t) MMCmonThread, NULL);
+	chThdCreateStatic(mmcThreadStack, sizeof(mmcThreadStack), LOWPRIO, (tfunc_t) MMCmonThread, NULL);
 
 	addConsoleAction("sdstat", sdStatistics);
 	addConsoleAction("mountsd", MMCmount);