dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected EOL (and EOL fixup script)

Browse Source
This commit is contained in:
skarg
2010-06-01 19:43:15 +00:00
parent 5964f49880
commit ed40541c36
4 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/fixup.sh
+6 -3
View File
@@ -1,15 +1,18 @@
#!/bin/sh #!/bin/sh
# fix DOS/Unix names and Subversion EOL-Style, and remove backup files # 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 # exit silently if utility is not installed
[ -x /usr/bin/dos2unix ] || exit 0 [ -x ${DOS2UNIX} ] || exit 0
[ -x /usr/bin/svn ] || exit 0 [ -x /usr/bin/svn ] || exit 0
directory=${1-`pwd`} directory=${1-`pwd`}
for filename in $( find ${directory} -name '*.c' ) for filename in $( find ${directory} -name '*.c' )
do do
echo Fixing DOS/Unix ${filename} echo Fixing DOS/Unix ${filename}
/usr/bin/dos2unix ${filename} ${DOS2UNIX} ${filename}
echo Setting Subversion EOL Style for ${filename} echo Setting Subversion EOL Style for ${filename}
/usr/bin/svn propset svn:eol-style native ${filename} /usr/bin/svn propset svn:eol-style native ${filename}
done done
@@ -17,7 +20,7 @@ done
for filename in $( find ${directory} -name '*.h' ) for filename in $( find ${directory} -name '*.h' )
do do
echo Fixing DOS/Unix ${filename} echo Fixing DOS/Unix ${filename}
/usr/bin/dos2unix ${filename} ${DOS2UNIX} ${filename}
echo Setting Subversion EOL Style for ${filename} echo Setting Subversion EOL Style for ${filename}
/usr/bin/svn propset svn:eol-style native ${filename} /usr/bin/svn propset svn:eol-style native ${filename}
done done
bacnet-stack/ports/bdk-atxx4-mstp/Makefile
+2 -1
View File
@@ -18,7 +18,8 @@ SIZE = avr-size
AVRDUDE = avrdude AVRDUDE = avrdude
LINT = splint LINT = splint
SIZE_OPTIONS = -C --mcu=${MCU} SIZE_OPTIONS = -t
#SIZE_OPTIONS = -C --mcu=${MCU}
# programmer id--check the avrdude for complete list # programmer id--check the avrdude for complete list
# of available opts. These should include stk500, # of available opts. These should include stk500,
# avr910, avrisp, bsd, pony and more. Set this to # avr910, avrisp, bsd, pony and more. Set this to
bacnet-stack/ports/bdk-atxx4-mstp/eeprom.c
-5
View File
@@ -29,11 +29,6 @@
/* Internal EEPROM of the AVR - http://supp.iar.com/Support/?note=45745 */ /* 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( int eeprom_bytes_read(
uint16_t eeaddr, /* EEPROM starting memory address (offset of zero) */ uint16_t eeaddr, /* EEPROM starting memory address (offset of zero) */
bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h
+5
View File
@@ -211,6 +211,11 @@ typedef struct {
#if defined(__GNUC__) #if defined(__GNUC__)
#include <avr/eeprom.h> #include <avr/eeprom.h>
#define EEPROM_DECLARE(x) x __attribute__((section (".eeprom"))) #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 #endif
/* IAR intrinsic routines */ /* IAR intrinsic routines */