From 63e4e1ce2d9cac2054c961539eb032dcec8b3220 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Tue, 11 Jun 2013 22:36:16 +0000
Subject: [PATCH] merge and cleaned up warning

---
 bacnet-stack/demo/object/bv.h     | 28 ++++++++++++++++++++++++++--
 bacnet-stack/doc/README.developer |  2 +-
 bacnet-stack/src/datetime.c       |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/bacnet-stack/demo/object/bv.h b/bacnet-stack/demo/object/bv.h
index 53110cbd..e96481f5 100644
--- a/bacnet-stack/demo/object/bv.h
+++ b/bacnet-stack/demo/object/bv.h
@@ -36,10 +36,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
+    void Binary_Value_Init(
+        void);
+
     void Binary_Value_Property_Lists(
         const int **pRequired,
         const int **pOptional,
         const int **pProprietary);
+
     bool Binary_Value_Valid_Instance(
         uint32_t object_instance);
     unsigned Binary_Value_Count(
@@ -48,13 +52,32 @@ extern "C" {
         unsigned index);
     unsigned Binary_Value_Instance_To_Index(
         uint32_t object_instance);
+    bool Binary_Value_Object_Instance_Add(
+        uint32_t instance);
 
     bool Binary_Value_Object_Name(
         uint32_t object_instance,
         BACNET_CHARACTER_STRING * object_name);
+    bool Binary_Value_Name_Set(
+        uint32_t object_instance,
+        char *new_name);
 
-    void Binary_Value_Init(
-        void);
+    char *Binary_Value_Description(
+        uint32_t instance);
+    bool Binary_Value_Description_Set(
+        uint32_t instance,
+        char *new_name);
+
+    char *Binary_Value_Inactive_Text(
+        uint32_t instance);
+    bool Binary_Value_Inactive_Text_Set(
+        uint32_t instance,
+        char *new_name);
+    char *Binary_Value_Active_Text(
+        uint32_t instance);
+    bool Binary_Value_Active_Text_Set(
+        uint32_t instance,
+        char *new_name);
 
     int Binary_Value_Read_Property(
         BACNET_READ_PROPERTY_DATA * rpdata);
@@ -115,3 +138,4 @@ extern "C" {
 }
 #endif /* __cplusplus */
 #endif
+
diff --git a/bacnet-stack/doc/README.developer b/bacnet-stack/doc/README.developer
index e04b918f..b0f38c96 100644
--- a/bacnet-stack/doc/README.developer
+++ b/bacnet-stack/doc/README.developer
@@ -9,7 +9,7 @@ A BACnet device is supposed to support, at a minimum, ReadProperty service
 PC that is used for reading other BACnet devices.
 
 There are a number of core files that you will need. Services such as
-ReadProperty, I-Am, and Reject are consided core files. After determinging
+ReadProperty, I-Am, and Reject are consided core files. After determining
 which services you want in your device, add files to your project or makefile
 from the following BACnet services (messages) provided by this BACnet stack:
 
diff --git a/bacnet-stack/src/datetime.c b/bacnet-stack/src/datetime.c
index 9831d93d..6e93350f 100644
--- a/bacnet-stack/src/datetime.c
+++ b/bacnet-stack/src/datetime.c
@@ -150,7 +150,7 @@ uint32_t datetime_days_since_epoch(
     return days;
 }
 
-void days_since_epoch_into_ymd(
+static void days_since_epoch_into_ymd(
     uint32_t days,
     uint16_t * pYear,
     uint8_t * pMonth,