dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert the property list values into int32_t to support the larger property values when an int is 8-bit or 16-bit. (#1145)

Browse Source
This commit is contained in:
Steve Karg
2025-11-16 08:34:45 -06:00
committed by GitHub
parent 3ea710f92f
commit e9dd910b55
180 changed files with 1071 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/arduino_uno/av.h
+3 -1
View File
@@ -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
+3 -1
View File
@@ -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
+3 -1
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+7 -7
View File
@@ -55,7 +55,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 };
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY,
PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL,
PROP_CHANGES_PENDING,
@@ -67,7 +67,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
#endif
-1 };
static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS,
#if (BACNET_PROTOCOL_REVISION >= 24)
PROP_APDU_LENGTH,
@@ -77,7 +77,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
#endif
-1 };
static const int Network_Port_Properties_Proprietary[] = { -1 };
static const int32_t Network_Port_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -92,9 +92,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_List(uint32_t object_instance,
const int **pRequired,
const int **pOptional,
const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
(void)object_instance;
if (pRequired) {
@@ -122,7 +122,7 @@ void Network_Port_Property_List(uint32_t object_instance,
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary)
{
Network_Port_Property_List(
BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary);
ports/bdk-atxx4-mstp/ai.c
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+5 -5
View File
@@ -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
+7 -7
View File
@@ -56,7 +56,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 };
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY,
PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL,
PROP_CHANGES_PENDING,
@@ -69,7 +69,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
-1
};
static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS,
#if (BACNET_PROTOCOL_REVISION >= 24)
PROP_APDU_LENGTH,
@@ -79,7 +79,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
#endif
-1 };
static const int Network_Port_Properties_Proprietary[] = { -1 };
static const int32_t Network_Port_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -94,9 +94,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_List(uint32_t object_instance,
const int **pRequired,
const int **pOptional,
const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
(void)object_instance;
if (pRequired) {
@@ -124,7 +124,7 @@ void Network_Port_Property_List(uint32_t object_instance,
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary)
{
Network_Port_Property_List(
BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary);
ports/esp32/src/ai.c
+4 -4
View File
@@ -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
+3 -3
View File
@@ -53,9 +53,9 @@ extern "C" {
} ANALOG_INPUT_DESCR;
void Analog_Input_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
bool Analog_Input_Valid_Instance(
uint32_t object_instance);
ports/esp32/src/bo.c
+4 -4
View File
@@ -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
+3 -3
View File
@@ -23,9 +23,9 @@ extern "C" {
void);
void Binary_Output_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
bool Binary_Output_Valid_Instance(
uint32_t object_instance);
ports/esp32/src/device.c
+4 -4
View File
@@ -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
+5 -5
View File
@@ -231,9 +231,9 @@ extern "C" {
bool Device_Interval_Offset_Set(uint32_t value);
void Device_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
void Device_Objects_Property_List(
BACNET_OBJECT_TYPE object_type,
uint32_t object_instance,
@@ -391,11 +391,11 @@ extern "C" {
const uint8_t * mac_adress);
bool Routed_Device_GetNext(
const BACNET_ADDRESS * dest,
const int *DNET_list,
const int32_t *DNET_list,
int *cursor);
bool Routed_Device_Is_Valid_Network(
uint16_t dest_net,
const int *DNET_list);
const int32_t *DNET_list);
uint32_t Routed_Device_Index_To_Instance(
unsigned index);
ports/rx62n/bo.c
+8 -6
View File
@@ -37,7 +37,7 @@ static uint8_t Out_Of_Service[MAX_BINARY_OUTPUTS];
static uint8_t Polarity[MAX_BINARY_OUTPUTS];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Binary_Output_Properties_Required[] = {
static const int32_t Binary_Output_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
@@ -51,14 +51,16 @@ static const int Binary_Output_Properties_Required[] = {
-1
};
static const int Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT,
PROP_INACTIVE_TEXT,
-1 };
static const int32_t Binary_Output_Properties_Optional[] = { PROP_ACTIVE_TEXT,
PROP_INACTIVE_TEXT,
-1 };
static const int Binary_Output_Properties_Proprietary[] = { -1 };
static const int32_t Binary_Output_Properties_Proprietary[] = { -1 };
void Binary_Output_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Binary_Output_Properties_Required;
ports/rx62n/device.c
+7 -5
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+7 -7
View File
@@ -55,7 +55,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 };
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY,
PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL,
PROP_CHANGES_PENDING,
@@ -67,7 +67,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
#endif
-1 };
static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS,
#if (BACNET_PROTOCOL_REVISION >= 24)
PROP_APDU_LENGTH,
@@ -77,7 +77,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
#endif
-1 };
static const int Network_Port_Properties_Proprietary[] = { -1 };
static const int32_t Network_Port_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -92,9 +92,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_List(uint32_t object_instance,
const int **pRequired,
const int **pOptional,
const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
(void)object_instance;
if (pRequired) {
@@ -122,7 +122,7 @@ void Network_Port_Property_List(uint32_t object_instance,
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary)
{
Network_Port_Property_List(
BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary);
ports/stm32f4xx/device.c
+6 -4
View File
@@ -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
+12 -10
View File
@@ -48,7 +48,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
static uint32_t Link_Speeds[] = { 9600, 19200, 38400, 57600, 76800, 115200 };
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Network_Port_Properties_Required[] = {
static const int32_t Network_Port_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
@@ -67,7 +67,7 @@ static const int Network_Port_Properties_Required[] = {
-1
};
static const int Network_Port_Properties_Optional[] = {
static const int32_t Network_Port_Properties_Optional[] = {
PROP_MAC_ADDRESS,
PROP_MAX_MASTER,
PROP_MAX_INFO_FRAMES,
@@ -81,7 +81,7 @@ static const int Network_Port_Properties_Optional[] = {
-1
};
static const int Network_Port_Properties_Proprietary[] = { -1 };
static const int32_t Network_Port_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -97,9 +97,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 };
*/
void Network_Port_Property_List(
uint32_t object_instance,
const int **pRequired,
const int **pOptional,
const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
(void)object_instance;
if (pRequired) {
@@ -127,7 +127,9 @@ void Network_Port_Property_List(
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
Network_Port_Property_List(
BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary);
@@ -533,9 +535,9 @@ static bool
Network_Port_Property_List_Member(uint32_t object_instance, int object_property)
{
bool found = false;
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
Network_Port_Property_List(
object_instance, &pRequired, &pOptional, &pProprietary);
ports/win32/main.c
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+7 -7
View File
@@ -49,7 +49,7 @@ struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
static uint32_t Link_Speeds[] = {9600, 19200, 38400, 57600, 76800, 115200 };
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
static const int32_t Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_STATUS_FLAGS, PROP_RELIABILITY,
PROP_OUT_OF_SERVICE, PROP_NETWORK_TYPE, PROP_PROTOCOL_LEVEL,
PROP_CHANGES_PENDING,
@@ -61,7 +61,7 @@ static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
#endif
-1 };
static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
static const int32_t Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES, PROP_LINK_SPEEDS,
#if (BACNET_PROTOCOL_REVISION >= 24)
PROP_APDU_LENGTH,
@@ -71,7 +71,7 @@ static const int Network_Port_Properties_Optional[] = { PROP_MAC_ADDRESS,
#endif
-1 };
static const int Network_Port_Properties_Proprietary[] = { -1 };
static const int32_t Network_Port_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -86,9 +86,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_List(uint32_t object_instance,
const int **pRequired,
const int **pOptional,
const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
(void)object_instance;
if (pRequired) {
@@ -116,7 +116,7 @@ void Network_Port_Property_List(uint32_t object_instance,
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary)
{
Network_Port_Property_List(
BACNET_NETWORK_PORT_INSTANCE, pRequired, pOptional, pProprietary);