dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions 1 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
src/bacnet/basic/object/acc.c
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+7 -5
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+7 -5
View File
@@ -63,7 +63,7 @@ static OS_Keylist Object_List;
static color_write_present_value_callback Color_Write_Present_Value_Callback;
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Color_Properties_Required[] = {
static const int32_t Color_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_PRESENT_VALUE,
PROP_TRACKING_VALUE, PROP_COLOR_COMMAND,
@@ -71,10 +71,10 @@ static const int Color_Properties_Required[] = {
PROP_DEFAULT_FADE_TIME, -1
};
static const int Color_Properties_Optional[] = { PROP_DESCRIPTION,
PROP_TRANSITION, -1 };
static const int32_t Color_Properties_Optional[] = { PROP_DESCRIPTION,
PROP_TRANSITION, -1 };
static const int Color_Properties_Proprietary[] = { -1 };
static const int32_t Color_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -88,7 +88,9 @@ static const int Color_Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Color_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Color_Properties_Required;
src/bacnet/basic/object/color_object.h
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+6 -3
View File
@@ -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
+2 -2
View File
@@ -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
+14 -10
View File
@@ -50,19 +50,21 @@ struct integer_object {
} INTERGER_VALUE_DESCR;
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Integer_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
PROP_PRESENT_VALUE,
PROP_STATUS_FLAGS,
PROP_UNITS,
-1 };
static const int32_t Integer_Value_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
PROP_PRESENT_VALUE,
PROP_STATUS_FLAGS,
PROP_UNITS,
-1
};
static const int Integer_Value_Properties_Optional[] = {
static const int32_t Integer_Value_Properties_Optional[] = {
PROP_OUT_OF_SERVICE, PROP_DESCRIPTION, PROP_COV_INCREMENT, -1
};
static const int Integer_Value_Properties_Proprietary[] = { -1 };
static const int32_t Integer_Value_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -76,7 +78,9 @@ static const int Integer_Value_Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Integer_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Integer_Value_Properties_Required;
src/bacnet/basic/object/iv.h
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+11 -9
View File
@@ -77,7 +77,7 @@ struct object_data {
};
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = {
static const int32_t Properties_Required[] = {
/* unordered list of required properties */
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
@@ -98,7 +98,7 @@ static const int Properties_Required[] = {
-1
};
static const int Properties_Optional[] = {
static const int32_t Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_RELIABILITY,
@@ -117,8 +117,8 @@ static const int Properties_Optional[] = {
};
/* handling for proprietary properties */
static const int Properties_Proprietary[] = { -1 };
static const int *Properties_Proprietary_Extended;
static const int32_t Properties_Proprietary[] = { -1 };
static const int32_t *Properties_Proprietary_Extended;
static write_property_function Write_Property_Proprietary_Callback;
static read_property_function Read_Property_Proprietary_Callback;
@@ -134,7 +134,9 @@ static read_property_function Read_Property_Proprietary_Callback;
* BACnet proprietary properties for this object.
*/
void Loop_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Properties_Required;
@@ -160,9 +162,9 @@ void Loop_Property_Lists(
*/
static bool Loop_Property_Lists_Member(int object_property)
{
const int *pRequired;
const int *pOptional;
const int *pProprietary;
const int32_t *pRequired;
const int32_t *pOptional;
const int32_t *pProprietary;
Loop_Property_Lists(&pRequired, &pOptional, &pProprietary);
return property_lists_member(
@@ -175,7 +177,7 @@ static bool Loop_Property_Lists_Member(int object_property)
* @param pProprietary - pointer to list of int terminated by -1, of
* BACnet proprietary properties for this object.
*/
void Loop_Proprietary_Property_List_Set(const int *pProprietary)
void Loop_Proprietary_Property_List_Set(const int32_t *pProprietary)
{
Properties_Proprietary_Extended = pProprietary;
}
src/bacnet/basic/object/loop.h
+4 -2
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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
+3 -1
View File
@@ -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
+6 -4
View File
@@ -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;
src/bacnet/basic/object/ms-input.h
+3 -1
View File
@@ -32,7 +32,9 @@ extern "C" {
BACNET_STACK_EXPORT
void Multistate_Input_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Multistate_Input_Valid_Instance(uint32_t object_instance);
src/bacnet/basic/object/mso.c
+6 -4
View File
@@ -56,7 +56,7 @@ static const char *Default_State_Text = "State 1\0"
"State 2\0"
"State 3\0";
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = {
static const int32_t Properties_Required[] = {
/* list of required properties in the object */
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
@@ -74,12 +74,12 @@ static const int Properties_Required[] = {
-1
};
static const int Properties_Optional[] = {
static const int32_t Properties_Optional[] = {
/* list of required properties in the object */
PROP_STATE_TEXT, PROP_DESCRIPTION, PROP_RELIABILITY, -1
};
static const int Properties_Proprietary[] = { -1 };
static const int32_t Properties_Proprietary[] = { -1 };
/**
* @brief Returns the list of required, optional, and proprietary properties.
@@ -92,7 +92,9 @@ static const int Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Multistate_Output_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Properties_Required;
src/bacnet/basic/object/mso.h
+3 -1
View File
@@ -33,7 +33,9 @@ extern "C" {
BACNET_STACK_EXPORT
void Multistate_Output_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Multistate_Output_Valid_Instance(uint32_t object_instance);
BACNET_STACK_EXPORT
src/bacnet/basic/object/msv.c
+6 -4
View File
@@ -48,19 +48,19 @@ static const char *Default_State_Text = "State 1\0"
"State 3\0";
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = {
static const int32_t Properties_Required[] = {
/* unordered list of required properties */
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE,
PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE,
PROP_OUT_OF_SERVICE, PROP_NUMBER_OF_STATES, -1
};
static const int Properties_Optional[] = {
static const int32_t Properties_Optional[] = {
/* unordered list of required properties */
PROP_DESCRIPTION, PROP_RELIABILITY, PROP_STATE_TEXT, -1
};
static const int Properties_Proprietary[] = { -1 };
static const int32_t Properties_Proprietary[] = { -1 };
/**
* Initialize the pointers for the required, the optional and the properitary
@@ -71,7 +71,9 @@ static const int Properties_Proprietary[] = { -1 };
* @param pProprietary - Pointer to the pointer of properitary values.
*/
void Multistate_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Properties_Required;
src/bacnet/basic/object/msv.h
+3 -1
View File
@@ -32,7 +32,9 @@ extern "C" {
BACNET_STACK_EXPORT
void Multistate_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Multistate_Value_Valid_Instance(uint32_t object_instance);
src/bacnet/basic/object/nc.c
+6 -4
View File
@@ -39,19 +39,21 @@ static NOTIFICATION_CLASS_INFO NC_Info[MAX_NOTIFICATION_CLASSES];
static uint8_t Event_Buffer[MAX_APDU];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = {
static const int32_t Properties_Required[] = {
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_NOTIFICATION_CLASS,
PROP_PRIORITY, PROP_ACK_REQUIRED,
PROP_RECIPIENT_LIST, -1
};
static const int Properties_Optional[] = { PROP_DESCRIPTION, -1 };
static const int32_t Properties_Optional[] = { PROP_DESCRIPTION, -1 };
static const int Properties_Proprietary[] = { -1 };
static const int32_t Properties_Proprietary[] = { -1 };
void Notification_Class_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Properties_Required;
src/bacnet/basic/object/nc.h
+3 -1
View File
@@ -52,7 +52,9 @@ typedef struct Ack_Notification {
BACNET_STACK_EXPORT
void Notification_Class_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
void Notification_Class_Init(void);
src/bacnet/basic/object/netport.c
+17 -15
View File
@@ -136,7 +136,7 @@ static struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
static uint32_t Link_Speeds[] = { 9600, 19200, 38400, 57600, 76800, 115200 };
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Network_Port_Properties_Required[] = {
static const int32_t Network_Port_Properties_Required[] = {
/* unordered list of required properties */
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
@@ -156,7 +156,7 @@ static const int Network_Port_Properties_Required[] = {
-1
};
static const int Ethernet_Port_Properties_Optional[] = {
static const int32_t Ethernet_Port_Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_MAC_ADDRESS,
@@ -169,7 +169,7 @@ static const int Ethernet_Port_Properties_Optional[] = {
-1
};
static const int Zigbee_Port_Properties_Optional[] = {
static const int32_t Zigbee_Port_Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_MAC_ADDRESS,
@@ -183,7 +183,7 @@ static const int Zigbee_Port_Properties_Optional[] = {
-1
};
static const int MSTP_Port_Properties_Optional[] = {
static const int32_t MSTP_Port_Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_MAC_ADDRESS,
@@ -199,7 +199,7 @@ static const int MSTP_Port_Properties_Optional[] = {
-1
};
static const int BIP_Port_Properties_Optional[] = {
static const int32_t BIP_Port_Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_MAC_ADDRESS,
@@ -233,7 +233,7 @@ static const int BIP_Port_Properties_Optional[] = {
-1
};
static const int BIP6_Port_Properties_Optional[] = {
static const int32_t BIP6_Port_Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_MAC_ADDRESS,
@@ -270,7 +270,7 @@ static const int BIP6_Port_Properties_Optional[] = {
-1
};
static const int BSC_Port_Properties_Optional[] = {
static const int32_t BSC_Port_Properties_Optional[] = {
PROP_NETWORK_NUMBER,
PROP_NETWORK_NUMBER_QUALITY,
PROP_APDU_LENGTH,
@@ -317,7 +317,7 @@ static const int BSC_Port_Properties_Optional[] = {
-1
};
static const int Network_Port_Properties_Proprietary[] = { -1 };
static const int32_t Network_Port_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -333,9 +333,9 @@ static const int Network_Port_Properties_Proprietary[] = { -1 };
*/
void Network_Port_Property_List(
uint32_t object_instance,
const int **pRequired,
const int **pOptional,
const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
unsigned index = 0;
@@ -387,7 +387,9 @@ void Network_Port_Property_List(
* BACnet proprietary properties for this object.
*/
void Network_Port_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
Network_Port_Property_List(
Object_List[0].Instance_Number, pRequired, pOptional, pProprietary);
@@ -402,9 +404,9 @@ void Network_Port_Property_Lists(
static bool Property_List_Member(uint32_t object_instance, int object_property)
{
bool found = false;
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
Network_Port_Property_List(
object_instance, &pRequired, &pOptional, &pProprietary);
src/bacnet/basic/object/netport.h
+6 -4
View File
@@ -38,13 +38,15 @@ extern "C" {
BACNET_STACK_EXPORT
void Network_Port_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
void Network_Port_Property_List(
uint32_t object_instance,
const int **pRequired,
const int **pOptional,
const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Network_Port_Object_Name(
src/bacnet/basic/object/osv.c
+6 -4
View File
@@ -26,19 +26,21 @@
static OCTETSTRING_VALUE_DESCR OSV_Descr[MAX_OCTETSTRING_VALUES];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int OctetString_Value_Properties_Required[] = {
static const int32_t OctetString_Value_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE,
PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1
};
static const int OctetString_Value_Properties_Optional[] = {
static const int32_t OctetString_Value_Properties_Optional[] = {
PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_DESCRIPTION, -1
};
static const int OctetString_Value_Properties_Proprietary[] = { -1 };
static const int32_t OctetString_Value_Properties_Proprietary[] = { -1 };
void OctetString_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = OctetString_Value_Properties_Required;
src/bacnet/basic/object/osv.h
+3 -1
View File
@@ -28,7 +28,9 @@ typedef struct octetstring_value_descr {
BACNET_STACK_EXPORT
void OctetString_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool OctetString_Value_Valid_Instance(uint32_t object_instance);
BACNET_STACK_EXPORT
src/bacnet/basic/object/piv.c
+6 -4
View File
@@ -26,7 +26,7 @@
static POSITIVEINTEGER_VALUE_DESCR PIV_Descr[MAX_POSITIVEINTEGER_VALUES];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int PositiveInteger_Value_Properties_Required[] = {
static const int32_t PositiveInteger_Value_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
@@ -36,14 +36,16 @@ static const int PositiveInteger_Value_Properties_Required[] = {
-1
};
static const int PositiveInteger_Value_Properties_Optional[] = {
static const int32_t PositiveInteger_Value_Properties_Optional[] = {
PROP_OUT_OF_SERVICE, -1
};
static const int PositiveInteger_Value_Properties_Proprietary[] = { -1 };
static const int32_t PositiveInteger_Value_Properties_Proprietary[] = { -1 };
void PositiveInteger_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = PositiveInteger_Value_Properties_Required;
src/bacnet/basic/object/piv.h
+3 -1
View File
@@ -28,7 +28,9 @@ typedef struct positiveinteger_value_descr {
BACNET_STACK_EXPORT
void PositiveInteger_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool PositiveInteger_Value_Valid_Instance(uint32_t object_instance);
unsigned PositiveInteger_Value_Count(void);
src/bacnet/basic/object/program.c
+6 -4
View File
@@ -56,7 +56,7 @@ struct object_data {
};
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = {
static const int32_t Properties_Required[] = {
/* unordered list of required properties */
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_PROGRAM_STATE,
@@ -64,7 +64,7 @@ static const int Properties_Required[] = {
PROP_OUT_OF_SERVICE, -1
};
static const int Properties_Optional[] = {
static const int32_t Properties_Optional[] = {
/* unordered list of optional properties */
PROP_REASON_FOR_HALT,
PROP_DESCRIPTION_OF_HALT,
@@ -75,7 +75,7 @@ static const int Properties_Optional[] = {
-1
};
static const int Properties_Proprietary[] = { -1 };
static const int32_t Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -89,7 +89,9 @@ static const int Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Program_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Properties_Required;
src/bacnet/basic/object/program.h
+3 -1
View File
@@ -22,7 +22,9 @@ extern "C" {
BACNET_STACK_EXPORT
void Program_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Program_Valid_Instance(uint32_t object_instance);
BACNET_STACK_EXPORT
src/bacnet/basic/object/schedule.c
+6 -4
View File
@@ -25,7 +25,7 @@
static SCHEDULE_DESCR Schedule_Descr[MAX_SCHEDULES];
static const int Schedule_Properties_Required[] = {
static const int32_t Schedule_Properties_Required[] = {
/* list of required properties */
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
@@ -41,7 +41,7 @@ static const int Schedule_Properties_Required[] = {
-1
};
static const int Schedule_Properties_Optional[] = {
static const int32_t Schedule_Properties_Optional[] = {
/* list of optional properties */
PROP_WEEKLY_SCHEDULE,
#if BACNET_EXCEPTION_SCHEDULE_SIZE
@@ -50,10 +50,12 @@ static const int Schedule_Properties_Optional[] = {
-1
};
static const int Schedule_Properties_Proprietary[] = { -1 };
static const int32_t Schedule_Properties_Proprietary[] = { -1 };
void Schedule_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Schedule_Properties_Required;
src/bacnet/basic/object/schedule.h
+3 -1
View File
@@ -64,7 +64,9 @@ BACNET_STACK_EXPORT
struct schedule *Schedule_Object(uint32_t object_instance);
BACNET_STACK_EXPORT
void Schedule_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Schedule_Valid_Instance(uint32_t object_instance);
src/bacnet/basic/object/structured_view.c
+6 -4
View File
@@ -47,13 +47,13 @@ struct object_data {
static OS_Keylist Object_List;
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = {
static const int32_t Properties_Required[] = {
/* unordered list of required properties */
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE,
PROP_NODE_TYPE, PROP_SUBORDINATE_LIST, -1
};
static const int Properties_Optional[] = {
static const int32_t Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_NODE_SUBTYPE,
@@ -65,7 +65,7 @@ static const int Properties_Optional[] = {
-1
};
static const int Properties_Proprietary[] = { -1 };
static const int32_t Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -79,7 +79,9 @@ static const int Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Structured_View_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Properties_Required;
src/bacnet/basic/object/structured_view.h
+3 -1
View File
@@ -35,7 +35,9 @@ extern "C" {
BACNET_STACK_EXPORT
void Structured_View_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Structured_View_Valid_Instance(uint32_t object_instance);
BACNET_STACK_EXPORT
src/bacnet/basic/object/time_value.c
+8 -6
View File
@@ -50,16 +50,16 @@ static time_value_write_present_value_callback
Time_Value_Write_Present_Value_Callback;
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Time_Value_Properties_Required[] = {
static const int32_t Time_Value_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE,
PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, -1
};
static const int Time_Value_Properties_Optional[] = { PROP_DESCRIPTION,
PROP_EVENT_STATE,
PROP_OUT_OF_SERVICE, -1 };
static const int32_t Time_Value_Properties_Optional[] = {
PROP_DESCRIPTION, PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, -1
};
static const int Time_Value_Properties_Proprietary[] = { -1 };
static const int32_t Time_Value_Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -73,7 +73,9 @@ static const int Time_Value_Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Time_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Time_Value_Properties_Required;
src/bacnet/basic/object/time_value.h
+3 -1
View File
@@ -32,7 +32,9 @@ extern "C" {
BACNET_STACK_EXPORT
void Time_Value_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Time_Value_Valid_Instance(uint32_t object_instance);
BACNET_STACK_EXPORT
src/bacnet/basic/object/timer.c
+6 -4
View File
@@ -65,7 +65,7 @@ struct object_data {
};
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = {
static const int32_t Properties_Required[] = {
/* unordered list of required properties */
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_PRESENT_VALUE,
@@ -73,7 +73,7 @@ static const int Properties_Required[] = {
PROP_TIMER_RUNNING, -1
};
static const int Properties_Optional[] = {
static const int32_t Properties_Optional[] = {
/* unordered list of optional properties */
PROP_DESCRIPTION,
PROP_RELIABILITY,
@@ -92,7 +92,7 @@ static const int Properties_Optional[] = {
-1
};
static const int Properties_Proprietary[] = { -1 };
static const int32_t Properties_Proprietary[] = { -1 };
/**
* Returns the list of required, optional, and proprietary properties.
@@ -106,7 +106,9 @@ static const int Properties_Proprietary[] = { -1 };
* BACnet proprietary properties for this object.
*/
void Timer_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Properties_Required;
src/bacnet/basic/object/timer.h
+3 -1
View File
@@ -24,7 +24,9 @@ extern "C" {
BACNET_STACK_EXPORT
void Timer_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Timer_Valid_Instance(uint32_t object_instance);
BACNET_STACK_EXPORT
src/bacnet/basic/object/trendlog.c
+20 -16
View File
@@ -36,21 +36,23 @@ static TL_DATA_REC Logs[MAX_TREND_LOGS][TL_MAX_ENTRIES];
static TL_LOG_INFO LogInfo[MAX_TREND_LOGS];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Trend_Log_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
PROP_ENABLE,
PROP_STOP_WHEN_FULL,
PROP_BUFFER_SIZE,
PROP_LOG_BUFFER,
PROP_RECORD_COUNT,
PROP_TOTAL_RECORD_COUNT,
PROP_EVENT_STATE,
PROP_LOGGING_TYPE,
PROP_STATUS_FLAGS,
-1 };
static const int32_t Trend_Log_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
PROP_ENABLE,
PROP_STOP_WHEN_FULL,
PROP_BUFFER_SIZE,
PROP_LOG_BUFFER,
PROP_RECORD_COUNT,
PROP_TOTAL_RECORD_COUNT,
PROP_EVENT_STATE,
PROP_LOGGING_TYPE,
PROP_STATUS_FLAGS,
-1
};
static const int Trend_Log_Properties_Optional[] = {
static const int32_t Trend_Log_Properties_Optional[] = {
PROP_DESCRIPTION, PROP_START_TIME, PROP_STOP_TIME,
PROP_LOG_DEVICE_OBJECT_PROPERTY, PROP_LOG_INTERVAL,
@@ -71,10 +73,12 @@ static const int Trend_Log_Properties_Optional[] = {
PROP_ALIGN_INTERVALS, PROP_INTERVAL_OFFSET, PROP_TRIGGER, -1
};
static const int Trend_Log_Properties_Proprietary[] = { -1 };
static const int32_t Trend_Log_Properties_Proprietary[] = { -1 };
void Trend_Log_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Trend_Log_Properties_Required;
src/bacnet/basic/object/trendlog.h
+3 -1
View File
@@ -114,7 +114,9 @@ typedef struct tl_log_info {
BACNET_STACK_EXPORT
void Trend_Log_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
BACNET_STACK_EXPORT
bool Trend_Log_Valid_Instance(uint32_t object_instance);