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.

2012-07-09 21:52:19 +00:00
parent 7578b4ef06
commit b6b852ef08
11 changed files with 18 additions and 25 deletions
@@ -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;
 }