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

Updated demo objects in ports to use new named constants for error return values.

Browse Source
This commit is contained in:
skarg
2010-06-12 23:24:01 +00:00
parent 805717179a
commit 8bb844de36
10 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/at91sam7s/ai.c
+2 -2
View File
@@ -200,14 +200,14 @@ int Analog_Input_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) { if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
bacnet-stack/ports/at91sam7s/av.c
+8 -8
View File
@@ -271,7 +271,7 @@ int Analog_Value_Read_Property(
else { else {
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
} }
@@ -291,7 +291,7 @@ int Analog_Value_Read_Property(
} else { } else {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX; rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
} }
@@ -304,7 +304,7 @@ int Analog_Value_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
@@ -315,7 +315,7 @@ int Analog_Value_Read_Property(
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
@@ -361,8 +361,8 @@ bool Analog_Value_Write_Property(
Present_Value[object_index] = level; Present_Value[object_index] = level;
/* Note: you could set the physical output here if we /* Note: you could set the physical output here if we
are the highest priority. are the highest priority.
However, if Out of Service is TRUE, then don't set the However, if Out of Service is TRUE, then don't set the
physical output. This comment may apply to the physical output. This comment may apply to the
main loop (i.e. check out of service before changing output) */ main loop (i.e. check out of service before changing output) */
status = true; status = true;
} else if (priority == 6) { } else if (priority == 6) {
@@ -387,8 +387,8 @@ bool Analog_Value_Write_Property(
/* Note: you could set the physical output here to the next /* Note: you could set the physical output here to the next
highest priority, or to the relinquish default if no highest priority, or to the relinquish default if no
priorities are set. priorities are set.
However, if Out of Service is TRUE, then don't set the However, if Out of Service is TRUE, then don't set the
physical output. This comment may apply to the physical output. This comment may apply to the
main loop (i.e. check out of service before changing output) */ main loop (i.e. check out of service before changing output) */
status = true; status = true;
} else { } else {
bacnet-stack/ports/at91sam7s/bi.c
+2 -2
View File
@@ -219,14 +219,14 @@ int Binary_Input_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) { if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
bacnet-stack/ports/at91sam7s/bv.c
+3 -3
View File
@@ -217,14 +217,14 @@ int Binary_Value_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) { if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
@@ -272,7 +272,7 @@ bool Binary_Value_Write_Property(
Present_Value[object_index] = level; Present_Value[object_index] = level;
/* Note: you could set the physical output here if we /* Note: you could set the physical output here if we
are the highest priority. are the highest priority.
However, if Out of Service is TRUE, then don't set the However, if Out of Service is TRUE, then don't set the
physical output. */ physical output. */
status = true; status = true;
} else if (priority == 6) { } else if (priority == 6) {
bacnet-stack/ports/at91sam7s/device.c
+6 -6
View File
@@ -152,7 +152,7 @@ void Device_Property_Lists(
int Device_Read_Property( int Device_Read_Property(
BACNET_READ_PROPERTY_DATA * rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = -1; int apdu_len = BACNET_STATUS_ERROR;
unsigned index = 0; unsigned index = 0;
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
bool found = false; bool found = false;
@@ -705,14 +705,14 @@ int Device_Read_Property_Local(
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = rpdata->error_code =
ERROR_CODE_NO_SPACE_FOR_OBJECT; ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
} else { } else {
/* error: internal error? */ /* error: internal error? */
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = ERROR_CODE_OTHER; rpdata->error_code = ERROR_CODE_OTHER;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
} }
@@ -725,7 +725,7 @@ int Device_Read_Property_Local(
else { else {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX; rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
} }
break; break;
@@ -792,7 +792,7 @@ int Device_Read_Property_Local(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
@@ -800,7 +800,7 @@ int Device_Read_Property_Local(
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
bacnet-stack/ports/bdk-atxx4-mstp/ai.c
+3 -3
View File
@@ -39,7 +39,7 @@
#define MAX_ANALOG_INPUTS 2 #define MAX_ANALOG_INPUTS 2
#endif #endif
static uint8_t Present_Value[MAX_ANALOG_INPUTS]; static float Present_Value[MAX_ANALOG_INPUTS];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Analog_Input_Properties_Required[] = { static const int Analog_Input_Properties_Required[] = {
@@ -185,14 +185,14 @@ int Analog_Input_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) { if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
bacnet-stack/ports/bdk-atxx4-mstp/av.c
+6 -6
View File
@@ -169,8 +169,8 @@ bool Analog_Value_Present_Value_Set(
Present_Value[index] = value; Present_Value[index] = value;
/* Note: you could set the physical output here if we /* Note: you could set the physical output here if we
are the highest priority. are the highest priority.
However, if Out of Service is TRUE, then don't set the However, if Out of Service is TRUE, then don't set the
physical output. This comment may apply to the physical output. This comment may apply to the
main loop (i.e. check out of service before changing output) */ main loop (i.e. check out of service before changing output) */
status = true; status = true;
} }
@@ -268,7 +268,7 @@ int Analog_Value_Read_Property(
else { else {
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
} }
@@ -289,7 +289,7 @@ int Analog_Value_Read_Property(
} else { } else {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX; rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
} }
@@ -302,7 +302,7 @@ int Analog_Value_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
@@ -313,7 +313,7 @@ int Analog_Value_Read_Property(
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
bacnet-stack/ports/bdk-atxx4-mstp/bi.c
+2 -2
View File
@@ -215,14 +215,14 @@ int Binary_Input_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) { if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
bacnet-stack/ports/bdk-atxx4-mstp/bo.c
+4 -4
View File
@@ -336,7 +336,7 @@ int Binary_Output_Read_Property(
else { else {
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
} }
@@ -357,7 +357,7 @@ int Binary_Output_Read_Property(
} else { } else {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX; rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
} }
break; break;
@@ -378,7 +378,7 @@ int Binary_Output_Read_Property(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
@@ -386,7 +386,7 @@ int Binary_Output_Read_Property(
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
return apdu_len; return apdu_len;
bacnet-stack/ports/bdk-atxx4-mstp/device.c
+5 -5
View File
@@ -203,7 +203,7 @@ static int Read_Property_Common(
int Device_Read_Property( int Device_Read_Property(
BACNET_READ_PROPERTY_DATA * rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = -1; int apdu_len = BACNET_STATUS_ERROR;
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
/* initialize the default return values */ /* initialize the default return values */
@@ -700,14 +700,14 @@ int Device_Read_Property_Local(
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = rpdata->error_code =
ERROR_CODE_NO_SPACE_FOR_OBJECT; ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
} else { } else {
/* error: internal error? */ /* error: internal error? */
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = ERROR_CODE_OTHER; rpdata->error_code = ERROR_CODE_OTHER;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
} }
@@ -720,7 +720,7 @@ int Device_Read_Property_Local(
else { else {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX; rpdata->error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
} }
} }
break; break;
@@ -768,7 +768,7 @@ int Device_Read_Property_Local(
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
apdu_len = -1; apdu_len = BACNET_STATUS_ERROR;
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */