From 138f8aab73b58bb18cd992f7d708d4833338d8d4 Mon Sep 17 00:00:00 2001 From: Frank Voorburg Date: Sat, 17 Dec 2016 10:48:25 +0000 Subject: [PATCH] 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 --- .../Boot/blt_conf.h | 2 +- .../Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h | 2 +- .../Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h | 2 +- .../Boot/blt_conf.h | 2 +- .../Boot/blt_conf.h | 2 +- .../Boot/blt_conf.h | 2 +- .../Boot/blt_conf.h | 2 +- .../Boot/blt_conf.h | 2 +- Target/Source/backdoor.c | 12 ++++++------ 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h index 15f8bf63..f9d0fb6a 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_Crossworks/Boot/blt_conf.h @@ -144,7 +144,7 @@ * 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. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000) #endif diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h index f3fcf89e..0dd2566c 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_GCC/Boot/blt_conf.h @@ -144,7 +144,7 @@ * 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. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000) #endif diff --git a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h index 60ba2c4b..b6cf560d 100644 --- a/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h +++ b/Target/Demo/ARMCM3_LM3S_EK_LM3S6965_IAR/Boot/blt_conf.h @@ -144,7 +144,7 @@ * 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. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000) #endif diff --git a/Target/Demo/ARMCM3_STM32F1_Olimexino_STM32_GCC/Boot/blt_conf.h b/Target/Demo/ARMCM3_STM32F1_Olimexino_STM32_GCC/Boot/blt_conf.h index 2a4a7cca..4a1c1803 100644 --- a/Target/Demo/ARMCM3_STM32F1_Olimexino_STM32_GCC/Boot/blt_conf.h +++ b/Target/Demo/ARMCM3_STM32F1_Olimexino_STM32_GCC/Boot/blt_conf.h @@ -109,7 +109,7 @@ * for the bootloader to stay active. Refer to CpuUserProgramStartHook() to determine * the digital input to use for this. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (2000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (2000) #endif /**************************************************************************************** diff --git a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/blt_conf.h b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/blt_conf.h index da09d847..620e4e0f 100644 --- a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/blt_conf.h +++ b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/blt_conf.h @@ -185,7 +185,7 @@ * 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. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000) #endif diff --git a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_GCC/Boot/blt_conf.h b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_GCC/Boot/blt_conf.h index 447e76f1..6e6feca7 100644 --- a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_GCC/Boot/blt_conf.h +++ b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_GCC/Boot/blt_conf.h @@ -185,7 +185,7 @@ * 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. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000) #endif diff --git a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_IAR/Boot/blt_conf.h b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_IAR/Boot/blt_conf.h index 7030adf2..8b1f0f70 100644 --- a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_IAR/Boot/blt_conf.h +++ b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_IAR/Boot/blt_conf.h @@ -185,7 +185,7 @@ * 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. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (10000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (10000) #endif diff --git a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32P405_GCC/Boot/blt_conf.h b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32P405_GCC/Boot/blt_conf.h index b1b13d3d..20bc2967 100644 --- a/Target/Demo/ARMCM4_STM32F4_Olimex_STM32P405_GCC/Boot/blt_conf.h +++ b/Target/Demo/ARMCM4_STM32F4_Olimex_STM32P405_GCC/Boot/blt_conf.h @@ -129,7 +129,7 @@ * for the bootloader to stay active. Refer to CpuUserProgramStartHook() to determine * the digital input to use for this. */ -#define BACKDOOR_ENTRY_TIMEOUT_MS (2000) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (2000) #endif /**************************************************************************************** diff --git a/Target/Source/backdoor.c b/Target/Source/backdoor.c index 0a3a4839..fae4dc1e 100644 --- a/Target/Source/backdoor.c +++ b/Target/Source/backdoor.c @@ -36,7 +36,7 @@ * Macro definitions ****************************************************************************************/ #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 * 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 @@ -46,13 +46,13 @@ * network latency. The default value was chosen safely for compatibility * reasons with all supported communication interfaces. It could be made * 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 - * in milliseconds. + * BOOT_BACKDOOR_ENTRY_TIMEOUT_MS to blt_conf.h with your desired backdoor + * open time in milliseconds. */ #if (BOOT_COM_NET_ENABLE == 1) -#define BACKDOOR_ENTRY_TIMEOUT_MS (750) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (750) #else -#define BACKDOOR_ENTRY_TIMEOUT_MS (500) +#define BOOT_BACKDOOR_ENTRY_TIMEOUT_MS (500) #endif #endif #endif @@ -148,7 +148,7 @@ void BackDoorCheck(void) if (backdoorOpen == BLT_TRUE) { /* 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 */ backdoorOpen = BLT_FALSE;