From e9dd910b559d1f777606ed288e6dd49fa55525a6 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Sun, 16 Nov 2025 08:34:45 -0600 Subject: [PATCH] Convert the property list values into int32_t to support the larger property values when an int is 8-bit or 16-bit. (#1145) --- CHANGELOG.md | 4 + ports/arduino_uno/av.h | 4 +- ports/arduino_uno/bv.h | 4 +- ports/arduino_uno/device.h | 4 +- ports/at91sam7s/ai.c | 8 +- ports/at91sam7s/av.c | 8 +- ports/at91sam7s/bi.c | 8 +- ports/at91sam7s/bv.c | 8 +- ports/at91sam7s/device.c | 8 +- ports/at91sam7s/netport.c | 14 +- ports/bdk-atxx4-mstp/ai.c | 8 +- ports/bdk-atxx4-mstp/av.c | 8 +- ports/bdk-atxx4-mstp/bi.c | 8 +- ports/bdk-atxx4-mstp/bo.c | 8 +- ports/bdk-atxx4-mstp/device.c | 10 +- ports/bdk-atxx4-mstp/netport.c | 14 +- ports/esp32/src/ai.c | 8 +- ports/esp32/src/ai.h | 6 +- ports/esp32/src/bo.c | 8 +- ports/esp32/src/bo.h | 6 +- ports/esp32/src/device.c | 8 +- ports/esp32/src/device.h | 10 +- ports/rx62n/bo.c | 14 +- ports/rx62n/device.c | 12 +- ports/stm32f10x/bo.c | 8 +- ports/stm32f10x/device.c | 8 +- ports/stm32f10x/netport.c | 14 +- ports/stm32f4xx/device.c | 10 +- ports/stm32f4xx/netport.c | 22 +- ports/win32/main.c | 2 +- ports/xplained/ai.c | 8 +- ports/xplained/device.c | 8 +- ports/xplained/netport.c | 14 +- src/bacnet/bactext.c | 168 +++++------ src/bacnet/bactext.h | 158 +++++----- src/bacnet/basic/object/acc.c | 10 +- src/bacnet/basic/object/acc.h | 4 +- src/bacnet/basic/object/access_credential.c | 10 +- src/bacnet/basic/object/access_credential.h | 4 +- src/bacnet/basic/object/access_door.c | 10 +- src/bacnet/basic/object/access_door.h | 4 +- src/bacnet/basic/object/access_point.c | 10 +- src/bacnet/basic/object/access_point.h | 4 +- src/bacnet/basic/object/access_rights.c | 10 +- src/bacnet/basic/object/access_rights.h | 4 +- src/bacnet/basic/object/access_user.c | 10 +- src/bacnet/basic/object/access_user.h | 4 +- src/bacnet/basic/object/access_zone.c | 10 +- src/bacnet/basic/object/access_zone.h | 4 +- src/bacnet/basic/object/ai.c | 10 +- src/bacnet/basic/object/ai.h | 4 +- src/bacnet/basic/object/ao.c | 10 +- src/bacnet/basic/object/ao.h | 4 +- src/bacnet/basic/object/auditlog.c | 12 +- src/bacnet/basic/object/auditlog.h | 4 +- src/bacnet/basic/object/av.c | 10 +- src/bacnet/basic/object/av.h | 4 +- src/bacnet/basic/object/bacfile.c | 10 +- src/bacnet/basic/object/bacfile.h | 4 +- src/bacnet/basic/object/bi.c | 10 +- src/bacnet/basic/object/bi.h | 4 +- src/bacnet/basic/object/bitstring_value.c | 10 +- src/bacnet/basic/object/bitstring_value.h | 4 +- src/bacnet/basic/object/blo.c | 10 +- src/bacnet/basic/object/blo.h | 4 +- src/bacnet/basic/object/bo.c | 10 +- src/bacnet/basic/object/bo.h | 4 +- src/bacnet/basic/object/bv.c | 10 +- src/bacnet/basic/object/bv.h | 4 +- src/bacnet/basic/object/calendar.c | 10 +- src/bacnet/basic/object/calendar.h | 4 +- src/bacnet/basic/object/channel.c | 10 +- src/bacnet/basic/object/channel.h | 4 +- .../basic/object/client/device-client.c | 10 +- src/bacnet/basic/object/color_object.c | 12 +- src/bacnet/basic/object/color_object.h | 4 +- src/bacnet/basic/object/color_temperature.c | 10 +- src/bacnet/basic/object/color_temperature.h | 4 +- src/bacnet/basic/object/command.c | 10 +- src/bacnet/basic/object/command.h | 4 +- .../basic/object/credential_data_input.c | 10 +- .../basic/object/credential_data_input.h | 4 +- src/bacnet/basic/object/csv.c | 10 +- src/bacnet/basic/object/csv.h | 4 +- src/bacnet/basic/object/device.c | 10 +- src/bacnet/basic/object/device.h | 9 +- src/bacnet/basic/object/gateway/gw_device.c | 4 +- src/bacnet/basic/object/iv.c | 24 +- src/bacnet/basic/object/iv.h | 4 +- src/bacnet/basic/object/lc.c | 10 +- src/bacnet/basic/object/lc.h | 4 +- src/bacnet/basic/object/lo.c | 10 +- src/bacnet/basic/object/lo.h | 4 +- src/bacnet/basic/object/loop.c | 20 +- src/bacnet/basic/object/loop.h | 6 +- src/bacnet/basic/object/lsp.c | 10 +- src/bacnet/basic/object/lsp.h | 4 +- src/bacnet/basic/object/lsz.c | 10 +- src/bacnet/basic/object/lsz.h | 4 +- src/bacnet/basic/object/ms-input.c | 10 +- src/bacnet/basic/object/ms-input.h | 4 +- src/bacnet/basic/object/mso.c | 10 +- src/bacnet/basic/object/mso.h | 4 +- src/bacnet/basic/object/msv.c | 10 +- src/bacnet/basic/object/msv.h | 4 +- src/bacnet/basic/object/nc.c | 10 +- src/bacnet/basic/object/nc.h | 4 +- src/bacnet/basic/object/netport.c | 32 +- src/bacnet/basic/object/netport.h | 10 +- src/bacnet/basic/object/osv.c | 10 +- src/bacnet/basic/object/osv.h | 4 +- src/bacnet/basic/object/piv.c | 10 +- src/bacnet/basic/object/piv.h | 4 +- src/bacnet/basic/object/program.c | 10 +- src/bacnet/basic/object/program.h | 4 +- src/bacnet/basic/object/schedule.c | 10 +- src/bacnet/basic/object/schedule.h | 4 +- src/bacnet/basic/object/structured_view.c | 10 +- src/bacnet/basic/object/structured_view.h | 4 +- src/bacnet/basic/object/time_value.c | 14 +- src/bacnet/basic/object/time_value.h | 4 +- src/bacnet/basic/object/timer.c | 10 +- src/bacnet/basic/object/timer.h | 4 +- src/bacnet/basic/object/trendlog.c | 36 ++- src/bacnet/basic/object/trendlog.h | 4 +- src/bacnet/basic/server/bacnet_device.c | 10 +- src/bacnet/indtext.c | 32 +- src/bacnet/indtext.h | 24 +- src/bacnet/property.c | 282 +++++++++--------- src/bacnet/property.h | 8 +- src/bacnet/proplist.c | 53 ++-- src/bacnet/proplist.h | 26 +- src/bacnet/rpm.h | 4 +- test/bacnet/basic/object/acc/src/main.c | 2 +- .../basic/object/access_credential/src/main.c | 2 +- .../basic/object/access_door/src/main.c | 6 +- .../basic/object/access_point/src/main.c | 2 +- .../basic/object/access_rights/src/main.c | 2 +- test/bacnet/basic/object/ai/src/main.c | 2 +- test/bacnet/basic/object/ao/src/main.c | 2 +- test/bacnet/basic/object/auditlog/src/main.c | 2 +- test/bacnet/basic/object/av/src/main.c | 2 +- test/bacnet/basic/object/bacfile/src/main.c | 2 +- test/bacnet/basic/object/bi/src/main.c | 2 +- .../basic/object/bitstring_value/src/main.c | 2 +- test/bacnet/basic/object/blo/src/main.c | 6 +- test/bacnet/basic/object/bo/src/main.c | 2 +- test/bacnet/basic/object/bv/src/main.c | 2 +- test/bacnet/basic/object/calendar/src/main.c | 6 +- test/bacnet/basic/object/channel/src/main.c | 2 +- .../basic/object/color_object/src/main.c | 6 +- .../basic/object/color_temperature/src/main.c | 6 +- test/bacnet/basic/object/command/src/main.c | 2 +- .../object/credential_data_input/src/main.c | 6 +- test/bacnet/basic/object/csv/src/main.c | 6 +- test/bacnet/basic/object/device/src/main.c | 6 +- test/bacnet/basic/object/iv/src/main.c | 2 +- test/bacnet/basic/object/lc/src/main.c | 2 +- test/bacnet/basic/object/lo/src/main.c | 2 +- test/bacnet/basic/object/loop/src/main.c | 2 +- test/bacnet/basic/object/lsp/src/main.c | 6 +- test/bacnet/basic/object/lsz/src/main.c | 2 +- test/bacnet/basic/object/ms-input/src/main.c | 2 +- test/bacnet/basic/object/mso/src/main.c | 2 +- test/bacnet/basic/object/msv/src/main.c | 2 +- test/bacnet/basic/object/nc/src/main.c | 6 +- test/bacnet/basic/object/netport/src/main.c | 2 +- test/bacnet/basic/object/osv/src/main.c | 2 +- test/bacnet/basic/object/piv/src/main.c | 2 +- test/bacnet/basic/object/program/src/main.c | 2 +- test/bacnet/basic/object/schedule/src/main.c | 2 +- .../basic/object/structured_view/src/main.c | 2 +- test/bacnet/basic/object/test/property_test.c | 13 +- test/bacnet/basic/object/test/property_test.h | 6 +- .../bacnet/basic/object/time_value/src/main.c | 2 +- test/bacnet/basic/object/timer/src/main.c | 2 +- test/bacnet/basic/object/trendlog/src/main.c | 2 +- .../basic/server/bacnet_device/src/main.c | 2 +- test/bacnet/datalink/bvlc/src/main.c | 4 +- test/bacnet/list_element/src/main.c | 3 +- 180 files changed, 1071 insertions(+), 861 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f391b64..a209718a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,10 @@ The git repositories are hosted at the following sites: and adjust BACNET_MAX_SEGMENTS_ACCEPTED for maximum number of segments. (#974) ### Changed + +* Changed all the property list values into int32_t to support the larger + BACnet property enumerations when an int is 8-bit or 16-bit in size. (#1145) + ### Fixed * Fixed segmented ComplexACK in MS/TP by adding postpone reply because diff --git a/ports/arduino_uno/av.h b/ports/arduino_uno/av.h index 0c63c1af..fd97a475 100644 --- a/ports/arduino_uno/av.h +++ b/ports/arduino_uno/av.h @@ -22,7 +22,9 @@ extern "C" { #endif /* __cplusplus */ void Analog_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); bool Analog_Value_Valid_Instance(uint32_t object_instance); unsigned Analog_Value_Count(void); uint32_t Analog_Value_Index_To_Instance(unsigned index); diff --git a/ports/arduino_uno/bv.h b/ports/arduino_uno/bv.h index c2e0dd99..13cb06b1 100644 --- a/ports/arduino_uno/bv.h +++ b/ports/arduino_uno/bv.h @@ -23,7 +23,9 @@ extern "C" { #endif /* __cplusplus */ void Binary_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); bool Binary_Value_Valid_Instance(uint32_t object_instance); unsigned Binary_Value_Count(void); uint32_t Binary_Value_Index_To_Instance(unsigned index); diff --git a/ports/arduino_uno/device.h b/ports/arduino_uno/device.h index 29a0feb3..be785ce1 100644 --- a/ports/arduino_uno/device.h +++ b/ports/arduino_uno/device.h @@ -32,7 +32,9 @@ void Device_Object_Function_Set( void Device_Init(void); void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); uint32_t Device_Object_Instance_Number(void); bool Device_Set_Object_Instance_Number(uint32_t object_id); diff --git a/ports/at91sam7s/ai.c b/ports/at91sam7s/ai.c index 1fdc3bb9..ea0b686f 100644 --- a/ports/at91sam7s/ai.c +++ b/ports/at91sam7s/ai.c @@ -28,16 +28,16 @@ static float Present_Value[MAX_ANALOG_INPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Analog_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Analog_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Input_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Analog_Input_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Analog_Input_Properties_Proprietary[] = { -1 }; +static const int32_t Analog_Input_Properties_Proprietary[] = { -1 }; void Analog_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Analog_Input_Properties_Required; diff --git a/ports/at91sam7s/av.c b/ports/at91sam7s/av.c index dff660af..d066b630 100644 --- a/ports/at91sam7s/av.c +++ b/ports/at91sam7s/av.c @@ -38,21 +38,21 @@ static uint8_t Present_Value[MAX_ANALOG_VALUES]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Analog_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Analog_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Value_Properties_Optional[] = { PROP_DESCRIPTION, +static const int32_t Analog_Value_Properties_Optional[] = { PROP_DESCRIPTION, #if 0 PROP_PRIORITY_ARRAY, PROP_RELINQUISH_DEFAULT, #endif -1 }; -static const int Analog_Value_Properties_Proprietary[] = { -1 }; +static const int32_t Analog_Value_Properties_Proprietary[] = { -1 }; void Analog_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Analog_Value_Properties_Required; diff --git a/ports/at91sam7s/bi.c b/ports/at91sam7s/bi.c index 9d46338c..9d0fc42b 100644 --- a/ports/at91sam7s/bi.c +++ b/ports/at91sam7s/bi.c @@ -27,16 +27,16 @@ static BACNET_BINARY_PV Present_Value[MAX_BINARY_INPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Binary_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, -1 }; -static const int Binary_Input_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Binary_Input_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Binary_Input_Properties_Proprietary[] = { -1 }; +static const int32_t Binary_Input_Properties_Proprietary[] = { -1 }; void Binary_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) { *pRequired = Binary_Input_Properties_Required; diff --git a/ports/at91sam7s/bv.c b/ports/at91sam7s/bv.c index b73c979d..61049fb9 100644 --- a/ports/at91sam7s/bv.c +++ b/ports/at91sam7s/bv.c @@ -28,16 +28,16 @@ static BACNET_BINARY_PV Present_Value[MAX_BINARY_VALUES]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Binary_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, -1 }; -static const int Binary_Value_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Binary_Value_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Binary_Value_Properties_Proprietary[] = { -1 }; +static const int32_t Binary_Value_Properties_Proprietary[] = { -1 }; void Binary_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Binary_Value_Properties_Required; diff --git a/ports/at91sam7s/device.c b/ports/at91sam7s/device.c index 6d5ca6c8..f511fe5c 100644 --- a/ports/at91sam7s/device.c +++ b/ports/at91sam7s/device.c @@ -87,7 +87,7 @@ static BACNET_REINITIALIZED_STATE Reinitialize_State = BACNET_REINIT_IDLE; static const char *Reinit_Password = "rehmite"; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_SYSTEM_STATUS, PROP_VENDOR_NAME, PROP_VENDOR_IDENTIFIER, PROP_MODEL_NAME, PROP_FIRMWARE_REVISION, PROP_APPLICATION_SOFTWARE_VERSION, PROP_PROTOCOL_VERSION, @@ -98,10 +98,10 @@ static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_MAX_INFO_FRAMES, PROP_DEVICE_ADDRESS_BINDING, PROP_DATABASE_REVISION, -1 }; -static const int Device_Properties_Optional[] = { PROP_DESCRIPTION, +static const int32_t Device_Properties_Optional[] = { PROP_DESCRIPTION, PROP_LOCATION, -1 }; -static const int Device_Properties_Proprietary[] = { 9600, -1 }; +static const int32_t Device_Properties_Proprietary[] = { 9600, -1 }; static struct my_object_functions *Device_Objects_Find_Functions( BACNET_OBJECT_TYPE Object_Type) @@ -371,7 +371,7 @@ bool Device_Objects_Property_List_Member( } void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Device_Properties_Required; diff --git a/ports/at91sam7s/netport.c b/ports/at91sam7s/netport.c index 955d7d6a..579d0825 100644 --- a/ports/at91sam7s/netport.c +++ b/ports/at91sam7s/netport.c @@ -55,7 +55,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX]; static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY, PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL, PROP_CHANGES_PENDING, @@ -67,7 +67,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, #endif -1 }; -static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, +static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS, #if (BACNET_PROTOCOL_REVISION >= 24) PROP_APDU_LENGTH, @@ -77,7 +77,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, #endif -1 }; -static const int Network_Port_Properties_Proprietary[] = { -1 }; +static const int32_t Network_Port_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -92,9 +92,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Network_Port_Property_List(uint32_t object_instance, - const int **pRequired, - const int **pOptional, - const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { (void)object_instance; if (pRequired) { @@ -122,7 +122,7 @@ void Network_Port_Property_List(uint32_t object_instance, * BACnet proprietary properties for this object. */ void Network_Port_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { Network_Port_Property_List( BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary); diff --git a/ports/bdk-atxx4-mstp/ai.c b/ports/bdk-atxx4-mstp/ai.c index 65d2c819..bedbce72 100644 --- a/ports/bdk-atxx4-mstp/ai.c +++ b/ports/bdk-atxx4-mstp/ai.c @@ -25,16 +25,16 @@ static float Present_Value[MAX_ANALOG_INPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Analog_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Analog_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Input_Properties_Optional[] = { -1 }; +static const int32_t Analog_Input_Properties_Optional[] = { -1 }; -static const int Analog_Input_Properties_Proprietary[] = { -1 }; +static const int32_t Analog_Input_Properties_Proprietary[] = { -1 }; void Analog_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Analog_Input_Properties_Required; diff --git a/ports/bdk-atxx4-mstp/av.c b/ports/bdk-atxx4-mstp/av.c index 712463c7..f56a1089 100644 --- a/ports/bdk-atxx4-mstp/av.c +++ b/ports/bdk-atxx4-mstp/av.c @@ -29,11 +29,11 @@ static float Present_Value[MAX_ANALOG_VALUES]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Analog_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Analog_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Value_Properties_Optional[] = { +static const int32_t Analog_Value_Properties_Optional[] = { #if 0 PROP_PRIORITY_ARRAY, PROP_RELINQUISH_DEFAULT, @@ -41,10 +41,10 @@ static const int Analog_Value_Properties_Optional[] = { -1 }; -static const int Analog_Value_Properties_Proprietary[] = { -1 }; +static const int32_t Analog_Value_Properties_Proprietary[] = { -1 }; void Analog_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Analog_Value_Properties_Required; diff --git a/ports/bdk-atxx4-mstp/bi.c b/ports/bdk-atxx4-mstp/bi.c index ae679131..e532fe25 100644 --- a/ports/bdk-atxx4-mstp/bi.c +++ b/ports/bdk-atxx4-mstp/bi.c @@ -25,16 +25,16 @@ static BACNET_BINARY_PV Present_Value[MAX_BINARY_INPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Binary_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, -1 }; -static const int Binary_Input_Properties_Optional[] = { -1 }; +static const int32_t Binary_Input_Properties_Optional[] = { -1 }; -static const int Binary_Input_Properties_Proprietary[] = { -1 }; +static const int32_t Binary_Input_Properties_Proprietary[] = { -1 }; void Binary_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) { *pRequired = Binary_Input_Properties_Required; diff --git a/ports/bdk-atxx4-mstp/bo.c b/ports/bdk-atxx4-mstp/bo.c index 57692d44..d07ceb60 100644 --- a/ports/bdk-atxx4-mstp/bo.c +++ b/ports/bdk-atxx4-mstp/bo.c @@ -38,18 +38,18 @@ static uint8_t Out_Of_Service[MAX_BINARY_OUTPUTS]; static uint8_t Polarity[MAX_BINARY_OUTPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, PROP_PRIORITY_ARRAY, PROP_RELINQUISH_DEFAULT, -1 }; -static const int Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT, +static const int32_t Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT, PROP_INACTIVE_TEXT, -1 }; -static const int Binary_Output_Properties_Proprietary[] = { -1 }; +static const int32_t Binary_Output_Properties_Proprietary[] = { -1 }; void Binary_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Binary_Output_Properties_Required; diff --git a/ports/bdk-atxx4-mstp/device.c b/ports/bdk-atxx4-mstp/device.c index c0ebb3de..e8c8a8d8 100644 --- a/ports/bdk-atxx4-mstp/device.c +++ b/ports/bdk-atxx4-mstp/device.c @@ -90,7 +90,7 @@ static BACNET_REINITIALIZED_STATE Reinitialize_State = BACNET_REINIT_IDLE; static const char *Reinit_Password = "rehmite"; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_SYSTEM_STATUS, PROP_VENDOR_NAME, PROP_VENDOR_IDENTIFIER, PROP_MODEL_NAME, PROP_FIRMWARE_REVISION, PROP_APPLICATION_SOFTWARE_VERSION, PROP_PROTOCOL_VERSION, @@ -100,10 +100,10 @@ static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_APDU_TIMEOUT, PROP_NUMBER_OF_APDU_RETRIES, PROP_DEVICE_ADDRESS_BINDING, PROP_DATABASE_REVISION, -1 }; -static const int Device_Properties_Optional[] = { PROP_MAX_MASTER, +static const int32_t Device_Properties_Optional[] = { PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_DESCRIPTION, PROP_LOCATION, -1 }; -static const int Device_Properties_Proprietary[] = { 512, 513, 9600, -1 }; +static const int32_t Device_Properties_Proprietary[] = { 512, 513, 9600, -1 }; static struct my_object_functions *Device_Objects_Find_Functions( BACNET_OBJECT_TYPE Object_Type) @@ -269,7 +269,7 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -static unsigned my_property_list_count(const int *pList) +static unsigned my_property_list_count(const int32_t *pList) { unsigned property_count = 0; @@ -352,7 +352,7 @@ bool Device_Objects_Property_List_Member( } void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Device_Properties_Required; diff --git a/ports/bdk-atxx4-mstp/netport.c b/ports/bdk-atxx4-mstp/netport.c index 85b2a055..898ea4eb 100644 --- a/ports/bdk-atxx4-mstp/netport.c +++ b/ports/bdk-atxx4-mstp/netport.c @@ -56,7 +56,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX]; static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY, PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL, PROP_CHANGES_PENDING, @@ -69,7 +69,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, -1 }; -static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, +static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS, #if (BACNET_PROTOCOL_REVISION >= 24) PROP_APDU_LENGTH, @@ -79,7 +79,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, #endif -1 }; -static const int Network_Port_Properties_Proprietary[] = { -1 }; +static const int32_t Network_Port_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -94,9 +94,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Network_Port_Property_List(uint32_t object_instance, - const int **pRequired, - const int **pOptional, - const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { (void)object_instance; if (pRequired) { @@ -124,7 +124,7 @@ void Network_Port_Property_List(uint32_t object_instance, * BACnet proprietary properties for this object. */ void Network_Port_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { Network_Port_Property_List( BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary); diff --git a/ports/esp32/src/ai.c b/ports/esp32/src/ai.c index a69566fa..8e28fcf9 100644 --- a/ports/esp32/src/ai.c +++ b/ports/esp32/src/ai.c @@ -31,11 +31,11 @@ ANALOG_INPUT_DESCR AI_Descr[MAX_ANALOG_INPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY, +static const int32_t Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY, PROP_COV_INCREMENT, #if defined(INTRINSIC_REPORTING) PROP_TIME_DELAY, PROP_NOTIFICATION_CLASS, PROP_HIGH_LIMIT, PROP_LOW_LIMIT, @@ -44,10 +44,10 @@ static const int Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY, #endif -1 }; -static const int Properties_Proprietary[] = { 9997, 9998, 9999, -1 }; +static const int32_t Properties_Proprietary[] = { 9997, 9998, 9999, -1 }; void Analog_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Properties_Required; diff --git a/ports/esp32/src/ai.h b/ports/esp32/src/ai.h index 3fb7c5ae..d19628c3 100644 --- a/ports/esp32/src/ai.h +++ b/ports/esp32/src/ai.h @@ -53,9 +53,9 @@ extern "C" { } ANALOG_INPUT_DESCR; void Analog_Input_Property_Lists( - const int **pRequired, - const int **pOptional, - const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); bool Analog_Input_Valid_Instance( uint32_t object_instance); diff --git a/ports/esp32/src/bo.c b/ports/esp32/src/bo.c index f36803aa..5b9b201f 100644 --- a/ports/esp32/src/bo.c +++ b/ports/esp32/src/bo.c @@ -36,18 +36,18 @@ static BACNET_BINARY_PV Binary_Output_Level[MAX_BINARY_OUTPUTS] static bool Out_Of_Service[MAX_BINARY_OUTPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, PROP_PRIORITY_ARRAY, PROP_RELINQUISH_DEFAULT, -1 }; -static const int Binary_Output_Properties_Optional[] = { PROP_DESCRIPTION, +static const int32_t Binary_Output_Properties_Optional[] = { PROP_DESCRIPTION, PROP_ACTIVE_TEXT, PROP_INACTIVE_TEXT, -1 }; -static const int Binary_Output_Properties_Proprietary[] = { -1 }; +static const int32_t Binary_Output_Properties_Proprietary[] = { -1 }; void Binary_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Binary_Output_Properties_Required; diff --git a/ports/esp32/src/bo.h b/ports/esp32/src/bo.h index ac84c762..82182db3 100644 --- a/ports/esp32/src/bo.h +++ b/ports/esp32/src/bo.h @@ -23,9 +23,9 @@ extern "C" { void); void Binary_Output_Property_Lists( - const int **pRequired, - const int **pOptional, - const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); bool Binary_Output_Valid_Instance( uint32_t object_instance); diff --git a/ports/esp32/src/device.c b/ports/esp32/src/device.c index aae7615d..c0e6377c 100644 --- a/ports/esp32/src/device.c +++ b/ports/esp32/src/device.c @@ -230,7 +230,7 @@ bool Device_Reinitialize(BACNET_REINITIALIZE_DEVICE_DATA *rd_data) } /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_SYSTEM_STATUS, PROP_VENDOR_NAME, PROP_VENDOR_IDENTIFIER, PROP_MODEL_NAME, PROP_FIRMWARE_REVISION, PROP_APPLICATION_SOFTWARE_VERSION, PROP_PROTOCOL_VERSION, @@ -240,7 +240,7 @@ static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_APDU_TIMEOUT, PROP_NUMBER_OF_APDU_RETRIES, PROP_DEVICE_ADDRESS_BINDING, PROP_DATABASE_REVISION, -1 }; -static const int Device_Properties_Optional[] = { +static const int32_t Device_Properties_Optional[] = { #if defined(BACDL_MSTP) PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, #endif @@ -253,10 +253,10 @@ static const int Device_Properties_Optional[] = { -1 }; -static const int Device_Properties_Proprietary[] = { -1 }; +static const int32_t Device_Properties_Proprietary[] = { -1 }; void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Device_Properties_Required; diff --git a/ports/esp32/src/device.h b/ports/esp32/src/device.h index b408f44e..90c8e804 100644 --- a/ports/esp32/src/device.h +++ b/ports/esp32/src/device.h @@ -231,9 +231,9 @@ extern "C" { bool Device_Interval_Offset_Set(uint32_t value); void Device_Property_Lists( - const int **pRequired, - const int **pOptional, - const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); void Device_Objects_Property_List( BACNET_OBJECT_TYPE object_type, uint32_t object_instance, @@ -391,11 +391,11 @@ extern "C" { const uint8_t * mac_adress); bool Routed_Device_GetNext( const BACNET_ADDRESS * dest, - const int *DNET_list, + const int32_t *DNET_list, int *cursor); bool Routed_Device_Is_Valid_Network( uint16_t dest_net, - const int *DNET_list); + const int32_t *DNET_list); uint32_t Routed_Device_Index_To_Instance( unsigned index); diff --git a/ports/rx62n/bo.c b/ports/rx62n/bo.c index 7f63a01b..ed34acd1 100644 --- a/ports/rx62n/bo.c +++ b/ports/rx62n/bo.c @@ -37,7 +37,7 @@ static uint8_t Out_Of_Service[MAX_BINARY_OUTPUTS]; static uint8_t Polarity[MAX_BINARY_OUTPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Output_Properties_Required[] = { +static const int32_t Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -51,14 +51,16 @@ static const int Binary_Output_Properties_Required[] = { -1 }; -static const int Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT, - PROP_INACTIVE_TEXT, - -1 }; +static const int32_t Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT, + PROP_INACTIVE_TEXT, + -1 }; -static const int Binary_Output_Properties_Proprietary[] = { -1 }; +static const int32_t Binary_Output_Properties_Proprietary[] = { -1 }; void Binary_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Binary_Output_Properties_Required; diff --git a/ports/rx62n/device.c b/ports/rx62n/device.c index d81e7a17..ae6d479c 100644 --- a/ports/rx62n/device.c +++ b/ports/rx62n/device.c @@ -75,7 +75,7 @@ static char Description[MAX_DEV_DESC_LEN + 1] = "Renesas Rulz!"; static uint32_t Database_Revision = 0; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { +static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -101,9 +101,9 @@ static const int Device_Properties_Required[] = { -1 }; -static const int Device_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Device_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Device_Properties_Proprietary[] = { -1 }; +static const int32_t Device_Properties_Proprietary[] = { -1 }; static struct my_object_functions * Device_Objects_Find_Functions(BACNET_OBJECT_TYPE Object_Type) @@ -181,7 +181,7 @@ static int Read_Property_Common( return apdu_len; } -static unsigned property_list_count(const int *pList) +static unsigned property_list_count(const int32_t *pList) { unsigned property_count = 0; @@ -247,7 +247,9 @@ void Device_Objects_Property_List( } void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Device_Properties_Required; diff --git a/ports/stm32f10x/bo.c b/ports/stm32f10x/bo.c index f60bd90f..f078a0e4 100644 --- a/ports/stm32f10x/bo.c +++ b/ports/stm32f10x/bo.c @@ -36,18 +36,18 @@ static uint8_t Out_Of_Service[MAX_BINARY_OUTPUTS]; static uint8_t Polarity[MAX_BINARY_OUTPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, PROP_PRIORITY_ARRAY, PROP_RELINQUISH_DEFAULT, -1 }; -static const int Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT, +static const int32_t Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT, PROP_INACTIVE_TEXT, -1 }; -static const int Binary_Output_Properties_Proprietary[] = { -1 }; +static const int32_t Binary_Output_Properties_Proprietary[] = { -1 }; void Binary_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Binary_Output_Properties_Required; diff --git a/ports/stm32f10x/device.c b/ports/stm32f10x/device.c index 8c508249..9ee76510 100644 --- a/ports/stm32f10x/device.c +++ b/ports/stm32f10x/device.c @@ -69,7 +69,7 @@ static const char *Reinit_Password = "stm32-challenge"; static const char *BACnet_Version = BACNET_VERSION_TEXT; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_SYSTEM_STATUS, PROP_VENDOR_NAME, PROP_VENDOR_IDENTIFIER, PROP_MODEL_NAME, PROP_FIRMWARE_REVISION, PROP_APPLICATION_SOFTWARE_VERSION, PROP_PROTOCOL_VERSION, @@ -79,10 +79,10 @@ static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_APDU_TIMEOUT, PROP_NUMBER_OF_APDU_RETRIES, PROP_DEVICE_ADDRESS_BINDING, PROP_DATABASE_REVISION, -1 }; -static const int Device_Properties_Optional[] = { PROP_DESCRIPTION, +static const int32_t Device_Properties_Optional[] = { PROP_DESCRIPTION, PROP_LOCATION, PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, -1 }; -static const int Device_Properties_Proprietary[] = { 9600, -1 }; +static const int32_t Device_Properties_Proprietary[] = { 9600, -1 }; static struct my_object_functions *Device_Objects_Find_Functions( BACNET_OBJECT_TYPE Object_Type) @@ -293,7 +293,7 @@ bool Device_Objects_Property_List_Member( * @ingroup ObjIntf */ void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Device_Properties_Required; diff --git a/ports/stm32f10x/netport.c b/ports/stm32f10x/netport.c index 955d7d6a..579d0825 100644 --- a/ports/stm32f10x/netport.c +++ b/ports/stm32f10x/netport.c @@ -55,7 +55,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX]; static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY, PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL, PROP_CHANGES_PENDING, @@ -67,7 +67,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, #endif -1 }; -static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, +static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS, #if (BACNET_PROTOCOL_REVISION >= 24) PROP_APDU_LENGTH, @@ -77,7 +77,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, #endif -1 }; -static const int Network_Port_Properties_Proprietary[] = { -1 }; +static const int32_t Network_Port_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -92,9 +92,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Network_Port_Property_List(uint32_t object_instance, - const int **pRequired, - const int **pOptional, - const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { (void)object_instance; if (pRequired) { @@ -122,7 +122,7 @@ void Network_Port_Property_List(uint32_t object_instance, * BACnet proprietary properties for this object. */ void Network_Port_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { Network_Port_Property_List( BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary); diff --git a/ports/stm32f4xx/device.c b/ports/stm32f4xx/device.c index 2d8de4bb..3372ab17 100644 --- a/ports/stm32f4xx/device.c +++ b/ports/stm32f4xx/device.c @@ -127,7 +127,7 @@ static const char *BACnet_Version = BACNET_VERSION_TEXT; static uint8_t Device_UUID[16]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { +static const int32_t Device_Properties_Required[] = { /* required properties for this object */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -152,7 +152,7 @@ static const int Device_Properties_Required[] = { -1 }; -static const int Device_Properties_Optional[] = { +static const int32_t Device_Properties_Optional[] = { /* optional properties for this object */ PROP_DESCRIPTION, PROP_LOCATION, @@ -166,7 +166,7 @@ static const int Device_Properties_Optional[] = { -1 }; -static const int Device_Properties_Proprietary[] = { -1 }; +static const int32_t Device_Properties_Proprietary[] = { -1 }; /** Glue function to let the Device object, when called by a handler, * lookup which Object type needs to be invoked. @@ -286,7 +286,9 @@ bool Device_Objects_Property_List_Member( * @ingroup ObjIntf */ void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Device_Properties_Required; diff --git a/ports/stm32f4xx/netport.c b/ports/stm32f4xx/netport.c index 5f1c45d4..abfcb5f5 100644 --- a/ports/stm32f4xx/netport.c +++ b/ports/stm32f4xx/netport.c @@ -48,7 +48,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX]; static uint32_t Link_Speeds[] = { 9600, 19200, 38400, 57600, 76800, 115200 }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Network_Port_Properties_Required[] = { +static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -67,7 +67,7 @@ static const int Network_Port_Properties_Required[] = { -1 }; -static const int Network_Port_Properties_Optional[] = { +static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, @@ -81,7 +81,7 @@ static const int Network_Port_Properties_Optional[] = { -1 }; -static const int Network_Port_Properties_Proprietary[] = { -1 }; +static const int32_t Network_Port_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -97,9 +97,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 }; */ void Network_Port_Property_List( uint32_t object_instance, - const int **pRequired, - const int **pOptional, - const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { (void)object_instance; if (pRequired) { @@ -127,7 +127,9 @@ void Network_Port_Property_List( * BACnet proprietary properties for this object. */ void Network_Port_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { Network_Port_Property_List( BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary); @@ -533,9 +535,9 @@ static bool Network_Port_Property_List_Member(uint32_t object_instance, int object_property) { bool found = false; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; Network_Port_Property_List( object_instance, &pRequired, &pOptional, &pProprietary); diff --git a/ports/win32/main.c b/ports/win32/main.c index 577bc176..dc047377 100644 --- a/ports/win32/main.c +++ b/ports/win32/main.c @@ -71,7 +71,7 @@ static void Read_Properties(void) Device Object note: you could just loop through all the properties in all the objects. */ - const int object_props[] = { + const int32_t object_props[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_SYSTEM_STATUS, PROP_VENDOR_NAME, PROP_VENDOR_IDENTIFIER, PROP_MODEL_NAME, PROP_FIRMWARE_REVISION, diff --git a/ports/xplained/ai.c b/ports/xplained/ai.c index 1ecde9aa..8126d4a7 100644 --- a/ports/xplained/ai.c +++ b/ports/xplained/ai.c @@ -24,16 +24,16 @@ static bool Out_Of_Service[MAX_ANALOG_INPUTS]; static BACNET_ENGINEERING_UNITS Units[MAX_ANALOG_INPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Analog_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Analog_Input_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Input_Properties_Optional[] = { -1 }; +static const int32_t Analog_Input_Properties_Optional[] = { -1 }; -static const int Analog_Input_Properties_Proprietary[] = { -1 }; +static const int32_t Analog_Input_Properties_Proprietary[] = { -1 }; void Analog_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Analog_Input_Properties_Required; diff --git a/ports/xplained/device.c b/ports/xplained/device.c index 58eb19c6..c50224cb 100644 --- a/ports/xplained/device.c +++ b/ports/xplained/device.c @@ -76,7 +76,7 @@ static uint32_t Database_Revision; static BACNET_REINITIALIZED_STATE Reinitialize_State = BACNET_REINIT_IDLE; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_SYSTEM_STATUS, PROP_VENDOR_NAME, PROP_VENDOR_IDENTIFIER, PROP_MODEL_NAME, PROP_FIRMWARE_REVISION, PROP_APPLICATION_SOFTWARE_VERSION, PROP_PROTOCOL_VERSION, @@ -86,10 +86,10 @@ static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_APDU_TIMEOUT, PROP_NUMBER_OF_APDU_RETRIES, PROP_DEVICE_ADDRESS_BINDING, PROP_DATABASE_REVISION, -1 }; -static const int Device_Properties_Optional[] = { PROP_MAX_MASTER, +static const int32_t Device_Properties_Optional[] = { PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_DESCRIPTION, PROP_LOCATION, -1 }; -static const int Device_Properties_Proprietary[] = { -1 }; +static const int32_t Device_Properties_Proprietary[] = { -1 }; static struct my_object_functions *Device_Objects_Find_Functions( BACNET_OBJECT_TYPE Object_Type) @@ -199,7 +199,7 @@ void Device_Objects_Property_List(BACNET_OBJECT_TYPE object_type, } void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { if (pRequired) *pRequired = Device_Properties_Required; diff --git a/ports/xplained/netport.c b/ports/xplained/netport.c index 1668e9d4..ca5f0095 100644 --- a/ports/xplained/netport.c +++ b/ports/xplained/netport.c @@ -49,7 +49,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX]; static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, +static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY, PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL, PROP_CHANGES_PENDING, @@ -61,7 +61,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, #endif -1 }; -static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, +static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS, #if (BACNET_PROTOCOL_REVISION >= 24) PROP_APDU_LENGTH, @@ -71,7 +71,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS, #endif -1 }; -static const int Network_Port_Properties_Proprietary[] = { -1 }; +static const int32_t Network_Port_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -86,9 +86,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Network_Port_Property_List(uint32_t object_instance, - const int **pRequired, - const int **pOptional, - const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { (void)object_instance; if (pRequired) { @@ -116,7 +116,7 @@ void Network_Port_Property_List(uint32_t object_instance, * BACnet proprietary properties for this object. */ void Network_Port_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary) { Network_Port_Property_List( BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary); diff --git a/src/bacnet/bactext.c b/src/bacnet/bactext.c index 1411acea..9d296dc4 100644 --- a/src/bacnet/bactext.c +++ b/src/bacnet/bactext.c @@ -15,13 +15,13 @@ static const char *ASHRAE_Reserved_String = "Reserved for Use by ASHRAE"; static const char *Vendor_Proprietary_String = "Vendor Proprietary Value"; /** - * @brief Attempt to convert a numeric string into a unsigned long integer + * @brief Attempt to convert a numeric string into a uint32_t value * @param search_name - string to convert * @param found_index - where to put the converted value * @return true if converted and found_index is set * @return false if not converted and found_index is not set */ -bool bactext_strtoul(const char *search_name, unsigned *found_index) +bool bactext_strtoul(const char *search_name, uint32_t *found_index) { char *endptr; unsigned long value; @@ -40,7 +40,7 @@ bool bactext_strtoul(const char *search_name, unsigned *found_index) /* Extra text found */ return false; } - *found_index = (unsigned)value; + *found_index = (uint32_t)value; return true; } @@ -48,7 +48,7 @@ bool bactext_strtoul(const char *search_name, unsigned *found_index) /* Search for a text value first based on the corresponding text list, then by * attempting to convert to an integer value. */ static bool bactext_strtoul_index( - INDTEXT_DATA *istring, const char *search_name, unsigned *found_index) + INDTEXT_DATA *istring, const char *search_name, uint32_t *found_index) { if (indtext_by_istring(istring, search_name, found_index) == true) { return true; @@ -98,7 +98,7 @@ INDTEXT_DATA bacnet_confirmed_service_names[] = { { 0, NULL } }; -const char *bactext_confirmed_service_name(unsigned index) +const char *bactext_confirmed_service_name(uint32_t index) { return indtext_by_index_default( bacnet_confirmed_service_names, index, ASHRAE_Reserved_String); @@ -124,7 +124,7 @@ INDTEXT_DATA bacnet_unconfirmed_service_names[] = { { 0, NULL } }; -const char *bactext_unconfirmed_service_name(unsigned index) +const char *bactext_unconfirmed_service_name(uint32_t index) { return indtext_by_index_default( bacnet_unconfirmed_service_names, index, ASHRAE_Reserved_String); @@ -185,14 +185,14 @@ INDTEXT_DATA bacnet_application_tag_names[] = { { 0, NULL } }; -const char *bactext_application_tag_name(unsigned index) +const char *bactext_application_tag_name(uint32_t index) { return indtext_by_index_default( bacnet_application_tag_names, index, ASHRAE_Reserved_String); } bool bactext_application_tag_index( - const char *search_name, unsigned *found_index) + const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_application_tag_names, search_name, found_index); @@ -342,27 +342,27 @@ INDTEXT_DATA bacnet_object_type_names_capitalized[] = { { 0, NULL } }; -const char *bactext_object_type_name(unsigned index) +const char *bactext_object_type_name(uint32_t index) { return indtext_by_index_split_default( bacnet_object_type_names, index, OBJECT_PROPRIETARY_MIN, ASHRAE_Reserved_String, Vendor_Proprietary_String); } -const char *bactext_object_type_name_capitalized(unsigned index) +const char *bactext_object_type_name_capitalized(uint32_t index) { return indtext_by_index_split_default( bacnet_object_type_names_capitalized, index, OBJECT_PROPRIETARY_MIN, ASHRAE_Reserved_String, Vendor_Proprietary_String); } -bool bactext_object_type_index(const char *search_name, unsigned *found_index) +bool bactext_object_type_index(const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_object_type_names, search_name, found_index); } -bool bactext_object_type_strtol(const char *search_name, unsigned *found_index) +bool bactext_object_type_strtol(const char *search_name, uint32_t *found_index) { return bactext_strtoul_index( bacnet_object_type_names, search_name, found_index); @@ -919,7 +919,7 @@ INDTEXT_DATA bacnet_property_names[] = { { 0, NULL } }; -bool bactext_property_name_proprietary(unsigned index) +bool bactext_property_name_proprietary(uint32_t index) { bool status = false; @@ -931,7 +931,7 @@ bool bactext_property_name_proprietary(unsigned index) return status; } -const char *bactext_property_name(unsigned index) +const char *bactext_property_name(uint32_t index) { /* Enumerated values 0-511 are reserved for definition by ASHRAE. Enumerated values 512-4194303 may be used by others subject to the @@ -945,23 +945,23 @@ const char *bactext_property_name(unsigned index) } const char * -bactext_property_name_default(unsigned index, const char *default_string) +bactext_property_name_default(uint32_t index, const char *default_string) { return indtext_by_index_default( bacnet_property_names, index, default_string); } -unsigned bactext_property_id(const char *name) +uint32_t bactext_property_id(const char *name) { return indtext_by_istring_default(bacnet_property_names, name, 0); } -bool bactext_property_index(const char *search_name, unsigned *found_index) +bool bactext_property_index(const char *search_name, uint32_t *found_index) { return indtext_by_istring(bacnet_property_names, search_name, found_index); } -bool bactext_property_strtol(const char *search_name, unsigned *found_index) +bool bactext_property_strtol(const char *search_name, uint32_t *found_index) { return bactext_strtoul_index( bacnet_property_names, search_name, found_index); @@ -1417,7 +1417,7 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = { subject to the procedures and constraints described in Clause 23. */ }; -bool bactext_engineering_unit_name_proprietary(unsigned index) +bool bactext_engineering_unit_name_proprietary(uint32_t index) { bool status = false; @@ -1433,7 +1433,7 @@ bool bactext_engineering_unit_name_proprietary(unsigned index) return status; } -const char *bactext_engineering_unit_name(unsigned index) +const char *bactext_engineering_unit_name(uint32_t index) { if (bactext_engineering_unit_name_proprietary(index)) { return Vendor_Proprietary_String; @@ -1446,7 +1446,7 @@ const char *bactext_engineering_unit_name(unsigned index) } bool bactext_engineering_unit_index( - const char *search_name, unsigned *found_index) + const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_engineering_unit_names, search_name, found_index); @@ -1469,7 +1469,7 @@ INDTEXT_DATA bacnet_reject_reason_names[] = { { 0, NULL } }; -const char *bactext_reject_reason_name(unsigned index) +const char *bactext_reject_reason_name(uint32_t index) { return indtext_by_index_split_default( bacnet_reject_reason_names, index, REJECT_REASON_PROPRIETARY_FIRST, @@ -1495,7 +1495,7 @@ INDTEXT_DATA bacnet_abort_reason_names[] = { { 0, NULL } }; -const char *bactext_abort_reason_name(unsigned index) +const char *bactext_abort_reason_name(uint32_t index) { return indtext_by_index_split_default( bacnet_abort_reason_names, index, ABORT_REASON_PROPRIETARY_FIRST, @@ -1514,7 +1514,7 @@ INDTEXT_DATA bacnet_error_class_names[] = { { 0, NULL } }; -const char *bactext_error_class_name(unsigned index) +const char *bactext_error_class_name(uint32_t index) { return indtext_by_index_split_default( bacnet_error_class_names, index, ERROR_CLASS_PROPRIETARY_FIRST, @@ -1791,7 +1791,7 @@ INDTEXT_DATA bacnet_error_code_names[] = { { 0, NULL } }; -const char *bactext_error_code_name(unsigned index) +const char *bactext_error_code_name(uint32_t index) { return indtext_by_index_split_default( bacnet_error_code_names, index, ERROR_CODE_PROPRIETARY_FIRST, @@ -1807,7 +1807,7 @@ INDTEXT_DATA bacnet_month_names[] = { { 0, NULL } }; -const char *bactext_month_name(unsigned index) +const char *bactext_month_name(uint32_t index) { return indtext_by_index_default( bacnet_month_names, index, ASHRAE_Reserved_String); @@ -1820,7 +1820,7 @@ INDTEXT_DATA bacnet_week_of_month_names[] = { { 255, "any week of this month" }, { 0, NULL } }; -const char *bactext_week_of_month_name(unsigned index) +const char *bactext_week_of_month_name(uint32_t index) { return indtext_by_index_default( bacnet_week_of_month_names, index, ASHRAE_Reserved_String); @@ -1835,7 +1835,7 @@ INDTEXT_DATA bacnet_day_of_week_names[] = { { 0, NULL } }; -const char *bactext_day_of_week_name(unsigned index) +const char *bactext_day_of_week_name(uint32_t index) { return indtext_by_index_default( bacnet_day_of_week_names, index, ASHRAE_Reserved_String); @@ -1853,13 +1853,13 @@ INDTEXT_DATA bacnet_days_of_week_names[] = { { 0, NULL } }; -const char *bactext_days_of_week_name(unsigned index) +const char *bactext_days_of_week_name(uint32_t index) { return indtext_by_index_default( bacnet_days_of_week_names, index, ASHRAE_Reserved_String); } -bool bactext_days_of_week_index(const char *search_name, unsigned *found_index) +bool bactext_days_of_week_index(const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_days_of_week_names, search_name, found_index); @@ -1873,13 +1873,13 @@ INDTEXT_DATA bacnet_notify_type_names[] = { { 0, NULL } }; -const char *bactext_notify_type_name(unsigned index) +const char *bactext_notify_type_name(uint32_t index) { return indtext_by_index_default( bacnet_notify_type_names, index, ASHRAE_Reserved_String); } -bool bactext_notify_type_index(const char *search_name, unsigned *found_index) +bool bactext_notify_type_index(const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_notify_type_names, search_name, found_index); @@ -1892,14 +1892,14 @@ INDTEXT_DATA bacnet_event_transition_names[] = { { 0, NULL } }; -const char *bactext_event_transition_name(unsigned index) +const char *bactext_event_transition_name(uint32_t index) { return indtext_by_index_default( bacnet_event_transition_names, index, ASHRAE_Reserved_String); } bool bactext_event_transition_index( - const char *search_name, unsigned *found_index) + const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_event_transition_names, search_name, found_index); @@ -1915,19 +1915,19 @@ INDTEXT_DATA bacnet_event_state_names[] = { { 0, NULL } }; -const char *bactext_event_state_name(unsigned index) +const char *bactext_event_state_name(uint32_t index) { return indtext_by_index_default( bacnet_event_state_names, index, ASHRAE_Reserved_String); } -bool bactext_event_state_index(const char *search_name, unsigned *found_index) +bool bactext_event_state_index(const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_event_state_names, search_name, found_index); } -bool bactext_event_state_strtol(const char *search_name, unsigned *found_index) +bool bactext_event_state_strtol(const char *search_name, uint32_t *found_index) { return bactext_strtoul_index( bacnet_event_state_names, search_name, found_index); @@ -1943,11 +1943,11 @@ INDTEXT_DATA bacnet_event_type_names[] = { { EVENT_CHANGE_OF_LIFE_SAFETY, "change-of-life-safety" }, { EVENT_EXTENDED, "extended" }, { EVENT_BUFFER_READY, "buffer-ready" }, - { EVENT_UNSIGNED_RANGE, "unsigned-range" }, + { EVENT_UNSIGNED_RANGE, "uint32_t-range" }, { EVENT_ACCESS_EVENT, "access-event" }, { EVENT_DOUBLE_OUT_OF_RANGE, "double-out-of-range" }, { EVENT_SIGNED_OUT_OF_RANGE, "signed-out-of-range" }, - { EVENT_UNSIGNED_OUT_OF_RANGE, "unsigned-out-of-range" }, + { EVENT_UNSIGNED_OUT_OF_RANGE, "uint32_t-out-of-range" }, { EVENT_CHANGE_OF_CHARACTERSTRING, "change-of-characterstring" }, { EVENT_CHANGE_OF_STATUS_FLAGS, "change-of-status-flags" }, { EVENT_CHANGE_OF_RELIABILITY, "change-of-reliability" }, @@ -1957,14 +1957,14 @@ INDTEXT_DATA bacnet_event_type_names[] = { { 0, NULL } }; -const char *bactext_event_type_name(unsigned index) +const char *bactext_event_type_name(uint32_t index) { return indtext_by_index_split_default( bacnet_event_type_names, index, EVENT_PROPRIETARY_MIN, ASHRAE_Reserved_String, Vendor_Proprietary_String); } -bool bactext_event_type_index(const char *search_name, unsigned *found_index) +bool bactext_event_type_index(const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_event_type_names, search_name, found_index); @@ -1974,14 +1974,14 @@ INDTEXT_DATA bacnet_binary_present_value_names[] = { { BINARY_INACTIVE, "inactive" }, { BINARY_ACTIVE, "active" }, { 0, NULL } }; -const char *bactext_binary_present_value_name(unsigned index) +const char *bactext_binary_present_value_name(uint32_t index) { return indtext_by_index_default( bacnet_binary_present_value_names, index, ASHRAE_Reserved_String); } bool bactext_binary_present_value_index( - const char *search_name, unsigned *found_index) + const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_binary_present_value_names, search_name, found_index); @@ -1991,7 +1991,7 @@ INDTEXT_DATA bacnet_binary_polarity_names[] = { { POLARITY_NORMAL, "normal" }, { POLARITY_REVERSE, "reverse" }, { 0, NULL } }; -const char *bactext_binary_polarity_name(unsigned index) +const char *bactext_binary_polarity_name(uint32_t index) { return indtext_by_index_default( bacnet_binary_polarity_names, index, ASHRAE_Reserved_String); @@ -2028,7 +2028,7 @@ INDTEXT_DATA bacnet_reliability_names[] = { { 0, NULL } }; -const char *bactext_reliability_name(unsigned index) +const char *bactext_reliability_name(uint32_t index) { return indtext_by_index_default( bacnet_reliability_names, index, ASHRAE_Reserved_String); @@ -2044,7 +2044,7 @@ INDTEXT_DATA bacnet_device_status_names[] = { { 0, NULL } }; -const char *bactext_device_status_name(unsigned index) +const char *bactext_device_status_name(uint32_t index) { return indtext_by_index_default( bacnet_device_status_names, index, ASHRAE_Reserved_String); @@ -2058,13 +2058,13 @@ INDTEXT_DATA bacnet_segmentation_names[] = { { 0, NULL } }; -const char *bactext_segmentation_name(unsigned index) +const char *bactext_segmentation_name(uint32_t index) { return indtext_by_index_default( bacnet_segmentation_names, index, ASHRAE_Reserved_String); } -bool bactext_segmentation_index(const char *search_name, unsigned *found_index) +bool bactext_segmentation_index(const char *search_name, uint32_t *found_index) { return indtext_by_istring( bacnet_segmentation_names, search_name, found_index); @@ -2096,7 +2096,7 @@ INDTEXT_DATA bacnet_node_type_names[] = { { 0, NULL } }; -const char *bactext_node_type_name(unsigned index) +const char *bactext_node_type_name(uint32_t index) { return indtext_by_index_default( bacnet_node_type_names, index, ASHRAE_Reserved_String); @@ -2119,7 +2119,7 @@ INDTEXT_DATA network_layer_msg_names[] = { { 0, NULL } }; -const char *bactext_network_layer_msg_name(unsigned index) +const char *bactext_network_layer_msg_name(uint32_t index) { if (index <= 0x7F) { return indtext_by_index_default( @@ -2157,7 +2157,7 @@ INDTEXT_DATA bactext_life_safety_mode_names[] = { { 0, NULL } }; -const char *bactext_life_safety_mode_name(unsigned index) +const char *bactext_life_safety_mode_name(uint32_t index) { if (index < LIFE_SAFETY_MODE_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2183,7 +2183,7 @@ INDTEXT_DATA bactext_life_safety_operation_names[] = { { 0, NULL } }; -const char *bactext_life_safety_operation_name(unsigned index) +const char *bactext_life_safety_operation_name(uint32_t index) { if (index < LIFE_SAFETY_OP_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2234,7 +2234,7 @@ INDTEXT_DATA bactext_life_safety_state_names[] = { { 0, NULL } }; -const char *bactext_life_safety_state_name(unsigned index) +const char *bactext_life_safety_state_name(uint32_t index) { if (index < LIFE_SAFETY_STATE_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2254,7 +2254,7 @@ INDTEXT_DATA bactext_silenced_state_names[] = { { 0, NULL } }; -const char *bactext_silenced_state_name(unsigned index) +const char *bactext_silenced_state_name(uint32_t index) { if (index < SILENCED_STATE_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2276,7 +2276,7 @@ INDTEXT_DATA bacnet_lighting_in_progress_names[] = { { 0, NULL } }; -const char *bactext_lighting_in_progress(unsigned index) +const char *bactext_lighting_in_progress(uint32_t index) { if (index < MAX_BACNET_LIGHTING_IN_PROGRESS) { return indtext_by_index_default( @@ -2293,7 +2293,7 @@ INDTEXT_DATA bacnet_lighting_transition_names[] = { { 0, NULL } }; -const char *bactext_lighting_transition(unsigned index) +const char *bactext_lighting_transition(uint32_t index) { if (index < BACNET_LIGHTING_TRANSITION_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2324,7 +2324,7 @@ INDTEXT_DATA bacnet_lighting_operation_names[] = { { 0, NULL } }; -const char *bactext_lighting_operation_name(unsigned index) +const char *bactext_lighting_operation_name(uint32_t index) { if (index < BACNET_LIGHTS_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2337,7 +2337,7 @@ const char *bactext_lighting_operation_name(unsigned index) } bool bactext_lighting_operation_strtol( - const char *search_name, unsigned *found_index) + const char *search_name, uint32_t *found_index) { return bactext_strtoul_index( bacnet_lighting_operation_names, search_name, found_index); @@ -2354,7 +2354,7 @@ INDTEXT_DATA bacnet_binary_lighting_pv_names[] = { { 0, NULL } }; -const char *bactext_binary_lighting_pv_name(unsigned index) +const char *bactext_binary_lighting_pv_name(uint32_t index) { if (index < BINARY_LIGHTING_PV_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2367,7 +2367,7 @@ const char *bactext_binary_lighting_pv_name(unsigned index) } bool bactext_binary_lighting_pv_names_strtol( - const char *search_name, unsigned *found_index) + const char *search_name, uint32_t *found_index) { return bactext_strtoul_index( bacnet_binary_lighting_pv_names, search_name, found_index); @@ -2384,7 +2384,7 @@ INDTEXT_DATA bacnet_color_operation_names[] = { { 0, NULL } }; -const char *bactext_color_operation_name(unsigned index) +const char *bactext_color_operation_name(uint32_t index) { return indtext_by_index_default( bacnet_color_operation_names, index, ASHRAE_Reserved_String); @@ -2397,7 +2397,7 @@ INDTEXT_DATA bacnet_device_communications_names[] = { { 0, NULL } }; -const char *bactext_device_communications_name(unsigned index) +const char *bactext_device_communications_name(uint32_t index) { return indtext_by_index_default( bacnet_device_communications_names, index, ASHRAE_Reserved_String); @@ -2411,7 +2411,7 @@ INDTEXT_DATA bacnet_shed_state_names[] = { { 0, NULL } }; -const char *bactext_shed_state_name(unsigned index) +const char *bactext_shed_state_name(uint32_t index) { return indtext_by_index_default( bacnet_shed_state_names, index, ASHRAE_Reserved_String); @@ -2424,7 +2424,7 @@ INDTEXT_DATA bacnet_shed_level_type_names[] = { { 0, NULL } }; -const char *bactext_shed_level_type_name(unsigned index) +const char *bactext_shed_level_type_name(uint32_t index) { return indtext_by_index_default( bacnet_shed_level_type_names, index, ASHRAE_Reserved_String); @@ -2435,7 +2435,7 @@ INDTEXT_DATA bacnet_log_datum_names[] = { { BACNET_LOG_DATUM_BOOLEAN, "boolean" }, { BACNET_LOG_DATUM_REAL, "real" }, { BACNET_LOG_DATUM_ENUMERATED, "enumerated" }, - { BACNET_LOG_DATUM_UNSIGNED, "unsigned" }, + { BACNET_LOG_DATUM_UNSIGNED, "uint32_t" }, { BACNET_LOG_DATUM_SIGNED, "signed" }, { BACNET_LOG_DATUM_BITSTRING, "bitstring" }, { BACNET_LOG_DATUM_NULL, "null" }, @@ -2445,7 +2445,7 @@ INDTEXT_DATA bacnet_log_datum_names[] = { { 0, NULL } }; -const char *bactext_log_datum_name(unsigned index) +const char *bactext_log_datum_name(uint32_t index) { return indtext_by_index_default( bacnet_log_datum_names, index, ASHRAE_Reserved_String); @@ -2464,7 +2464,7 @@ INDTEXT_DATA bactext_restart_reason_names[] = { { 0, NULL } }; -const char *bactext_restart_reason_name(unsigned index) +const char *bactext_restart_reason_name(uint32_t index) { if (index < RESTART_REASON_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2493,7 +2493,7 @@ INDTEXT_DATA bactext_network_port_type_names[] = { { 0, NULL } }; -const char *bactext_network_port_type_name(unsigned index) +const char *bactext_network_port_type_name(uint32_t index) { if (index <= PORT_TYPE_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2513,7 +2513,7 @@ INDTEXT_DATA bactext_network_number_quality_names[] = { { 0, NULL } }; -const char *bactext_network_number_quality_name(unsigned index) +const char *bactext_network_number_quality_name(uint32_t index) { return indtext_by_index_default( bactext_network_number_quality_names, index, ASHRAE_Reserved_String); @@ -2527,7 +2527,7 @@ INDTEXT_DATA bactext_protocol_level_names[] = { { 0, NULL } }; -const char *bactext_protocol_level_name(unsigned index) +const char *bactext_protocol_level_name(uint32_t index) { return indtext_by_index_default( bactext_protocol_level_names, index, ASHRAE_Reserved_String); @@ -2548,7 +2548,7 @@ INDTEXT_DATA bactext_network_port_command_names[] = { { 0, NULL } }; -const char *bactext_network_port_command_name(unsigned index) +const char *bactext_network_port_command_name(uint32_t index) { if (index < PORT_COMMAND_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2567,7 +2567,7 @@ INDTEXT_DATA bactext_authentication_decision_names[] = { { 0, NULL } }; -const char *bactext_authentication_decision_name(unsigned index) +const char *bactext_authentication_decision_name(uint32_t index) { return indtext_by_index_default( bactext_authentication_decision_names, index, ASHRAE_Reserved_String); @@ -2583,7 +2583,7 @@ INDTEXT_DATA bactext_authorization_posture_names[] = { { 0, NULL } }; -const char *bactext_authorization_posture_name(unsigned index) +const char *bactext_authorization_posture_name(uint32_t index) { return indtext_by_index_default( bactext_authorization_posture_names, index, ASHRAE_Reserved_String); @@ -2601,7 +2601,7 @@ INDTEXT_DATA bactext_fault_type_names[] = { { 0, NULL } }; -const char *bactext_fault_type_name(unsigned index) +const char *bactext_fault_type_name(uint32_t index) { return indtext_by_index_default( bactext_fault_type_names, index, ASHRAE_Reserved_String); @@ -2628,7 +2628,7 @@ INDTEXT_DATA bacnet_priority_filter_names[] = { { 0, NULL } }; -const char *bacnet_priority_filter_name(unsigned index) +const char *bacnet_priority_filter_name(uint32_t index) { return indtext_by_index_default( bacnet_priority_filter_names, index, ASHRAE_Reserved_String); @@ -2641,7 +2641,7 @@ INDTEXT_DATA bactext_result_flags_names[] = { { 0, NULL } }; -const char *bactext_result_flags_name(unsigned index) +const char *bactext_result_flags_name(uint32_t index) { return indtext_by_index_default( bactext_result_flags_names, index, ASHRAE_Reserved_String); @@ -2654,7 +2654,7 @@ INDTEXT_DATA bactext_success_filter_names[] = { { 0, NULL } }; -const char *bactext_success_filter_name(unsigned index) +const char *bactext_success_filter_name(uint32_t index) { return indtext_by_index_default( bactext_success_filter_names, index, ASHRAE_Reserved_String); @@ -2668,7 +2668,7 @@ INDTEXT_DATA bactext_logging_type_names[] = { { 0, NULL } }; -const char *bactext_logging_type_name(unsigned index) +const char *bactext_logging_type_name(uint32_t index) { return indtext_by_index_default( bactext_logging_type_names, index, ASHRAE_Reserved_String); @@ -2684,7 +2684,7 @@ INDTEXT_DATA bactext_program_request_names[] = { { 0, NULL } }; -const char *bactext_program_request_name(unsigned index) +const char *bactext_program_request_name(uint32_t index) { return indtext_by_index_default( bactext_program_request_names, index, ASHRAE_Reserved_String); @@ -2701,7 +2701,7 @@ INDTEXT_DATA bactext_program_state_names[] = { { 0, NULL } }; -const char *bactext_program_state_name(unsigned index) +const char *bactext_program_state_name(uint32_t index) { return indtext_by_index_default( bactext_program_state_names, index, ASHRAE_Reserved_String); @@ -2717,7 +2717,7 @@ INDTEXT_DATA bactext_program_error_names[] = { { 0, NULL } }; -const char *bactext_program_error_name(unsigned index) +const char *bactext_program_error_name(uint32_t index) { if (index < PROGRAM_ERROR_PROPRIETARY_MIN) { return indtext_by_index_default( @@ -2737,7 +2737,7 @@ INDTEXT_DATA bactext_timer_state_names[] = { { 0, NULL } }; -const char *bactext_timer_state_name(unsigned index) +const char *bactext_timer_state_name(uint32_t index) { return indtext_by_index_default( bactext_timer_state_names, index, ASHRAE_Reserved_String); @@ -2756,7 +2756,7 @@ INDTEXT_DATA bactext_timer_transition_names[] = { { 0, NULL } }; -const char *bactext_timer_transition_name(unsigned index) +const char *bactext_timer_transition_name(uint32_t index) { return indtext_by_index_default( bactext_timer_transition_names, index, ASHRAE_Reserved_String); @@ -2776,7 +2776,7 @@ bool bactext_object_property_strtoul( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property, const char *search_name, - unsigned *found_index) + uint32_t *found_index) { bool status = false; diff --git a/src/bacnet/bactext.h b/src/bacnet/bactext.h index 21d5f635..daa22ca4 100644 --- a/src/bacnet/bactext.h +++ b/src/bacnet/bactext.h @@ -25,194 +25,194 @@ extern "C" { #endif /* __cplusplus */ BACNET_STACK_EXPORT -const char *bactext_confirmed_service_name(unsigned index); +const char *bactext_confirmed_service_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_unconfirmed_service_name(unsigned index); +const char *bactext_unconfirmed_service_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_application_tag_name(unsigned index); +const char *bactext_application_tag_name(uint32_t index); BACNET_STACK_EXPORT bool bactext_application_tag_index( - const char *search_name, unsigned *found_index); + const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_object_type_name(unsigned index); +const char *bactext_object_type_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_object_type_name_capitalized(unsigned index); +const char *bactext_object_type_name_capitalized(uint32_t index); BACNET_STACK_EXPORT -bool bactext_object_type_index(const char *search_name, unsigned *found_index); +bool bactext_object_type_index(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -bool bactext_object_type_strtol(const char *search_name, unsigned *found_index); +bool bactext_object_type_strtol(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -bool bactext_property_name_proprietary(unsigned index); +bool bactext_property_name_proprietary(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_property_name(unsigned index); +const char *bactext_property_name(uint32_t index); BACNET_STACK_EXPORT const char * -bactext_property_name_default(unsigned index, const char *default_string); +bactext_property_name_default(uint32_t index, const char *default_string); BACNET_STACK_EXPORT -bool bactext_property_index(const char *search_name, unsigned *found_index); +bool bactext_property_index(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -bool bactext_property_strtol(const char *search_name, unsigned *found_index); +bool bactext_property_strtol(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -bool bactext_engineering_unit_name_proprietary(unsigned index); +bool bactext_engineering_unit_name_proprietary(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_engineering_unit_name(unsigned index); +const char *bactext_engineering_unit_name(uint32_t index); BACNET_STACK_EXPORT bool bactext_engineering_unit_index( - const char *search_name, unsigned *found_index); + const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_reject_reason_name(unsigned index); +const char *bactext_reject_reason_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_abort_reason_name(unsigned index); +const char *bactext_abort_reason_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_error_class_name(unsigned index); +const char *bactext_error_class_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_error_code_name(unsigned index); +const char *bactext_error_code_name(uint32_t index); BACNET_STACK_EXPORT -unsigned bactext_property_id(const char *name); +uint32_t bactext_property_id(const char *name); BACNET_STACK_EXPORT -const char *bactext_month_name(unsigned index); +const char *bactext_month_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_week_of_month_name(unsigned index); +const char *bactext_week_of_month_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_day_of_week_name(unsigned index); +const char *bactext_day_of_week_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_notify_type_name(unsigned index); +const char *bactext_notify_type_name(uint32_t index); BACNET_STACK_EXPORT -bool bactext_notify_type_index(const char *search_name, unsigned *found_index); +bool bactext_notify_type_index(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_event_state_name(unsigned index); +const char *bactext_event_state_name(uint32_t index); BACNET_STACK_EXPORT -bool bactext_event_state_index(const char *search_name, unsigned *found_index); +bool bactext_event_state_index(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -bool bactext_event_state_strtol(const char *search_name, unsigned *found_index); +bool bactext_event_state_strtol(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_event_type_name(unsigned index); +const char *bactext_event_type_name(uint32_t index); BACNET_STACK_EXPORT -bool bactext_event_type_index(const char *search_name, unsigned *found_index); +bool bactext_event_type_index(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_binary_present_value_name(unsigned index); +const char *bactext_binary_present_value_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_binary_polarity_name(unsigned index); +const char *bactext_binary_polarity_name(uint32_t index); BACNET_STACK_EXPORT bool bactext_binary_present_value_index( - const char *search_name, unsigned *found_index); + const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_reliability_name(unsigned index); +const char *bactext_reliability_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_device_status_name(unsigned index); +const char *bactext_device_status_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_segmentation_name(unsigned index); +const char *bactext_segmentation_name(uint32_t index); BACNET_STACK_EXPORT -bool bactext_segmentation_index(const char *search_name, unsigned *found_index); +bool bactext_segmentation_index(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_node_type_name(unsigned index); +const char *bactext_node_type_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_character_string_encoding_name(unsigned index); +const char *bactext_character_string_encoding_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_event_transition_name(unsigned index); +const char *bactext_event_transition_name(uint32_t index); BACNET_STACK_EXPORT bool bactext_event_transition_index( - const char *search_name, unsigned *found_index); + const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_days_of_week_name(unsigned index); +const char *bactext_days_of_week_name(uint32_t index); BACNET_STACK_EXPORT -bool bactext_days_of_week_index(const char *search_name, unsigned *found_index); +bool bactext_days_of_week_index(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_network_layer_msg_name(unsigned index); +const char *bactext_network_layer_msg_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_life_safety_mode_name(unsigned index); +const char *bactext_life_safety_mode_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_life_safety_operation_name(unsigned index); +const char *bactext_life_safety_operation_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_life_safety_state_name(unsigned index); +const char *bactext_life_safety_state_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_silenced_state_name(unsigned index); +const char *bactext_silenced_state_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_device_communications_name(unsigned index); +const char *bactext_device_communications_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_lighting_operation_name(unsigned index); +const char *bactext_lighting_operation_name(uint32_t index); BACNET_STACK_EXPORT bool bactext_lighting_operation_strtol( - const char *search_name, unsigned *found_index); + const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_binary_lighting_pv_name(unsigned index); +const char *bactext_binary_lighting_pv_name(uint32_t index); BACNET_STACK_EXPORT bool bactext_binary_lighting_pv_names_strtol( - const char *search_name, unsigned *found_index); + const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT -const char *bactext_lighting_in_progress(unsigned index); +const char *bactext_lighting_in_progress(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_lighting_transition(unsigned index); +const char *bactext_lighting_transition(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_color_operation_name(unsigned index); +const char *bactext_color_operation_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_shed_state_name(unsigned index); +const char *bactext_shed_state_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_shed_level_type_name(unsigned index); +const char *bactext_shed_level_type_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_log_datum_name(unsigned index); +const char *bactext_log_datum_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_restart_reason_name(unsigned index); +const char *bactext_restart_reason_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_network_port_type_name(unsigned index); +const char *bactext_network_port_type_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_network_number_quality_name(unsigned index); +const char *bactext_network_number_quality_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_protocol_level_name(unsigned index); +const char *bactext_protocol_level_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_network_port_command_name(unsigned index); +const char *bactext_network_port_command_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_authentication_decision_name(unsigned index); +const char *bactext_authentication_decision_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_authorization_posture_name(unsigned index); +const char *bactext_authorization_posture_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_fault_type_name(unsigned index); +const char *bactext_fault_type_name(uint32_t index); BACNET_STACK_EXPORT -const char *bacnet_priority_filter_name(unsigned index); +const char *bacnet_priority_filter_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_success_filter_name(unsigned index); +const char *bactext_success_filter_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_result_flags_name(unsigned index); +const char *bactext_result_flags_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_logging_type_name(unsigned index); +const char *bactext_logging_type_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_program_request_name(unsigned index); +const char *bactext_program_request_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_program_state_name(unsigned index); +const char *bactext_program_state_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_program_error_name(unsigned index); +const char *bactext_program_error_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_timer_transition_name(unsigned index); +const char *bactext_timer_transition_name(uint32_t index); BACNET_STACK_EXPORT -const char *bactext_timer_state_name(unsigned index); +const char *bactext_timer_state_name(uint32_t index); BACNET_STACK_EXPORT -bool bactext_strtoul(const char *search_name, unsigned *found_index); +bool bactext_strtoul(const char *search_name, uint32_t *found_index); BACNET_STACK_EXPORT bool bactext_object_property_strtoul( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property, const char *search_name, - unsigned *found_index); + uint32_t *found_index); #ifdef __cplusplus } diff --git a/src/bacnet/basic/object/acc.c b/src/bacnet/basic/object/acc.c index 24eddcb8..1bd326ff 100644 --- a/src/bacnet/basic/object/acc.c +++ b/src/bacnet/basic/object/acc.c @@ -27,7 +27,7 @@ struct object_data { static struct object_data Object_List[MAX_ACCUMULATORS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -42,9 +42,9 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -58,7 +58,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Accumulator_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/acc.h b/src/bacnet/basic/object/acc.h index 63ae1121..a25c60f3 100644 --- a/src/bacnet/basic/object/acc.h +++ b/src/bacnet/basic/object/acc.h @@ -22,7 +22,9 @@ extern "C" { #endif /* __cplusplus */ BACNET_STACK_EXPORT void Accumulator_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Accumulator_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/access_credential.c b/src/bacnet/basic/object/access_credential.c index c571603c..6fdb68f4 100644 --- a/src/bacnet/basic/object/access_credential.c +++ b/src/bacnet/basic/object/access_credential.c @@ -24,7 +24,7 @@ static bool Access_Credential_Initialized = false; static ACCESS_CREDENTIAL_DESCR ac_descr[MAX_ACCESS_CREDENTIALS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -42,12 +42,14 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { -1 }; +static const int32_t Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Access_Credential_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/access_credential.h b/src/bacnet/basic/object/access_credential.h index 361d4bd8..bd04b753 100644 --- a/src/bacnet/basic/object/access_credential.h +++ b/src/bacnet/basic/object/access_credential.h @@ -60,7 +60,9 @@ typedef struct { BACNET_STACK_EXPORT void Access_Credential_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Access_Credential_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/access_door.c b/src/bacnet/basic/object/access_door.c index 0a192f35..261dd9ba 100644 --- a/src/bacnet/basic/object/access_door.c +++ b/src/bacnet/basic/object/access_door.c @@ -22,7 +22,7 @@ static bool Access_Door_Initialized = false; static ACCESS_DOOR_DESCR ad_descr[MAX_ACCESS_DOORS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -40,16 +40,18 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { PROP_DOOR_STATUS, PROP_LOCK_STATUS, PROP_SECURED_STATUS, PROP_DOOR_UNLOCK_DELAY_TIME, PROP_DOOR_ALARM_STATE, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Access_Door_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/access_door.h b/src/bacnet/basic/object/access_door.h index d4b67f6a..1bbfe727 100644 --- a/src/bacnet/basic/object/access_door.h +++ b/src/bacnet/basic/object/access_door.h @@ -42,7 +42,9 @@ typedef struct { BACNET_STACK_EXPORT void Access_Door_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Access_Door_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/access_point.c b/src/bacnet/basic/object/access_point.c index d97d5a53..0bb4b10f 100644 --- a/src/bacnet/basic/object/access_point.c +++ b/src/bacnet/basic/object/access_point.c @@ -22,7 +22,7 @@ static bool Access_Point_Initialized = false; static ACCESS_POINT_DESCR ap_descr[MAX_ACCESS_POINTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -44,12 +44,14 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { -1 }; +static const int32_t Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Access_Point_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/access_point.h b/src/bacnet/basic/object/access_point.h index 13608f6f..03dc61f6 100644 --- a/src/bacnet/basic/object/access_point.h +++ b/src/bacnet/basic/object/access_point.h @@ -49,7 +49,9 @@ typedef struct { BACNET_STACK_EXPORT void Access_Point_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Access_Point_Valid_Instance(uint32_t object_instance); unsigned Access_Point_Count(void); diff --git a/src/bacnet/basic/object/access_rights.c b/src/bacnet/basic/object/access_rights.c index df7440cb..71b99341 100644 --- a/src/bacnet/basic/object/access_rights.c +++ b/src/bacnet/basic/object/access_rights.c @@ -25,7 +25,7 @@ static bool Access_Rights_Initialized = false; static ACCESS_RIGHTS_DESCR ar_descr[MAX_ACCESS_RIGHTSS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -39,12 +39,14 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { -1 }; +static const int32_t Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Access_Rights_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/access_rights.h b/src/bacnet/basic/object/access_rights.h index f6333e4e..2eb60e18 100644 --- a/src/bacnet/basic/object/access_rights.h +++ b/src/bacnet/basic/object/access_rights.h @@ -48,7 +48,9 @@ typedef struct { BACNET_STACK_EXPORT void Access_Rights_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Access_Rights_Valid_Instance(uint32_t object_instance); unsigned Access_Rights_Count(void); diff --git a/src/bacnet/basic/object/access_user.c b/src/bacnet/basic/object/access_user.c index e9c2ef91..cbcab2bb 100644 --- a/src/bacnet/basic/object/access_user.c +++ b/src/bacnet/basic/object/access_user.c @@ -23,19 +23,21 @@ static bool Access_User_Initialized = false; static ACCESS_USER_DESCR au_descr[MAX_ACCESS_USERS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_GLOBAL_IDENTIFIER, PROP_STATUS_FLAGS, PROP_RELIABILITY, PROP_USER_TYPE, PROP_CREDENTIALS, -1 }; -static const int Properties_Optional[] = { -1 }; +static const int32_t Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Access_User_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/access_user.h b/src/bacnet/basic/object/access_user.h index b19ff9a7..5ec89942 100644 --- a/src/bacnet/basic/object/access_user.h +++ b/src/bacnet/basic/object/access_user.h @@ -41,7 +41,9 @@ typedef struct { BACNET_STACK_EXPORT void Access_User_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Access_User_Valid_Instance(uint32_t object_instance); unsigned Access_User_Count(void); diff --git a/src/bacnet/basic/object/access_zone.c b/src/bacnet/basic/object/access_zone.c index 603a9dc3..6f843391 100644 --- a/src/bacnet/basic/object/access_zone.c +++ b/src/bacnet/basic/object/access_zone.c @@ -23,7 +23,7 @@ static bool Access_Zone_Initialized = false; static ACCESS_ZONE_DESCR az_descr[MAX_ACCESS_ZONES]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_GLOBAL_IDENTIFIER, PROP_OCCUPANCY_STATE, PROP_STATUS_FLAGS, @@ -31,12 +31,14 @@ static const int Properties_Required[] = { PROP_ENTRY_POINTS, PROP_EXIT_POINTS, -1 }; -static const int Properties_Optional[] = { -1 }; +static const int32_t Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Access_Zone_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/access_zone.h b/src/bacnet/basic/object/access_zone.h index 6dc797c2..1ae467af 100644 --- a/src/bacnet/basic/object/access_zone.h +++ b/src/bacnet/basic/object/access_zone.h @@ -49,7 +49,9 @@ typedef struct { BACNET_STACK_EXPORT void Access_Zone_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Access_Zone_Valid_Instance(uint32_t object_instance); unsigned Access_Zone_Count(void); diff --git a/src/bacnet/basic/object/ai.c b/src/bacnet/basic/object/ai.c index c7457221..2783e9e3 100644 --- a/src/bacnet/basic/object/ai.c +++ b/src/bacnet/basic/object/ai.c @@ -31,14 +31,14 @@ static OS_Keylist Object_List; static const BACNET_OBJECT_TYPE Object_Type = OBJECT_ANALOG_INPUT; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -59,7 +59,7 @@ static const int Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Initialize the pointers for the required, the optional and the properitary @@ -70,7 +70,9 @@ static const int Properties_Proprietary[] = { -1 }; * @param pProprietary - Pointer to the pointer of properitary values. */ void Analog_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/ai.h b/src/bacnet/basic/object/ai.h index 2a1acc24..61786b6e 100644 --- a/src/bacnet/basic/object/ai.h +++ b/src/bacnet/basic/object/ai.h @@ -60,7 +60,9 @@ extern "C" { BACNET_STACK_EXPORT void Analog_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Analog_Input_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/ao.c b/src/bacnet/basic/object/ao.c index 507129a8..b8a4bfe7 100644 --- a/src/bacnet/basic/object/ao.c +++ b/src/bacnet/basic/object/ao.c @@ -58,7 +58,7 @@ static analog_output_write_present_value_callback /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -76,13 +76,13 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_RELIABILITY, PROP_DESCRIPTION, PROP_COV_INCREMENT, PROP_MIN_PRES_VALUE, PROP_MAX_PRES_VALUE, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * @brief Returns the list of required, optional, and proprietary properties. @@ -95,7 +95,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Analog_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/ao.h b/src/bacnet/basic/object/ao.h index 6dcf9aa2..06702168 100644 --- a/src/bacnet/basic/object/ao.h +++ b/src/bacnet/basic/object/ao.h @@ -33,7 +33,9 @@ extern "C" { BACNET_STACK_EXPORT void Analog_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Analog_Output_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/auditlog.c b/src/bacnet/basic/object/auditlog.c index ad870dfc..dd3cdff3 100644 --- a/src/bacnet/basic/object/auditlog.c +++ b/src/bacnet/basic/object/auditlog.c @@ -108,7 +108,7 @@ struct object_data { /* Key List for storing the object data sorted by instance number */ static OS_Keylist Object_List; -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* required properties that are supported for this object */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -123,11 +123,11 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; -static const int BACnetARRAY_Properties[] = { +static const int32_t BACnetARRAY_Properties[] = { /* standard properties that are arrays for this object */ PROP_LOG_BUFFER, PROP_EVENT_TIME_STAMPS, @@ -159,7 +159,9 @@ static bool BACnetARRAY_Property(int object_property) * BACnet proprietary properties for this object. */ void Audit_Log_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/auditlog.h b/src/bacnet/basic/object/auditlog.h index a68fd194..c7647868 100644 --- a/src/bacnet/basic/object/auditlog.h +++ b/src/bacnet/basic/object/auditlog.h @@ -39,7 +39,9 @@ extern "C" { BACNET_STACK_EXPORT void Audit_Log_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Audit_Log_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/av.c b/src/bacnet/basic/object/av.c index 6817922b..9874b6fe 100644 --- a/src/bacnet/basic/object/av.c +++ b/src/bacnet/basic/object/av.c @@ -38,13 +38,13 @@ static analog_value_write_present_value_callback /* clang-format off */ /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Analog_Value_Properties_Required[] = { +static const int32_t Analog_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Value_Properties_Optional[] = { +static const int32_t Analog_Value_Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY, PROP_COV_INCREMENT, #if defined(INTRINSIC_REPORTING) PROP_TIME_DELAY, PROP_NOTIFICATION_CLASS, PROP_HIGH_LIMIT, @@ -55,7 +55,7 @@ static const int Analog_Value_Properties_Optional[] = { -1 }; -static const int Analog_Value_Properties_Proprietary[] = { +static const int32_t Analog_Value_Properties_Proprietary[] = { -1 }; /* clang-format on */ @@ -69,7 +69,9 @@ static const int Analog_Value_Properties_Proprietary[] = { * @param pProprietary - Pointer to the pointer of properitary values. */ void Analog_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Analog_Value_Properties_Required; diff --git a/src/bacnet/basic/object/av.h b/src/bacnet/basic/object/av.h index 41105c63..d155c191 100644 --- a/src/bacnet/basic/object/av.h +++ b/src/bacnet/basic/object/av.h @@ -70,7 +70,9 @@ extern "C" { #endif /* __cplusplus */ BACNET_STACK_EXPORT void Analog_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Analog_Value_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/bacfile.c b/src/bacnet/basic/object/bacfile.c index 9dcd2fe2..85870bd2 100644 --- a/src/bacnet/basic/object/bacfile.c +++ b/src/bacnet/basic/object/bacfile.c @@ -47,7 +47,7 @@ static OS_Keylist Object_List; /* common object type */ static const BACNET_OBJECT_TYPE Object_Type = OBJECT_FILE; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -61,12 +61,12 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * @brief Returns the list of required, optional, and proprietary properties. @@ -79,7 +79,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void BACfile_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/bacfile.h b/src/bacnet/basic/object/bacfile.h index a8a40083..bb39fe0c 100644 --- a/src/bacnet/basic/object/bacfile.h +++ b/src/bacnet/basic/object/bacfile.h @@ -26,7 +26,9 @@ extern "C" { BACNET_STACK_EXPORT void BACfile_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool bacfile_object_name( diff --git a/src/bacnet/basic/object/bi.c b/src/bacnet/basic/object/bi.c index 30e17f0a..0b214117 100644 --- a/src/bacnet/basic/object/bi.c +++ b/src/bacnet/basic/object/bi.c @@ -69,14 +69,14 @@ static binary_input_write_present_value_callback Binary_Input_Write_Present_Value_Callback; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_RELIABILITY, PROP_DESCRIPTION, @@ -95,7 +95,7 @@ static const int Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Initialize the pointers for the required, the optional and the properitary @@ -106,7 +106,9 @@ static const int Properties_Proprietary[] = { -1 }; * @param pProprietary - Pointer to the pointer of properitary values. */ void Binary_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/bi.h b/src/bacnet/basic/object/bi.h index 668a893b..8278a94c 100644 --- a/src/bacnet/basic/object/bi.h +++ b/src/bacnet/basic/object/bi.h @@ -42,7 +42,9 @@ extern "C" { BACNET_STACK_EXPORT void Binary_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Binary_Input_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/bitstring_value.c b/src/bacnet/basic/object/bitstring_value.c index 413c79ef..7543ab07 100644 --- a/src/bacnet/basic/object/bitstring_value.c +++ b/src/bacnet/basic/object/bitstring_value.c @@ -42,18 +42,18 @@ static bitstring_value_write_present_value_callback BitString_Value_Write_Present_Value_Callback; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_RELIABILITY, PROP_OUT_OF_SERVICE, PROP_DESCRIPTION, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Initialize the pointers for the required, the optional and the properitary @@ -64,7 +64,9 @@ static const int Properties_Proprietary[] = { -1 }; * @param pProprietary - Pointer to the pointer of properitary values. */ void BitString_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/bitstring_value.h b/src/bacnet/basic/object/bitstring_value.h index 41eefc43..407b15c8 100644 --- a/src/bacnet/basic/object/bitstring_value.h +++ b/src/bacnet/basic/object/bitstring_value.h @@ -39,7 +39,9 @@ void BitString_Value_Write_Present_Value_Callback_Set( BACNET_STACK_EXPORT void BitString_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool BitString_Value_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/blo.c b/src/bacnet/basic/object/blo.c index 37e10548..ddc85260 100644 --- a/src/bacnet/basic/object/blo.c +++ b/src/bacnet/basic/object/blo.c @@ -60,7 +60,7 @@ static binary_lighting_output_blink_warn_callback /* These arrays are used by the ReadPropertyMultiple handler and property-list property (as of protocol-revision 14) */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -78,12 +78,12 @@ static const int Properties_Required[] = { #endif -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_RELIABILITY, PROP_FEEDBACK_VALUE, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -97,7 +97,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Binary_Lighting_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/blo.h b/src/bacnet/basic/object/blo.h index f1bc06e9..85f8fad1 100644 --- a/src/bacnet/basic/object/blo.h +++ b/src/bacnet/basic/object/blo.h @@ -40,7 +40,9 @@ extern "C" { BACNET_STACK_EXPORT void Binary_Lighting_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Binary_Lighting_Output_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/bo.c b/src/bacnet/basic/object/bo.c index d6b10827..ddd379d2 100644 --- a/src/bacnet/basic/object/bo.c +++ b/src/bacnet/basic/object/bo.c @@ -57,7 +57,7 @@ static binary_output_write_present_value_callback Binary_Output_Write_Present_Value_Callback; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -75,12 +75,12 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_RELIABILITY, PROP_DESCRIPTION, PROP_ACTIVE_TEXT, PROP_INACTIVE_TEXT, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -94,7 +94,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Binary_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/bo.h b/src/bacnet/basic/object/bo.h index 7ba41798..0511b7e6 100644 --- a/src/bacnet/basic/object/bo.h +++ b/src/bacnet/basic/object/bo.h @@ -39,7 +39,9 @@ void Binary_Output_Init(void); BACNET_STACK_EXPORT void Binary_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Binary_Output_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/bv.c b/src/bacnet/basic/object/bv.c index 64464c60..693269db 100644 --- a/src/bacnet/basic/object/bv.c +++ b/src/bacnet/basic/object/bv.c @@ -69,7 +69,7 @@ static binary_value_write_present_value_callback /* clang-format off */ /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Binary_Value_Properties_Required[] = { +static const int32_t Binary_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -80,7 +80,7 @@ static const int Binary_Value_Properties_Required[] = { -1 }; -static const int Binary_Value_Properties_Optional[] = { +static const int32_t Binary_Value_Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY, PROP_ACTIVE_TEXT, @@ -98,7 +98,7 @@ static const int Binary_Value_Properties_Optional[] = { -1 }; -static const int Binary_Value_Properties_Proprietary[] = { +static const int32_t Binary_Value_Properties_Proprietary[] = { -1 }; /* clang-format on */ @@ -112,7 +112,9 @@ static const int Binary_Value_Properties_Proprietary[] = { * @param pProprietary - Pointer to the pointer of properitary values. */ void Binary_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Binary_Value_Properties_Required; diff --git a/src/bacnet/basic/object/bv.h b/src/bacnet/basic/object/bv.h index 075f8a5a..5be52d30 100644 --- a/src/bacnet/basic/object/bv.h +++ b/src/bacnet/basic/object/bv.h @@ -44,7 +44,9 @@ void Binary_Value_Init(void); BACNET_STACK_EXPORT void Binary_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Binary_Value_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/calendar.c b/src/bacnet/basic/object/calendar.c index dde2209b..dcd66115 100644 --- a/src/bacnet/basic/object/calendar.c +++ b/src/bacnet/basic/object/calendar.c @@ -49,14 +49,14 @@ static calendar_write_present_value_callback Calendar_Write_Present_Value_Callback; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Calendar_Properties_Required[] = { +static const int32_t Calendar_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_DATE_LIST, -1 }; -static const int Calendar_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Calendar_Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Calendar_Properties_Proprietary[] = { -1 }; +static const int32_t Calendar_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -70,7 +70,9 @@ static const int Calendar_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Calendar_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Calendar_Properties_Required; diff --git a/src/bacnet/basic/object/calendar.h b/src/bacnet/basic/object/calendar.h index cddf2f38..ae299138 100644 --- a/src/bacnet/basic/object/calendar.h +++ b/src/bacnet/basic/object/calendar.h @@ -33,7 +33,9 @@ extern "C" { BACNET_STACK_EXPORT void Calendar_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Calendar_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/channel.c b/src/bacnet/basic/object/channel.c index bafecd45..f75a6cd1 100644 --- a/src/bacnet/basic/object/channel.c +++ b/src/bacnet/basic/object/channel.c @@ -57,7 +57,7 @@ static write_property_function Write_Property_Internal_Callback; /* These arrays are used by the ReadPropertyMultiple handler property-list property (as of protocol-revision 14) */ -static const int Channel_Properties_Required[] = { +static const int32_t Channel_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -72,9 +72,9 @@ static const int Channel_Properties_Required[] = { -1 }; -static const int Channel_Properties_Optional[] = { -1 }; +static const int32_t Channel_Properties_Optional[] = { -1 }; -static const int Channel_Properties_Proprietary[] = { -1 }; +static const int32_t Channel_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -88,7 +88,9 @@ static const int Channel_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Channel_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Channel_Properties_Required; diff --git a/src/bacnet/basic/object/channel.h b/src/bacnet/basic/object/channel.h index c3278fff..9815a5a6 100644 --- a/src/bacnet/basic/object/channel.h +++ b/src/bacnet/basic/object/channel.h @@ -24,7 +24,9 @@ extern "C" { #endif /* __cplusplus */ BACNET_STACK_EXPORT void Channel_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Channel_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/client/device-client.c b/src/bacnet/basic/object/client/device-client.c index 1ad23e72..d878bfbc 100644 --- a/src/bacnet/basic/object/client/device-client.c +++ b/src/bacnet/basic/object/client/device-client.c @@ -305,7 +305,7 @@ bool Device_Objects_Property_List_Member( } /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { +static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -329,7 +329,7 @@ static const int Device_Properties_Required[] = { -1 }; -static const int Device_Properties_Optional[] = { +static const int32_t Device_Properties_Optional[] = { #if defined(BACDL_MSTP) PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, @@ -341,10 +341,12 @@ static const int Device_Properties_Optional[] = { -1 }; -static const int Device_Properties_Proprietary[] = { -1 }; +static const int32_t Device_Properties_Proprietary[] = { -1 }; void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Device_Properties_Required; diff --git a/src/bacnet/basic/object/color_object.c b/src/bacnet/basic/object/color_object.c index 893053c3..66fd63ef 100644 --- a/src/bacnet/basic/object/color_object.c +++ b/src/bacnet/basic/object/color_object.c @@ -63,7 +63,7 @@ static OS_Keylist Object_List; static color_write_present_value_callback Color_Write_Present_Value_Callback; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Color_Properties_Required[] = { +static const int32_t Color_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_TRACKING_VALUE, PROP_COLOR_COMMAND, @@ -71,10 +71,10 @@ static const int Color_Properties_Required[] = { PROP_DEFAULT_FADE_TIME, -1 }; -static const int Color_Properties_Optional[] = { PROP_DESCRIPTION, - PROP_TRANSITION, -1 }; +static const int32_t Color_Properties_Optional[] = { PROP_DESCRIPTION, + PROP_TRANSITION, -1 }; -static const int Color_Properties_Proprietary[] = { -1 }; +static const int32_t Color_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -88,7 +88,9 @@ static const int Color_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Color_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Color_Properties_Required; diff --git a/src/bacnet/basic/object/color_object.h b/src/bacnet/basic/object/color_object.h index 01ddb84e..09e71099 100644 --- a/src/bacnet/basic/object/color_object.h +++ b/src/bacnet/basic/object/color_object.h @@ -35,7 +35,9 @@ extern "C" { BACNET_STACK_EXPORT void Color_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Color_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/color_temperature.c b/src/bacnet/basic/object/color_temperature.c index 01b51172..7bafe679 100644 --- a/src/bacnet/basic/object/color_temperature.c +++ b/src/bacnet/basic/object/color_temperature.c @@ -57,7 +57,7 @@ static color_temperature_write_present_value_callback Color_Temperature_Write_Present_Value_Callback; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Color_Temperature_Properties_Required[] = { +static const int32_t Color_Temperature_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -72,12 +72,12 @@ static const int Color_Temperature_Properties_Required[] = { -1 }; -static const int Color_Temperature_Properties_Optional[] = { +static const int32_t Color_Temperature_Properties_Optional[] = { PROP_DESCRIPTION, PROP_TRANSITION, PROP_MIN_PRES_VALUE, PROP_MAX_PRES_VALUE, -1 }; -static const int Color_Temperature_Properties_Proprietary[] = { -1 }; +static const int32_t Color_Temperature_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -91,7 +91,9 @@ static const int Color_Temperature_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Color_Temperature_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Color_Temperature_Properties_Required; diff --git a/src/bacnet/basic/object/color_temperature.h b/src/bacnet/basic/object/color_temperature.h index 89bcfe55..464effd5 100644 --- a/src/bacnet/basic/object/color_temperature.h +++ b/src/bacnet/basic/object/color_temperature.h @@ -31,7 +31,9 @@ extern "C" { BACNET_STACK_EXPORT void Color_Temperature_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Color_Temperature_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/command.c b/src/bacnet/basic/object/command.c index 1779ce0e..a632b4fa 100644 --- a/src/bacnet/basic/object/command.c +++ b/src/bacnet/basic/object/command.c @@ -35,7 +35,7 @@ static COMMAND_DESCR Command_Descr[MAX_COMMANDS]; /* clang-format off */ /* These arrays are used by the ReadPropertyMultiple handler */ -static const int Command_Properties_Required[] = { +static const int32_t Command_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -45,9 +45,9 @@ static const int Command_Properties_Required[] = { PROP_ACTION, -1 }; -static const int Command_Properties_Optional[] = { -1 }; +static const int32_t Command_Properties_Optional[] = { -1 }; -static const int Command_Properties_Proprietary[] = { -1 }; +static const int32_t Command_Properties_Proprietary[] = { -1 }; /* clang-format on */ /** @@ -62,7 +62,9 @@ static const int Command_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Command_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Command_Properties_Required; diff --git a/src/bacnet/basic/object/command.h b/src/bacnet/basic/object/command.h index e07b8cbc..f0300b41 100644 --- a/src/bacnet/basic/object/command.h +++ b/src/bacnet/basic/object/command.h @@ -37,7 +37,9 @@ typedef struct command_descr { BACNET_STACK_EXPORT void Command_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Command_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/credential_data_input.c b/src/bacnet/basic/object/credential_data_input.c index d36a01c8..1295bbed 100644 --- a/src/bacnet/basic/object/credential_data_input.c +++ b/src/bacnet/basic/object/credential_data_input.c @@ -24,7 +24,7 @@ static bool Credential_Data_Input_Initialized = false; static CREDENTIAL_DATA_INPUT_DESCR cdi_descr[MAX_CREDENTIAL_DATA_INPUTS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -33,12 +33,14 @@ static const int Properties_Required[] = { PROP_UPDATE_TIME, -1 }; -static const int Properties_Optional[] = { -1 }; +static const int32_t Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Credential_Data_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/credential_data_input.h b/src/bacnet/basic/object/credential_data_input.h index be4ba554..e708fbab 100644 --- a/src/bacnet/basic/object/credential_data_input.h +++ b/src/bacnet/basic/object/credential_data_input.h @@ -45,7 +45,9 @@ typedef struct { BACNET_STACK_EXPORT void Credential_Data_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Credential_Data_Input_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/csv.c b/src/bacnet/basic/object/csv.c index 69a5201a..1a54902c 100644 --- a/src/bacnet/basic/object/csv.c +++ b/src/bacnet/basic/object/csv.c @@ -28,18 +28,18 @@ static OS_Keylist Object_List = NULL; static const BACNET_OBJECT_TYPE Object_Type = OBJECT_CHARACTERSTRING_VALUE; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* list of the optional properties */ PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_DESCRIPTION, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; typedef struct characterstring_object { /* Writable out-of-service allows others to manipulate our Present Value */ @@ -63,7 +63,9 @@ typedef struct characterstring_object { * @param pProprietary - Pointer to the pointer of properitary values. */ void CharacterString_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/csv.h b/src/bacnet/basic/object/csv.h index c8cca021..44e226c2 100644 --- a/src/bacnet/basic/object/csv.h +++ b/src/bacnet/basic/object/csv.h @@ -22,7 +22,9 @@ extern "C" { BACNET_STACK_EXPORT void CharacterString_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool CharacterString_Value_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/device.c b/src/bacnet/basic/object/device.c index 47c70169..e9719fb1 100644 --- a/src/bacnet/basic/object/device.c +++ b/src/bacnet/basic/object/device.c @@ -510,7 +510,7 @@ void Device_Objects_Property_List( } /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { +static const int32_t Device_Properties_Required[] = { /* List of Required properties in this object */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -535,7 +535,7 @@ static const int Device_Properties_Required[] = { -1 }; -static const int Device_Properties_Optional[] = { +static const int32_t Device_Properties_Optional[] = { /* List of Optional properties in this object */ #if defined(BACDL_MSTP) PROP_MAX_MASTER, @@ -559,7 +559,7 @@ static const int Device_Properties_Optional[] = { -1 }; -static const int Device_Properties_Proprietary[] = { -1 }; +static const int32_t Device_Properties_Proprietary[] = { -1 }; /** * @brief Returns the list of required, optional, and proprietary properties @@ -573,7 +573,9 @@ static const int Device_Properties_Proprietary[] = { -1 }; * @ingroup ObjIntf */ void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Device_Properties_Required; diff --git a/src/bacnet/basic/object/device.h b/src/bacnet/basic/object/device.h index 47664dc4..f9fc24a9 100644 --- a/src/bacnet/basic/object/device.h +++ b/src/bacnet/basic/object/device.h @@ -242,7 +242,9 @@ bool Device_Interval_Offset_Set(uint32_t value); BACNET_STACK_EXPORT void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT void Device_Objects_Property_List( BACNET_OBJECT_TYPE object_type, @@ -442,9 +444,10 @@ bool Routed_Device_Address_Lookup( int idx, uint8_t address_len, const uint8_t *mac_adress); BACNET_STACK_EXPORT bool Routed_Device_GetNext( - const BACNET_ADDRESS *dest, const int *DNET_list, int *cursor); + const BACNET_ADDRESS *dest, const int32_t *DNET_list, int *cursor); BACNET_STACK_EXPORT -bool Routed_Device_Is_Valid_Network(uint16_t dest_net, const int *DNET_list); +bool Routed_Device_Is_Valid_Network( + uint16_t dest_net, const int32_t *DNET_list); BACNET_STACK_EXPORT uint32_t Routed_Device_Index_To_Instance(unsigned index); diff --git a/src/bacnet/basic/object/gateway/gw_device.c b/src/bacnet/basic/object/gateway/gw_device.c index c8b50034..235fab75 100644 --- a/src/bacnet/basic/object/gateway/gw_device.c +++ b/src/bacnet/basic/object/gateway/gw_device.c @@ -251,7 +251,7 @@ bool Routed_Device_Address_Lookup(int idx, uint8_t dlen, const uint8_t *dadr) * returned as -1 in these cases. */ bool Routed_Device_GetNext( - const BACNET_ADDRESS *dest, const int *DNET_list, int *cursor) + const BACNET_ADDRESS *dest, const int32_t *DNET_list, int *cursor) { int dnet = DNET_list[0]; /* Get the DNET of our virtual network */ int idx = *cursor; @@ -315,7 +315,7 @@ bool Routed_Device_GetNext( * Device (the gateway), or is BACNET_BROADCAST_NETWORK, * which is an automatic match. Else False if not a reachable network. */ -bool Routed_Device_Is_Valid_Network(uint16_t dest_net, const int *DNET_list) +bool Routed_Device_Is_Valid_Network(uint16_t dest_net, const int32_t *DNET_list) { int dnet = DNET_list[0]; /* Get the DNET of our virtual network */ bool bSuccess = false; diff --git a/src/bacnet/basic/object/iv.c b/src/bacnet/basic/object/iv.c index 8a3f2f56..a86477eb 100644 --- a/src/bacnet/basic/object/iv.c +++ b/src/bacnet/basic/object/iv.c @@ -50,19 +50,21 @@ struct integer_object { } INTERGER_VALUE_DESCR; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Integer_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, - PROP_OBJECT_NAME, - PROP_OBJECT_TYPE, - PROP_PRESENT_VALUE, - PROP_STATUS_FLAGS, - PROP_UNITS, - -1 }; +static const int32_t Integer_Value_Properties_Required[] = { + PROP_OBJECT_IDENTIFIER, + PROP_OBJECT_NAME, + PROP_OBJECT_TYPE, + PROP_PRESENT_VALUE, + PROP_STATUS_FLAGS, + PROP_UNITS, + -1 +}; -static const int Integer_Value_Properties_Optional[] = { +static const int32_t Integer_Value_Properties_Optional[] = { PROP_OUT_OF_SERVICE, PROP_DESCRIPTION, PROP_COV_INCREMENT, -1 }; -static const int Integer_Value_Properties_Proprietary[] = { -1 }; +static const int32_t Integer_Value_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -76,7 +78,9 @@ static const int Integer_Value_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Integer_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Integer_Value_Properties_Required; diff --git a/src/bacnet/basic/object/iv.h b/src/bacnet/basic/object/iv.h index dafb998c..44a61020 100644 --- a/src/bacnet/basic/object/iv.h +++ b/src/bacnet/basic/object/iv.h @@ -31,7 +31,9 @@ typedef void (*integer_value_write_present_value_callback)( BACNET_STACK_EXPORT void Integer_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Integer_Value_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/lc.c b/src/bacnet/basic/object/lc.c index de67d1d6..9a385534 100644 --- a/src/bacnet/basic/object/lc.c +++ b/src/bacnet/basic/object/lc.c @@ -97,7 +97,7 @@ static OS_Keylist Object_List; /* clang-format off */ /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Load_Control_Properties_Required[] = { +static const int32_t Load_Control_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -116,19 +116,21 @@ static const int Load_Control_Properties_Required[] = { -1 }; -static const int Load_Control_Properties_Optional[] = { +static const int32_t Load_Control_Properties_Optional[] = { PROP_DESCRIPTION, PROP_FULL_DUTY_BASELINE, -1 }; -static const int Load_Control_Properties_Proprietary[] = { +static const int32_t Load_Control_Properties_Proprietary[] = { -1 }; /* clang-format on */ void Load_Control_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Load_Control_Properties_Required; diff --git a/src/bacnet/basic/object/lc.h b/src/bacnet/basic/object/lc.h index bb49c589..2fb4e553 100644 --- a/src/bacnet/basic/object/lc.h +++ b/src/bacnet/basic/object/lc.h @@ -73,7 +73,9 @@ extern "C" { BACNET_STACK_EXPORT void Load_Control_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_DEPRECATED("Use Load_Control_Timer() instead") BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/lo.c b/src/bacnet/basic/object/lo.c index 907a1df6..b8556fac 100644 --- a/src/bacnet/basic/object/lo.c +++ b/src/bacnet/basic/object/lo.c @@ -65,7 +65,7 @@ static lighting_command_tracking_value_callback /* These arrays are used by the ReadPropertyMultiple handler and property-list property (as of protocol-revision 14) */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -94,7 +94,7 @@ static const int Properties_Required[] = { #endif -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_TRANSITION, @@ -111,7 +111,7 @@ static const int Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * @brief compare two floating point values to 3 decimal places @@ -137,7 +137,9 @@ static bool is_float_equal(float x1, float x2) * BACnet proprietary properties for this object. */ void Lighting_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/lo.h b/src/bacnet/basic/object/lo.h index 876d80fc..26edaf8e 100644 --- a/src/bacnet/basic/object/lo.h +++ b/src/bacnet/basic/object/lo.h @@ -23,7 +23,9 @@ extern "C" { BACNET_STACK_EXPORT void Lighting_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Lighting_Output_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/loop.c b/src/bacnet/basic/object/loop.c index 2e766d37..00912572 100644 --- a/src/bacnet/basic/object/loop.c +++ b/src/bacnet/basic/object/loop.c @@ -77,7 +77,7 @@ struct object_data { }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -98,7 +98,7 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -117,8 +117,8 @@ static const int Properties_Optional[] = { }; /* handling for proprietary properties */ -static const int Properties_Proprietary[] = { -1 }; -static const int *Properties_Proprietary_Extended; +static const int32_t Properties_Proprietary[] = { -1 }; +static const int32_t *Properties_Proprietary_Extended; static write_property_function Write_Property_Proprietary_Callback; static read_property_function Read_Property_Proprietary_Callback; @@ -134,7 +134,9 @@ static read_property_function Read_Property_Proprietary_Callback; * BACnet proprietary properties for this object. */ void Loop_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; @@ -160,9 +162,9 @@ void Loop_Property_Lists( */ static bool Loop_Property_Lists_Member(int object_property) { - const int *pRequired; - const int *pOptional; - const int *pProprietary; + const int32_t *pRequired; + const int32_t *pOptional; + const int32_t *pProprietary; Loop_Property_Lists(&pRequired, &pOptional, &pProprietary); return property_lists_member( @@ -175,7 +177,7 @@ static bool Loop_Property_Lists_Member(int object_property) * @param pProprietary - pointer to list of int terminated by -1, of * BACnet proprietary properties for this object. */ -void Loop_Proprietary_Property_List_Set(const int *pProprietary) +void Loop_Proprietary_Property_List_Set(const int32_t *pProprietary) { Properties_Proprietary_Extended = pProprietary; } diff --git a/src/bacnet/basic/object/loop.h b/src/bacnet/basic/object/loop.h index 9f375bd3..4397e69a 100644 --- a/src/bacnet/basic/object/loop.h +++ b/src/bacnet/basic/object/loop.h @@ -24,9 +24,11 @@ extern "C" { BACNET_STACK_EXPORT void Loop_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT -void Loop_Proprietary_Property_List_Set(const int *pProprietary); +void Loop_Proprietary_Property_List_Set(const int32_t *pProprietary); BACNET_STACK_EXPORT void Loop_Read_Property_Proprietary_Callback_Set(read_property_function cb); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/lsp.c b/src/bacnet/basic/object/lsp.c index 98acbbe8..9c8664b8 100644 --- a/src/bacnet/basic/object/lsp.c +++ b/src/bacnet/basic/object/lsp.c @@ -38,7 +38,7 @@ static OS_Keylist Object_List; static const BACNET_OBJECT_TYPE Object_Type = OBJECT_LIFE_SAFETY_POINT; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Life_Safety_Point_Properties_Required[] = { +static const int32_t Life_Safety_Point_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_TRACKING_VALUE, PROP_STATUS_FLAGS, @@ -48,9 +48,9 @@ static const int Life_Safety_Point_Properties_Required[] = { PROP_OPERATION_EXPECTED, -1 }; -static const int Life_Safety_Point_Properties_Optional[] = { -1 }; +static const int32_t Life_Safety_Point_Properties_Optional[] = { -1 }; -static const int Life_Safety_Point_Properties_Proprietary[] = { -1 }; +static const int32_t Life_Safety_Point_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -64,7 +64,9 @@ static const int Life_Safety_Point_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Life_Safety_Point_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Life_Safety_Point_Properties_Required; diff --git a/src/bacnet/basic/object/lsp.h b/src/bacnet/basic/object/lsp.h index 9ad332c8..382ce1fd 100644 --- a/src/bacnet/basic/object/lsp.h +++ b/src/bacnet/basic/object/lsp.h @@ -22,7 +22,9 @@ extern "C" { BACNET_STACK_EXPORT void Life_Safety_Point_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Life_Safety_Point_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/lsz.c b/src/bacnet/basic/object/lsz.c index 8486c1c2..6a6ab0cc 100644 --- a/src/bacnet/basic/object/lsz.c +++ b/src/bacnet/basic/object/lsz.c @@ -48,7 +48,7 @@ static OS_Keylist Object_List; static const BACNET_OBJECT_TYPE Object_Type = OBJECT_LIFE_SAFETY_ZONE; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Life_Safety_Zone_Properties_Required[] = { +static const int32_t Life_Safety_Zone_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_TRACKING_VALUE, PROP_STATUS_FLAGS, @@ -59,9 +59,9 @@ static const int Life_Safety_Zone_Properties_Required[] = { PROP_MAINTENANCE_REQUIRED, -1 }; -static const int Life_Safety_Zone_Properties_Optional[] = { -1 }; +static const int32_t Life_Safety_Zone_Properties_Optional[] = { -1 }; -static const int Life_Safety_Zone_Properties_Proprietary[] = { -1 }; +static const int32_t Life_Safety_Zone_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -75,7 +75,9 @@ static const int Life_Safety_Zone_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Life_Safety_Zone_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Life_Safety_Zone_Properties_Required; diff --git a/src/bacnet/basic/object/lsz.h b/src/bacnet/basic/object/lsz.h index 7cd8e470..d67c13ea 100644 --- a/src/bacnet/basic/object/lsz.h +++ b/src/bacnet/basic/object/lsz.h @@ -22,7 +22,9 @@ extern "C" { BACNET_STACK_EXPORT void Life_Safety_Zone_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Life_Safety_Zone_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/ms-input.c b/src/bacnet/basic/object/ms-input.c index af5920b9..a9c6f6fb 100644 --- a/src/bacnet/basic/object/ms-input.c +++ b/src/bacnet/basic/object/ms-input.c @@ -48,19 +48,19 @@ static const char *Default_State_Text = "State 1\0" "State 3\0"; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_NUMBER_OF_STATES, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_RELIABILITY, PROP_STATE_TEXT, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Initialize the pointers for the required, the optional and the properitary @@ -71,7 +71,9 @@ static const int Properties_Proprietary[] = { -1 }; * @param pProprietary - Pointer to the pointer of properitary values. */ void Multistate_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/ms-input.h b/src/bacnet/basic/object/ms-input.h index c8c0c1a0..7c0c2505 100644 --- a/src/bacnet/basic/object/ms-input.h +++ b/src/bacnet/basic/object/ms-input.h @@ -32,7 +32,9 @@ extern "C" { BACNET_STACK_EXPORT void Multistate_Input_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Multistate_Input_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/mso.c b/src/bacnet/basic/object/mso.c index 1cbbb9ca..d67fc96d 100644 --- a/src/bacnet/basic/object/mso.c +++ b/src/bacnet/basic/object/mso.c @@ -56,7 +56,7 @@ static const char *Default_State_Text = "State 1\0" "State 2\0" "State 3\0"; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* list of required properties in the object */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -74,12 +74,12 @@ static const int Properties_Required[] = { -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* list of required properties in the object */ PROP_STATE_TEXT, PROP_DESCRIPTION, PROP_RELIABILITY, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * @brief Returns the list of required, optional, and proprietary properties. @@ -92,7 +92,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Multistate_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/mso.h b/src/bacnet/basic/object/mso.h index a4c391d3..e4b64272 100644 --- a/src/bacnet/basic/object/mso.h +++ b/src/bacnet/basic/object/mso.h @@ -33,7 +33,9 @@ extern "C" { BACNET_STACK_EXPORT void Multistate_Output_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Multistate_Output_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/msv.c b/src/bacnet/basic/object/msv.c index 4f982b0e..d4d1ee6d 100644 --- a/src/bacnet/basic/object/msv.c +++ b/src/bacnet/basic/object/msv.c @@ -48,19 +48,19 @@ static const char *Default_State_Text = "State 1\0" "State 3\0"; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_NUMBER_OF_STATES, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of required properties */ PROP_DESCRIPTION, PROP_RELIABILITY, PROP_STATE_TEXT, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Initialize the pointers for the required, the optional and the properitary @@ -71,7 +71,9 @@ static const int Properties_Proprietary[] = { -1 }; * @param pProprietary - Pointer to the pointer of properitary values. */ void Multistate_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/msv.h b/src/bacnet/basic/object/msv.h index ef71825d..24443957 100644 --- a/src/bacnet/basic/object/msv.h +++ b/src/bacnet/basic/object/msv.h @@ -32,7 +32,9 @@ extern "C" { BACNET_STACK_EXPORT void Multistate_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Multistate_Value_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/nc.c b/src/bacnet/basic/object/nc.c index 3f4bd24a..da490b9d 100644 --- a/src/bacnet/basic/object/nc.c +++ b/src/bacnet/basic/object/nc.c @@ -39,19 +39,21 @@ static NOTIFICATION_CLASS_INFO NC_Info[MAX_NOTIFICATION_CLASSES]; static uint8_t Event_Buffer[MAX_APDU]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_NOTIFICATION_CLASS, PROP_PRIORITY, PROP_ACK_REQUIRED, PROP_RECIPIENT_LIST, -1 }; -static const int Properties_Optional[] = { PROP_DESCRIPTION, -1 }; +static const int32_t Properties_Optional[] = { PROP_DESCRIPTION, -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; void Notification_Class_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/nc.h b/src/bacnet/basic/object/nc.h index b3346595..210b0fbe 100644 --- a/src/bacnet/basic/object/nc.h +++ b/src/bacnet/basic/object/nc.h @@ -52,7 +52,9 @@ typedef struct Ack_Notification { BACNET_STACK_EXPORT void Notification_Class_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT void Notification_Class_Init(void); diff --git a/src/bacnet/basic/object/netport.c b/src/bacnet/basic/object/netport.c index ce705760..c997670c 100644 --- a/src/bacnet/basic/object/netport.c +++ b/src/bacnet/basic/object/netport.c @@ -136,7 +136,7 @@ static struct object_data Object_List[BACNET_NETWORK_PORTS_MAX]; static uint32_t Link_Speeds[] = { 9600, 19200, 38400, 57600, 76800, 115200 }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Network_Port_Properties_Required[] = { +static const int32_t Network_Port_Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -156,7 +156,7 @@ static const int Network_Port_Properties_Required[] = { -1 }; -static const int Ethernet_Port_Properties_Optional[] = { +static const int32_t Ethernet_Port_Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_MAC_ADDRESS, @@ -169,7 +169,7 @@ static const int Ethernet_Port_Properties_Optional[] = { -1 }; -static const int Zigbee_Port_Properties_Optional[] = { +static const int32_t Zigbee_Port_Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_MAC_ADDRESS, @@ -183,7 +183,7 @@ static const int Zigbee_Port_Properties_Optional[] = { -1 }; -static const int MSTP_Port_Properties_Optional[] = { +static const int32_t MSTP_Port_Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_MAC_ADDRESS, @@ -199,7 +199,7 @@ static const int MSTP_Port_Properties_Optional[] = { -1 }; -static const int BIP_Port_Properties_Optional[] = { +static const int32_t BIP_Port_Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_MAC_ADDRESS, @@ -233,7 +233,7 @@ static const int BIP_Port_Properties_Optional[] = { -1 }; -static const int BIP6_Port_Properties_Optional[] = { +static const int32_t BIP6_Port_Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_MAC_ADDRESS, @@ -270,7 +270,7 @@ static const int BIP6_Port_Properties_Optional[] = { -1 }; -static const int BSC_Port_Properties_Optional[] = { +static const int32_t BSC_Port_Properties_Optional[] = { PROP_NETWORK_NUMBER, PROP_NETWORK_NUMBER_QUALITY, PROP_APDU_LENGTH, @@ -317,7 +317,7 @@ static const int BSC_Port_Properties_Optional[] = { -1 }; -static const int Network_Port_Properties_Proprietary[] = { -1 }; +static const int32_t Network_Port_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -333,9 +333,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 }; */ void Network_Port_Property_List( uint32_t object_instance, - const int **pRequired, - const int **pOptional, - const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { unsigned index = 0; @@ -387,7 +387,9 @@ void Network_Port_Property_List( * BACnet proprietary properties for this object. */ void Network_Port_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { Network_Port_Property_List( Object_List[0].Instance_Number, pRequired, pOptional, pProprietary); @@ -402,9 +404,9 @@ void Network_Port_Property_Lists( static bool Property_List_Member(uint32_t object_instance, int object_property) { bool found = false; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; Network_Port_Property_List( object_instance, &pRequired, &pOptional, &pProprietary); diff --git a/src/bacnet/basic/object/netport.h b/src/bacnet/basic/object/netport.h index e6a389c1..2e61e78c 100644 --- a/src/bacnet/basic/object/netport.h +++ b/src/bacnet/basic/object/netport.h @@ -38,13 +38,15 @@ extern "C" { BACNET_STACK_EXPORT void Network_Port_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT void Network_Port_Property_List( uint32_t object_instance, - const int **pRequired, - const int **pOptional, - const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Network_Port_Object_Name( diff --git a/src/bacnet/basic/object/osv.c b/src/bacnet/basic/object/osv.c index 5b095147..929193cc 100644 --- a/src/bacnet/basic/object/osv.c +++ b/src/bacnet/basic/object/osv.c @@ -26,19 +26,21 @@ static OCTETSTRING_VALUE_DESCR OSV_Descr[MAX_OCTETSTRING_VALUES]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int OctetString_Value_Properties_Required[] = { +static const int32_t OctetString_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int OctetString_Value_Properties_Optional[] = { +static const int32_t OctetString_Value_Properties_Optional[] = { PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_DESCRIPTION, -1 }; -static const int OctetString_Value_Properties_Proprietary[] = { -1 }; +static const int32_t OctetString_Value_Properties_Proprietary[] = { -1 }; void OctetString_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = OctetString_Value_Properties_Required; diff --git a/src/bacnet/basic/object/osv.h b/src/bacnet/basic/object/osv.h index 5814cdee..1b09f9fc 100644 --- a/src/bacnet/basic/object/osv.h +++ b/src/bacnet/basic/object/osv.h @@ -28,7 +28,9 @@ typedef struct octetstring_value_descr { BACNET_STACK_EXPORT void OctetString_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool OctetString_Value_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/piv.c b/src/bacnet/basic/object/piv.c index cad8954c..0520aa5f 100644 --- a/src/bacnet/basic/object/piv.c +++ b/src/bacnet/basic/object/piv.c @@ -26,7 +26,7 @@ static POSITIVEINTEGER_VALUE_DESCR PIV_Descr[MAX_POSITIVEINTEGER_VALUES]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int PositiveInteger_Value_Properties_Required[] = { +static const int32_t PositiveInteger_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, @@ -36,14 +36,16 @@ static const int PositiveInteger_Value_Properties_Required[] = { -1 }; -static const int PositiveInteger_Value_Properties_Optional[] = { +static const int32_t PositiveInteger_Value_Properties_Optional[] = { PROP_OUT_OF_SERVICE, -1 }; -static const int PositiveInteger_Value_Properties_Proprietary[] = { -1 }; +static const int32_t PositiveInteger_Value_Properties_Proprietary[] = { -1 }; void PositiveInteger_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = PositiveInteger_Value_Properties_Required; diff --git a/src/bacnet/basic/object/piv.h b/src/bacnet/basic/object/piv.h index 4af0b29f..2d827ad3 100644 --- a/src/bacnet/basic/object/piv.h +++ b/src/bacnet/basic/object/piv.h @@ -28,7 +28,9 @@ typedef struct positiveinteger_value_descr { BACNET_STACK_EXPORT void PositiveInteger_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool PositiveInteger_Value_Valid_Instance(uint32_t object_instance); unsigned PositiveInteger_Value_Count(void); diff --git a/src/bacnet/basic/object/program.c b/src/bacnet/basic/object/program.c index cb3447f0..8c4e169a 100644 --- a/src/bacnet/basic/object/program.c +++ b/src/bacnet/basic/object/program.c @@ -56,7 +56,7 @@ struct object_data { }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PROGRAM_STATE, @@ -64,7 +64,7 @@ static const int Properties_Required[] = { PROP_OUT_OF_SERVICE, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_REASON_FOR_HALT, PROP_DESCRIPTION_OF_HALT, @@ -75,7 +75,7 @@ static const int Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -89,7 +89,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Program_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/program.h b/src/bacnet/basic/object/program.h index ad48a0d7..067bc956 100644 --- a/src/bacnet/basic/object/program.h +++ b/src/bacnet/basic/object/program.h @@ -22,7 +22,9 @@ extern "C" { BACNET_STACK_EXPORT void Program_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Program_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/schedule.c b/src/bacnet/basic/object/schedule.c index 92404dcb..2f83053f 100644 --- a/src/bacnet/basic/object/schedule.c +++ b/src/bacnet/basic/object/schedule.c @@ -25,7 +25,7 @@ static SCHEDULE_DESCR Schedule_Descr[MAX_SCHEDULES]; -static const int Schedule_Properties_Required[] = { +static const int32_t Schedule_Properties_Required[] = { /* list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -41,7 +41,7 @@ static const int Schedule_Properties_Required[] = { -1 }; -static const int Schedule_Properties_Optional[] = { +static const int32_t Schedule_Properties_Optional[] = { /* list of optional properties */ PROP_WEEKLY_SCHEDULE, #if BACNET_EXCEPTION_SCHEDULE_SIZE @@ -50,10 +50,12 @@ static const int Schedule_Properties_Optional[] = { -1 }; -static const int Schedule_Properties_Proprietary[] = { -1 }; +static const int32_t Schedule_Properties_Proprietary[] = { -1 }; void Schedule_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Schedule_Properties_Required; diff --git a/src/bacnet/basic/object/schedule.h b/src/bacnet/basic/object/schedule.h index a109bb2d..95954c3e 100644 --- a/src/bacnet/basic/object/schedule.h +++ b/src/bacnet/basic/object/schedule.h @@ -64,7 +64,9 @@ BACNET_STACK_EXPORT struct schedule *Schedule_Object(uint32_t object_instance); BACNET_STACK_EXPORT void Schedule_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Schedule_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/object/structured_view.c b/src/bacnet/basic/object/structured_view.c index 422ac90f..502bca90 100644 --- a/src/bacnet/basic/object/structured_view.c +++ b/src/bacnet/basic/object/structured_view.c @@ -47,13 +47,13 @@ struct object_data { static OS_Keylist Object_List; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_NODE_TYPE, PROP_SUBORDINATE_LIST, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_NODE_SUBTYPE, @@ -65,7 +65,7 @@ static const int Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -79,7 +79,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Structured_View_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/structured_view.h b/src/bacnet/basic/object/structured_view.h index 21e96643..5be18868 100644 --- a/src/bacnet/basic/object/structured_view.h +++ b/src/bacnet/basic/object/structured_view.h @@ -35,7 +35,9 @@ extern "C" { BACNET_STACK_EXPORT void Structured_View_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Structured_View_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/time_value.c b/src/bacnet/basic/object/time_value.c index 3319e42f..14aa2750 100644 --- a/src/bacnet/basic/object/time_value.c +++ b/src/bacnet/basic/object/time_value.c @@ -50,16 +50,16 @@ static time_value_write_present_value_callback Time_Value_Write_Present_Value_Callback; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Time_Value_Properties_Required[] = { +static const int32_t Time_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int Time_Value_Properties_Optional[] = { PROP_DESCRIPTION, - PROP_EVENT_STATE, - PROP_OUT_OF_SERVICE, -1 }; +static const int32_t Time_Value_Properties_Optional[] = { + PROP_DESCRIPTION, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, -1 +}; -static const int Time_Value_Properties_Proprietary[] = { -1 }; +static const int32_t Time_Value_Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -73,7 +73,9 @@ static const int Time_Value_Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Time_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Time_Value_Properties_Required; diff --git a/src/bacnet/basic/object/time_value.h b/src/bacnet/basic/object/time_value.h index 3ed9f5a7..8bc38ab8 100644 --- a/src/bacnet/basic/object/time_value.h +++ b/src/bacnet/basic/object/time_value.h @@ -32,7 +32,9 @@ extern "C" { BACNET_STACK_EXPORT void Time_Value_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Time_Value_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/timer.c b/src/bacnet/basic/object/timer.c index d2618e72..0a686add 100644 --- a/src/bacnet/basic/object/timer.c +++ b/src/bacnet/basic/object/timer.c @@ -65,7 +65,7 @@ struct object_data { }; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Properties_Required[] = { +static const int32_t Properties_Required[] = { /* unordered list of required properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -73,7 +73,7 @@ static const int Properties_Required[] = { PROP_TIMER_RUNNING, -1 }; -static const int Properties_Optional[] = { +static const int32_t Properties_Optional[] = { /* unordered list of optional properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -92,7 +92,7 @@ static const int Properties_Optional[] = { -1 }; -static const int Properties_Proprietary[] = { -1 }; +static const int32_t Properties_Proprietary[] = { -1 }; /** * Returns the list of required, optional, and proprietary properties. @@ -106,7 +106,9 @@ static const int Properties_Proprietary[] = { -1 }; * BACnet proprietary properties for this object. */ void Timer_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Properties_Required; diff --git a/src/bacnet/basic/object/timer.h b/src/bacnet/basic/object/timer.h index 25bbf44d..1ba7baa3 100644 --- a/src/bacnet/basic/object/timer.h +++ b/src/bacnet/basic/object/timer.h @@ -24,7 +24,9 @@ extern "C" { BACNET_STACK_EXPORT void Timer_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Timer_Valid_Instance(uint32_t object_instance); BACNET_STACK_EXPORT diff --git a/src/bacnet/basic/object/trendlog.c b/src/bacnet/basic/object/trendlog.c index 13be14be..2fadcdea 100644 --- a/src/bacnet/basic/object/trendlog.c +++ b/src/bacnet/basic/object/trendlog.c @@ -36,21 +36,23 @@ static TL_DATA_REC Logs[MAX_TREND_LOGS][TL_MAX_ENTRIES]; static TL_LOG_INFO LogInfo[MAX_TREND_LOGS]; /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Trend_Log_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, - PROP_OBJECT_NAME, - PROP_OBJECT_TYPE, - PROP_ENABLE, - PROP_STOP_WHEN_FULL, - PROP_BUFFER_SIZE, - PROP_LOG_BUFFER, - PROP_RECORD_COUNT, - PROP_TOTAL_RECORD_COUNT, - PROP_EVENT_STATE, - PROP_LOGGING_TYPE, - PROP_STATUS_FLAGS, - -1 }; +static const int32_t Trend_Log_Properties_Required[] = { + PROP_OBJECT_IDENTIFIER, + PROP_OBJECT_NAME, + PROP_OBJECT_TYPE, + PROP_ENABLE, + PROP_STOP_WHEN_FULL, + PROP_BUFFER_SIZE, + PROP_LOG_BUFFER, + PROP_RECORD_COUNT, + PROP_TOTAL_RECORD_COUNT, + PROP_EVENT_STATE, + PROP_LOGGING_TYPE, + PROP_STATUS_FLAGS, + -1 +}; -static const int Trend_Log_Properties_Optional[] = { +static const int32_t Trend_Log_Properties_Optional[] = { PROP_DESCRIPTION, PROP_START_TIME, PROP_STOP_TIME, PROP_LOG_DEVICE_OBJECT_PROPERTY, PROP_LOG_INTERVAL, @@ -71,10 +73,12 @@ static const int Trend_Log_Properties_Optional[] = { PROP_ALIGN_INTERVALS, PROP_INTERVAL_OFFSET, PROP_TRIGGER, -1 }; -static const int Trend_Log_Properties_Proprietary[] = { -1 }; +static const int32_t Trend_Log_Properties_Proprietary[] = { -1 }; void Trend_Log_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Trend_Log_Properties_Required; diff --git a/src/bacnet/basic/object/trendlog.h b/src/bacnet/basic/object/trendlog.h index ea05fb0c..cee60415 100644 --- a/src/bacnet/basic/object/trendlog.h +++ b/src/bacnet/basic/object/trendlog.h @@ -114,7 +114,9 @@ typedef struct tl_log_info { BACNET_STACK_EXPORT void Trend_Log_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); BACNET_STACK_EXPORT bool Trend_Log_Valid_Instance(uint32_t object_instance); diff --git a/src/bacnet/basic/server/bacnet_device.c b/src/bacnet/basic/server/bacnet_device.c index 5b02e98c..9d5e79e0 100644 --- a/src/bacnet/basic/server/bacnet_device.c +++ b/src/bacnet/basic/server/bacnet_device.c @@ -995,7 +995,7 @@ void Device_Objects_Property_List( } /* These three arrays are used by the ReadPropertyMultiple handler */ -static const int Device_Properties_Required[] = { +static const int32_t Device_Properties_Required[] = { /* List of Required properties in this object */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1020,7 +1020,7 @@ static const int Device_Properties_Required[] = { -1 }; -static const int Device_Properties_Optional[] = { +static const int32_t Device_Properties_Optional[] = { /* List of Optional properties in this object */ #if defined(BACDL_MSTP) PROP_MAX_MASTER, @@ -1046,7 +1046,7 @@ static const int Device_Properties_Optional[] = { -1 }; -static const int Device_Properties_Proprietary[] = { +static const int32_t Device_Properties_Proprietary[] = { /* List of Proprietary properties in this object */ -1 }; @@ -1063,7 +1063,9 @@ static const int Device_Properties_Proprietary[] = { * @ingroup ObjIntf */ void Device_Property_Lists( - const int **pRequired, const int **pOptional, const int **pProprietary) + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary) { if (pRequired) { *pRequired = Device_Properties_Required; diff --git a/src/bacnet/indtext.c b/src/bacnet/indtext.c index 75afd018..8c4c8210 100644 --- a/src/bacnet/indtext.c +++ b/src/bacnet/indtext.c @@ -20,10 +20,10 @@ * @return true if the string is found */ bool indtext_by_string( - INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index) + INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index) { bool found = false; - unsigned index = 0; + uint32_t index = 0; if (data_list && search_name) { while (data_list->pString) { @@ -51,10 +51,10 @@ bool indtext_by_string( * @return true if the string is found */ bool indtext_by_istring( - INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index) + INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index) { bool found = false; - unsigned index = 0; + uint32_t index = 0; if (data_list && search_name) { while (data_list->pString) { @@ -82,10 +82,10 @@ bool indtext_by_istring( * @param default_index - index to return if the string is not found * @return index of the string found, or the default index */ -unsigned indtext_by_string_default( - INDTEXT_DATA *data_list, const char *search_name, unsigned default_index) +uint32_t indtext_by_string_default( + INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index) { - unsigned index = 0; + uint32_t index = 0; if (!indtext_by_string(data_list, search_name, &index)) { index = default_index; @@ -102,10 +102,10 @@ unsigned indtext_by_string_default( * @param default_index - index to return if the string is not found * @return index of the string found, or the default index */ -unsigned indtext_by_istring_default( - INDTEXT_DATA *data_list, const char *search_name, unsigned default_index) +uint32_t indtext_by_istring_default( + INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index) { - unsigned index = 0; + uint32_t index = 0; if (!indtext_by_istring(data_list, search_name, &index)) { index = default_index; @@ -121,7 +121,7 @@ unsigned indtext_by_istring_default( * @return the string found, or NULL if not found */ const char *indtext_by_index_default( - INDTEXT_DATA *data_list, unsigned index, const char *default_string) + INDTEXT_DATA *data_list, uint32_t index, const char *default_string) { const char *pString = NULL; @@ -149,8 +149,8 @@ const char *indtext_by_index_default( */ const char *indtext_by_index_split_default( INDTEXT_DATA *data_list, - unsigned index, - unsigned split_index, + uint32_t index, + uint32_t split_index, const char *before_split_default_name, const char *default_name) { @@ -168,7 +168,7 @@ const char *indtext_by_index_split_default( * @param index - index to search for * @return the string found, or NULL if not found */ -const char *indtext_by_index(INDTEXT_DATA *data_list, unsigned index) +const char *indtext_by_index(INDTEXT_DATA *data_list, uint32_t index) { return indtext_by_index_default(data_list, index, NULL); } @@ -178,9 +178,9 @@ const char *indtext_by_index(INDTEXT_DATA *data_list, unsigned index) * @param data_list - list of strings and indices * @return the number of elements in the list */ -unsigned indtext_count(INDTEXT_DATA *data_list) +uint32_t indtext_count(INDTEXT_DATA *data_list) { - unsigned count = 0; /* return value */ + uint32_t count = 0; /* return value */ if (data_list) { while (data_list->pString) { diff --git a/src/bacnet/indtext.h b/src/bacnet/indtext.h index 1ab2af7c..672a1d55 100644 --- a/src/bacnet/indtext.h +++ b/src/bacnet/indtext.h @@ -16,7 +16,7 @@ /* index and text pairs */ typedef const struct { - const unsigned index; /* index number that matches the text */ + const uint32_t index; /* index number that matches the text */ const char *pString; /* text pair - use NULL to end the list */ } INDTEXT_DATA; @@ -31,29 +31,29 @@ extern "C" { the first index where the string was found. */ BACNET_STACK_EXPORT bool indtext_by_string( - INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index); + INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index); /* case insensitive version */ BACNET_STACK_EXPORT bool indtext_by_istring( - INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index); + INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index); /* Searches for a matching string and returns the index to the string or the default_index if the string is not found. */ BACNET_STACK_EXPORT -unsigned indtext_by_string_default( - INDTEXT_DATA *data_list, const char *search_name, unsigned default_index); +uint32_t indtext_by_string_default( + INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index); /* case insensitive version */ BACNET_STACK_EXPORT -unsigned indtext_by_istring_default( - INDTEXT_DATA *data_list, const char *search_name, unsigned default_index); +uint32_t indtext_by_istring_default( + INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index); /* for a given index, return the matching string, or NULL if not found */ BACNET_STACK_EXPORT -const char *indtext_by_index(INDTEXT_DATA *data_list, unsigned index); +const char *indtext_by_index(INDTEXT_DATA *data_list, uint32_t index); /* for a given index, return the matching string, or default_name if not found */ BACNET_STACK_EXPORT const char *indtext_by_index_default( - INDTEXT_DATA *data_list, unsigned index, const char *default_name); + INDTEXT_DATA *data_list, uint32_t index, const char *default_name); /* for a given index, return the matching string, or default_name if not found. if the index is before the split, @@ -61,14 +61,14 @@ const char *indtext_by_index_default( BACNET_STACK_EXPORT const char *indtext_by_index_split_default( INDTEXT_DATA *data_list, - unsigned index, - unsigned split_index, + uint32_t index, + uint32_t split_index, const char *before_split_default_name, const char *default_name); /* returns the number of elements in the list */ BACNET_STACK_EXPORT -unsigned indtext_count(INDTEXT_DATA *data_list); +uint32_t indtext_count(INDTEXT_DATA *data_list); #ifdef __cplusplus } diff --git a/src/bacnet/property.c b/src/bacnet/property.c index f03df104..0da38c6c 100644 --- a/src/bacnet/property.c +++ b/src/bacnet/property.c @@ -23,17 +23,17 @@ /** @file property.c List of Required and Optional object properties */ /* note: the PROP_PROPERTY_LIST is NOT included in these lists, on purpose */ -static const int Default_Properties_Required[] = { +static const int32_t Default_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, -1 }; -static const int Default_Properties_Optional[] = { +static const int32_t Default_Properties_Optional[] = { /* unordered list of properties */ -1 }; -static const int Access_Credential_Properties_Required[] = { +static const int32_t Access_Credential_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -51,7 +51,7 @@ static const int Access_Credential_Properties_Required[] = { -1 }; -static const int Access_Credential_Properties_Optional[] = { +static const int32_t Access_Credential_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DAYS_REMAINING, @@ -74,7 +74,7 @@ static const int Access_Credential_Properties_Optional[] = { -1 }; -static const int Access_Door_Properties_Required[] = { +static const int32_t Access_Door_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -93,7 +93,7 @@ static const int Access_Door_Properties_Required[] = { -1 }; -static const int Access_Door_Properties_Optional[] = { +static const int32_t Access_Door_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DOOR_STATUS, @@ -132,7 +132,7 @@ static const int Access_Door_Properties_Optional[] = { -1 }; -static const int Access_Point_Properties_Required[] = { +static const int32_t Access_Point_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -154,7 +154,7 @@ static const int Access_Point_Properties_Required[] = { -1 }; -static const int Access_Point_Properties_Optional[] = { +static const int32_t Access_Point_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_AUTHENTICATION_POLICY_LIST, @@ -197,7 +197,7 @@ static const int Access_Point_Properties_Optional[] = { -1 }; -static const int Access_Rights_Properties_Required[] = { +static const int32_t Access_Rights_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -211,7 +211,7 @@ static const int Access_Rights_Properties_Required[] = { -1 }; -static const int Access_Rights_Properties_Optional[] = { +static const int32_t Access_Rights_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_ACCOMPANIMENT, @@ -224,14 +224,14 @@ static const int Access_Rights_Properties_Optional[] = { -1 }; -static const int Access_User_Properties_Required[] = { +static const int32_t Access_User_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_GLOBAL_IDENTIFIER, PROP_STATUS_FLAGS, PROP_RELIABILITY, PROP_USER_TYPE, PROP_CREDENTIALS, -1 }; -static const int Access_User_Properties_Optional[] = { +static const int32_t Access_User_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_USER_NAME, @@ -248,7 +248,7 @@ static const int Access_User_Properties_Optional[] = { -1 }; -static const int Access_Zone_Properties_Required[] = { +static const int32_t Access_Zone_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_GLOBAL_IDENTIFIER, PROP_OCCUPANCY_STATE, PROP_STATUS_FLAGS, @@ -256,7 +256,7 @@ static const int Access_Zone_Properties_Required[] = { PROP_ENTRY_POINTS, PROP_EXIT_POINTS, -1 }; -static const int Access_Zone_Properties_Optional[] = { +static const int32_t Access_Zone_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_OCCUPANCY_COUNT, @@ -293,7 +293,7 @@ static const int Access_Zone_Properties_Optional[] = { -1 }; -static const int Accumulator_Properties_Required[] = { +static const int32_t Accumulator_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -308,7 +308,7 @@ static const int Accumulator_Properties_Required[] = { -1 }; -static const int Accumulator_Properties_Optional[] = { +static const int32_t Accumulator_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -347,7 +347,7 @@ static const int Accumulator_Properties_Optional[] = { -1 }; -static const int Alert_Enrollment_Properties_Required[] = { +static const int32_t Alert_Enrollment_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -357,7 +357,7 @@ static const int Alert_Enrollment_Properties_Required[] = { PROP_EVENT_TIME_STAMPS, -1 }; -static const int Alert_Enrollment_Properties_Optional[] = { +static const int32_t Alert_Enrollment_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_MESSAGE_TEXTS, @@ -372,14 +372,14 @@ static const int Alert_Enrollment_Properties_Optional[] = { -1 }; -static const int Analog_Input_Properties_Required[] = { +static const int32_t Analog_Input_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Input_Properties_Optional[] = { +static const int32_t Analog_Input_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -417,7 +417,7 @@ static const int Analog_Input_Properties_Optional[] = { -1 }; -static const int Analog_Output_Properties_Required[] = { +static const int32_t Analog_Output_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -435,7 +435,7 @@ static const int Analog_Output_Properties_Required[] = { -1 }; -static const int Analog_Output_Properties_Optional[] = { +static const int32_t Analog_Output_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -475,14 +475,14 @@ static const int Analog_Output_Properties_Optional[] = { -1 }; -static const int Analog_Value_Properties_Required[] = { +static const int32_t Analog_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; -static const int Analog_Value_Properties_Optional[] = { +static const int32_t Analog_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -525,7 +525,7 @@ static const int Analog_Value_Properties_Optional[] = { -1 }; -static const int Averaging_Properties_Required[] = { +static const int32_t Averaging_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_MINIMUM_VALUE, PROP_AVERAGE_VALUE, PROP_MAXIMUM_VALUE, @@ -533,7 +533,7 @@ static const int Averaging_Properties_Required[] = { PROP_WINDOW_INTERVAL, PROP_WINDOW_SAMPLES, -1 }; -static const int Averaging_Properties_Optional[] = { +static const int32_t Averaging_Properties_Optional[] = { /* unordered list of properties */ PROP_MINIMUM_VALUE_TIMESTAMP, PROP_VARIANCE_VALUE, @@ -547,14 +547,14 @@ static const int Averaging_Properties_Optional[] = { -1 }; -static const int Binary_Input_Properties_Required[] = { +static const int32_t Binary_Input_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, -1 }; -static const int Binary_Input_Properties_Optional[] = { +static const int32_t Binary_Input_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -589,7 +589,7 @@ static const int Binary_Input_Properties_Optional[] = { -1 }; -static const int Binary_Lighting_Output_Properties_Required[] = { +static const int32_t Binary_Lighting_Output_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -606,7 +606,7 @@ static const int Binary_Lighting_Output_Properties_Required[] = { -1 }; -static const int Binary_Lighting_Output_Properties_Optional[] = { +static const int32_t Binary_Lighting_Output_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -639,7 +639,7 @@ static const int Binary_Lighting_Output_Properties_Optional[] = { -1 }; -static const int Binary_Output_Properties_Required[] = { +static const int32_t Binary_Output_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -657,7 +657,7 @@ static const int Binary_Output_Properties_Required[] = { -1 }; -static const int Binary_Output_Properties_Optional[] = { +static const int32_t Binary_Output_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -699,7 +699,7 @@ static const int Binary_Output_Properties_Optional[] = { -1 }; -static const int Binary_Value_Properties_Required[] = { +static const int32_t Binary_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -707,7 +707,7 @@ static const int Binary_Value_Properties_Required[] = { PROP_OUT_OF_SERVICE, -1 }; -static const int Binary_Value_Properties_Optional[] = { +static const int32_t Binary_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -750,13 +750,13 @@ static const int Binary_Value_Properties_Optional[] = { -1 }; -static const int BitString_Value_Properties_Required[] = { +static const int32_t BitString_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int BitString_Value_Properties_Optional[] = { +static const int32_t BitString_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -792,13 +792,13 @@ static const int BitString_Value_Properties_Optional[] = { -1 }; -static const int Calendar_Properties_Required[] = { +static const int32_t Calendar_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_DATE_LIST, -1 }; -static const int Calendar_Properties_Optional[] = { +static const int32_t Calendar_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_AUDIT_LEVEL, @@ -809,7 +809,7 @@ static const int Calendar_Properties_Optional[] = { -1 }; -static const int Channel_Properties_Required[] = { +static const int32_t Channel_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -825,7 +825,7 @@ static const int Channel_Properties_Required[] = { -1 }; -static const int Channel_Properties_Optional[] = { +static const int32_t Channel_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -850,7 +850,7 @@ static const int Channel_Properties_Optional[] = { -1 }; -static const int Command_Properties_Required[] = { +static const int32_t Command_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -862,7 +862,7 @@ static const int Command_Properties_Required[] = { -1 }; -static const int Command_Properties_Optional[] = { +static const int32_t Command_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_ACTION_TEXT, @@ -887,13 +887,13 @@ static const int Command_Properties_Optional[] = { -1 }; -static const int CharacterString_Value_Properties_Required[] = { +static const int32_t CharacterString_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int CharacterString_Value_Properties_Optional[] = { +static const int32_t CharacterString_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -929,7 +929,7 @@ static const int CharacterString_Value_Properties_Optional[] = { -1 }; -static const int Color_Properties_Required[] = { +static const int32_t Color_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -938,7 +938,7 @@ static const int Color_Properties_Required[] = { PROP_DEFAULT_FADE_TIME, -1 }; -static const int Color_Properties_Optional[] = { +static const int32_t Color_Properties_Optional[] = { /* unordered list of properties */ PROP_RELIABILITY, PROP_DESCRIPTION, PROP_TRANSITION, PROP_VALUE_SOURCE, @@ -947,7 +947,7 @@ static const int Color_Properties_Optional[] = { PROP_PROFILE_NAME, -1 }; -static const int Color_Temperature_Properties_Required[] = { +static const int32_t Color_Temperature_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -963,7 +963,7 @@ static const int Color_Temperature_Properties_Required[] = { -1 }; -static const int Color_Temperature_Properties_Optional[] = { +static const int32_t Color_Temperature_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_MIN_PRES_VALUE, @@ -978,7 +978,7 @@ static const int Color_Temperature_Properties_Optional[] = { -1 }; -static const int Credential_Data_Input_Properties_Required[] = { +static const int32_t Credential_Data_Input_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -987,7 +987,7 @@ static const int Credential_Data_Input_Properties_Required[] = { PROP_UPDATE_TIME, -1 }; -static const int Credential_Data_Input_Properties_Optional[] = { +static const int32_t Credential_Data_Input_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_SUPPORTED_FORMAT_CLASSES, @@ -1009,13 +1009,13 @@ static const int Credential_Data_Input_Properties_Optional[] = { -1 }; -static const int Date_Pattern_Value_Properties_Required[] = { +static const int32_t Date_Pattern_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int Date_Pattern_Value_Properties_Optional[] = { +static const int32_t Date_Pattern_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -1045,13 +1045,13 @@ static const int Date_Pattern_Value_Properties_Optional[] = { -1 }; -static const int Date_Value_Properties_Required[] = { +static const int32_t Date_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int Date_Value_Properties_Optional[] = { +static const int32_t Date_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -1082,13 +1082,13 @@ static const int Date_Value_Properties_Optional[] = { -1 }; -static const int DateTime_Pattern_Value_Properties_Required[] = { +static const int32_t DateTime_Pattern_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int DateTime_Pattern_Value_Properties_Optional[] = { +static const int32_t DateTime_Pattern_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -1120,13 +1120,13 @@ static const int DateTime_Pattern_Value_Properties_Optional[] = { -1 }; -static const int DateTime_Value_Properties_Required[] = { +static const int32_t DateTime_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int DateTime_Value_Properties_Optional[] = { +static const int32_t DateTime_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -1158,7 +1158,7 @@ static const int DateTime_Value_Properties_Optional[] = { -1 }; -static const int Device_Properties_Required[] = { +static const int32_t Device_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1183,7 +1183,7 @@ static const int Device_Properties_Required[] = { -1 }; -static const int Device_Properties_Optional[] = { +static const int32_t Device_Properties_Optional[] = { /* unordered list of properties */ PROP_LOCATION, PROP_DESCRIPTION, @@ -1240,7 +1240,7 @@ static const int Device_Properties_Optional[] = { -1 }; -static const int Elevator_Group_Properties_Required[] = { +static const int32_t Elevator_Group_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1251,7 +1251,7 @@ static const int Elevator_Group_Properties_Required[] = { -1 }; -static const int Elevator_Group_Properties_Optional[] = { +static const int32_t Elevator_Group_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_GROUP_MODE, PROP_LANDING_CALLS, PROP_LANDING_CALL_CONTROL, @@ -1260,7 +1260,7 @@ static const int Elevator_Group_Properties_Optional[] = { PROP_PROFILE_NAME, -1 }; -static const int Escalator_Properties_Required[] = { +static const int32_t Escalator_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1275,7 +1275,7 @@ static const int Escalator_Properties_Required[] = { -1 }; -static const int Escalator_Properties_Optional[] = { +static const int32_t Escalator_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_POWER_MODE, @@ -1306,7 +1306,7 @@ static const int Escalator_Properties_Optional[] = { -1 }; -static const int Event_Enrollment_Properties_Required[] = { +static const int32_t Event_Enrollment_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1326,7 +1326,7 @@ static const int Event_Enrollment_Properties_Required[] = { -1 }; -static const int Event_Enrollment_Properties_Optional[] = { +static const int32_t Event_Enrollment_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_MESSAGE_TEXTS, @@ -1344,7 +1344,7 @@ static const int Event_Enrollment_Properties_Optional[] = { -1 }; -static const int Event_Log_Properties_Required[] = { +static const int32_t Event_Log_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_ENABLE, @@ -1352,7 +1352,7 @@ static const int Event_Log_Properties_Required[] = { PROP_RECORD_COUNT, PROP_TOTAL_RECORD_COUNT, -1 }; -static const int Event_Log_Properties_Optional[] = { +static const int32_t Event_Log_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -1380,7 +1380,7 @@ static const int Event_Log_Properties_Optional[] = { -1 }; -static const int File_Properties_Required[] = { +static const int32_t File_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1394,7 +1394,7 @@ static const int File_Properties_Required[] = { -1 }; -static const int File_Properties_Optional[] = { +static const int32_t File_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RECORD_COUNT, PROP_AUDIT_LEVEL, PROP_AUDITABLE_OPERATIONS, @@ -1402,7 +1402,7 @@ static const int File_Properties_Optional[] = { PROP_PROFILE_NAME, -1 }; -static const int Global_Group_Properties_Required[] = { +static const int32_t Global_Group_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_GROUP_MEMBERS, @@ -1411,7 +1411,7 @@ static const int Global_Group_Properties_Required[] = { PROP_OUT_OF_SERVICE, -1 }; -static const int Global_Group_Properties_Optional[] = { +static const int32_t Global_Group_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_GROUP_MEMBER_NAMES, @@ -1443,13 +1443,13 @@ static const int Global_Group_Properties_Optional[] = { -1 }; -static const int Group_Properties_Required[] = { +static const int32_t Group_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_LIST_OF_GROUP_MEMBERS, PROP_PRESENT_VALUE, -1 }; -static const int Group_Properties_Optional[] = { +static const int32_t Group_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_AUDIT_LEVEL, @@ -1460,7 +1460,7 @@ static const int Group_Properties_Optional[] = { -1 }; -static const int Integer_Value_Properties_Required[] = { +static const int32_t Integer_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1471,7 +1471,7 @@ static const int Integer_Value_Properties_Required[] = { -1 }; -static const int Integer_Value_Properties_Optional[] = { +static const int32_t Integer_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -1516,7 +1516,7 @@ static const int Integer_Value_Properties_Optional[] = { -1 }; -static const int Large_Analog_Value_Properties_Required[] = { +static const int32_t Large_Analog_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1527,7 +1527,7 @@ static const int Large_Analog_Value_Properties_Required[] = { -1 }; -static const int Large_Analog_Value_Properties_Optional[] = { +static const int32_t Large_Analog_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -1572,7 +1572,7 @@ static const int Large_Analog_Value_Properties_Optional[] = { -1 }; -static const int Lift_Properties_Required[] = { +static const int32_t Lift_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, @@ -1583,7 +1583,7 @@ static const int Lift_Properties_Required[] = { PROP_FAULT_SIGNALS, -1 }; -static const int Lift_Properties_Optional[] = { +static const int32_t Lift_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_FLOOR_TEXT, @@ -1627,7 +1627,7 @@ static const int Lift_Properties_Optional[] = { -1 }; -static const int Lighting_Output_Properties_Required[] = { +static const int32_t Lighting_Output_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1653,7 +1653,7 @@ static const int Lighting_Output_Properties_Required[] = { -1 }; -static const int Lighting_Output_Properties_Optional[] = { +static const int32_t Lighting_Output_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -1684,7 +1684,7 @@ static const int Lighting_Output_Properties_Optional[] = { -1 }; -static const int Load_Control_Properties_Required[] = { +static const int32_t Load_Control_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1704,7 +1704,7 @@ static const int Load_Control_Properties_Required[] = { -1 }; -static const int Load_Control_Properties_Optional[] = { +static const int32_t Load_Control_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_STATE_DESCRIPTION, @@ -1732,7 +1732,7 @@ static const int Load_Control_Properties_Optional[] = { -1 }; -static const int Life_Safety_Point_Properties_Required[] = { +static const int32_t Life_Safety_Point_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -1743,7 +1743,7 @@ static const int Life_Safety_Point_Properties_Required[] = { PROP_OPERATION_EXPECTED, -1 }; -static const int Life_Safety_Point_Properties_Optional[] = { +static const int32_t Life_Safety_Point_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -1777,7 +1777,7 @@ static const int Life_Safety_Point_Properties_Optional[] = { -1 }; -static const int Life_Safety_Zone_Properties_Required[] = { +static const int32_t Life_Safety_Zone_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1796,7 +1796,7 @@ static const int Life_Safety_Zone_Properties_Required[] = { -1 }; -static const int Life_Safety_Zone_Properties_Optional[] = { +static const int32_t Life_Safety_Zone_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -1826,7 +1826,7 @@ static const int Life_Safety_Zone_Properties_Optional[] = { -1 }; -static const int Loop_Properties_Required[] = { +static const int32_t Loop_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1847,7 +1847,7 @@ static const int Loop_Properties_Required[] = { -1 }; -static const int Loop_Properties_Optional[] = { +static const int32_t Loop_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -1886,14 +1886,14 @@ static const int Loop_Properties_Optional[] = { -1 }; -static const int Multistate_Input_Properties_Required[] = { +static const int32_t Multistate_Input_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_NUMBER_OF_STATES, -1 }; -static const int Multistate_Input_Properties_Optional[] = { +static const int32_t Multistate_Input_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -1923,7 +1923,7 @@ static const int Multistate_Input_Properties_Optional[] = { -1 }; -static const int Multistate_Output_Properties_Required[] = { +static const int32_t Multistate_Output_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -1941,7 +1941,7 @@ static const int Multistate_Output_Properties_Required[] = { -1 }; -static const int Multistate_Output_Properties_Optional[] = { +static const int32_t Multistate_Output_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_DEVICE_TYPE, @@ -1975,14 +1975,14 @@ static const int Multistate_Output_Properties_Optional[] = { -1 }; -static const int Multistate_Value_Properties_Required[] = { +static const int32_t Multistate_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_NUMBER_OF_STATES, -1 }; -static const int Multistate_Value_Properties_Optional[] = { +static const int32_t Multistate_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -2018,7 +2018,7 @@ static const int Multistate_Value_Properties_Optional[] = { -1 }; -static const int Network_Port_Properties_Required[] = { +static const int32_t Network_Port_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2038,7 +2038,7 @@ static const int Network_Port_Properties_Required[] = { -1 }; -static const int Network_Port_Properties_Optional[] = { +static const int32_t Network_Port_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_REFERENCE_PORT, @@ -2109,7 +2109,7 @@ static const int Network_Port_Properties_Optional[] = { -1 }; -static const int Network_Security_Properties_Required[] = { +static const int32_t Network_Security_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2128,7 +2128,7 @@ static const int Network_Security_Properties_Required[] = { -1 }; -static const int Network_Security_Properties_Optional[] = { +static const int32_t Network_Security_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_AUDIT_LEVEL, @@ -2139,7 +2139,7 @@ static const int Network_Security_Properties_Optional[] = { -1 }; -static const int Notification_Class_Properties_Required[] = { +static const int32_t Notification_Class_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_NOTIFICATION_CLASS, @@ -2147,7 +2147,7 @@ static const int Notification_Class_Properties_Required[] = { PROP_RECIPIENT_LIST, -1 }; -static const int Notification_Class_Properties_Optional[] = { +static const int32_t Notification_Class_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_STATUS_FLAGS, @@ -2169,7 +2169,7 @@ static const int Notification_Class_Properties_Optional[] = { -1 }; -static const int Notification_Forwarder_Properties_Required[] = { +static const int32_t Notification_Forwarder_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2184,7 +2184,7 @@ static const int Notification_Forwarder_Properties_Required[] = { -1 }; -static const int Notification_Forwarder_Properties_Optional[] = { +static const int32_t Notification_Forwarder_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_PORT_FILTER, @@ -2197,13 +2197,13 @@ static const int Notification_Forwarder_Properties_Optional[] = { -1 }; -static const int OctetString_Value_Properties_Required[] = { +static const int32_t OctetString_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int OctetString_Value_Properties_Optional[] = { +static const int32_t OctetString_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -2226,7 +2226,7 @@ static const int OctetString_Value_Properties_Optional[] = { -1 }; -static const int Positive_Integer_Value_Properties_Required[] = { +static const int32_t Positive_Integer_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2237,7 +2237,7 @@ static const int Positive_Integer_Value_Properties_Required[] = { -1 }; -static const int Positive_Integer_Value_Properties_Optional[] = { +static const int32_t Positive_Integer_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -2282,7 +2282,7 @@ static const int Positive_Integer_Value_Properties_Optional[] = { -1 }; -static const int Program_Properties_Required[] = { +static const int32_t Program_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PROGRAM_STATE, @@ -2290,7 +2290,7 @@ static const int Program_Properties_Required[] = { PROP_OUT_OF_SERVICE, -1 }; -static const int Program_Properties_Optional[] = { +static const int32_t Program_Properties_Optional[] = { /* unordered list of properties */ PROP_REASON_FOR_HALT, PROP_DESCRIPTION_OF_HALT, @@ -2316,7 +2316,7 @@ static const int Program_Properties_Optional[] = { -1 }; -static const int Pulse_Converter_Properties_Required[] = { +static const int32_t Pulse_Converter_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2335,7 +2335,7 @@ static const int Pulse_Converter_Properties_Required[] = { -1 }; -static const int Pulse_Converter_Properties_Optional[] = { +static const int32_t Pulse_Converter_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_INPUT_REFERENCE, @@ -2367,7 +2367,7 @@ static const int Pulse_Converter_Properties_Optional[] = { -1 }; -static const int Schedule_Properties_Required[] = { +static const int32_t Schedule_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2383,7 +2383,7 @@ static const int Schedule_Properties_Required[] = { -1 }; -static const int Schedule_Properties_Optional[] = { +static const int32_t Schedule_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_WEEKLY_SCHEDULE, @@ -2406,7 +2406,7 @@ static const int Schedule_Properties_Optional[] = { -1 }; -static const int Staging_Properties_Required[] = { +static const int32_t Staging_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2426,7 +2426,7 @@ static const int Staging_Properties_Required[] = { -1 }; -static const int Staging_Properties_Optional[] = { +static const int32_t Staging_Properties_Optional[] = { /* unordered list of properties */ PROP_STAGE_NAMES, PROP_DESCRIPTION, @@ -2450,13 +2450,13 @@ static const int Staging_Properties_Optional[] = { -1 }; -static const int Structured_View_Properties_Required[] = { +static const int32_t Structured_View_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_NODE_TYPE, PROP_SUBORDINATE_LIST, -1 }; -static const int Structured_View_Properties_Optional[] = { +static const int32_t Structured_View_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_NODE_SUBTYPE, @@ -2474,13 +2474,13 @@ static const int Structured_View_Properties_Optional[] = { -1 }; -static const int Time_Pattern_Value_Properties_Required[] = { +static const int32_t Time_Pattern_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int Time_Pattern_Value_Properties_Optional[] = { +static const int32_t Time_Pattern_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -2511,13 +2511,13 @@ static const int Time_Pattern_Value_Properties_Optional[] = { -1 }; -static const int Time_Value_Properties_Required[] = { +static const int32_t Time_Value_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1 }; -static const int Time_Value_Properties_Optional[] = { +static const int32_t Time_Value_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -2548,7 +2548,7 @@ static const int Time_Value_Properties_Optional[] = { -1 }; -static const int Timer_Properties_Required[] = { +static const int32_t Timer_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, @@ -2556,7 +2556,7 @@ static const int Timer_Properties_Required[] = { PROP_TIMER_RUNNING, -1 }; -static const int Timer_Properties_Optional[] = { +static const int32_t Timer_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_EVENT_STATE, @@ -2595,7 +2595,7 @@ static const int Timer_Properties_Optional[] = { -1 }; -static const int Trend_Log_Properties_Required[] = { +static const int32_t Trend_Log_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2612,7 +2612,7 @@ static const int Trend_Log_Properties_Required[] = { -1 }; -static const int Trend_Log_Properties_Optional[] = { +static const int32_t Trend_Log_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_START_TIME, @@ -2647,7 +2647,7 @@ static const int Trend_Log_Properties_Optional[] = { -1 }; -static const int Trend_Log_Multiple_Properties_Required[] = { +static const int32_t Trend_Log_Multiple_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2666,7 +2666,7 @@ static const int Trend_Log_Multiple_Properties_Required[] = { -1 }; -static const int Trend_Log_Multiple_Properties_Optional[] = { +static const int32_t Trend_Log_Multiple_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -2697,7 +2697,7 @@ static const int Trend_Log_Multiple_Properties_Optional[] = { -1 }; -static const int Audit_Log_Properties_Required[] = { +static const int32_t Audit_Log_Properties_Required[] = { /* unordered list of properties */ PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, @@ -2712,7 +2712,7 @@ static const int Audit_Log_Properties_Required[] = { -1 }; -static const int Audit_Log_Properties_Optional[] = { +static const int32_t Audit_Log_Properties_Optional[] = { /* unordered list of properties */ PROP_DESCRIPTION, PROP_RELIABILITY, @@ -2742,12 +2742,12 @@ static const int Audit_Log_Properties_Optional[] = { * * @param object_type - enumerated BACNET_OBJECT_TYPE * @return returns a pointer to a '-1' terminated array of - * type 'int' that contain BACnet object properties for the given object + * type 'int32_t' that contain BACnet object properties for the given object * type. */ -const int *property_list_optional(BACNET_OBJECT_TYPE object_type) +const int32_t *property_list_optional(BACNET_OBJECT_TYPE object_type) { - const int *pList = NULL; + const int32_t *pList = NULL; switch (object_type) { case OBJECT_ACCESS_CREDENTIAL: @@ -2956,12 +2956,12 @@ const int *property_list_optional(BACNET_OBJECT_TYPE object_type) * * @param object_type - enumerated BACNET_OBJECT_TYPE * @return returns a pointer to a '-1' terminated array of - * type 'int' that contain BACnet object properties for the given object + * type 'int32_t' that contain BACnet object properties for the given object * type. */ -const int *property_list_required(BACNET_OBJECT_TYPE object_type) +const int32_t *property_list_required(BACNET_OBJECT_TYPE object_type) { - const int *pList = NULL; + const int32_t *pList = NULL; switch (object_type) { case OBJECT_ACCESS_CREDENTIAL: @@ -3170,7 +3170,7 @@ const int *property_list_required(BACNET_OBJECT_TYPE object_type) * * @param object_type - enumerated BACNET_OBJECT_TYPE * @param pPropertyList - returns a pointer to two '-1' terminated arrays of - * type 'int' that contain BACnet object properties for the given object + * type 'int32_t' that contain BACnet object properties for the given object * type. */ void property_list_special( @@ -3196,10 +3196,10 @@ void property_list_special( BACNET_PROPERTY_ID property_list_special_property( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID special_property, - unsigned index) + uint32_t index) { BACNET_PROPERTY_ID property = UINT32_MAX; /* return value */ - unsigned required, optional, proprietary; + uint32_t required, optional, proprietary; struct special_property_list_t PropertyList = { 0 }; property_list_special(object_type, &PropertyList); @@ -3239,10 +3239,10 @@ BACNET_PROPERTY_ID property_list_special_property( return property; } -unsigned property_list_special_count( +uint32_t property_list_special_count( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID special_property) { - unsigned count = 0; /* return value */ + uint32_t count = 0; /* return value */ struct special_property_list_t PropertyList = { 0 }; property_list_special(object_type, &PropertyList); diff --git a/src/bacnet/property.h b/src/bacnet/property.h index 9db25b63..0477fac0 100644 --- a/src/bacnet/property.h +++ b/src/bacnet/property.h @@ -21,9 +21,9 @@ extern "C" { #endif /* __cplusplus */ BACNET_STACK_EXPORT -const int *property_list_optional(BACNET_OBJECT_TYPE object_type); +const int32_t *property_list_optional(BACNET_OBJECT_TYPE object_type); BACNET_STACK_EXPORT -const int *property_list_required(BACNET_OBJECT_TYPE object_type); +const int32_t *property_list_required(BACNET_OBJECT_TYPE object_type); BACNET_STACK_EXPORT void property_list_special( BACNET_OBJECT_TYPE object_type, @@ -32,9 +32,9 @@ BACNET_STACK_EXPORT BACNET_PROPERTY_ID property_list_special_property( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID special_property, - unsigned index); + uint32_t index); BACNET_STACK_EXPORT -unsigned property_list_special_count( +uint32_t property_list_special_count( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID special_property); BACNET_STACK_EXPORT bool property_list_writable_member( diff --git a/src/bacnet/proplist.c b/src/bacnet/proplist.c index d119cab2..e7c82ad6 100644 --- a/src/bacnet/proplist.c +++ b/src/bacnet/proplist.c @@ -17,12 +17,12 @@ /** * Function that returns the number of BACnet object properties in a list * - * @param pList - array of type 'int' that is a list of BACnet object + * @param pList - array of type 'int32_t' that is a list of BACnet object * properties, terminated by a '-1' value. */ -unsigned property_list_count(const int *pList) +uint32_t property_list_count(const int32_t *pList) { - unsigned property_count = 0; + uint32_t property_count = 0; if (pList) { while (*pList != -1) { @@ -37,12 +37,12 @@ unsigned property_list_count(const int *pList) /** * For a given object property, returns the true if in the property list * - * @param pList - array of type 'int' that is a list of BACnet object + * @param pList - array of type 'int32_t' that is a list of BACnet object * @param object_property - property enumeration or propritary value * * @return true if object_property is a member of the property list */ -bool property_list_member(const int *pList, int object_property) +bool property_list_member(const int32_t *pList, int32_t object_property) { bool status = false; @@ -61,17 +61,20 @@ bool property_list_member(const int *pList, int object_property) /** * @brief Determine if the object property is a member of any of the lists - * @param pRequired - array of type 'int' that is a list of BACnet properties - * @param pOptional - array of type 'int' that is a list of BACnet properties - * @param pProprietary - array of type 'int' that is a list of BACnet properties + * @param pRequired - array of type 'int32_t' that is a list of BACnet + * properties + * @param pOptional - array of type 'int32_t' that is a list of BACnet + * properties + * @param pProprietary - array of type 'int32_t' that is a list of BACnet + * properties * @param object_property - object-property to be checked * @return true if the property is a member of any of these lists */ bool property_lists_member( - const int *pRequired, - const int *pOptional, - const int *pProprietary, - int object_property) + const int32_t *pRequired, + const int32_t *pOptional, + const int32_t *pProprietary, + int32_t object_property) { bool found = false; @@ -98,19 +101,19 @@ bool property_lists_member( */ int property_list_encode( BACNET_READ_PROPERTY_DATA *rpdata, - const int *pListRequired, - const int *pListOptional, - const int *pListProprietary) + const int32_t *pListRequired, + const int32_t *pListOptional, + const int32_t *pListProprietary) { int apdu_len = 0; /* return value */ uint8_t *apdu = NULL; int max_apdu_len = 0; uint32_t count = 0; - unsigned required_count = 0; - unsigned optional_count = 0; - unsigned proprietary_count = 0; + uint32_t required_count = 0; + uint32_t optional_count = 0; + uint32_t proprietary_count = 0; int len = 0; - unsigned i = 0; /* loop index */ + uint32_t i = 0; /* loop index */ required_count = property_list_count(pListRequired); optional_count = property_list_count(pListOptional); @@ -323,7 +326,7 @@ bool property_list_common(BACNET_PROPERTY_ID property) /* standard properties that are arrays but not required to be supported in every object */ -static const int Properties_BACnetARRAY[] = { +static const int32_t Properties_BACnetARRAY[] = { /* unordered list of properties */ PROP_OBJECT_LIST, PROP_STRUCTURED_OBJECT_LIST, @@ -391,10 +394,10 @@ static const int Properties_BACnetARRAY[] = { * * @param object_type - enumerated BACNET_OBJECT_TYPE * @return returns a pointer to a '-1' terminated array of - * type 'int' that contain BACnet object properties for the given object + * type 'int32_t' that contain BACnet object properties for the given object * type. */ -const int *property_list_bacnet_array(void) +const int32_t *property_list_bacnet_array(void) { return Properties_BACnetARRAY; } @@ -448,7 +451,7 @@ bool property_list_bacnet_array_member( } /* standard properties that are BACnetLIST */ -static const int Properties_BACnetLIST[] = { +static const int32_t Properties_BACnetLIST[] = { /* unordered list of properties */ PROP_DATE_LIST, PROP_VT_CLASSES_SUPPORTED, @@ -499,10 +502,10 @@ static const int Properties_BACnetLIST[] = { * * @param object_type - enumerated BACNET_OBJECT_TYPE * @return returns a pointer to a '-1' terminated array of - * type 'int' that contain BACnet object properties for the given object + * type 'int32_t' that contain BACnet object properties for the given object * type. */ -const int *property_list_bacnet_list(void) +const int32_t *property_list_bacnet_list(void) { return Properties_BACnetLIST; } diff --git a/src/bacnet/proplist.h b/src/bacnet/proplist.h index 6fc32bba..993b6ed0 100644 --- a/src/bacnet/proplist.h +++ b/src/bacnet/proplist.h @@ -16,8 +16,8 @@ #include "bacnet/rp.h" struct property_list_t { - const int *pList; - unsigned count; + const int32_t *pList; + uint32_t count; }; struct special_property_list_t { @@ -31,21 +31,21 @@ extern "C" { #endif /* __cplusplus */ BACNET_STACK_EXPORT -unsigned property_list_count(const int *pList); +uint32_t property_list_count(const int32_t *pList); BACNET_STACK_EXPORT -bool property_list_member(const int *pList, int object_property); +bool property_list_member(const int32_t *pList, int32_t object_property); BACNET_STACK_EXPORT bool property_lists_member( - const int *pRequired, - const int *pOptional, - const int *pProprietary, - int object_property); + const int32_t *pRequired, + const int32_t *pOptional, + const int32_t *pProprietary, + int32_t object_property); BACNET_STACK_EXPORT int property_list_encode( BACNET_READ_PROPERTY_DATA *rpdata, - const int *pListRequired, - const int *pListOptional, - const int *pListProprietary); + const int32_t *pListRequired, + const int32_t *pListOptional, + const int32_t *pListProprietary); BACNET_STACK_EXPORT int property_list_common_encode( BACNET_READ_PROPERTY_DATA *rpdata, uint32_t device_instance_number); @@ -53,12 +53,12 @@ BACNET_STACK_EXPORT bool property_list_common(BACNET_PROPERTY_ID property); BACNET_STACK_EXPORT -const int *property_list_bacnet_array(void); +const int32_t *property_list_bacnet_array(void); BACNET_STACK_EXPORT bool property_list_bacnet_array_member( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property); BACNET_STACK_EXPORT -const int *property_list_bacnet_list(void); +const int32_t *property_list_bacnet_list(void); BACNET_STACK_EXPORT bool property_list_bacnet_list_member( BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property); diff --git a/src/bacnet/rpm.h b/src/bacnet/rpm.h index 3e3f1604..51c9d03b 100644 --- a/src/bacnet/rpm.h +++ b/src/bacnet/rpm.h @@ -51,7 +51,9 @@ typedef struct BACnet_Read_Access_Data { * properties for this BACNET_OBJECT_TYPE. */ typedef void (*rpm_property_lists_function)( - const int **pRequired, const int **pOptional, const int **pProprietary); + const int32_t **pRequired, + const int32_t **pOptional, + const int32_t **pProprietary); typedef void (*rpm_object_property_lists_function)( BACNET_OBJECT_TYPE object_type, diff --git a/test/bacnet/basic/object/acc/src/main.c b/test/bacnet/basic/object/acc/src/main.c index 0a974af7..d6af89a9 100644 --- a/test/bacnet/basic/object/acc/src/main.c +++ b/test/bacnet/basic/object/acc/src/main.c @@ -28,7 +28,7 @@ static void test_Accumulator(void) int test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *required_property = NULL; + const int32_t *required_property = NULL; BACNET_UNSIGNED_INTEGER unsigned_value = 1; Accumulator_Init(); diff --git a/test/bacnet/basic/object/access_credential/src/main.c b/test/bacnet/basic/object/access_credential/src/main.c index a4fe0d05..94dc84dc 100644 --- a/test/bacnet/basic/object/access_credential/src/main.c +++ b/test/bacnet/basic/object/access_credential/src/main.c @@ -28,7 +28,7 @@ static void testAccessCredential(void) BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; BACNET_APPLICATION_DATA_VALUE value2 = { 0 }; - const int *required_property = NULL; + const int32_t *required_property = NULL; bool status = false; Access_Credential_Init(); diff --git a/test/bacnet/basic/object/access_door/src/main.c b/test/bacnet/basic/object/access_door/src/main.c index 6c667b3d..a5844155 100644 --- a/test/bacnet/basic/object/access_door/src/main.c +++ b/test/bacnet/basic/object/access_door/src/main.c @@ -28,9 +28,9 @@ static void test_object_access_door(void) BACNET_READ_PROPERTY_DATA rpdata; /* for decode value data */ BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; unsigned count = 0; uint32_t object_instance = 0; diff --git a/test/bacnet/basic/object/access_point/src/main.c b/test/bacnet/basic/object/access_point/src/main.c index 9bc366d4..02c59ce7 100644 --- a/test/bacnet/basic/object/access_point/src/main.c +++ b/test/bacnet/basic/object/access_point/src/main.c @@ -28,7 +28,7 @@ static void testAccessPoint(void) int len = 0, test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *required_property = NULL; + const int32_t *required_property = NULL; unsigned count = 0; uint32_t object_instance = 0; diff --git a/test/bacnet/basic/object/access_rights/src/main.c b/test/bacnet/basic/object/access_rights/src/main.c index f6d7af28..af4d2f02 100644 --- a/test/bacnet/basic/object/access_rights/src/main.c +++ b/test/bacnet/basic/object/access_rights/src/main.c @@ -26,7 +26,7 @@ static void testAccessRights(void) bool status = false; unsigned count = 0; uint32_t object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Access_Rights_Init(); count = Access_Rights_Count(); diff --git a/test/bacnet/basic/object/ai/src/main.c b/test/bacnet/basic/object/ai/src/main.c index 5021a558..60f54b6a 100644 --- a/test/bacnet/basic/object/ai/src/main.c +++ b/test/bacnet/basic/object/ai/src/main.c @@ -28,7 +28,7 @@ static void testAnalogInput(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Analog_Input_Init(); object_instance = Analog_Input_Create(object_instance); diff --git a/test/bacnet/basic/object/ao/src/main.c b/test/bacnet/basic/object/ao/src/main.c index 6a280767..0ca9f86c 100644 --- a/test/bacnet/basic/object/ao/src/main.c +++ b/test/bacnet/basic/object/ao/src/main.c @@ -28,7 +28,7 @@ static void testAnalogOutput(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Analog_Output_Init(); object_instance = Analog_Output_Create(object_instance); diff --git a/test/bacnet/basic/object/auditlog/src/main.c b/test/bacnet/basic/object/auditlog/src/main.c index 7a58ad77..11a6b521 100644 --- a/test/bacnet/basic/object/auditlog/src/main.c +++ b/test/bacnet/basic/object/auditlog/src/main.c @@ -26,7 +26,7 @@ static void testAuditlog(void) int len = 0, index = 0; const uint32_t instance = 1; uint32_t test_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; bool status = false; BACNET_WRITE_PROPERTY_DATA wp_data = { 0 }; uint32_t buffer_size = 0; diff --git a/test/bacnet/basic/object/av/src/main.c b/test/bacnet/basic/object/av/src/main.c index 01b6e389..7946ffde 100644 --- a/test/bacnet/basic/object/av/src/main.c +++ b/test/bacnet/basic/object/av/src/main.c @@ -28,7 +28,7 @@ static void testAnalog_Value(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Analog_Value_Init(); object_instance = Analog_Value_Create(object_instance); diff --git a/test/bacnet/basic/object/bacfile/src/main.c b/test/bacnet/basic/object/bacfile/src/main.c index 48163320..9685c1bf 100644 --- a/test/bacnet/basic/object/bacfile/src/main.c +++ b/test/bacnet/basic/object/bacfile/src/main.c @@ -30,7 +30,7 @@ static void test_BACnet_File_Object(void) int len = 0, test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *required_property = NULL; + const int32_t *required_property = NULL; const uint32_t instance = 1; bacfile_init(); diff --git a/test/bacnet/basic/object/bi/src/main.c b/test/bacnet/basic/object/bi/src/main.c index 2385aa2a..e22797e4 100644 --- a/test/bacnet/basic/object/bi/src/main.c +++ b/test/bacnet/basic/object/bi/src/main.c @@ -29,7 +29,7 @@ static void testBinaryInput(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Binary_Input_Init(); object_instance = Binary_Input_Create(object_instance); diff --git a/test/bacnet/basic/object/bitstring_value/src/main.c b/test/bacnet/basic/object/bitstring_value/src/main.c index 3e94b4f5..2721e20b 100644 --- a/test/bacnet/basic/object/bitstring_value/src/main.c +++ b/test/bacnet/basic/object/bitstring_value/src/main.c @@ -25,7 +25,7 @@ ZTEST(bitstring_value_object_tests, test_BitString_Value_Object) static void test_BitString_Value_Object(void) #endif { - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; const uint32_t instance = 123; uint32_t test_instance = 0; unsigned test_count = 0; diff --git a/test/bacnet/basic/object/blo/src/main.c b/test/bacnet/basic/object/blo/src/main.c index 76d0d66e..81a89dce 100644 --- a/test/bacnet/basic/object/blo/src/main.c +++ b/test/bacnet/basic/object/blo/src/main.c @@ -29,9 +29,9 @@ static void testBinaryLightingOutput(void) BACNET_READ_PROPERTY_DATA rpdata; BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; const uint32_t instance = 123; uint32_t test_instance = 0; bool status = false; diff --git a/test/bacnet/basic/object/bo/src/main.c b/test/bacnet/basic/object/bo/src/main.c index 31eaba64..d8f4be76 100644 --- a/test/bacnet/basic/object/bo/src/main.c +++ b/test/bacnet/basic/object/bo/src/main.c @@ -28,7 +28,7 @@ static void testBinaryOutput(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 }; + const int32_t skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 }; Binary_Output_Init(); object_instance = Binary_Output_Create(object_instance); diff --git a/test/bacnet/basic/object/bv/src/main.c b/test/bacnet/basic/object/bv/src/main.c index 77093fb1..001a9744 100644 --- a/test/bacnet/basic/object/bv/src/main.c +++ b/test/bacnet/basic/object/bv/src/main.c @@ -27,7 +27,7 @@ static void testBinary_Value(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Binary_Value_Init(); object_instance = Binary_Value_Create(object_instance); diff --git a/test/bacnet/basic/object/calendar/src/main.c b/test/bacnet/basic/object/calendar/src/main.c index 7f0dc5d2..f7dcc32a 100644 --- a/test/bacnet/basic/object/calendar/src/main.c +++ b/test/bacnet/basic/object/calendar/src/main.c @@ -30,9 +30,9 @@ static void testCalendar(void) BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; const uint32_t instance = 1; uint32_t test_instance = 0; bool status = false; diff --git a/test/bacnet/basic/object/channel/src/main.c b/test/bacnet/basic/object/channel/src/main.c index 1bbc2eb0..d9d9e38a 100644 --- a/test/bacnet/basic/object/channel/src/main.c +++ b/test/bacnet/basic/object/channel/src/main.c @@ -29,7 +29,7 @@ static void test_Channel_Property_Read_Write(void) const char *test_name = NULL; uint32_t test_instance = 0; bool status = false; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; BACNET_CHANNEL_VALUE channel_value = { 0 }; BACNET_WRITE_PROPERTY_DATA wp_data = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; diff --git a/test/bacnet/basic/object/color_object/src/main.c b/test/bacnet/basic/object/color_object/src/main.c index a30742a0..495fea65 100644 --- a/test/bacnet/basic/object/color_object/src/main.c +++ b/test/bacnet/basic/object/color_object/src/main.c @@ -29,9 +29,9 @@ static void testColorObject(void) int test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; const uint32_t instance = 123; BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; bool status = false; diff --git a/test/bacnet/basic/object/color_temperature/src/main.c b/test/bacnet/basic/object/color_temperature/src/main.c index 0c0757db..22972470 100644 --- a/test/bacnet/basic/object/color_temperature/src/main.c +++ b/test/bacnet/basic/object/color_temperature/src/main.c @@ -29,9 +29,9 @@ static void testColorTemperature(void) int test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; const uint32_t instance = 123; BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; bool status = false; diff --git a/test/bacnet/basic/object/command/src/main.c b/test/bacnet/basic/object/command/src/main.c index b9f77839..1b246479 100644 --- a/test/bacnet/basic/object/command/src/main.c +++ b/test/bacnet/basic/object/command/src/main.c @@ -27,7 +27,7 @@ static void test_object_command(void) bool status = false; unsigned count = 0; uint32_t object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; BACNET_ACTION_LIST *pAction; Command_Init(); diff --git a/test/bacnet/basic/object/credential_data_input/src/main.c b/test/bacnet/basic/object/credential_data_input/src/main.c index a9a19aad..8bb64730 100644 --- a/test/bacnet/basic/object/credential_data_input/src/main.c +++ b/test/bacnet/basic/object/credential_data_input/src/main.c @@ -27,9 +27,9 @@ static void testCredentialDataInput(void) { unsigned count = 0; uint32_t object_instance = 0; - const int skip_fail_property_list[] = { PROP_PRESENT_VALUE, - PROP_UPDATE_TIME, - PROP_SUPPORTED_FORMATS, -1 }; + const int32_t skip_fail_property_list[] = { PROP_PRESENT_VALUE, + PROP_UPDATE_TIME, + PROP_SUPPORTED_FORMATS, -1 }; Credential_Data_Input_Init(); count = Credential_Data_Input_Count(); diff --git a/test/bacnet/basic/object/csv/src/main.c b/test/bacnet/basic/object/csv/src/main.c index f8579842..07688fea 100644 --- a/test/bacnet/basic/object/csv/src/main.c +++ b/test/bacnet/basic/object/csv/src/main.c @@ -25,9 +25,9 @@ static void testCharacterString_Value(void) int len = 0, test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; unsigned count = 0; bool status = false; uint32_t object_instance = BACNET_MAX_INSTANCE; diff --git a/test/bacnet/basic/object/device/src/main.c b/test/bacnet/basic/object/device/src/main.c index 81bff07f..48de7916 100644 --- a/test/bacnet/basic/object/device/src/main.c +++ b/test/bacnet/basic/object/device/src/main.c @@ -26,9 +26,9 @@ static void test_Device_Data_Sharing(void) BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; /* for decode value data */ BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; unsigned count = 0; bool status = false; diff --git a/test/bacnet/basic/object/iv/src/main.c b/test/bacnet/basic/object/iv/src/main.c index f8cd8976..27222f6a 100644 --- a/test/bacnet/basic/object/iv/src/main.c +++ b/test/bacnet/basic/object/iv/src/main.c @@ -25,7 +25,7 @@ static void testInteger_Value(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; const char *test_name = NULL; char *sample_name = "sample"; diff --git a/test/bacnet/basic/object/lc/src/main.c b/test/bacnet/basic/object/lc/src/main.c index 0a7f041d..730482da 100644 --- a/test/bacnet/basic/object/lc/src/main.c +++ b/test/bacnet/basic/object/lc/src/main.c @@ -640,7 +640,7 @@ static void test_Load_Control_Read_Write_Property(void) uint32_t object_instance = 123; unsigned index; bool status = false; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; test_setup(object_instance); status = Load_Control_Valid_Instance(object_instance); diff --git a/test/bacnet/basic/object/lo/src/main.c b/test/bacnet/basic/object/lo/src/main.c index 371f62b8..8ec6e292 100644 --- a/test/bacnet/basic/object/lo/src/main.c +++ b/test/bacnet/basic/object/lo/src/main.c @@ -64,7 +64,7 @@ static void testLightingOutput(void) uint32_t unsigned_value, test_unsigned; unsigned priority, test_priority; BACNET_OBJECT_ID object_id, test_object_id; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Lighting_Output_Init(); Lighting_Output_Create(instance); diff --git a/test/bacnet/basic/object/loop/src/main.c b/test/bacnet/basic/object/loop/src/main.c index 454e02c0..71bbc261 100644 --- a/test/bacnet/basic/object/loop/src/main.c +++ b/test/bacnet/basic/object/loop/src/main.c @@ -151,7 +151,7 @@ static void test_Loop_Read_Write(void) const char *test_name = NULL; uint32_t test_instance = 0; bool status = false; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; BACNET_WRITE_PROPERTY_DATA wp_data = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; BACNET_CHARACTER_STRING cstring = { 0 }; diff --git a/test/bacnet/basic/object/lsp/src/main.c b/test/bacnet/basic/object/lsp/src/main.c index 0946c773..e9bf2e6c 100644 --- a/test/bacnet/basic/object/lsp/src/main.c +++ b/test/bacnet/basic/object/lsp/src/main.c @@ -29,9 +29,9 @@ static void testLifeSafetyPoint(void) int test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; const uint32_t instance = 123; BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; bool status = false; diff --git a/test/bacnet/basic/object/lsz/src/main.c b/test/bacnet/basic/object/lsz/src/main.c index c0dbf688..ba78ee09 100644 --- a/test/bacnet/basic/object/lsz/src/main.c +++ b/test/bacnet/basic/object/lsz/src/main.c @@ -27,7 +27,7 @@ static void testLifeSafetyZone(void) bool status; unsigned count = 0; uint32_t object_instance = 0, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; const char *test_name = NULL; char *sample_name = "sample"; diff --git a/test/bacnet/basic/object/ms-input/src/main.c b/test/bacnet/basic/object/ms-input/src/main.c index a0f8c37c..3115d676 100644 --- a/test/bacnet/basic/object/ms-input/src/main.c +++ b/test/bacnet/basic/object/ms-input/src/main.c @@ -29,7 +29,7 @@ static void testMultistateInput(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Multistate_Input_Init(); object_instance = Multistate_Input_Create(object_instance); diff --git a/test/bacnet/basic/object/mso/src/main.c b/test/bacnet/basic/object/mso/src/main.c index 14b48956..3af524c7 100644 --- a/test/bacnet/basic/object/mso/src/main.c +++ b/test/bacnet/basic/object/mso/src/main.c @@ -28,7 +28,7 @@ static void testMultistateOutput(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 }; + const int32_t skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 }; Multistate_Output_Init(); object_instance = Multistate_Output_Create(object_instance); diff --git a/test/bacnet/basic/object/msv/src/main.c b/test/bacnet/basic/object/msv/src/main.c index f0917497..52c0a930 100644 --- a/test/bacnet/basic/object/msv/src/main.c +++ b/test/bacnet/basic/object/msv/src/main.c @@ -29,7 +29,7 @@ static void testMultistateValue(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Multistate_Value_Init(); object_instance = Multistate_Value_Create(object_instance); diff --git a/test/bacnet/basic/object/nc/src/main.c b/test/bacnet/basic/object/nc/src/main.c index 351da132..e5c76085 100644 --- a/test/bacnet/basic/object/nc/src/main.c +++ b/test/bacnet/basic/object/nc/src/main.c @@ -32,9 +32,9 @@ static void test_Notification_Class_Read_Write_Property(void) int test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; const uint32_t instance = 1; uint32_t test_instance = 0; BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; diff --git a/test/bacnet/basic/object/netport/src/main.c b/test/bacnet/basic/object/netport/src/main.c index 51004d6e..357467d2 100644 --- a/test/bacnet/basic/object/netport/src/main.c +++ b/test/bacnet/basic/object/netport/src/main.c @@ -70,7 +70,7 @@ static void test_network_port(void) PORT_TYPE_ZIGBEE, PORT_TYPE_VIRTUAL, PORT_TYPE_NON_BACNET, PORT_TYPE_BIP6, PORT_TYPE_BSC, PORT_TYPE_MAX }; - const int known_fail_property_list[] = { -1 }; + const int32_t known_fail_property_list[] = { -1 }; while (port_type[port] != PORT_TYPE_MAX) { Network_Port_Init(); diff --git a/test/bacnet/basic/object/osv/src/main.c b/test/bacnet/basic/object/osv/src/main.c index f5d68dc6..7c2f0f50 100644 --- a/test/bacnet/basic/object/osv/src/main.c +++ b/test/bacnet/basic/object/osv/src/main.c @@ -28,7 +28,7 @@ static void testOctetString_Value(void) int len = 0, test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *required_property = NULL; + const int32_t *required_property = NULL; const uint32_t instance = 1; OctetString_Value_Init(); diff --git a/test/bacnet/basic/object/piv/src/main.c b/test/bacnet/basic/object/piv/src/main.c index 92b840de..d23cf42c 100644 --- a/test/bacnet/basic/object/piv/src/main.c +++ b/test/bacnet/basic/object/piv/src/main.c @@ -29,7 +29,7 @@ static void testPositiveInteger_Value(void) int len = 0, test_len = 0; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_APPLICATION_DATA_VALUE value = { 0 }; - const int *required_property = NULL; + const int32_t *required_property = NULL; const uint32_t instance = 1; PositiveInteger_Value_Init(); diff --git a/test/bacnet/basic/object/program/src/main.c b/test/bacnet/basic/object/program/src/main.c index b87d0ee5..ce9905e3 100644 --- a/test/bacnet/basic/object/program/src/main.c +++ b/test/bacnet/basic/object/program/src/main.c @@ -112,7 +112,7 @@ static void testProgramObject(void) bool status = false; unsigned count = 0; uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Program_Init(); object_instance = Program_Create(object_instance); diff --git a/test/bacnet/basic/object/schedule/src/main.c b/test/bacnet/basic/object/schedule/src/main.c index 9bd41f42..7e9f07a2 100644 --- a/test/bacnet/basic/object/schedule/src/main.c +++ b/test/bacnet/basic/object/schedule/src/main.c @@ -27,7 +27,7 @@ static void testSchedule(void) { unsigned count = 0; uint32_t object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; BACNET_DAILY_SCHEDULE daily_schedule = { 0 }, *test_daily_schedule; BACNET_SPECIAL_EVENT special_event = { 0 }, *test_special_event; BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE object_property_reference = { 0 }, diff --git a/test/bacnet/basic/object/structured_view/src/main.c b/test/bacnet/basic/object/structured_view/src/main.c index b9b13c45..2b8b7279 100644 --- a/test/bacnet/basic/object/structured_view/src/main.c +++ b/test/bacnet/basic/object/structured_view/src/main.c @@ -28,7 +28,7 @@ static void test_object_structured_view(void) int diff = 0; unsigned count = 0, index = 0; const uint32_t instance = 123; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; const char *test_name = "name-1234"; const char *test_description = "description-1234"; const char *test_node_subtype = "node-subtype-1234"; diff --git a/test/bacnet/basic/object/test/property_test.c b/test/bacnet/basic/object/test/property_test.c index 6c82af0d..c4a9d8cc 100644 --- a/test/bacnet/basic/object/test/property_test.c +++ b/test/bacnet/basic/object/test/property_test.c @@ -6,6 +6,7 @@ * * @copyright SPDX-License-Identifier: MIT */ +#include #include #include #include @@ -27,7 +28,7 @@ bool bacnet_object_property_write_test( BACNET_WRITE_PROPERTY_DATA *wp_data, write_property_function write_property, bool commandable, - const int *skip_fail_property_list) + const int32_t *skip_fail_property_list) { bool status = false; bool is_array, is_list; @@ -143,7 +144,7 @@ void bacnet_object_property_write_parameter_init( int bacnet_object_property_read_test( BACNET_READ_PROPERTY_DATA *rpdata, read_property_function read_property, - const int *skip_fail_property_list) + const int32_t *skip_fail_property_list) { int len = 0; int test_len = 0; @@ -292,14 +293,14 @@ void bacnet_object_properties_read_write_test( rpm_property_lists_function property_list, read_property_function read_property, write_property_function write_property, - const int *skip_fail_property_list) + const int32_t *skip_fail_property_list) { uint8_t apdu[MAX_APDU] = { 0 }; BACNET_READ_PROPERTY_DATA rpdata = { 0 }; BACNET_WRITE_PROPERTY_DATA wpdata = { 0 }; - const int *pRequired = NULL; - const int *pOptional = NULL; - const int *pProprietary = NULL; + const int32_t *pRequired = NULL; + const int32_t *pOptional = NULL; + const int32_t *pProprietary = NULL; BACNET_PROPERTY_ID property; int len = 0; bool commandable = false; diff --git a/test/bacnet/basic/object/test/property_test.h b/test/bacnet/basic/object/test/property_test.h index 83812402..5431efe7 100644 --- a/test/bacnet/basic/object/test/property_test.h +++ b/test/bacnet/basic/object/test/property_test.h @@ -29,18 +29,18 @@ void bacnet_object_properties_read_write_test( rpm_property_lists_function property_list, read_property_function read_property, write_property_function write_property, - const int *skip_fail_property_list); + const int32_t *skip_fail_property_list); int bacnet_object_property_read_test( BACNET_READ_PROPERTY_DATA *rpdata, read_property_function read_property, - const int *skip_fail_property_list); + const int32_t *skip_fail_property_list); bool bacnet_object_property_write_test( BACNET_WRITE_PROPERTY_DATA *wpdata, write_property_function write_property, bool commandable, - const int *skip_fail_property_list); + const int32_t *skip_fail_property_list); void bacnet_object_property_write_parameter_init( BACNET_WRITE_PROPERTY_DATA *wpdata, diff --git a/test/bacnet/basic/object/time_value/src/main.c b/test/bacnet/basic/object/time_value/src/main.c index 1f1e3ebf..bbaab750 100644 --- a/test/bacnet/basic/object/time_value/src/main.c +++ b/test/bacnet/basic/object/time_value/src/main.c @@ -29,7 +29,7 @@ static void testTimeValue(void) bool status = false; unsigned count = 0; uint32_t object_instance = 0; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Time_Value_Init(); object_instance = Time_Value_Create(BACNET_MAX_INSTANCE); diff --git a/test/bacnet/basic/object/timer/src/main.c b/test/bacnet/basic/object/timer/src/main.c index 311c3298..d8396891 100644 --- a/test/bacnet/basic/object/timer/src/main.c +++ b/test/bacnet/basic/object/timer/src/main.c @@ -40,7 +40,7 @@ static void test_Timer_Read_Write(void) const char *test_name = NULL; uint32_t test_instance = 0; bool status = false; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; BACNET_WRITE_PROPERTY_DATA wp_data = { 0 }; BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE member = { 0 }, *test_member = NULL; BACNET_APPLICATION_DATA_VALUE value = { 0 }; diff --git a/test/bacnet/basic/object/trendlog/src/main.c b/test/bacnet/basic/object/trendlog/src/main.c index 0763a8b4..15b01f5b 100644 --- a/test/bacnet/basic/object/trendlog/src/main.c +++ b/test/bacnet/basic/object/trendlog/src/main.c @@ -24,7 +24,7 @@ static void test_Trend_Log_ReadProperty(void) unsigned count = 0; uint32_t object_instance = 0; bool status = false; - const int known_fail_property_list[] = { -1 }; + const int32_t known_fail_property_list[] = { -1 }; Trend_Log_Init(); count = Trend_Log_Count(); diff --git a/test/bacnet/basic/server/bacnet_device/src/main.c b/test/bacnet/basic/server/bacnet_device/src/main.c index c40c7f71..9df8294f 100644 --- a/test/bacnet/basic/server/bacnet_device/src/main.c +++ b/test/bacnet/basic/server/bacnet_device/src/main.c @@ -24,7 +24,7 @@ static void test_Device_Data_Sharing(void) unsigned count; bool status = false; uint32_t test_instance; - const int skip_fail_property_list[] = { -1 }; + const int32_t skip_fail_property_list[] = { -1 }; Device_Init(NULL); status = Device_Set_Object_Instance_Number(instance); diff --git a/test/bacnet/datalink/bvlc/src/main.c b/test/bacnet/datalink/bvlc/src/main.c index 4235574a..9dd51599 100644 --- a/test/bacnet/datalink/bvlc/src/main.c +++ b/test/bacnet/datalink/bvlc/src/main.c @@ -287,7 +287,7 @@ static void test_BVLC_Register_Foreign_Device_Message(uint16_t ttl_seconds) uint8_t message_type = 0; uint16_t length = 0; int len = 0, test_len = 0; - const int msg_len = 6; + const int32_t msg_len = 6; len = bvlc_encode_register_foreign_device(pdu, sizeof(pdu), ttl_seconds); zassert_equal(len, msg_len, NULL); @@ -323,7 +323,7 @@ static void test_BVLC_Delete_Foreign_Device_Message( uint8_t message_type = 0; uint16_t length = 0; int len = 0, test_len = 0; - const int msg_len = 0x000A; + const int32_t msg_len = 0x000A; len = bvlc_encode_delete_foreign_device( pdu, sizeof(pdu), &fdt_entry->dest_address); diff --git a/test/bacnet/list_element/src/main.c b/test/bacnet/list_element/src/main.c index 947734b8..f63ad49d 100644 --- a/test/bacnet/list_element/src/main.c +++ b/test/bacnet/list_element/src/main.c @@ -23,7 +23,8 @@ static void test_ListElement(void) int application_data_len = 0, test_application_data_len = 0; unsigned i = 0; BACNET_DESTINATION destination[5] = { 0 }, test_destination[5] = { 0 }; - const int destination_size = sizeof(destination) / sizeof(destination[0]); + const int32_t destination_size = + sizeof(destination) / sizeof(destination[0]); list_element.application_data = NULL; list_element.application_data_len = 0;