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

Resolve AV_Descr naming conflict for Analog Value and OctetString Value. (#12)

Browse Source
This commit is contained in:
Geert Linders
2020-01-15 06:19:33 +01:00
committed by Steve Karg
parent 5a7049557b
commit 284f009a05
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/osv.c
+7 -7
View File
@@ -44,7 +44,7 @@
#define MAX_OCTETSTRING_VALUES 4 #define MAX_OCTETSTRING_VALUES 4
#endif #endif
OCTETSTRING_VALUE_DESCR AV_Descr[MAX_OCTETSTRING_VALUES]; OCTETSTRING_VALUE_DESCR OSV_Descr[MAX_OCTETSTRING_VALUES];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int OctetString_Value_Properties_Required[] = { static const int OctetString_Value_Properties_Required[] = {
@@ -78,8 +78,8 @@ void OctetString_Value_Init(void)
unsigned i; unsigned i;
for (i = 0; i < MAX_OCTETSTRING_VALUES; i++) { for (i = 0; i < MAX_OCTETSTRING_VALUES; i++) {
memset(&AV_Descr[i], 0x00, sizeof(OCTETSTRING_VALUE_DESCR)); memset(&OSV_Descr[i], 0x00, sizeof(OCTETSTRING_VALUE_DESCR));
octetstring_init(&AV_Descr[i].Present_Value, NULL, 0); octetstring_init(&OSV_Descr[i].Present_Value, NULL, 0);
} }
} }
@@ -142,7 +142,7 @@ bool OctetString_Value_Present_Value_Set(
index = OctetString_Value_Instance_To_Index(object_instance); index = OctetString_Value_Instance_To_Index(object_instance);
if (index < MAX_OCTETSTRING_VALUES) { if (index < MAX_OCTETSTRING_VALUES) {
octetstring_copy(&AV_Descr[index].Present_Value, value); octetstring_copy(&OSV_Descr[index].Present_Value, value);
status = true; status = true;
} }
return status; return status;
@@ -155,7 +155,7 @@ BACNET_OCTET_STRING *OctetString_Value_Present_Value(uint32_t object_instance)
index = OctetString_Value_Instance_To_Index(object_instance); index = OctetString_Value_Instance_To_Index(object_instance);
if (index < MAX_OCTETSTRING_VALUES) { if (index < MAX_OCTETSTRING_VALUES) {
value = &AV_Descr[index].Present_Value; value = &OSV_Descr[index].Present_Value;
} }
return value; return value;
@@ -198,7 +198,7 @@ int OctetString_Value_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
object_index = OctetString_Value_Instance_To_Index(rpdata->object_instance); object_index = OctetString_Value_Instance_To_Index(rpdata->object_instance);
if (object_index < MAX_OCTETSTRING_VALUES) { if (object_index < MAX_OCTETSTRING_VALUES) {
CurrentAV = &AV_Descr[object_index]; CurrentAV = &OSV_Descr[object_index];
} else { } else {
return BACNET_STATUS_ERROR; return BACNET_STATUS_ERROR;
} }
@@ -296,7 +296,7 @@ bool OctetString_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
object_index = object_index =
OctetString_Value_Instance_To_Index(wp_data->object_instance); OctetString_Value_Instance_To_Index(wp_data->object_instance);
if (object_index < MAX_OCTETSTRING_VALUES) { if (object_index < MAX_OCTETSTRING_VALUES) {
CurrentAV = &AV_Descr[object_index]; CurrentAV = &OSV_Descr[object_index];
} else { } else {
return false; return false;
} }