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