From 52c745cd0699b0ade80e5e2cb6f4e0c3c76f9ec8 Mon Sep 17 00:00:00 2001
From: k001a <k001a@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Tue, 14 Jun 2011 21:25:32 +0000
Subject: [PATCH] Removed encode_tagged_enumerated function, because it was
 identical like encode_application_enumerated (I didn't see this before).

---
 bacnet-stack/include/bacdcode.h |  3 ---
 bacnet-stack/src/bacdcode.c     | 17 -----------------
 bacnet-stack/src/wpm.c          |  4 ++--
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/bacnet-stack/include/bacdcode.h b/bacnet-stack/include/bacdcode.h
index fd1a4d9b..eab9a8b8 100644
--- a/bacnet-stack/include/bacdcode.h
+++ b/bacnet-stack/include/bacdcode.h
@@ -313,9 +313,6 @@ extern "C" {
     int encode_bacnet_enumerated(
         uint8_t * apdu,
         uint32_t value);
-    int encode_tagged_enumerated(
-       uint8_t * apdu,
-       int value);
     int encode_application_enumerated(
         uint8_t * apdu,
         uint32_t value);
diff --git a/bacnet-stack/src/bacdcode.c b/bacnet-stack/src/bacdcode.c
index e5e3147c..01a039fa 100644
--- a/bacnet-stack/src/bacdcode.c
+++ b/bacnet-stack/src/bacdcode.c
@@ -1260,23 +1260,6 @@ int encode_bacnet_enumerated(
     return encode_bacnet_unsigned(apdu, value);
 }
 
-/* from clause 20.2.11 Encoding of an Enumerated Value */
-/* and 20.2.1 General Rules for Encoding BACnet Tags */
-/* returns the number of apdu bytes consumed */
-int encode_tagged_enumerated(
-    uint8_t * apdu, 
-    int value)
-{
-    int len = 0;                /* return value */
-
-    /* assumes that the tag only consumes 1 octet */
-    len = encode_bacnet_enumerated(&apdu[1], value);
-    len += encode_tag(&apdu[0], BACNET_APPLICATION_TAG_ENUMERATED,
-        false, len);
-
-    return len;
-}
-
 /* from clause 20.2.11 Encoding of an Enumerated Value */
 /* and 20.2.1 General Rules for Encoding BACnet Tags */
 /* returns the number of apdu bytes consumed */
diff --git a/bacnet-stack/src/wpm.c b/bacnet-stack/src/wpm.c
index 0559b3c4..3ae7422c 100644
--- a/bacnet-stack/src/wpm.c
+++ b/bacnet-stack/src/wpm.c
@@ -161,8 +161,8 @@ int wpm_error_ack_encode_apdu(uint8_t * apdu, uint8_t invoke_id,
         apdu[len++] = SERVICE_CONFIRMED_WRITE_PROP_MULTIPLE;
 
         len += encode_opening_tag(&apdu[len], 0);
-        len += encode_tagged_enumerated(&apdu[len], wp_data->error_class);
-        len += encode_tagged_enumerated(&apdu[len], wp_data->error_code);
+        len += encode_application_enumerated(&apdu[len], wp_data->error_class);
+        len += encode_application_enumerated(&apdu[len], wp_data->error_code);
         len += encode_closing_tag(&apdu[len],  0);
 
         len += encode_opening_tag(&apdu[len], 1);