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

auto-sync

This commit is contained in:
rusEfi 2016-02-11 14:01:38 -05:00
parent 7d3142b395
commit 006df914f9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/hw_layer/flash.c
View File

@ -47,8 +47,8 @@ flashsector_t flashSectorAt(flashaddr_t address) {
/** /**
* @brief Unlock the flash memory for write access. * @brief Unlock the flash memory for write access.
* @return CH_SUCCESS Unlock was successful. * @return HAL_SUCCESS Unlock was successful.
* @return CH_FAILED Unlock failed. * @return HAL_FAILED Unlock failed.
*/ */
static bool flashUnlock(void) { static bool flashUnlock(void) {
/* Check if unlock is really needed */ /* Check if unlock is really needed */
@ -72,7 +72,7 @@ static bool flashUnlock(void) {
int flashSectorErase(flashsector_t sector) { int flashSectorErase(flashsector_t sector) {
/* Unlock flash for write access */ /* Unlock flash for write access */
if (flashUnlock() == CH_FAILED) if (flashUnlock() == HAL_FAILED)
return FLASH_RETURN_NO_PERMISSION; return FLASH_RETURN_NO_PERMISSION;
/* Wait for any busy flags. */ /* 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) { int flashWrite(flashaddr_t address, const char* buffer, size_t size) {
/* Unlock flash for write access */ /* Unlock flash for write access */
if (flashUnlock() == CH_FAILED) if (flashUnlock() == HAL_FAILED)
return FLASH_RETURN_NO_PERMISSION; return FLASH_RETURN_NO_PERMISSION;
/* Wait for any busy flags */ /* Wait for any busy flags */

2
firmware/rusefi.cpp
View File

@ -148,7 +148,7 @@ static void rebootNow(void) {
static void scheduleReboot(void) { static void scheduleReboot(void) {
scheduleMsg(&sharedLogger, "Rebooting in 5 seconds..."); scheduleMsg(&sharedLogger, "Rebooting in 5 seconds...");
lockAnyContext(); lockAnyContext();
chVTSetI(&resetTimer, 5 * CH_FREQUENCY, (vtfunc_t) rebootNow, NULL); chVTSetI(&resetTimer, MS2ST(5000), (vtfunc_t) rebootNow, NULL);
unlockAnyContext(); unlockAnyContext();
} }