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

Removed wildcard match for Device Instance since it is only done for ReadProperty and ReadPropertyMultiple services, and the match is done by substitution in those service handlers.

Browse Source
This commit is contained in:
skarg
2012-07-09 21:52:19 +00:00
parent 7578b4ef06
commit b6b852ef08
11 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/device-client.c
+1 -3
View File
@@ -209,9 +209,7 @@ bool Device_Set_Object_Instance_Number(
bool Device_Valid_Object_Instance_Number(
uint32_t object_id)
{
/* BACnet allows for a wildcard instance number */
return ((Object_Instance_Number == object_id) ||
(object_id == BACNET_MAX_INSTANCE));
return (Object_Instance_Number == object_id);
}
bool Device_Object_Name(
bacnet-stack/demo/object/device.c
+1 -3
View File
@@ -661,9 +661,7 @@ bool Device_Set_Object_Instance_Number(
bool Device_Valid_Object_Instance_Number(
uint32_t object_id)
{
/* BACnet allows for a wildcard instance number */
return ((Object_Instance_Number == object_id) ||
(object_id == BACNET_MAX_INSTANCE));
return (Object_Instance_Number == object_id);
}
bool Device_Object_Name(
bacnet-stack/demo/object/gw_device.c
+2 -3
View File
@@ -393,11 +393,10 @@ bool Routed_Device_Valid_Object_Instance_Number(
{
bool bResult = false;
DEVICE_OBJECT_DATA *pDev = &Devices[iCurrent_Device_Idx];
/* BACnet allows for a wildcard instance number */
if (object_id == BACNET_MAX_INSTANCE)
bResult = true;
if (pDev->bacObj.Object_Instance_Number == object_id)
bResult = true;
return bResult;
}