From 8d557718d265d7a05c76d437f6b46cc0be0feaee Mon Sep 17 00:00:00 2001 From: skarg Date: Wed, 6 Jun 2007 00:17:59 +0000 Subject: [PATCH] --- bacnet-stack/demo/object/device.c | 3 +++ bacnet-stack/ports/pic18f6720/device.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c index 7ac7d35d..fa542d92 100644 --- a/bacnet-stack/demo/object/device.c +++ b/bacnet-stack/demo/object/device.c @@ -130,6 +130,9 @@ bool Device_Set_Object_Name(const char *name, size_t length) { bool status = false; /*return value */ + /* FIXME: All the object names in a device must be unique. + Disallow setting the Device Object Name to any objects in + the device. */ if (length < sizeof(Object_Name)) { memmove(Object_Name, name, length); Object_Name[length] = 0; diff --git a/bacnet-stack/ports/pic18f6720/device.c b/bacnet-stack/ports/pic18f6720/device.c index 248527a2..3780805a 100644 --- a/bacnet-stack/ports/pic18f6720/device.c +++ b/bacnet-stack/ports/pic18f6720/device.c @@ -538,8 +538,10 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, if (len <= 20) { /* FIXME: set the name */ /* Display_Set_Name( - characterstring_value(&value.type.Character_String)); */ - + characterstring_value(&value.type.Character_String)); */ + /* FIXME: All the object names in a device must be unique. + Disallow setting the Device Object Name to any objects in + the device. */ } else { *error_class = ERROR_CLASS_PROPERTY; *error_code = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY;