From 4f34f6994b5ef2ed7e0456611976fadba0485460 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 6 Sep 2007 00:09:46 +0000
Subject: [PATCH] Updated the library in the ATmega makefile, and updated the
 tsm module.

---
 bacnet-stack/ports/atmega168/Makefile | 64 +++++++++++++++++----------
 bacnet-stack/tsm.c                    |  2 +
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/bacnet-stack/ports/atmega168/Makefile b/bacnet-stack/ports/atmega168/Makefile
index 7fd3e5a0..ca1097ab 100644
--- a/bacnet-stack/ports/atmega168/Makefile
+++ b/bacnet-stack/ports/atmega168/Makefile
@@ -13,41 +13,57 @@ OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 SIZE = avr-size
 
+# Source locations
+BACNET_ROOT = ../..
+
 CSRC = main.c \
 	timer.c \
 	rs485.c \
 	dlmstp.c \
-	../../npdu.c \
-	../../bacint.c \
-	../../bacaddr.c \
-	../../crc.c
+	$(BACNET_ROOT)/crc.c
 
 DEMOSRC = h_rp.c \
 	h_wp.c \
 	device.c \
 	ai.c \
-	../../demo/handler/txbuf.c \
-	../../demo/handler/h_whois.c \
-	../../demo/handler/h_rd.c \
-	../../demo/handler/h_dcc.c
+	$(BACNET_ROOT)/demo/handler/txbuf.c \
+	$(BACNET_ROOT)/demo/handler/h_whois.c \
+	$(BACNET_ROOT)/demo/handler/h_rd.c \
+	$(BACNET_ROOT)/demo/handler/h_dcc.c
 
 CORESRC =  \
-	../../bacint.c \
-	../../apdu.c \
-	../../bacdcode.c \
-	../../bacstr.c \
-	../../abort.c \
-	../../bacerror.c \
-	../../reject.c \
-	../../bacapp.c \
-	../../datetime.c \
-	../../rp.c \
-	../../wp.c \
-	../../dcc.c \
-	../../rd.c \
-	../../whois.c \
-	../../iam.c \
-	../../version.c
+	$(BACNET_ROOT)/apdu.c \
+	$(BACNET_ROOT)/npdu.c \
+	$(BACNET_ROOT)/bacdcode.c \
+	$(BACNET_ROOT)/bacint.c \
+	$(BACNET_ROOT)/bacapp.c \
+	$(BACNET_ROOT)/bacprop.c \
+	$(BACNET_ROOT)/bacstr.c \
+	$(BACNET_ROOT)/bactext.c \
+	$(BACNET_ROOT)/datetime.c \
+	$(BACNET_ROOT)/indtext.c \
+	$(BACNET_ROOT)/bigend.c \
+	$(BACNET_ROOT)/arf.c \
+	$(BACNET_ROOT)/awf.c \
+	$(BACNET_ROOT)/cov.c \
+	$(BACNET_ROOT)/dcc.c \
+	$(BACNET_ROOT)/iam.c \
+	$(BACNET_ROOT)/ihave.c \
+	$(BACNET_ROOT)/rd.c \
+	$(BACNET_ROOT)/rp.c \
+	$(BACNET_ROOT)/rpm.c \
+	$(BACNET_ROOT)/timesync.c \
+	$(BACNET_ROOT)/whohas.c \
+	$(BACNET_ROOT)/whois.c \
+	$(BACNET_ROOT)/wp.c \
+	$(BACNET_ROOT)/abort.c \
+	$(BACNET_ROOT)/reject.c \
+	$(BACNET_ROOT)/bacerror.c \
+	$(BACNET_ROOT)/filename.c \
+	$(BACNET_ROOT)/tsm.c \
+	$(BACNET_ROOT)/bacaddr.c \
+	$(BACNET_ROOT)/address.c \
+	$(BACNET_ROOT)/version.c
 
 ## Include Directories
 INCLUDES = -I. -I../.. -I../../demo/object -I../../demo/handler
diff --git a/bacnet-stack/tsm.c b/bacnet-stack/tsm.c
index a9846728..48b2e92a 100644
--- a/bacnet-stack/tsm.c
+++ b/bacnet-stack/tsm.c
@@ -49,6 +49,7 @@
 #include "address.h"
 #include "bacaddr.h"
 
+#if (MAX_TSM_TRANSACTIONS)
 /* Transaction State Machine */
 /* Really only needed for segmented messages */
 /* and a little for sending confirmed messages */
@@ -353,3 +354,4 @@ int main(void)
 }
 #endif                          /* TEST_TSM */
 #endif                          /* TEST */
+#endif /* MAX_TSM_TRANSACTIONS */