From 3d0eaed3d6c16ada6fc8eac74d963254e1a928f2 Mon Sep 17 00:00:00 2001 From: skarg Date: Sat, 10 Dec 2005 22:42:41 +0000 Subject: [PATCH] cleaned up the fallout after refactoring to bacapp module. --- bacnet-stack/Makefile | 1 + bacnet-stack/bacdef.h | 1 + bacnet-stack/device.c | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile index 86004551..d799ff1e 100644 --- a/bacnet-stack/Makefile +++ b/bacnet-stack/Makefile @@ -19,6 +19,7 @@ SRCS = ports/linux/main.c \ dlmstp.c \ handlers.c \ bacdcode.c \ + bacapp.c \ bigend.c \ whois.c \ iam.c \ diff --git a/bacnet-stack/bacdef.h b/bacnet-stack/bacdef.h index 8ad0f52f..7bf0c7a7 100644 --- a/bacnet-stack/bacdef.h +++ b/bacnet-stack/bacdef.h @@ -34,6 +34,7 @@ #ifndef BACDEF_H #define BACDEF_H +#include #include #include "bacenum.h" #include "config.h" diff --git a/bacnet-stack/device.c b/bacnet-stack/device.c index cf140254..c1092598 100644 --- a/bacnet-stack/device.c +++ b/bacnet-stack/device.c @@ -489,11 +489,11 @@ bool Device_Write_Property( case PROP_OBJECT_IDENTIFIER: if (wp_data->value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { - if ((wp_data->value.type.Object_ID.type == OBJECT_DEVICE) && - (wp_data->value.type.Object_ID.instance <= BACNET_MAX_INSTANCE)) + if ((wp_data->value.type.Object_Id.type == OBJECT_DEVICE) && + (wp_data->value.type.Object_Id.instance <= BACNET_MAX_INSTANCE)) { Device_Set_Object_Instance_Number( - wp_data->value.type.Object_ID.instance); + wp_data->value.type.Object_Id.instance); I_Am_Request = true; status = true; }