From 9a944e51446bd45fb9dabe0daf13946154451398 Mon Sep 17 00:00:00 2001 From: Frank Voorburg Date: Thu, 26 Jul 2018 09:34:18 +0000 Subject: [PATCH] Refs #585. Removed plausibility value checks for configuration macros that could be linked to a function. git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@547 5dc33758-31d5-4daf-9ae8-b24bf3d40d73 --- Target/Source/plausibility.h | 96 ++++++++++-------------------------- 1 file changed, 26 insertions(+), 70 deletions(-) diff --git a/Target/Source/plausibility.h b/Target/Source/plausibility.h index 1702613c..1a764351 100644 --- a/Target/Source/plausibility.h +++ b/Target/Source/plausibility.h @@ -106,22 +106,20 @@ #endif #if (BOOT_COM_CAN_ENABLE > 0) +/* Note that the value check was disabled for the following configuration macros, which + * makes it possible to link them to a function, allowing a more dynamic configuration: + * - BOOT_COM_CAN_BAUDRATE + * - BOOT_COM_CAN_TX_MSG_ID + * - BOOT_COM_CAN_RX_MSG_ID + */ #ifndef BOOT_COM_CAN_BAUDRATE #error "BOOT_COM_CAN_BAUDRATE is missing in blt_conf.h" #endif -#if (BOOT_COM_CAN_BAUDRATE <= 0) -#error "BOOT_COM_CAN_BAUDRATE must be > 0" -#endif - #ifndef BOOT_COM_CAN_TX_MSG_ID #error "BOOT_COM_CAN_TX_MSG_ID is missing in blt_conf.h" #endif -#if (BOOT_COM_CAN_TX_MSG_ID <= 0) -#error "BOOT_COM_CAN_TX_MSG_ID must be > 0" -#endif - #ifndef BOOT_COM_CAN_TX_MAX_DATA #error "BOOT_COM_CAN_TX_MAX_DATA is missing in blt_conf.h" #endif @@ -138,10 +136,6 @@ #error "BOOT_COM_CAN_RX_MSG_ID is missing in blt_conf.h" #endif -#if (BOOT_COM_CAN_RX_MSG_ID <= 0) -#error "BOOT_COM_CAN_RX_MSG_ID must be > 0" -#endif - #ifndef BOOT_COM_CAN_RX_MAX_DATA #error "BOOT_COM_CAN_RX_MAX_DATA is missing in blt_conf.h" #endif @@ -168,14 +162,14 @@ #endif #if (BOOT_COM_UART_ENABLE > 0) +/* Note that the value check was disabled for the following configuration macros, which + * makes it possible to link them to a function, allowing a more dynamic configuration: + * - BOOT_COM_UART_BAUDRATE + */ #ifndef BOOT_COM_UART_BAUDRATE #error "BOOT_COM_UART_BAUDRATE is missing in blt_conf.h" #endif -#if (BOOT_COM_UART_BAUDRATE <= 0) -#error "BOOT_COM_UART_BAUDRATE must be > 0" -#endif - #ifndef BOOT_COM_UART_TX_MAX_DATA #error "BOOT_COM_UART_TX_MAX_DATA is missing in blt_conf.h" #endif @@ -231,13 +225,27 @@ #endif #endif /* BOOT_COM_USB_ENABLE > 0 */ - - #ifndef BOOT_COM_NET_ENABLE #define BOOT_COM_NET_ENABLE (0) #endif #if (BOOT_COM_NET_ENABLE > 0) +/* Note that the value check was disabled for the following configuration macros, which + * makes it possible to link them to a function, allowing a more dynamic configuration: + * - BOOT_COM_NET_IPADDR0 + * - BOOT_COM_NET_IPADDR1 + * - BOOT_COM_NET_IPADDR2 + * - BOOT_COM_NET_IPADDR3 + * - BOOT_COM_NET_NETMASK0 + * - BOOT_COM_NET_NETMASK1 + * - BOOT_COM_NET_NETMASK2 + * - BOOT_COM_NET_NETMASK3 + * - BOOT_COM_NET_GATEWAY0 + * - BOOT_COM_NET_GATEWAY1 + * - BOOT_COM_NET_GATEWAY2 + * - BOOT_COM_NET_GATEWAY3 + * - BOOT_COM_NET_PORT + */ #ifndef BOOT_COM_NET_TX_MAX_DATA #error "BOOT_COM_NET_TX_MAX_DATA is missing in blt_conf.h" #endif @@ -258,106 +266,54 @@ #error "BOOT_COM_NET_IPADDR0 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_IPADDR0 < 0) -#error "BOOT_COM_NET_IPADDR0 must be >= 0" -#endif - #ifndef BOOT_COM_NET_IPADDR1 #error "BOOT_COM_NET_IPADDR1 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_IPADDR1 < 0) -#error "BOOT_COM_NET_IPADDR1 must be >= 0" -#endif - #ifndef BOOT_COM_NET_IPADDR2 #error "BOOT_COM_NET_IPADDR2 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_IPADDR2 < 0) -#error "BOOT_COM_NET_IPADDR2 must be >= 0" -#endif - #ifndef BOOT_COM_NET_IPADDR3 #error "BOOT_COM_NET_IPADDR3 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_IPADDR3 < 0) -#error "BOOT_COM_NET_IPADDR3 must be >= 0" -#endif - #ifndef BOOT_COM_NET_NETMASK0 #error "BOOT_COM_NET_NETMASK0 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_NETMASK0 < 0) -#error "BOOT_COM_NET_NETMASK0 must be >= 0" -#endif - #ifndef BOOT_COM_NET_NETMASK1 #error "BOOT_COM_NET_NETMASK1 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_NETMASK1 < 0) -#error "BOOT_COM_NET_NETMASK1 must be >= 0" -#endif - #ifndef BOOT_COM_NET_NETMASK2 #error "BOOT_COM_NET_NETMASK2 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_NETMASK2 < 0) -#error "BOOT_COM_NET_NETMASK2 must be >= 0" -#endif - #ifndef BOOT_COM_NET_NETMASK3 #error "BOOT_COM_NET_NETMASK3 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_NETMASK3 < 0) -#error "BOOT_COM_NET_NETMASK3 must be >= 0" -#endif - #ifndef BOOT_COM_NET_GATEWAY0 #error "BOOT_COM_NET_GATEWAY0 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_GATEWAY0 < 0) -#error "BOOT_COM_NET_GATEWAY0 must be >= 0" -#endif - #ifndef BOOT_COM_NET_GATEWAY1 #error "BOOT_COM_NET_GATEWAY1 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_GATEWAY1 < 0) -#error "BOOT_COM_NET_GATEWAY1 must be >= 0" -#endif - #ifndef BOOT_COM_NET_GATEWAY2 #error "BOOT_COM_NET_GATEWAY2 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_GATEWAY2 < 0) -#error "BOOT_COM_NET_GATEWAY2 must be >= 0" -#endif - #ifndef BOOT_COM_NET_GATEWAY3 #error "BOOT_COM_NET_GATEWAY3 is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_GATEWAY3 < 0) -#error "BOOT_COM_NET_GATEWAY3 must be >= 0" -#endif - #ifndef BOOT_COM_NET_PORT #error "BOOT_COM_NET_PORT is missing in blt_conf.h" #endif -#if (BOOT_COM_NET_PORT < 0) -#error "BOOT_COM_NET_PORT must be >= 0" -#endif - #ifndef BOOT_COM_NET_IPADDR_HOOK_ENABLE #define BOOT_COM_NET_IPADDR_HOOK_ENABLE (0) #endif