From 41313fdd7b73573160db7c20116b632063a993e0 Mon Sep 17 00:00:00 2001
From: Oliver Lehmann <lehmann@ans-netz.de>
Date: Sat, 4 May 2013 14:53:30 +0000
Subject: [PATCH] add format target fix newline to "lf" when executing
 uncrustify

---
 P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo   | Bin 50176 -> 50176 bytes
 .../P8000_WDC_Emulator/Makefile               |  15 ++++++++++-----
 P8000_WDC_Emulator/uncrustify.cfg             |   6 +++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo b/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo
index d5964713b544655fe7366892e68a7fb2dc3cec84..43c8129b210abe4f36e4ff93593b563a4401ab10 100755
GIT binary patch
delta 189
zcmZqZU~cGO-jKt>+VJAF$+gXeEd9&^?3ps3{L{?b_i(+?R6cp%aPmhvgUt>cmI~~f
zJ|-!<_Wa!3py9y871FpbGQNnBbs@`S0X>n;_q3k6vog9cFfdH^SJs*QrO2O?!4=4J
z2Z_k*DNZ(EVV_)5?9a*g9|$~<L^ppa_BWV(n8k2%$&vsLH=v9clI-L!OD=GD0tI}K
L1UG+K$|DB=k{mry

delta 189
zcmZqZU~cGO-jKt>dSSm}=<&^kEd9&^DK+^I7ytM5UKwt_Ywp4~FD8GKGuZ6FVX44w
z)a3G0u(oS+gN6eW*S#+{WIm<V<xFOoETAW{`JUEOcUA@$1_p-7{>nO&zZCg%GP(kJ
z?jR9)J;lieEbNm@iv1@aW-;9SrP$wqlhF+*<%uG_B!J^T5O^UAepzyX!viSbgCw~5
I%TgXW09%7V_5c6?

diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile b/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile
index c80e68b..d1b7fd6 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile
@@ -2,9 +2,9 @@ OUTPUT_FILE=P8000_WDC_Emulator
 MCU=	-mmcu=atmega1284p
 
 CC=avr-gcc
-CFLAGS= -I/usr/local/avr/include -funsigned-char -funsigned-bitfields -O1 \
-	-ffunction-sections -fpack-struct -fshort-enums -Wall -Wundef \
-	-Werror -pedantic -pedantic-errors -c  ${MCU}
+CFLAGS= -I/usr/local/avr/include -funsigned-char -funsigned-bitfields \
+	-O1 -ffunction-sections -fpack-struct -fshort-enums -Wall \
+	-Wundef -Werror -pedantic -pedantic-errors ${MCU}
 
 LDFLAGS=-Wl,-Map="${OUTPUT_FILE}.map" -Wl,--start-group -Wl,-lm  \
 	-Wl,--end-group -Wl,--gc-sections ${MCU}
@@ -30,9 +30,14 @@ ${OUTPUT_FILE}: ${OBJS}
 	avr-objcopy -O ihex -R .eeprom -R .fuse -R .lock -R .signature  "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.hex"
 	avr-objcopy -j .eeprom  --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0  --no-change-warnings -O ihex "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.eep" || exit 0
 	avr-objdump -h -S "${OUTPUT_FILE}.elf" > "${OUTPUT_FILE}.lss"
+	avr-objcopy -O srec -R .eeprom -R .fuse -R .lock -R .signature  "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.srec"
 	avr-size "${OUTPUT_FILE}.elf"
 	
 clean:
 	-${RM} ${OBJS}
-	rm -rf "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.a" "${OUTPUT_FILE}.hex" "${OUTPUT_FILE}.lss" "${OUTPUT_FILE}.eep" "${OUTPUT_FILE}.map"
-	
+	rm -rf "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.a" "${OUTPUT_FILE}.hex" "${OUTPUT_FILE}.lss" "${OUTPUT_FILE}.eep" "${OUTPUT_FILE}.map" "${OUTPUT_FILE}.srec"
+
+format:
+	for file in *.h *.c ; do \
+		uncrustify -l C -c ../uncrustify.cfg --no-backup $$file ;\
+	done
diff --git a/P8000_WDC_Emulator/uncrustify.cfg b/P8000_WDC_Emulator/uncrustify.cfg
index ae813a6..f4e70ff 100755
--- a/P8000_WDC_Emulator/uncrustify.cfg
+++ b/P8000_WDC_Emulator/uncrustify.cfg
@@ -1,3 +1,4 @@
+newlines		= lf
 indent_columns          = 4
 indent_with_tabs        = 0
 indent_switch_case	= 4
@@ -33,7 +34,7 @@ mod_remove_extra_semicolon = true
 
 sp_return_paren		= force	
 sp_sizeof_paren		= remove
-sp_before_sparen	= remove
+sp_before_sparen	= force
 sp_after_sparen		= force
 sp_after_cast		= remove
 sp_inside_braces	= force
@@ -54,6 +55,9 @@ sp_inside_fparen	= force
 sp_paren_brace		= force
 sp_sparen_brace		= force 
 sp_fparen_brace		= force 
+sp_func_call_paren	= add
+sp_func_call_paren_empty = remove
+
 align_struct_init_span	= 0
 align_func_params	= true
 align_var_def_span	= 3