[Cryptech-Commits] [user/ln5/stm32-avalanche-noise] 03/05: Merge branch 'ln/cc20rng-revamp' into ln/devel

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

linus at nordberg.se pushed a commit to branch master
in repository user/ln5/stm32-avalanche-noise.

commit ee799425c42bbd46dddb506f9133091874a74175
Merge: e775954 76a6b63
Author: Linus Nordberg <linus at nordberg.se>
AuthorDate: Tue Jan 21 16:11:38 2020 +0100

    Merge branch 'ln/cc20rng-revamp' into ln/devel

 src/cc20rng/.clang-format  |   4 ++
 src/cc20rng/Makefile       |   4 ++
 src/cc20rng/cc20_prng.c    | 147 ++++++++++++++++++++++---------------------
 src/cc20rng/cc20_prng.h    |  20 +++---
 src/cc20rng/main.c         | 151 +++++++++++++++++++++------------------------
 src/cc20rng/main.h         |   4 --
 src/cc20rng/stm32f4xx_it.h |   2 -
 7 files changed, 167 insertions(+), 165 deletions(-)

diff --cc src/cc20rng/Makefile
index c52bc52,6c274be..bc5fce5
--- a/src/cc20rng/Makefile
+++ b/src/cc20rng/Makefile
@@@ -45,7 -29,12 +45,11 @@@ $(PROJ_NAME).elf: $(SRCS
  	$(OBJDUMP) -St $(PROJ_NAME).elf >$(PROJ_NAME).lst
  	$(SIZE) $(PROJ_NAME).elf
  
+ c-format:
+ 	clang-format-4.0 -i cc20_prng.[ch]
+ 	clang-format-4.0 -style="{IndentWidth: 2}" -i main.c
+ 
  clean:
 -	find ./ -name '*~' | xargs rm -f
  	rm -f *.o
  	rm -f $(PROJ_NAME).elf
  	rm -f $(PROJ_NAME).hex