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
src/bacnet/bactext.c
+84 -84
View File
@@ -15,13 +15,13 @@ static const char *ASHRAE_Reserved_String = "Reserved for Use by ASHRAE";
static const char *Vendor_Proprietary_String = "Vendor Proprietary Value";
/**
* @brief Attempt to convert a numeric string into a unsigned long integer
* @brief Attempt to convert a numeric string into a uint32_t value
* @param search_name - string to convert
* @param found_index - where to put the converted value
* @return true if converted and found_index is set
* @return false if not converted and found_index is not set
*/
bool bactext_strtoul(const char *search_name, unsigned *found_index)
bool bactext_strtoul(const char *search_name, uint32_t *found_index)
{
char *endptr;
unsigned long value;
@@ -40,7 +40,7 @@ bool bactext_strtoul(const char *search_name, unsigned *found_index)
/* Extra text found */
return false;
}
*found_index = (unsigned)value;
*found_index = (uint32_t)value;
return true;
}
@@ -48,7 +48,7 @@ bool bactext_strtoul(const char *search_name, unsigned *found_index)
/* Search for a text value first based on the corresponding text list, then by
* attempting to convert to an integer value. */
static bool bactext_strtoul_index(
INDTEXT_DATA *istring, const char *search_name, unsigned *found_index)
INDTEXT_DATA *istring, const char *search_name, uint32_t *found_index)
{
if (indtext_by_istring(istring, search_name, found_index) == true) {
return true;
@@ -98,7 +98,7 @@ INDTEXT_DATA bacnet_confirmed_service_names[] = {
{ 0, NULL }
};
const char *bactext_confirmed_service_name(unsigned index)
const char *bactext_confirmed_service_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_confirmed_service_names, index, ASHRAE_Reserved_String);
@@ -124,7 +124,7 @@ INDTEXT_DATA bacnet_unconfirmed_service_names[] = {
{ 0, NULL }
};
const char *bactext_unconfirmed_service_name(unsigned index)
const char *bactext_unconfirmed_service_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_unconfirmed_service_names, index, ASHRAE_Reserved_String);
@@ -185,14 +185,14 @@ INDTEXT_DATA bacnet_application_tag_names[] = {
{ 0, NULL }
};
const char *bactext_application_tag_name(unsigned index)
const char *bactext_application_tag_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_application_tag_names, index, ASHRAE_Reserved_String);
}
bool bactext_application_tag_index(
const char *search_name, unsigned *found_index)
const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_application_tag_names, search_name, found_index);
@@ -342,27 +342,27 @@ INDTEXT_DATA bacnet_object_type_names_capitalized[] = {
{ 0, NULL }
};
const char *bactext_object_type_name(unsigned index)
const char *bactext_object_type_name(uint32_t index)
{
return indtext_by_index_split_default(
bacnet_object_type_names, index, OBJECT_PROPRIETARY_MIN,
ASHRAE_Reserved_String, Vendor_Proprietary_String);
}
const char *bactext_object_type_name_capitalized(unsigned index)
const char *bactext_object_type_name_capitalized(uint32_t index)
{
return indtext_by_index_split_default(
bacnet_object_type_names_capitalized, index, OBJECT_PROPRIETARY_MIN,
ASHRAE_Reserved_String, Vendor_Proprietary_String);
}
bool bactext_object_type_index(const char *search_name, unsigned *found_index)
bool bactext_object_type_index(const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_object_type_names, search_name, found_index);
}
bool bactext_object_type_strtol(const char *search_name, unsigned *found_index)
bool bactext_object_type_strtol(const char *search_name, uint32_t *found_index)
{
return bactext_strtoul_index(
bacnet_object_type_names, search_name, found_index);
@@ -919,7 +919,7 @@ INDTEXT_DATA bacnet_property_names[] = {
{ 0, NULL }
};
bool bactext_property_name_proprietary(unsigned index)
bool bactext_property_name_proprietary(uint32_t index)
{
bool status = false;
@@ -931,7 +931,7 @@ bool bactext_property_name_proprietary(unsigned index)
return status;
}
const char *bactext_property_name(unsigned index)
const char *bactext_property_name(uint32_t index)
{
/* Enumerated values 0-511 are reserved for definition by ASHRAE.
Enumerated values 512-4194303 may be used by others subject to the
@@ -945,23 +945,23 @@ const char *bactext_property_name(unsigned index)
}
const char *
bactext_property_name_default(unsigned index, const char *default_string)
bactext_property_name_default(uint32_t index, const char *default_string)
{
return indtext_by_index_default(
bacnet_property_names, index, default_string);
}
unsigned bactext_property_id(const char *name)
uint32_t bactext_property_id(const char *name)
{
return indtext_by_istring_default(bacnet_property_names, name, 0);
}
bool bactext_property_index(const char *search_name, unsigned *found_index)
bool bactext_property_index(const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(bacnet_property_names, search_name, found_index);
}
bool bactext_property_strtol(const char *search_name, unsigned *found_index)
bool bactext_property_strtol(const char *search_name, uint32_t *found_index)
{
return bactext_strtoul_index(
bacnet_property_names, search_name, found_index);
@@ -1417,7 +1417,7 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
subject to the procedures and constraints described in Clause 23. */
};
bool bactext_engineering_unit_name_proprietary(unsigned index)
bool bactext_engineering_unit_name_proprietary(uint32_t index)
{
bool status = false;
@@ -1433,7 +1433,7 @@ bool bactext_engineering_unit_name_proprietary(unsigned index)
return status;
}
const char *bactext_engineering_unit_name(unsigned index)
const char *bactext_engineering_unit_name(uint32_t index)
{
if (bactext_engineering_unit_name_proprietary(index)) {
return Vendor_Proprietary_String;
@@ -1446,7 +1446,7 @@ const char *bactext_engineering_unit_name(unsigned index)
}
bool bactext_engineering_unit_index(
const char *search_name, unsigned *found_index)
const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_engineering_unit_names, search_name, found_index);
@@ -1469,7 +1469,7 @@ INDTEXT_DATA bacnet_reject_reason_names[] = {
{ 0, NULL }
};
const char *bactext_reject_reason_name(unsigned index)
const char *bactext_reject_reason_name(uint32_t index)
{
return indtext_by_index_split_default(
bacnet_reject_reason_names, index, REJECT_REASON_PROPRIETARY_FIRST,
@@ -1495,7 +1495,7 @@ INDTEXT_DATA bacnet_abort_reason_names[] = {
{ 0, NULL }
};
const char *bactext_abort_reason_name(unsigned index)
const char *bactext_abort_reason_name(uint32_t index)
{
return indtext_by_index_split_default(
bacnet_abort_reason_names, index, ABORT_REASON_PROPRIETARY_FIRST,
@@ -1514,7 +1514,7 @@ INDTEXT_DATA bacnet_error_class_names[] = {
{ 0, NULL }
};
const char *bactext_error_class_name(unsigned index)
const char *bactext_error_class_name(uint32_t index)
{
return indtext_by_index_split_default(
bacnet_error_class_names, index, ERROR_CLASS_PROPRIETARY_FIRST,
@@ -1791,7 +1791,7 @@ INDTEXT_DATA bacnet_error_code_names[] = {
{ 0, NULL }
};
const char *bactext_error_code_name(unsigned index)
const char *bactext_error_code_name(uint32_t index)
{
return indtext_by_index_split_default(
bacnet_error_code_names, index, ERROR_CODE_PROPRIETARY_FIRST,
@@ -1807,7 +1807,7 @@ INDTEXT_DATA bacnet_month_names[] = {
{ 0, NULL }
};
const char *bactext_month_name(unsigned index)
const char *bactext_month_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_month_names, index, ASHRAE_Reserved_String);
@@ -1820,7 +1820,7 @@ INDTEXT_DATA bacnet_week_of_month_names[] = {
{ 255, "any week of this month" }, { 0, NULL }
};
const char *bactext_week_of_month_name(unsigned index)
const char *bactext_week_of_month_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_week_of_month_names, index, ASHRAE_Reserved_String);
@@ -1835,7 +1835,7 @@ INDTEXT_DATA bacnet_day_of_week_names[] = {
{ 0, NULL }
};
const char *bactext_day_of_week_name(unsigned index)
const char *bactext_day_of_week_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_day_of_week_names, index, ASHRAE_Reserved_String);
@@ -1853,13 +1853,13 @@ INDTEXT_DATA bacnet_days_of_week_names[] = {
{ 0, NULL }
};
const char *bactext_days_of_week_name(unsigned index)
const char *bactext_days_of_week_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_days_of_week_names, index, ASHRAE_Reserved_String);
}
bool bactext_days_of_week_index(const char *search_name, unsigned *found_index)
bool bactext_days_of_week_index(const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_days_of_week_names, search_name, found_index);
@@ -1873,13 +1873,13 @@ INDTEXT_DATA bacnet_notify_type_names[] = {
{ 0, NULL }
};
const char *bactext_notify_type_name(unsigned index)
const char *bactext_notify_type_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_notify_type_names, index, ASHRAE_Reserved_String);
}
bool bactext_notify_type_index(const char *search_name, unsigned *found_index)
bool bactext_notify_type_index(const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_notify_type_names, search_name, found_index);
@@ -1892,14 +1892,14 @@ INDTEXT_DATA bacnet_event_transition_names[] = {
{ 0, NULL }
};
const char *bactext_event_transition_name(unsigned index)
const char *bactext_event_transition_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_event_transition_names, index, ASHRAE_Reserved_String);
}
bool bactext_event_transition_index(
const char *search_name, unsigned *found_index)
const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_event_transition_names, search_name, found_index);
@@ -1915,19 +1915,19 @@ INDTEXT_DATA bacnet_event_state_names[] = {
{ 0, NULL }
};
const char *bactext_event_state_name(unsigned index)
const char *bactext_event_state_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_event_state_names, index, ASHRAE_Reserved_String);
}
bool bactext_event_state_index(const char *search_name, unsigned *found_index)
bool bactext_event_state_index(const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_event_state_names, search_name, found_index);
}
bool bactext_event_state_strtol(const char *search_name, unsigned *found_index)
bool bactext_event_state_strtol(const char *search_name, uint32_t *found_index)
{
return bactext_strtoul_index(
bacnet_event_state_names, search_name, found_index);
@@ -1943,11 +1943,11 @@ INDTEXT_DATA bacnet_event_type_names[] = {
{ EVENT_CHANGE_OF_LIFE_SAFETY, "change-of-life-safety" },
{ EVENT_EXTENDED, "extended" },
{ EVENT_BUFFER_READY, "buffer-ready" },
{ EVENT_UNSIGNED_RANGE, "unsigned-range" },
{ EVENT_UNSIGNED_RANGE, "uint32_t-range" },
{ EVENT_ACCESS_EVENT, "access-event" },
{ EVENT_DOUBLE_OUT_OF_RANGE, "double-out-of-range" },
{ EVENT_SIGNED_OUT_OF_RANGE, "signed-out-of-range" },
{ EVENT_UNSIGNED_OUT_OF_RANGE, "unsigned-out-of-range" },
{ EVENT_UNSIGNED_OUT_OF_RANGE, "uint32_t-out-of-range" },
{ EVENT_CHANGE_OF_CHARACTERSTRING, "change-of-characterstring" },
{ EVENT_CHANGE_OF_STATUS_FLAGS, "change-of-status-flags" },
{ EVENT_CHANGE_OF_RELIABILITY, "change-of-reliability" },
@@ -1957,14 +1957,14 @@ INDTEXT_DATA bacnet_event_type_names[] = {
{ 0, NULL }
};
const char *bactext_event_type_name(unsigned index)
const char *bactext_event_type_name(uint32_t index)
{
return indtext_by_index_split_default(
bacnet_event_type_names, index, EVENT_PROPRIETARY_MIN,
ASHRAE_Reserved_String, Vendor_Proprietary_String);
}
bool bactext_event_type_index(const char *search_name, unsigned *found_index)
bool bactext_event_type_index(const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_event_type_names, search_name, found_index);
@@ -1974,14 +1974,14 @@ INDTEXT_DATA bacnet_binary_present_value_names[] = {
{ BINARY_INACTIVE, "inactive" }, { BINARY_ACTIVE, "active" }, { 0, NULL }
};
const char *bactext_binary_present_value_name(unsigned index)
const char *bactext_binary_present_value_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_binary_present_value_names, index, ASHRAE_Reserved_String);
}
bool bactext_binary_present_value_index(
const char *search_name, unsigned *found_index)
const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_binary_present_value_names, search_name, found_index);
@@ -1991,7 +1991,7 @@ INDTEXT_DATA bacnet_binary_polarity_names[] = { { POLARITY_NORMAL, "normal" },
{ POLARITY_REVERSE, "reverse" },
{ 0, NULL } };
const char *bactext_binary_polarity_name(unsigned index)
const char *bactext_binary_polarity_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_binary_polarity_names, index, ASHRAE_Reserved_String);
@@ -2028,7 +2028,7 @@ INDTEXT_DATA bacnet_reliability_names[] = {
{ 0, NULL }
};
const char *bactext_reliability_name(unsigned index)
const char *bactext_reliability_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_reliability_names, index, ASHRAE_Reserved_String);
@@ -2044,7 +2044,7 @@ INDTEXT_DATA bacnet_device_status_names[] = {
{ 0, NULL }
};
const char *bactext_device_status_name(unsigned index)
const char *bactext_device_status_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_device_status_names, index, ASHRAE_Reserved_String);
@@ -2058,13 +2058,13 @@ INDTEXT_DATA bacnet_segmentation_names[] = {
{ 0, NULL }
};
const char *bactext_segmentation_name(unsigned index)
const char *bactext_segmentation_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_segmentation_names, index, ASHRAE_Reserved_String);
}
bool bactext_segmentation_index(const char *search_name, unsigned *found_index)
bool bactext_segmentation_index(const char *search_name, uint32_t *found_index)
{
return indtext_by_istring(
bacnet_segmentation_names, search_name, found_index);
@@ -2096,7 +2096,7 @@ INDTEXT_DATA bacnet_node_type_names[] = {
{ 0, NULL }
};
const char *bactext_node_type_name(unsigned index)
const char *bactext_node_type_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_node_type_names, index, ASHRAE_Reserved_String);
@@ -2119,7 +2119,7 @@ INDTEXT_DATA network_layer_msg_names[] = {
{ 0, NULL }
};
const char *bactext_network_layer_msg_name(unsigned index)
const char *bactext_network_layer_msg_name(uint32_t index)
{
if (index <= 0x7F) {
return indtext_by_index_default(
@@ -2157,7 +2157,7 @@ INDTEXT_DATA bactext_life_safety_mode_names[] = {
{ 0, NULL }
};
const char *bactext_life_safety_mode_name(unsigned index)
const char *bactext_life_safety_mode_name(uint32_t index)
{
if (index < LIFE_SAFETY_MODE_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2183,7 +2183,7 @@ INDTEXT_DATA bactext_life_safety_operation_names[] = {
{ 0, NULL }
};
const char *bactext_life_safety_operation_name(unsigned index)
const char *bactext_life_safety_operation_name(uint32_t index)
{
if (index < LIFE_SAFETY_OP_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2234,7 +2234,7 @@ INDTEXT_DATA bactext_life_safety_state_names[] = {
{ 0, NULL }
};
const char *bactext_life_safety_state_name(unsigned index)
const char *bactext_life_safety_state_name(uint32_t index)
{
if (index < LIFE_SAFETY_STATE_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2254,7 +2254,7 @@ INDTEXT_DATA bactext_silenced_state_names[] = {
{ 0, NULL }
};
const char *bactext_silenced_state_name(unsigned index)
const char *bactext_silenced_state_name(uint32_t index)
{
if (index < SILENCED_STATE_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2276,7 +2276,7 @@ INDTEXT_DATA bacnet_lighting_in_progress_names[] = {
{ 0, NULL }
};
const char *bactext_lighting_in_progress(unsigned index)
const char *bactext_lighting_in_progress(uint32_t index)
{
if (index < MAX_BACNET_LIGHTING_IN_PROGRESS) {
return indtext_by_index_default(
@@ -2293,7 +2293,7 @@ INDTEXT_DATA bacnet_lighting_transition_names[] = {
{ 0, NULL }
};
const char *bactext_lighting_transition(unsigned index)
const char *bactext_lighting_transition(uint32_t index)
{
if (index < BACNET_LIGHTING_TRANSITION_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2324,7 +2324,7 @@ INDTEXT_DATA bacnet_lighting_operation_names[] = {
{ 0, NULL }
};
const char *bactext_lighting_operation_name(unsigned index)
const char *bactext_lighting_operation_name(uint32_t index)
{
if (index < BACNET_LIGHTS_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2337,7 +2337,7 @@ const char *bactext_lighting_operation_name(unsigned index)
}
bool bactext_lighting_operation_strtol(
const char *search_name, unsigned *found_index)
const char *search_name, uint32_t *found_index)
{
return bactext_strtoul_index(
bacnet_lighting_operation_names, search_name, found_index);
@@ -2354,7 +2354,7 @@ INDTEXT_DATA bacnet_binary_lighting_pv_names[] = {
{ 0, NULL }
};
const char *bactext_binary_lighting_pv_name(unsigned index)
const char *bactext_binary_lighting_pv_name(uint32_t index)
{
if (index < BINARY_LIGHTING_PV_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2367,7 +2367,7 @@ const char *bactext_binary_lighting_pv_name(unsigned index)
}
bool bactext_binary_lighting_pv_names_strtol(
const char *search_name, unsigned *found_index)
const char *search_name, uint32_t *found_index)
{
return bactext_strtoul_index(
bacnet_binary_lighting_pv_names, search_name, found_index);
@@ -2384,7 +2384,7 @@ INDTEXT_DATA bacnet_color_operation_names[] = {
{ 0, NULL }
};
const char *bactext_color_operation_name(unsigned index)
const char *bactext_color_operation_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_color_operation_names, index, ASHRAE_Reserved_String);
@@ -2397,7 +2397,7 @@ INDTEXT_DATA bacnet_device_communications_names[] = {
{ 0, NULL }
};
const char *bactext_device_communications_name(unsigned index)
const char *bactext_device_communications_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_device_communications_names, index, ASHRAE_Reserved_String);
@@ -2411,7 +2411,7 @@ INDTEXT_DATA bacnet_shed_state_names[] = {
{ 0, NULL }
};
const char *bactext_shed_state_name(unsigned index)
const char *bactext_shed_state_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_shed_state_names, index, ASHRAE_Reserved_String);
@@ -2424,7 +2424,7 @@ INDTEXT_DATA bacnet_shed_level_type_names[] = {
{ 0, NULL }
};
const char *bactext_shed_level_type_name(unsigned index)
const char *bactext_shed_level_type_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_shed_level_type_names, index, ASHRAE_Reserved_String);
@@ -2435,7 +2435,7 @@ INDTEXT_DATA bacnet_log_datum_names[] = {
{ BACNET_LOG_DATUM_BOOLEAN, "boolean" },
{ BACNET_LOG_DATUM_REAL, "real" },
{ BACNET_LOG_DATUM_ENUMERATED, "enumerated" },
{ BACNET_LOG_DATUM_UNSIGNED, "unsigned" },
{ BACNET_LOG_DATUM_UNSIGNED, "uint32_t" },
{ BACNET_LOG_DATUM_SIGNED, "signed" },
{ BACNET_LOG_DATUM_BITSTRING, "bitstring" },
{ BACNET_LOG_DATUM_NULL, "null" },
@@ -2445,7 +2445,7 @@ INDTEXT_DATA bacnet_log_datum_names[] = {
{ 0, NULL }
};
const char *bactext_log_datum_name(unsigned index)
const char *bactext_log_datum_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_log_datum_names, index, ASHRAE_Reserved_String);
@@ -2464,7 +2464,7 @@ INDTEXT_DATA bactext_restart_reason_names[] = {
{ 0, NULL }
};
const char *bactext_restart_reason_name(unsigned index)
const char *bactext_restart_reason_name(uint32_t index)
{
if (index < RESTART_REASON_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2493,7 +2493,7 @@ INDTEXT_DATA bactext_network_port_type_names[] = {
{ 0, NULL }
};
const char *bactext_network_port_type_name(unsigned index)
const char *bactext_network_port_type_name(uint32_t index)
{
if (index <= PORT_TYPE_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2513,7 +2513,7 @@ INDTEXT_DATA bactext_network_number_quality_names[] = {
{ 0, NULL }
};
const char *bactext_network_number_quality_name(unsigned index)
const char *bactext_network_number_quality_name(uint32_t index)
{
return indtext_by_index_default(
bactext_network_number_quality_names, index, ASHRAE_Reserved_String);
@@ -2527,7 +2527,7 @@ INDTEXT_DATA bactext_protocol_level_names[] = {
{ 0, NULL }
};
const char *bactext_protocol_level_name(unsigned index)
const char *bactext_protocol_level_name(uint32_t index)
{
return indtext_by_index_default(
bactext_protocol_level_names, index, ASHRAE_Reserved_String);
@@ -2548,7 +2548,7 @@ INDTEXT_DATA bactext_network_port_command_names[] = {
{ 0, NULL }
};
const char *bactext_network_port_command_name(unsigned index)
const char *bactext_network_port_command_name(uint32_t index)
{
if (index < PORT_COMMAND_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2567,7 +2567,7 @@ INDTEXT_DATA bactext_authentication_decision_names[] = {
{ 0, NULL }
};
const char *bactext_authentication_decision_name(unsigned index)
const char *bactext_authentication_decision_name(uint32_t index)
{
return indtext_by_index_default(
bactext_authentication_decision_names, index, ASHRAE_Reserved_String);
@@ -2583,7 +2583,7 @@ INDTEXT_DATA bactext_authorization_posture_names[] = {
{ 0, NULL }
};
const char *bactext_authorization_posture_name(unsigned index)
const char *bactext_authorization_posture_name(uint32_t index)
{
return indtext_by_index_default(
bactext_authorization_posture_names, index, ASHRAE_Reserved_String);
@@ -2601,7 +2601,7 @@ INDTEXT_DATA bactext_fault_type_names[] = {
{ 0, NULL }
};
const char *bactext_fault_type_name(unsigned index)
const char *bactext_fault_type_name(uint32_t index)
{
return indtext_by_index_default(
bactext_fault_type_names, index, ASHRAE_Reserved_String);
@@ -2628,7 +2628,7 @@ INDTEXT_DATA bacnet_priority_filter_names[] = {
{ 0, NULL }
};
const char *bacnet_priority_filter_name(unsigned index)
const char *bacnet_priority_filter_name(uint32_t index)
{
return indtext_by_index_default(
bacnet_priority_filter_names, index, ASHRAE_Reserved_String);
@@ -2641,7 +2641,7 @@ INDTEXT_DATA bactext_result_flags_names[] = {
{ 0, NULL }
};
const char *bactext_result_flags_name(unsigned index)
const char *bactext_result_flags_name(uint32_t index)
{
return indtext_by_index_default(
bactext_result_flags_names, index, ASHRAE_Reserved_String);
@@ -2654,7 +2654,7 @@ INDTEXT_DATA bactext_success_filter_names[] = {
{ 0, NULL }
};
const char *bactext_success_filter_name(unsigned index)
const char *bactext_success_filter_name(uint32_t index)
{
return indtext_by_index_default(
bactext_success_filter_names, index, ASHRAE_Reserved_String);
@@ -2668,7 +2668,7 @@ INDTEXT_DATA bactext_logging_type_names[] = {
{ 0, NULL }
};
const char *bactext_logging_type_name(unsigned index)
const char *bactext_logging_type_name(uint32_t index)
{
return indtext_by_index_default(
bactext_logging_type_names, index, ASHRAE_Reserved_String);
@@ -2684,7 +2684,7 @@ INDTEXT_DATA bactext_program_request_names[] = {
{ 0, NULL }
};
const char *bactext_program_request_name(unsigned index)
const char *bactext_program_request_name(uint32_t index)
{
return indtext_by_index_default(
bactext_program_request_names, index, ASHRAE_Reserved_String);
@@ -2701,7 +2701,7 @@ INDTEXT_DATA bactext_program_state_names[] = {
{ 0, NULL }
};
const char *bactext_program_state_name(unsigned index)
const char *bactext_program_state_name(uint32_t index)
{
return indtext_by_index_default(
bactext_program_state_names, index, ASHRAE_Reserved_String);
@@ -2717,7 +2717,7 @@ INDTEXT_DATA bactext_program_error_names[] = {
{ 0, NULL }
};
const char *bactext_program_error_name(unsigned index)
const char *bactext_program_error_name(uint32_t index)
{
if (index < PROGRAM_ERROR_PROPRIETARY_MIN) {
return indtext_by_index_default(
@@ -2737,7 +2737,7 @@ INDTEXT_DATA bactext_timer_state_names[] = {
{ 0, NULL }
};
const char *bactext_timer_state_name(unsigned index)
const char *bactext_timer_state_name(uint32_t index)
{
return indtext_by_index_default(
bactext_timer_state_names, index, ASHRAE_Reserved_String);
@@ -2756,7 +2756,7 @@ INDTEXT_DATA bactext_timer_transition_names[] = {
{ 0, NULL }
};
const char *bactext_timer_transition_name(unsigned index)
const char *bactext_timer_transition_name(uint32_t index)
{
return indtext_by_index_default(
bactext_timer_transition_names, index, ASHRAE_Reserved_String);
@@ -2776,7 +2776,7 @@ bool bactext_object_property_strtoul(
BACNET_OBJECT_TYPE object_type,
BACNET_PROPERTY_ID object_property,
const char *search_name,
unsigned *found_index)
uint32_t *found_index)
{
bool status = false;
src/bacnet/bactext.h
+79 -79
View File
@@ -25,194 +25,194 @@ extern "C" {
#endif /* __cplusplus */
BACNET_STACK_EXPORT
const char *bactext_confirmed_service_name(unsigned index);
const char *bactext_confirmed_service_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_unconfirmed_service_name(unsigned index);
const char *bactext_unconfirmed_service_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_application_tag_name(unsigned index);
const char *bactext_application_tag_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_application_tag_index(
const char *search_name, unsigned *found_index);
const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_object_type_name(unsigned index);
const char *bactext_object_type_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_object_type_name_capitalized(unsigned index);
const char *bactext_object_type_name_capitalized(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_object_type_index(const char *search_name, unsigned *found_index);
bool bactext_object_type_index(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
bool bactext_object_type_strtol(const char *search_name, unsigned *found_index);
bool bactext_object_type_strtol(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
bool bactext_property_name_proprietary(unsigned index);
bool bactext_property_name_proprietary(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_property_name(unsigned index);
const char *bactext_property_name(uint32_t index);
BACNET_STACK_EXPORT
const char *
bactext_property_name_default(unsigned index, const char *default_string);
bactext_property_name_default(uint32_t index, const char *default_string);
BACNET_STACK_EXPORT
bool bactext_property_index(const char *search_name, unsigned *found_index);
bool bactext_property_index(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
bool bactext_property_strtol(const char *search_name, unsigned *found_index);
bool bactext_property_strtol(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
bool bactext_engineering_unit_name_proprietary(unsigned index);
bool bactext_engineering_unit_name_proprietary(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_engineering_unit_name(unsigned index);
const char *bactext_engineering_unit_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_engineering_unit_index(
const char *search_name, unsigned *found_index);
const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_reject_reason_name(unsigned index);
const char *bactext_reject_reason_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_abort_reason_name(unsigned index);
const char *bactext_abort_reason_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_error_class_name(unsigned index);
const char *bactext_error_class_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_error_code_name(unsigned index);
const char *bactext_error_code_name(uint32_t index);
BACNET_STACK_EXPORT
unsigned bactext_property_id(const char *name);
uint32_t bactext_property_id(const char *name);
BACNET_STACK_EXPORT
const char *bactext_month_name(unsigned index);
const char *bactext_month_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_week_of_month_name(unsigned index);
const char *bactext_week_of_month_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_day_of_week_name(unsigned index);
const char *bactext_day_of_week_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_notify_type_name(unsigned index);
const char *bactext_notify_type_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_notify_type_index(const char *search_name, unsigned *found_index);
bool bactext_notify_type_index(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_event_state_name(unsigned index);
const char *bactext_event_state_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_event_state_index(const char *search_name, unsigned *found_index);
bool bactext_event_state_index(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
bool bactext_event_state_strtol(const char *search_name, unsigned *found_index);
bool bactext_event_state_strtol(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_event_type_name(unsigned index);
const char *bactext_event_type_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_event_type_index(const char *search_name, unsigned *found_index);
bool bactext_event_type_index(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_binary_present_value_name(unsigned index);
const char *bactext_binary_present_value_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_binary_polarity_name(unsigned index);
const char *bactext_binary_polarity_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_binary_present_value_index(
const char *search_name, unsigned *found_index);
const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_reliability_name(unsigned index);
const char *bactext_reliability_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_device_status_name(unsigned index);
const char *bactext_device_status_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_segmentation_name(unsigned index);
const char *bactext_segmentation_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_segmentation_index(const char *search_name, unsigned *found_index);
bool bactext_segmentation_index(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_node_type_name(unsigned index);
const char *bactext_node_type_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_character_string_encoding_name(unsigned index);
const char *bactext_character_string_encoding_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_event_transition_name(unsigned index);
const char *bactext_event_transition_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_event_transition_index(
const char *search_name, unsigned *found_index);
const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_days_of_week_name(unsigned index);
const char *bactext_days_of_week_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_days_of_week_index(const char *search_name, unsigned *found_index);
bool bactext_days_of_week_index(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_network_layer_msg_name(unsigned index);
const char *bactext_network_layer_msg_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_life_safety_mode_name(unsigned index);
const char *bactext_life_safety_mode_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_life_safety_operation_name(unsigned index);
const char *bactext_life_safety_operation_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_life_safety_state_name(unsigned index);
const char *bactext_life_safety_state_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_silenced_state_name(unsigned index);
const char *bactext_silenced_state_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_device_communications_name(unsigned index);
const char *bactext_device_communications_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_lighting_operation_name(unsigned index);
const char *bactext_lighting_operation_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_lighting_operation_strtol(
const char *search_name, unsigned *found_index);
const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_binary_lighting_pv_name(unsigned index);
const char *bactext_binary_lighting_pv_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_binary_lighting_pv_names_strtol(
const char *search_name, unsigned *found_index);
const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
const char *bactext_lighting_in_progress(unsigned index);
const char *bactext_lighting_in_progress(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_lighting_transition(unsigned index);
const char *bactext_lighting_transition(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_color_operation_name(unsigned index);
const char *bactext_color_operation_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_shed_state_name(unsigned index);
const char *bactext_shed_state_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_shed_level_type_name(unsigned index);
const char *bactext_shed_level_type_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_log_datum_name(unsigned index);
const char *bactext_log_datum_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_restart_reason_name(unsigned index);
const char *bactext_restart_reason_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_network_port_type_name(unsigned index);
const char *bactext_network_port_type_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_network_number_quality_name(unsigned index);
const char *bactext_network_number_quality_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_protocol_level_name(unsigned index);
const char *bactext_protocol_level_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_network_port_command_name(unsigned index);
const char *bactext_network_port_command_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_authentication_decision_name(unsigned index);
const char *bactext_authentication_decision_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_authorization_posture_name(unsigned index);
const char *bactext_authorization_posture_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_fault_type_name(unsigned index);
const char *bactext_fault_type_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bacnet_priority_filter_name(unsigned index);
const char *bacnet_priority_filter_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_success_filter_name(unsigned index);
const char *bactext_success_filter_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_result_flags_name(unsigned index);
const char *bactext_result_flags_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_logging_type_name(unsigned index);
const char *bactext_logging_type_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_program_request_name(unsigned index);
const char *bactext_program_request_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_program_state_name(unsigned index);
const char *bactext_program_state_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_program_error_name(unsigned index);
const char *bactext_program_error_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_timer_transition_name(unsigned index);
const char *bactext_timer_transition_name(uint32_t index);
BACNET_STACK_EXPORT
const char *bactext_timer_state_name(unsigned index);
const char *bactext_timer_state_name(uint32_t index);
BACNET_STACK_EXPORT
bool bactext_strtoul(const char *search_name, unsigned *found_index);
bool bactext_strtoul(const char *search_name, uint32_t *found_index);
BACNET_STACK_EXPORT
bool bactext_object_property_strtoul(
BACNET_OBJECT_TYPE object_type,
BACNET_PROPERTY_ID object_property,
const char *search_name,
unsigned *found_index);
uint32_t *found_index);
#ifdef __cplusplus
}
src/bacnet/basic/object/acc.c
+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);
src/bacnet/basic/server/bacnet_device.c
+6 -4
View File
@@ -995,7 +995,7 @@ void Device_Objects_Property_List(
}
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Device_Properties_Required[] = {
static const int32_t Device_Properties_Required[] = {
/* List of Required properties in this object */
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
@@ -1020,7 +1020,7 @@ static const int Device_Properties_Required[] = {
-1
};
static const int Device_Properties_Optional[] = {
static const int32_t Device_Properties_Optional[] = {
/* List of Optional properties in this object */
#if defined(BACDL_MSTP)
PROP_MAX_MASTER,
@@ -1046,7 +1046,7 @@ static const int Device_Properties_Optional[] = {
-1
};
static const int Device_Properties_Proprietary[] = {
static const int32_t Device_Properties_Proprietary[] = {
/* List of Proprietary properties in this object */
-1
};
@@ -1063,7 +1063,9 @@ static const int Device_Properties_Proprietary[] = {
* @ingroup ObjIntf
*/
void Device_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary)
{
if (pRequired) {
*pRequired = Device_Properties_Required;
src/bacnet/indtext.c
+16 -16
View File
@@ -20,10 +20,10 @@
* @return true if the string is found
*/
bool indtext_by_string(
INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index)
INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index)
{
bool found = false;
unsigned index = 0;
uint32_t index = 0;
if (data_list && search_name) {
while (data_list->pString) {
@@ -51,10 +51,10 @@ bool indtext_by_string(
* @return true if the string is found
*/
bool indtext_by_istring(
INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index)
INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index)
{
bool found = false;
unsigned index = 0;
uint32_t index = 0;
if (data_list && search_name) {
while (data_list->pString) {
@@ -82,10 +82,10 @@ bool indtext_by_istring(
* @param default_index - index to return if the string is not found
* @return index of the string found, or the default index
*/
unsigned indtext_by_string_default(
INDTEXT_DATA *data_list, const char *search_name, unsigned default_index)
uint32_t indtext_by_string_default(
INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index)
{
unsigned index = 0;
uint32_t index = 0;
if (!indtext_by_string(data_list, search_name, &index)) {
index = default_index;
@@ -102,10 +102,10 @@ unsigned indtext_by_string_default(
* @param default_index - index to return if the string is not found
* @return index of the string found, or the default index
*/
unsigned indtext_by_istring_default(
INDTEXT_DATA *data_list, const char *search_name, unsigned default_index)
uint32_t indtext_by_istring_default(
INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index)
{
unsigned index = 0;
uint32_t index = 0;
if (!indtext_by_istring(data_list, search_name, &index)) {
index = default_index;
@@ -121,7 +121,7 @@ unsigned indtext_by_istring_default(
* @return the string found, or NULL if not found
*/
const char *indtext_by_index_default(
INDTEXT_DATA *data_list, unsigned index, const char *default_string)
INDTEXT_DATA *data_list, uint32_t index, const char *default_string)
{
const char *pString = NULL;
@@ -149,8 +149,8 @@ const char *indtext_by_index_default(
*/
const char *indtext_by_index_split_default(
INDTEXT_DATA *data_list,
unsigned index,
unsigned split_index,
uint32_t index,
uint32_t split_index,
const char *before_split_default_name,
const char *default_name)
{
@@ -168,7 +168,7 @@ const char *indtext_by_index_split_default(
* @param index - index to search for
* @return the string found, or NULL if not found
*/
const char *indtext_by_index(INDTEXT_DATA *data_list, unsigned index)
const char *indtext_by_index(INDTEXT_DATA *data_list, uint32_t index)
{
return indtext_by_index_default(data_list, index, NULL);
}
@@ -178,9 +178,9 @@ const char *indtext_by_index(INDTEXT_DATA *data_list, unsigned index)
* @param data_list - list of strings and indices
* @return the number of elements in the list
*/
unsigned indtext_count(INDTEXT_DATA *data_list)
uint32_t indtext_count(INDTEXT_DATA *data_list)
{
unsigned count = 0; /* return value */
uint32_t count = 0; /* return value */
if (data_list) {
while (data_list->pString) {
src/bacnet/indtext.h
+12 -12
View File
@@ -16,7 +16,7 @@
/* index and text pairs */
typedef const struct {
const unsigned index; /* index number that matches the text */
const uint32_t index; /* index number that matches the text */
const char *pString; /* text pair - use NULL to end the list */
} INDTEXT_DATA;
@@ -31,29 +31,29 @@ extern "C" {
the first index where the string was found. */
BACNET_STACK_EXPORT
bool indtext_by_string(
INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index);
INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index);
/* case insensitive version */
BACNET_STACK_EXPORT
bool indtext_by_istring(
INDTEXT_DATA *data_list, const char *search_name, unsigned *found_index);
INDTEXT_DATA *data_list, const char *search_name, uint32_t *found_index);
/* Searches for a matching string and returns the index to the string
or the default_index if the string is not found. */
BACNET_STACK_EXPORT
unsigned indtext_by_string_default(
INDTEXT_DATA *data_list, const char *search_name, unsigned default_index);
uint32_t indtext_by_string_default(
INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index);
/* case insensitive version */
BACNET_STACK_EXPORT
unsigned indtext_by_istring_default(
INDTEXT_DATA *data_list, const char *search_name, unsigned default_index);
uint32_t indtext_by_istring_default(
INDTEXT_DATA *data_list, const char *search_name, uint32_t default_index);
/* for a given index, return the matching string,
or NULL if not found */
BACNET_STACK_EXPORT
const char *indtext_by_index(INDTEXT_DATA *data_list, unsigned index);
const char *indtext_by_index(INDTEXT_DATA *data_list, uint32_t index);
/* for a given index, return the matching string,
or default_name if not found */
BACNET_STACK_EXPORT
const char *indtext_by_index_default(
INDTEXT_DATA *data_list, unsigned index, const char *default_name);
INDTEXT_DATA *data_list, uint32_t index, const char *default_name);
/* for a given index, return the matching string,
or default_name if not found.
if the index is before the split,
@@ -61,14 +61,14 @@ const char *indtext_by_index_default(
BACNET_STACK_EXPORT
const char *indtext_by_index_split_default(
INDTEXT_DATA *data_list,
unsigned index,
unsigned split_index,
uint32_t index,
uint32_t split_index,
const char *before_split_default_name,
const char *default_name);
/* returns the number of elements in the list */
BACNET_STACK_EXPORT
unsigned indtext_count(INDTEXT_DATA *data_list);
uint32_t indtext_count(INDTEXT_DATA *data_list);
#ifdef __cplusplus
}
src/bacnet/property.c
+141 -141
View File
File diff suppressed because it is too large Load Diff
src/bacnet/property.h
+4 -4
View File
@@ -21,9 +21,9 @@ extern "C" {
#endif /* __cplusplus */
BACNET_STACK_EXPORT
const int *property_list_optional(BACNET_OBJECT_TYPE object_type);
const int32_t *property_list_optional(BACNET_OBJECT_TYPE object_type);
BACNET_STACK_EXPORT
const int *property_list_required(BACNET_OBJECT_TYPE object_type);
const int32_t *property_list_required(BACNET_OBJECT_TYPE object_type);
BACNET_STACK_EXPORT
void property_list_special(
BACNET_OBJECT_TYPE object_type,
@@ -32,9 +32,9 @@ BACNET_STACK_EXPORT
BACNET_PROPERTY_ID property_list_special_property(
BACNET_OBJECT_TYPE object_type,
BACNET_PROPERTY_ID special_property,
unsigned index);
uint32_t index);
BACNET_STACK_EXPORT
unsigned property_list_special_count(
uint32_t property_list_special_count(
BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID special_property);
BACNET_STACK_EXPORT
bool property_list_writable_member(
src/bacnet/proplist.c
+28 -25
View File
@@ -17,12 +17,12 @@
/**
* Function that returns the number of BACnet object properties in a list
*
* @param pList - array of type 'int' that is a list of BACnet object
* @param pList - array of type 'int32_t' that is a list of BACnet object
* properties, terminated by a '-1' value.
*/
unsigned property_list_count(const int *pList)
uint32_t property_list_count(const int32_t *pList)
{
unsigned property_count = 0;
uint32_t property_count = 0;
if (pList) {
while (*pList != -1) {
@@ -37,12 +37,12 @@ unsigned property_list_count(const int *pList)
/**
* For a given object property, returns the true if in the property list
*
* @param pList - array of type 'int' that is a list of BACnet object
* @param pList - array of type 'int32_t' that is a list of BACnet object
* @param object_property - property enumeration or propritary value
*
* @return true if object_property is a member of the property list
*/
bool property_list_member(const int *pList, int object_property)
bool property_list_member(const int32_t *pList, int32_t object_property)
{
bool status = false;
@@ -61,17 +61,20 @@ bool property_list_member(const int *pList, int object_property)
/**
* @brief Determine if the object property is a member of any of the lists
* @param pRequired - array of type 'int' that is a list of BACnet properties
* @param pOptional - array of type 'int' that is a list of BACnet properties
* @param pProprietary - array of type 'int' that is a list of BACnet properties
* @param pRequired - array of type 'int32_t' that is a list of BACnet
* properties
* @param pOptional - array of type 'int32_t' that is a list of BACnet
* properties
* @param pProprietary - array of type 'int32_t' that is a list of BACnet
* properties
* @param object_property - object-property to be checked
* @return true if the property is a member of any of these lists
*/
bool property_lists_member(
const int *pRequired,
const int *pOptional,
const int *pProprietary,
int object_property)
const int32_t *pRequired,
const int32_t *pOptional,
const int32_t *pProprietary,
int32_t object_property)
{
bool found = false;
@@ -98,19 +101,19 @@ bool property_lists_member(
*/
int property_list_encode(
BACNET_READ_PROPERTY_DATA *rpdata,
const int *pListRequired,
const int *pListOptional,
const int *pListProprietary)
const int32_t *pListRequired,
const int32_t *pListOptional,
const int32_t *pListProprietary)
{
int apdu_len = 0; /* return value */
uint8_t *apdu = NULL;
int max_apdu_len = 0;
uint32_t count = 0;
unsigned required_count = 0;
unsigned optional_count = 0;
unsigned proprietary_count = 0;
uint32_t required_count = 0;
uint32_t optional_count = 0;
uint32_t proprietary_count = 0;
int len = 0;
unsigned i = 0; /* loop index */
uint32_t i = 0; /* loop index */
required_count = property_list_count(pListRequired);
optional_count = property_list_count(pListOptional);
@@ -323,7 +326,7 @@ bool property_list_common(BACNET_PROPERTY_ID property)
/* standard properties that are arrays
but not required to be supported in every object */
static const int Properties_BACnetARRAY[] = {
static const int32_t Properties_BACnetARRAY[] = {
/* unordered list of properties */
PROP_OBJECT_LIST,
PROP_STRUCTURED_OBJECT_LIST,
@@ -391,10 +394,10 @@ static const int Properties_BACnetARRAY[] = {
*
* @param object_type - enumerated BACNET_OBJECT_TYPE
* @return returns a pointer to a '-1' terminated array of
* type 'int' that contain BACnet object properties for the given object
* type 'int32_t' that contain BACnet object properties for the given object
* type.
*/
const int *property_list_bacnet_array(void)
const int32_t *property_list_bacnet_array(void)
{
return Properties_BACnetARRAY;
}
@@ -448,7 +451,7 @@ bool property_list_bacnet_array_member(
}
/* standard properties that are BACnetLIST */
static const int Properties_BACnetLIST[] = {
static const int32_t Properties_BACnetLIST[] = {
/* unordered list of properties */
PROP_DATE_LIST,
PROP_VT_CLASSES_SUPPORTED,
@@ -499,10 +502,10 @@ static const int Properties_BACnetLIST[] = {
*
* @param object_type - enumerated BACNET_OBJECT_TYPE
* @return returns a pointer to a '-1' terminated array of
* type 'int' that contain BACnet object properties for the given object
* type 'int32_t' that contain BACnet object properties for the given object
* type.
*/
const int *property_list_bacnet_list(void)
const int32_t *property_list_bacnet_list(void)
{
return Properties_BACnetLIST;
}
src/bacnet/proplist.h
+13 -13
View File
@@ -16,8 +16,8 @@
#include "bacnet/rp.h"
struct property_list_t {
const int *pList;
unsigned count;
const int32_t *pList;
uint32_t count;
};
struct special_property_list_t {
@@ -31,21 +31,21 @@ extern "C" {
#endif /* __cplusplus */
BACNET_STACK_EXPORT
unsigned property_list_count(const int *pList);
uint32_t property_list_count(const int32_t *pList);
BACNET_STACK_EXPORT
bool property_list_member(const int *pList, int object_property);
bool property_list_member(const int32_t *pList, int32_t object_property);
BACNET_STACK_EXPORT
bool property_lists_member(
const int *pRequired,
const int *pOptional,
const int *pProprietary,
int object_property);
const int32_t *pRequired,
const int32_t *pOptional,
const int32_t *pProprietary,
int32_t object_property);
BACNET_STACK_EXPORT
int property_list_encode(
BACNET_READ_PROPERTY_DATA *rpdata,
const int *pListRequired,
const int *pListOptional,
const int *pListProprietary);
const int32_t *pListRequired,
const int32_t *pListOptional,
const int32_t *pListProprietary);
BACNET_STACK_EXPORT
int property_list_common_encode(
BACNET_READ_PROPERTY_DATA *rpdata, uint32_t device_instance_number);
@@ -53,12 +53,12 @@ BACNET_STACK_EXPORT
bool property_list_common(BACNET_PROPERTY_ID property);
BACNET_STACK_EXPORT
const int *property_list_bacnet_array(void);
const int32_t *property_list_bacnet_array(void);
BACNET_STACK_EXPORT
bool property_list_bacnet_array_member(
BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property);
BACNET_STACK_EXPORT
const int *property_list_bacnet_list(void);
const int32_t *property_list_bacnet_list(void);
BACNET_STACK_EXPORT
bool property_list_bacnet_list_member(
BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property);
src/bacnet/rpm.h
+3 -1
View File
@@ -51,7 +51,9 @@ typedef struct BACnet_Read_Access_Data {
* properties for this BACNET_OBJECT_TYPE.
*/
typedef void (*rpm_property_lists_function)(
const int **pRequired, const int **pOptional, const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
typedef void (*rpm_object_property_lists_function)(
BACNET_OBJECT_TYPE object_type,