Corrected EOL (and EOL fixup script)

bacnet-stack/fixup.sh

@@ -1,15 +1,18 @@
 #!/bin/sh
 # fix DOS/Unix names and Subversion EOL-Style, and remove backup files
 
+#DOS2UNIX=/usr/bin/dos2unix
+DOS2UNIX=/usr/bin/fromdos
+
 # exit silently if utility is not installed
-[ -x /usr/bin/dos2unix ] || exit 0
+[ -x ${DOS2UNIX} ] || exit 0
 [ -x /usr/bin/svn ] || exit 0
 
 directory=${1-`pwd`}
 for filename in $( find ${directory} -name '*.c' )
 do
   echo Fixing DOS/Unix ${filename}
-  /usr/bin/dos2unix ${filename}
+  ${DOS2UNIX} ${filename}
   echo Setting Subversion EOL Style for ${filename}
   /usr/bin/svn propset svn:eol-style native ${filename}
 done
@@ -17,7 +20,7 @@ done
 for filename in $( find ${directory} -name '*.h' )
 do
   echo Fixing DOS/Unix ${filename}
-  /usr/bin/dos2unix ${filename}
+  ${DOS2UNIX} ${filename}
   echo Setting Subversion EOL Style for ${filename}
   /usr/bin/svn propset svn:eol-style native ${filename}
 done

bacnet-stack/ports/bdk-atxx4-mstp/Makefile

@@ -18,7 +18,8 @@ SIZE = avr-size
 AVRDUDE = avrdude
 LINT = splint
 
-SIZE_OPTIONS = -C --mcu=${MCU}
+SIZE_OPTIONS = -t
+#SIZE_OPTIONS = -C --mcu=${MCU}
 # programmer id--check the avrdude for complete list
 # of available opts.  These should include stk500,
 # avr910, avrisp, bsd, pony and more.  Set this to

bacnet-stack/ports/bdk-atxx4-mstp/eeprom.c

@@ -29,11 +29,6 @@
 
 /* Internal EEPROM of the AVR - http://supp.iar.com/Support/?note=45745 */
 
-#if defined(__GNUC__)
-    /* bug in WinAVR - not quite IAR compatible */
-#define __EEPUT _EEPUT
-#define __EEGET _EEGET
-#endif
 
 int eeprom_bytes_read(
     uint16_t eeaddr,    /* EEPROM starting memory address (offset of zero) */

bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h

@@ -211,6 +211,11 @@ typedef struct {
 #if defined(__GNUC__)
 #include <avr/eeprom.h>
 #define EEPROM_DECLARE(x) x __attribute__((section (".eeprom")))
+#if ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3)))
+    /* bug in WinAVR - not quite IAR compatible */
+    #define __EEPUT _EEPUT
+    #define __EEGET _EEGET
+#endif
 #endif
 
 /* IAR intrinsic routines */