From 4b09a4ed3a15b943fb88a9e8af150ff93cb24bfb Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Sat, 15 Aug 2009 02:35:24 +0000
Subject: [PATCH] Updated after some consistency checking.

---
 bacnet-stack/ports/bdk-atxx4-mstp/av.c     | 2 ++
 bacnet-stack/ports/bdk-atxx4-mstp/device.c | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/av.c b/bacnet-stack/ports/bdk-atxx4-mstp/av.c
index 9645bb24..bdf42407 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/av.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/av.c
@@ -62,8 +62,10 @@ static const int Analog_Value_Properties_Required[] = {
 
 static const int Analog_Value_Properties_Optional[] = {
     PROP_DESCRIPTION,
+#if 0
     PROP_PRIORITY_ARRAY,
     PROP_RELINQUISH_DEFAULT,
+#endif
     -1
 };
 
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
index 93ab3385..a48c8da4 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
@@ -76,10 +76,8 @@ static const int Device_Properties_Required[] = {
     PROP_SEGMENTATION_SUPPORTED,
     PROP_APDU_TIMEOUT,
     PROP_NUMBER_OF_APDU_RETRIES,
-#if defined(BACDL_MSTP)
     PROP_MAX_MASTER,
     PROP_MAX_INFO_FRAMES,
-#endif
     PROP_DEVICE_ADDRESS_BINDING,
     PROP_DATABASE_REVISION,
     -1
@@ -499,6 +497,10 @@ int Device_Encode_Property_APDU(
         case 513:
             apdu_len = encode_application_unsigned(&apdu[0], stack_unused());
             break;
+        case 9600:
+            apdu_len = encode_application_unsigned(&apdu[0], 
+			    rs485_baud_rate());
+            break;
         default:
             *error_class = ERROR_CLASS_PROPERTY;
             *error_code = ERROR_CODE_UNKNOWN_PROPERTY;