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

Corrected return value of WriteProperty in device object.

Browse Source
This commit is contained in:
skarg
2010-04-28 17:35:23 +00:00
parent e261490f61
commit 69e1121d66
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/at91sam7s/device.c
+3 -3
View File
@@ -216,7 +216,7 @@ int Device_Read_Property(
bool Device_Write_Property( bool Device_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data) BACNET_WRITE_PROPERTY_DATA * wp_data)
{ {
int apdu_len = -1; bool status = false;
unsigned index = 0; unsigned index = 0;
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
bool found = false; bool found = false;
@@ -232,7 +232,7 @@ bool Device_Write_Property(
if (pObject->Object_Valid_Instance && if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(wp_data->object_instance)) { pObject->Object_Valid_Instance(wp_data->object_instance)) {
if (pObject->Object_Write_Property) { if (pObject->Object_Write_Property) {
apdu_len = pObject->Object_Write_Property(wp_data); status = pObject->Object_Write_Property(wp_data);
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED; wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
@@ -251,7 +251,7 @@ bool Device_Write_Property(
wp_data->error_code = ERROR_CODE_UNSUPPORTED_OBJECT_TYPE; wp_data->error_code = ERROR_CODE_UNSUPPORTED_OBJECT_TYPE;
} }
return apdu_len; return status;
} }
static unsigned property_list_count( static unsigned property_list_count(
bacnet-stack/ports/bdk-atxx4-mstp/device.c
+4 -4
View File
@@ -254,7 +254,7 @@ int Device_Read_Property(
bool Device_Write_Property( bool Device_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data) BACNET_WRITE_PROPERTY_DATA * wp_data)
{ {
int apdu_len = -1; bool status = false;
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
/* initialize the default return values */ /* initialize the default return values */
@@ -263,7 +263,7 @@ bool Device_Write_Property(
if (pObject->Object_Valid_Instance && if (pObject->Object_Valid_Instance &&
pObject->Object_Valid_Instance(wp_data->object_instance)) { pObject->Object_Valid_Instance(wp_data->object_instance)) {
if (pObject->Object_Write_Property) { if (pObject->Object_Write_Property) {
apdu_len = pObject->Object_Write_Property(wp_data); status = pObject->Object_Write_Property(wp_data);
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED; wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
@@ -277,7 +277,7 @@ bool Device_Write_Property(
wp_data->error_code = ERROR_CODE_UNSUPPORTED_OBJECT_TYPE; wp_data->error_code = ERROR_CODE_UNSUPPORTED_OBJECT_TYPE;
} }
return apdu_len; return status;
} }
static unsigned property_list_count( static unsigned property_list_count(
@@ -817,7 +817,7 @@ int Device_Read_Property_Local(
bool Device_Write_Property_Local( bool Device_Write_Property_Local(
BACNET_WRITE_PROPERTY_DATA * wp_data) BACNET_WRITE_PROPERTY_DATA * wp_data)
{ {
bool status = false; /* return value */ bool status = false; /* return value - false=error */
int len = 0; int len = 0;
BACNET_APPLICATION_DATA_VALUE value; BACNET_APPLICATION_DATA_VALUE value;