sysmocom
/
openblt
11
0
Fork 0
Code Issues Pull Requests Releases Activity

Refs #201. Renamed BACKDOOR_ENTRY_TIMEOUT_MS configuration macro to BOOT_BACKDOOR_ENTRY_TIMEOUT_MS. 

git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@193 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
Frank Voorburg 2016-12-17 10:48:25 +00:00
parent 18090ed664
commit 138f8aab73
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h
View File

@ -144,7 +144,7 @@
* shorten/lengthen this time for finetuning. the only downside of a long backdoor open * shorten/lengthen this time for finetuning. the only downside of a long backdoor open
* time is that the starting of the user program will also be delayed for this time. * time is that the starting of the user program will also be delayed for this time.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000)
#endif #endif

2
Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h
View File

@ -144,7 +144,7 @@
* shorten/lengthen this time for finetuning. the only downside of a long backdoor open * shorten/lengthen this time for finetuning. the only downside of a long backdoor open
* time is that the starting of the user program will also be delayed for this time. * time is that the starting of the user program will also be delayed for this time.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000)
#endif #endif

2
Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h
View File

@ -144,7 +144,7 @@
* shorten/lengthen this time for finetuning. the only downside of a long backdoor open * shorten/lengthen this time for finetuning. the only downside of a long backdoor open
* time is that the starting of the user program will also be delayed for this time. * time is that the starting of the user program will also be delayed for this time.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000)
#endif #endif

2
Target/Demo/ARMCM3_STM32F1_Olimexino_STM32_GCC/Boot/blt_conf.h
View File

@ -109,7 +109,7 @@
* for the bootloader to stay active. Refer to CpuUserProgramStartHook() to determine * for the bootloader to stay active. Refer to CpuUserProgramStartHook() to determine
* the digital input to use for this. * the digital input to use for this.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (2000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (2000)
#endif #endif
/**************************************************************************************** /****************************************************************************************

2
Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/blt_conf.h
View File

@ -185,7 +185,7 @@
* shorten/lengthen this time for finetuning. the only downside of a long backdoor open * shorten/lengthen this time for finetuning. the only downside of a long backdoor open
* time is that the starting of the user program will also be delayed for this time. * time is that the starting of the user program will also be delayed for this time.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000)
#endif #endif

2
Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_GCC/Boot/blt_conf.h
View File

@ -185,7 +185,7 @@
* shorten/lengthen this time for finetuning. the only downside of a long backdoor open * shorten/lengthen this time for finetuning. the only downside of a long backdoor open
* time is that the starting of the user program will also be delayed for this time. * time is that the starting of the user program will also be delayed for this time.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000)
#endif #endif

2
Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_IAR/Boot/blt_conf.h
View File

@ -185,7 +185,7 @@
* shorten/lengthen this time for finetuning. the only downside of a long backdoor open * shorten/lengthen this time for finetuning. the only downside of a long backdoor open
* time is that the starting of the user program will also be delayed for this time. * time is that the starting of the user program will also be delayed for this time.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000)
#endif #endif

2
Target/Demo/ARMCM4_STM32F4_Olimex_STM32P405_GCC/Boot/blt_conf.h
View File

@ -129,7 +129,7 @@
* for the bootloader to stay active. Refer to CpuUserProgramStartHook() to determine * for the bootloader to stay active. Refer to CpuUserProgramStartHook() to determine
* the digital input to use for this. * the digital input to use for this.
*/ */
#define BACKDOOR_ENTRY_TIMEOUT_MS (2000) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (2000)
#endif #endif
/**************************************************************************************** /****************************************************************************************

12
Target/Source/backdoor.c
View File

@ -36,7 +36,7 @@
* Macro definitions * Macro definitions
****************************************************************************************/ ****************************************************************************************/
#if (BOOT_BACKDOOR_HOOKS_ENABLE == 0) #if (BOOT_BACKDOOR_HOOKS_ENABLE == 0)
#ifndef BACKDOOR_ENTRY_TIMEOUT_MS #ifndef BOOT_BACKDOOR_ENTRY_TIMEOUT_MS
/** \brief Sets the time in milliseconds that the backdoor is open, but allow an /** \brief Sets the time in milliseconds that the backdoor is open, but allow an
* override for this time. note that this time should be at least 2.5 times * override for this time. note that this time should be at least 2.5 times
* as long as the time that is configured in Microboot's XCP settings for the * as long as the time that is configured in Microboot's XCP settings for the
@ -46,13 +46,13 @@
* network latency. The default value was chosen safely for compatibility * network latency. The default value was chosen safely for compatibility
* reasons with all supported communication interfaces. It could be made * reasons with all supported communication interfaces. It could be made
* shorter your bootloader. To change this value, simply add the macro * shorter your bootloader. To change this value, simply add the macro
* BACKDOOR_ENTRY_TIMEOUT_MS to blt_conf.h with your desired backdoor open time * BOOT_BACKDOOR_ENTRY_TIMEOUT_MS to blt_conf.h with your desired backdoor
* in milliseconds. * open time in milliseconds.
*/ */
#if (BOOT_COM_NET_ENABLE == 1) #if (BOOT_COM_NET_ENABLE == 1)
#define BACKDOOR_ENTRY_TIMEOUT_MS (750) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (750)
#else #else
#define BACKDOOR_ENTRY_TIMEOUT_MS (500) #define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (500)
#endif #endif
#endif #endif
#endif #endif
@ -148,7 +148,7 @@ void BackDoorCheck(void)
if (backdoorOpen == BLT_TRUE) if (backdoorOpen == BLT_TRUE)
{ {
/* check if the backdoor entry time window elapsed */ /* check if the backdoor entry time window elapsed */
if (TimerGet() >= (BACKDOOR_ENTRY_TIMEOUT_MS + backdoorOpenTime)) if (TimerGet() >= (BOOT_BACKDOOR_ENTRY_TIMEOUT_MS + backdoorOpenTime))
{ {
/* close the backdoor */ /* close the backdoor */
backdoorOpen = BLT_FALSE; backdoorOpen = BLT_FALSE;