From 972afaa97420ca80932064a3e4dc5af52c8d419e Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Wed, 25 Apr 2012 19:05:59 +0000
Subject: [PATCH] Updated AVR port projects to build with IAR and AVR Studio.

---
 bacnet-stack/ports/atmega168/bacnet.ewp      | 12 ++++++------
 bacnet-stack/ports/bdk-atxx4-mstp/bacnet.ewp |  3 +++
 bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h  |  5 ++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bacnet-stack/ports/atmega168/bacnet.ewp b/bacnet-stack/ports/atmega168/bacnet.ewp
index 420b2544..15daa734 100644
--- a/bacnet-stack/ports/atmega168/bacnet.ewp
+++ b/bacnet-stack/ports/atmega168/bacnet.ewp
@@ -10,7 +10,7 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>9</archiveVersion>
+      <archiveVersion>10</archiveVersion>
       <data>
         <version>8</version>
         <wantNonLocal>1</wantNonLocal>
@@ -127,8 +127,8 @@
         </option>
         <option>
           <name>New Variant Processor</name>
-          <version>30</version>
-          <state>57</state>
+          <version>33</version>
+          <state>62</state>
         </option>
         <option>
           <name>GRuntimeLibSelect</name>
@@ -1000,7 +1000,7 @@
     <debug>0</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>9</archiveVersion>
+      <archiveVersion>10</archiveVersion>
       <data>
         <version>8</version>
         <wantNonLocal>1</wantNonLocal>
@@ -1117,8 +1117,8 @@
         </option>
         <option>
           <name>New Variant Processor</name>
-          <version>30</version>
-          <state>57</state>
+          <version>33</version>
+          <state>62</state>
         </option>
         <option>
           <name>GRuntimeLibSelect</name>
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.ewp b/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.ewp
index 7172be2e..d99c004a 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.ewp
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.ewp
@@ -252,6 +252,7 @@
           <state>MAX_APDU=50</state>
           <state>BIG_ENDIAN=0</state>
           <state>MAX_TSM_TRANSACTIONS=0</state>
+          <state>MSTP_PDU_PACKET_COUNT=2</state>
           <state>BACAPP_BOOLEAN</state>
           <state>BACAPP_REAL</state>
           <state>BACAPP_OBJECT_ID</state>
@@ -424,6 +425,7 @@
           <name>newCCIncludePaths</name>
           <state>$PROJ_DIR$</state>
           <state>$PROJ_DIR$\..\..\include</state>
+          <state>$PROJ_DIR$\..\..\demo\object</state>
         </option>
         <option>
           <name>CCStdIncCheck</name>
@@ -1244,6 +1246,7 @@
           <state>MAX_APDU=128</state>
           <state>BIG_ENDIAN=0</state>
           <state>MAX_TSM_TRANSACTIONS=0</state>
+          <state>MSTP_PDU_PACKET_COUNT=2</state>
           <state>BACAPP_BOOLEAN</state>
           <state>BACAPP_REAL</state>
           <state>BACAPP_OBJECT_ID</state>
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h b/bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h
index a9337a2a..3bee43ae 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h
@@ -238,7 +238,10 @@ typedef struct {
 /* Interrupts */
 #if defined(__ICCAVR__)
 #define PRAGMA(x) _Pragma( #x )
-#define ISR(vec) PRAGMA( vector=vec ) __interrupt void handler_##vec(void)
+#define ISR(vec) \
+    /* function prototype for use with "require protoptypes" option.  */ \
+    PRAGMA( vector=vec ) __interrupt void handler_##vec(void); \
+    PRAGMA( vector=vec ) __interrupt void handler_##vec(void)
 #elif defined(__GNUC__)
 #include <avr/interrupt.h>
 #elif defined (__CROSSWORKS_AVR)