From 006df914f920bd417343d696ae83757807624962 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 11 Feb 2016 14:01:38 -0500 Subject: [PATCH] auto-sync --- firmware/hw_layer/flash.c | 8 ++++---- firmware/rusefi.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/hw_layer/flash.c b/firmware/hw_layer/flash.c index 18b75deea7..0c4327f70f 100644 --- a/firmware/hw_layer/flash.c +++ b/firmware/hw_layer/flash.c @@ -47,8 +47,8 @@ flashsector_t flashSectorAt(flashaddr_t address) { /** * @brief Unlock the flash memory for write access. - * @return CH_SUCCESS Unlock was successful. - * @return CH_FAILED Unlock failed. + * @return HAL_SUCCESS Unlock was successful. + * @return HAL_FAILED Unlock failed. */ static bool flashUnlock(void) { /* Check if unlock is really needed */ @@ -72,7 +72,7 @@ static bool flashUnlock(void) { int flashSectorErase(flashsector_t sector) { /* Unlock flash for write access */ - if (flashUnlock() == CH_FAILED) + if (flashUnlock() == HAL_FAILED) return FLASH_RETURN_NO_PERMISSION; /* Wait for any busy flags. */ @@ -197,7 +197,7 @@ static void flashWriteData(flashaddr_t address, const flashdata_t data) { int flashWrite(flashaddr_t address, const char* buffer, size_t size) { /* Unlock flash for write access */ - if (flashUnlock() == CH_FAILED) + if (flashUnlock() == HAL_FAILED) return FLASH_RETURN_NO_PERMISSION; /* Wait for any busy flags */ diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 797922d4dd..548bcfb66b 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -148,7 +148,7 @@ static void rebootNow(void) { static void scheduleReboot(void) { scheduleMsg(&sharedLogger, "Rebooting in 5 seconds..."); lockAnyContext(); - chVTSetI(&resetTimer, 5 * CH_FREQUENCY, (vtfunc_t) rebootNow, NULL); + chVTSetI(&resetTimer, MS2ST(5000), (vtfunc_t) rebootNow, NULL); unlockAnyContext(); }