From David Richards:

numerous changes, most notably:

1) BACnetStatusFlags is bit string, not enum, in NotificationParameters
2) Fixes many places where enclosing context tags were not handled properly.
3) Simplify tag decoding logic.  Change to explicit decoding in many 
instances rather
    than read tags in a loop and do a switch based on tag number.  Looping
    ignores out-of-order and other types of tagging errors.

svn path=/trunk/; revision=19410

1 files changed, 0 insertions, 15 deletions

diff --git a/epan/dissectors/packet-bacapp.h b/epan/dissectors/packet-bacapp.h
index ee9c836cde..9e482fb3b0 100644
--- a/epan/dissectors/packet-bacapp.h
+++ b/epan/dissectors/packet-bacapp.h
@@ -1483,7 +1483,6 @@ static guint
 fDeviceObjectPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
 #endif
 
-#if 0
 /**
  * BACnetDeviceObjectReference ::= SEQUENCE {
  *  deviceIdentifier    [0] BACnetObjectIdentifier OPTIONAL,
@@ -1496,7 +1495,6 @@ fDeviceObjectPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
  */
 static guint
 fDeviceObjectReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
-#endif
 
 #if 0
 /**
@@ -2012,19 +2010,6 @@ static guint
 fObjectSelectionCriteria (tvbuff_t *tvb, proto_tree *subtree, guint offset);
 
 /**
- * ObjectSpecifier ::= CHOICE {
- * 	objectType	[0] BACnetObjectType,
- *  objectIdentifier	[1] BACnetObjectIdentifier
- * }
- * @param tvb
- * @param tree
- * @param offset
- * @return modified offset
- */
-static guint
-fObjectSpecifier (tvbuff_t *tvb, proto_tree *tree, guint offset);
-
-/**
  * BACnet-Error ::= SEQUENCE {
  *    error-class ENUMERATED {},
  *    error-code  ENUMERATED {}