From 63d7a8018d01d7c4daaa99d0c042ae483ba7c2b6 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 11 Feb 2010 04:30:20 +0000
Subject: [PATCH] Changed value of MAX OBJECT type to be consistent with other
 MAX values, and fixed places that relied on this value (most had a hack in
 place).

---
 bacnet-stack/demo/readprop/main.c  | 4 ++--
 bacnet-stack/demo/readpropm/main.c | 4 ++--
 bacnet-stack/demo/ucov/main.c      | 4 ++--
 bacnet-stack/src/ihave.c           | 2 +-
 bacnet-stack/src/whohas.c          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bacnet-stack/demo/readprop/main.c b/bacnet-stack/demo/readprop/main.c
index ab2374ee..c15451f4 100644
--- a/bacnet-stack/demo/readprop/main.c
+++ b/bacnet-stack/demo/readprop/main.c
@@ -203,9 +203,9 @@ int main(
             Target_Device_Object_Instance, BACNET_MAX_INSTANCE);
         return 1;
     }
-    if (Target_Object_Type > MAX_BACNET_OBJECT_TYPE) {
+    if (Target_Object_Type >= MAX_BACNET_OBJECT_TYPE) {
         fprintf(stderr, "object-type=%u - it must be less than %u\r\n",
-            Target_Object_Type, MAX_BACNET_OBJECT_TYPE + 1);
+            Target_Object_Type, MAX_BACNET_OBJECT_TYPE);
         return 1;
     }
     if (Target_Object_Instance > BACNET_MAX_INSTANCE) {
diff --git a/bacnet-stack/demo/readpropm/main.c b/bacnet-stack/demo/readpropm/main.c
index acd9e37c..45cb126e 100644
--- a/bacnet-stack/demo/readpropm/main.c
+++ b/bacnet-stack/demo/readpropm/main.c
@@ -243,9 +243,9 @@ int main(
             fprintf(stderr, "Error: not enough object property quads.\r\n");
             return 1;
         }
-        if (rpm_object->object_type > MAX_BACNET_OBJECT_TYPE) {
+        if (rpm_object->object_type >= MAX_BACNET_OBJECT_TYPE) {
             fprintf(stderr, "object-type=%u - it must be less than %u\r\n",
-                rpm_object->object_type, MAX_BACNET_OBJECT_TYPE + 1);
+                rpm_object->object_type, MAX_BACNET_OBJECT_TYPE);
             return 1;
         }
         rpm_object->object_instance = strtol(argv[tag_value_arg], NULL, 0);
diff --git a/bacnet-stack/demo/ucov/main.c b/bacnet-stack/demo/ucov/main.c
index 5ab49460..1ea22fd5 100644
--- a/bacnet-stack/demo/ucov/main.c
+++ b/bacnet-stack/demo/ucov/main.c
@@ -158,10 +158,10 @@ int main(
             cov_data.initiatingDeviceIdentifier, BACNET_MAX_INSTANCE);
         return 1;
     }
-    if (cov_data.monitoredObjectIdentifier.type > MAX_BACNET_OBJECT_TYPE) {
+    if (cov_data.monitoredObjectIdentifier.type >= MAX_BACNET_OBJECT_TYPE) {
         fprintf(stderr, "object-type=%u - it must be less than %u\r\n",
             cov_data.monitoredObjectIdentifier.type,
-            MAX_BACNET_OBJECT_TYPE + 1);
+            MAX_BACNET_OBJECT_TYPE);
         return 1;
     }
     if (cov_data.monitoredObjectIdentifier.instance > BACNET_MAX_INSTANCE) {
diff --git a/bacnet-stack/src/ihave.c b/bacnet-stack/src/ihave.c
index 3c6e2bec..a78d8c07 100644
--- a/bacnet-stack/src/ihave.c
+++ b/bacnet-stack/src/ihave.c
@@ -173,7 +173,7 @@ void testIHave(
         data.device_id.instance <= BACNET_MAX_INSTANCE;
         data.device_id.instance <<= 1) {
         for (data.object_id.type = OBJECT_ANALOG_INPUT;
-            data.object_id.type <= MAX_BACNET_OBJECT_TYPE;
+            data.object_id.type < MAX_BACNET_OBJECT_TYPE;
             data.object_id.type++) {
             for (data.object_id.instance = 1;
                 data.object_id.instance <= BACNET_MAX_INSTANCE;
diff --git a/bacnet-stack/src/whohas.c b/bacnet-stack/src/whohas.c
index 373392d0..22f6e578 100644
--- a/bacnet-stack/src/whohas.c
+++ b/bacnet-stack/src/whohas.c
@@ -218,7 +218,7 @@ void testWhoHas(
             data.high_limit += (BACNET_MAX_INSTANCE / 4)) {
             data.object_name = false;
             for (data.object.identifier.type = OBJECT_ANALOG_INPUT;
-                data.object.identifier.type <= MAX_BACNET_OBJECT_TYPE;
+                data.object.identifier.type < MAX_BACNET_OBJECT_TYPE;
                 data.object.identifier.type++) {
                 for (data.object.identifier.instance = 1;
                     data.object.identifier.instance <= BACNET_MAX_INSTANCE;