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

@@ -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

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);

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);

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);

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;

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;

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;

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;

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;

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 int32_t **pRequired,
-    const int **pOptional,
+    const int32_t **pOptional,
-    const int **pProprietary)
+    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);

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;

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;

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;

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;

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;

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 int32_t **pRequired,
-    const int **pOptional,
+    const int32_t **pOptional,
-    const int **pProprietary)
+    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);

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;

ports/esp32/src/ai.h

@@ -53,9 +53,9 @@ extern "C" {
     } ANALOG_INPUT_DESCR;
 
     void Analog_Input_Property_Lists(
-        const int **pRequired,
+        const int32_t **pRequired,
-        const int **pOptional,
+        const int32_t **pOptional,
-        const int **pProprietary);
+        const int32_t **pProprietary);
 
     bool Analog_Input_Valid_Instance(
         uint32_t object_instance);

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;

ports/esp32/src/bo.h

@@ -23,9 +23,9 @@ extern "C" {
         void);
 
     void Binary_Output_Property_Lists(
-        const int **pRequired,
+        const int32_t **pRequired,
-        const int **pOptional,
+        const int32_t **pOptional,
-        const int **pProprietary);
+        const int32_t **pProprietary);
 
     bool Binary_Output_Valid_Instance(
         uint32_t object_instance);

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;

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 int32_t **pRequired,
-        const int **pOptional,
+        const int32_t **pOptional,
-        const int **pProprietary);
+        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);

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,
+static const int32_t Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT,
-                                                         PROP_INACTIVE_TEXT,
+                                                             PROP_INACTIVE_TEXT,
-                                                         -1 };
+                                                             -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;

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;

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;

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;

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 int32_t **pRequired,
-    const int **pOptional,
+    const int32_t **pOptional,
-    const int **pProprietary)
+    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);

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;

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 int32_t **pRequired,
-    const int **pOptional,
+    const int32_t **pOptional,
-    const int **pProprietary)
+    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 int32_t *pRequired = NULL;
-    const int *pOptional = NULL;
+    const int32_t *pOptional = NULL;
-    const int *pProprietary = NULL;
+    const int32_t *pProprietary = NULL;
 
     Network_Port_Property_List(
         object_instance, &pRequired, &pOptional, &pProprietary);

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,

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;

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;

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 int32_t **pRequired,
-    const int **pOptional,
+    const int32_t **pOptional,
-    const int **pProprietary)
+    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);

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;
 

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
 }

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;

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);

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;

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

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;

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

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;

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);

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;

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);

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;

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);

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;

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);

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;

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);

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;

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

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;

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);

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;

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

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;

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(

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;

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);

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;

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);

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;

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

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;

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);

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;

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);

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;

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

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;

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

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;

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,
+static const int32_t Color_Properties_Optional[] = { PROP_DESCRIPTION,
-                                                 PROP_TRANSITION, -1 };
+                                                     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;

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

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;

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

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;

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);

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;

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

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;

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);

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;

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);

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;

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,
+static const int32_t Integer_Value_Properties_Required[] = {
-                                                         PROP_OBJECT_NAME,
+    PROP_OBJECT_IDENTIFIER,
-                                                         PROP_OBJECT_TYPE,
+    PROP_OBJECT_NAME,
-                                                         PROP_PRESENT_VALUE,
+    PROP_OBJECT_TYPE,
-                                                         PROP_STATUS_FLAGS,
+    PROP_PRESENT_VALUE,
-                                                         PROP_UNITS,
+    PROP_STATUS_FLAGS,
-                                                         -1 };
+    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;

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

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;

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

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;

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

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 int32_t Properties_Proprietary[] = { -1 };
-static const int *Properties_Proprietary_Extended;
+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 int32_t *pRequired;
-    const int *pOptional;
+    const int32_t *pOptional;
-    const int *pProprietary;
+    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;
 }

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

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;

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

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;

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

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;