diff --git a/Makefile b/Makefile index b8d43caa7f..13f58aebc6 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,12 @@ DIRS = $(RIOTCPU)/$(CPU) core drivers sys all: mkdir -p $(BINDIR) @for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ; - + clean: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; -@if [ -d $(BINDIR) ] ; \ then rm -rf $(BINDIR) ; \ - fi + fi doc: "$(MAKE)" -BC doc/doxygen diff --git a/Makefile.base b/Makefile.base index 5ea0a15657..d5195431a2 100644 --- a/Makefile.base +++ b/Makefile.base @@ -44,4 +44,3 @@ $(BINDIR)%.o: %.S # remove compilation products clean:: $(AD)rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ) - diff --git a/Makefile.dep b/Makefile.dep index c4acbeb2a2..682d8108f5 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -18,7 +18,7 @@ endif ifneq (,$(findstring uart0,$(USEMODULE))) ifeq (,$(findstring lib,$(USEMODULE))) - USEMODULE += lib + USEMODULE += lib endif ifeq (,$(findstring posix,$(USEMODULE))) USEMODULE += posix diff --git a/Makefile.include b/Makefile.include index 1b0b0185ef..d57f4fc330 100644 --- a/Makefile.include +++ b/Makefile.include @@ -2,7 +2,7 @@ ifeq ($(strip $(RIOTCPU)),) export RIOTCPU =$(RIOTBASE)/cpu endif - + ifeq ($(strip $(RIOTBOARD)),) export RIOTBOARD =$(RIOTBASE)/boards endif @@ -46,7 +46,7 @@ all: $(BINDIR)$(PROJECT).a "$(MAKE)" -C $(RIOTBOARD)/$(BOARD) "$(MAKE)" -C $(RIOTBASE) @for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i ; done ; -ifeq ($(BUILDOSXNATIVE),1) +ifeq ($(BUILDOSXNATIVE),1) $(AD)$(LINK) $(UNDEF) -o $(BINDIR)$(PROJECT).elf $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie else $(AD)$(LINK) $(UNDEF) -o $(BINDIR)$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(BINDIR)$(PROJECT).map $(LINKFLAGS) @@ -57,12 +57,12 @@ endif ## your make rules ## Only basic example - modify it for larger projects!! #$(BINDIR)/$(PROJECT).a: $(BINDIR)/$(PROJECT).o -# $(AR) -rc $(BINDIR)/project.a $(BINDIR)/$(PROJECT).o +# $(AR) -rc $(BINDIR)/project.a $(BINDIR)/$(PROJECT).o # string array of all names of c files in dir SRC = $(wildcard *.c) -# string array of all names replaced .c with .o +# string array of all names replaced .c with .o OBJ = $(SRC:%.c=${BINDIR}${PROJECT}/%.o) $(BINDIR)$(PROJECT).a: $(OBJ) diff --git a/README.md b/README.md index d6b58fc08a..5e418cf8dc 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,29 @@ - ZZZZZZ - ZZZZZZZZZZZZ - ZZZZZZZZZZZZZZZZ - ZZZZZZZ ZZZZZZ - ZZZZZZ ZZZZZ - ZZZZZ ZZZZ - ZZZZ ZZZZZ - ZZZZ ZZZZ - ZZZZ ZZZZZ - ZZZZ ZZZZZZ - ZZZZ ZZZZZZZZ 777 7777 7777777777 - ZZ ZZZZ ZZZZZZZZ 777 77777777 77777777777 - ZZZZZZZ ZZZZ ZZZZZZZ 777 7777 7777 777 - ZZZZZZZZZ ZZZZ Z 777 777 777 777 - ZZZZZZ ZZZZ 777 777 777 777 - ZZZZZ ZZZZ 777 777 777 777 - ZZZZZ ZZZZZ ZZZZ 777 777 777 777 - ZZZZ ZZZZZ ZZZZZ 777 777 777 777 - ZZZZ ZZZZZ ZZZZZ 777 777 777 777 - ZZZZ ZZZZ ZZZZZ 777 777 777 777 - ZZZZZ ZZZZZ ZZZZZ 777 777 777 777 - ZZZZZZ ZZZZZZ ZZZZZ 777 7777777777 777 - ZZZZZZZZZZZZZZZ ZZZZ 777 77777777 777 - ZZZZZZZZZZZ Z - ZZZZZ - + ZZZZZZ + ZZZZZZZZZZZZ + ZZZZZZZZZZZZZZZZ + ZZZZZZZ ZZZZZZ + ZZZZZZ ZZZZZ + ZZZZZ ZZZZ + ZZZZ ZZZZZ + ZZZZ ZZZZ + ZZZZ ZZZZZ + ZZZZ ZZZZZZ + ZZZZ ZZZZZZZZ 777 7777 7777777777 + ZZ ZZZZ ZZZZZZZZ 777 77777777 77777777777 + ZZZZZZZ ZZZZ ZZZZZZZ 777 7777 7777 777 + ZZZZZZZZZ ZZZZ Z 777 777 777 777 + ZZZZZZ ZZZZ 777 777 777 777 + ZZZZZ ZZZZ 777 777 777 777 + ZZZZZ ZZZZZ ZZZZ 777 777 777 777 + ZZZZ ZZZZZ ZZZZZ 777 777 777 777 + ZZZZ ZZZZZ ZZZZZ 777 777 777 777 + ZZZZ ZZZZ ZZZZZ 777 777 777 777 + ZZZZZ ZZZZZ ZZZZZ 777 777 777 777 + ZZZZZZ ZZZZZZ ZZZZZ 777 7777777777 777 + ZZZZZZZZZZZZZZZ ZZZZ 777 77777777 777 + ZZZZZZZZZZZ Z + ZZZZZ + The friendly Operating System for IoT! ## FEATURES @@ -43,7 +43,7 @@ Its features comprise * TCP and UDP * 6LoWPAN * RPL - + ## GETTING STARTED * You want to start the RIOT? Just follow our [Getting started documentation](https://github.com/RIOT-OS/RIOT/wiki/Introduction) * The RIOT API itself can be built from the code using doxygen. The latest version is uploaded daily to http://riot-os.org/api. @@ -96,7 +96,7 @@ For example, you can use it to the test the native networking by running the `./ Free Software Foundation. * Some external sources, especially files developed by SICS are published under a separate license. - + All code files contain licensing information. For more information, see the RIOT website: diff --git a/boards/avsextrem/board_init.c b/boards/avsextrem/board_init.c index 17074464eb..5ae829fe87 100644 --- a/boards/avsextrem/board_init.c +++ b/boards/avsextrem/board_init.c @@ -197,4 +197,3 @@ void bl_init_ports(void) PINMODE4 |= (BIT23) | (BIT25) | (BIT27); // no resistors } - diff --git a/boards/avsextrem/drivers/avsextrem-cc1100.c b/boards/avsextrem/drivers/avsextrem-cc1100.c index ffda08267d..b35f286f81 100644 --- a/boards/avsextrem/drivers/avsextrem-cc1100.c +++ b/boards/avsextrem/drivers/avsextrem-cc1100.c @@ -117,7 +117,7 @@ void cc1100_spi_init(void) while (SPI_RX_AVAIL) { // while RNE (Receive FIFO Not Empty)... dummy = SSP1DR; // read data } - + /* to suppress unused-but-set-variable */ (void) dummy; } @@ -253,4 +253,3 @@ void cc1100_init_interrupts(void) // Enable external interrupt on low edge (for GDO0) FIO2DIR &= ~BIT6; } - diff --git a/boards/avsextrem/drivers/avsextrem-smb380.c b/boards/avsextrem/drivers/avsextrem-smb380.c index 8462662dca..b5b4a981be 100644 --- a/boards/avsextrem/drivers/avsextrem-smb380.c +++ b/boards/avsextrem/drivers/avsextrem-smb380.c @@ -1331,5 +1331,3 @@ unsigned char SMB380_readGainTemp(uint16_t *gain) return true; } - - diff --git a/boards/avsextrem/drivers/avsextrem-ssp0.c b/boards/avsextrem/drivers/avsextrem-ssp0.c index a43993ff7c..5055cbefbe 100644 --- a/boards/avsextrem/drivers/avsextrem-ssp0.c +++ b/boards/avsextrem/drivers/avsextrem-ssp0.c @@ -206,7 +206,7 @@ uint8_t SSP0Prepare(uint8_t chip, uint8_t datasize, uint8_t cpol, uint8_t cpha, for (uint32_t i = 0; i < FIFOSIZE; i++) { dummy = SSP0DR; // clear the RxFIFO } - + /* to suppress unused-but-set-variable */ (void) dummy; @@ -425,4 +425,3 @@ unsigned short acam_trx(const uint8_t data) SSP0_write(data, ACAMDMS); return SSP0_read(ACAMDMS); } - diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h index ffcc5356ee..f17b3cd82a 100644 --- a/boards/avsextrem/include/ssp0-board.h +++ b/boards/avsextrem/include/ssp0-board.h @@ -115,4 +115,3 @@ unsigned short acam_trx(const uint8_t data); void SSP0Handler(void); #endif /* __SSP_H__ */ - diff --git a/boards/chronos/putchar.c b/boards/chronos/putchar.c index 8c7b005812..31987e8fd4 100644 --- a/boards/chronos/putchar.c +++ b/boards/chronos/putchar.c @@ -30,4 +30,3 @@ int putchar(int c) _putchar(c); return c; } - diff --git a/boards/doc.txt b/boards/doc.txt index a2ee047942..4898012e03 100644 --- a/boards/doc.txt +++ b/boards/doc.txt @@ -9,7 +9,7 @@ /** * @defgroup boards Boards * @brief Board specific definitions and implementations - * + * * The boards module contains all definitions and implementations, that are specific to a certain board. Boards * generally consist of a fixed configuration of a controller and some external devices as sensors or radios. All * aspects concerning pin-configurion, mcu clock and driver configuration should go into this module. diff --git a/boards/mbed_lpc1768/include/system_LPC17xx.h b/boards/mbed_lpc1768/include/system_LPC17xx.h index 85f789d513..b7259c3951 100644 --- a/boards/mbed_lpc1768/include/system_LPC17xx.h +++ b/boards/mbed_lpc1768/include/system_LPC17xx.h @@ -9,7 +9,7 @@ *---------------------------------------------------------------------------- * * Copyright (C) 2009 ARM Limited. All rights reserved. - * Copyright (C) 2013 Oliver Hahm + * Copyright (C) 2013 Oliver Hahm * * ARM Limited (ARM) is supplying this software for use with Cortex-M3 * processor based microcontrollers. This file can be freely distributed diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index d25fd8efee..3f7bcc2bbe 100644 --- a/boards/msb-430-common/Makefile.include +++ b/boards/msb-430-common/Makefile.include @@ -35,6 +35,6 @@ endif export FFLAGS += "prog $(HEXFILE)" -export USEMODULE += msp430_common +export USEMODULE += msp430_common export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include export OFLAGS = -O ihex diff --git a/boards/msb-430-common/uart1.c b/boards/msb-430-common/uart1.c index c0cab8380d..89ba4f2045 100644 --- a/boards/msb-430-common/uart1.c +++ b/boards/msb-430-common/uart1.c @@ -74,4 +74,3 @@ interrupt(USART1RX_VECTOR) usart0irq(void) } #endif } - diff --git a/boards/msb-430/Makefile b/boards/msb-430/Makefile index 0a7ebeb637..ecf719f258 100644 --- a/boards/msb-430/Makefile +++ b/boards/msb-430/Makefile @@ -1,6 +1,6 @@ MODULE =$(BOARD)_base -DIRS = $(RIOTBOARD)/msb-430-common +DIRS = $(RIOTBOARD)/msb-430-common all: $(BINDIR)$(MODULE).a @for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ; diff --git a/boards/msb-430h/Makefile b/boards/msb-430h/Makefile index 0a7ebeb637..ecf719f258 100644 --- a/boards/msb-430h/Makefile +++ b/boards/msb-430h/Makefile @@ -1,6 +1,6 @@ MODULE =$(BOARD)_base -DIRS = $(RIOTBOARD)/msb-430-common +DIRS = $(RIOTBOARD)/msb-430-common all: $(BINDIR)$(MODULE).a @for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ; diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep index de1d7e692c..90564bbaee 100644 --- a/boards/msb-430h/Makefile.dep +++ b/boards/msb-430h/Makefile.dep @@ -3,4 +3,3 @@ ifneq (,$(findstring cc110x_ng,$(USEMODULE))) USEMODULE += cc110x_spi endif endif - diff --git a/boards/msba2-common/drivers/Makefile b/boards/msba2-common/drivers/Makefile index 7f461f12f9..275a4456b6 100644 --- a/boards/msba2-common/drivers/Makefile +++ b/boards/msba2-common/drivers/Makefile @@ -2,4 +2,3 @@ MODULE =$(BOARD)_base include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTBASE)/Makefile.base - diff --git a/boards/msba2-common/drivers/msba2-uart0.c b/boards/msba2-common/drivers/msba2-uart0.c index 44c6c7741c..4243898cbd 100644 --- a/boards/msba2-common/drivers/msba2-uart0.c +++ b/boards/msba2-common/drivers/msba2-uart0.c @@ -227,4 +227,3 @@ bl_uart_init(void) U0IER |= BIT0; // enable only RX irq return 1; } - diff --git a/boards/msba2-common/lpc2387-timer3.c b/boards/msba2-common/lpc2387-timer3.c index b9d1e23adf..c0de286b9e 100644 --- a/boards/msba2-common/lpc2387-timer3.c +++ b/boards/msba2-common/lpc2387-timer3.c @@ -48,4 +48,3 @@ unsigned int benchmark_read_stop(void) T3TCR = 0; // disable timer return T3TC; } - diff --git a/boards/msba2-common/tools/CHANGES b/boards/msba2-common/tools/CHANGES index dd9e6ec1ea..1b676291fe 100644 --- a/boards/msba2-common/tools/CHANGES +++ b/boards/msba2-common/tools/CHANGES @@ -18,6 +18,3 @@ Added 2103 chip to chip list. ID numbers for 2101 and 2102 unknown Added support for other chips Added soft boot code Added user configurable crystal value (for baud sync protocol) - - - diff --git a/boards/msba2-common/tools/COPYING b/boards/msba2-common/tools/COPYING index a43ea2126f..b8cf3a1ab2 100644 --- a/boards/msba2-common/tools/COPYING +++ b/boards/msba2-common/tools/COPYING @@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest diff --git a/boards/msba2-common/tools/Makefile b/boards/msba2-common/tools/Makefile index 442d751691..aff58e4300 100644 --- a/boards/msba2-common/tools/Makefile +++ b/boards/msba2-common/tools/Makefile @@ -18,7 +18,7 @@ lpc2k_pgm: $(OBJS) pseudoterm: $(PSEUDOTERM_OBJS) mkdir -p $(TARGETDIR) - $(CC) -o $(TARGETDIR)/pseudoterm $(PSEUDOTERM_OBJS) -lpthread + $(CC) -o $(TARGETDIR)/pseudoterm $(PSEUDOTERM_OBJS) -lpthread chipinfo.o: boot_2xxx.h boot_23xx.h diff --git a/boards/msba2-common/tools/README.txt b/boards/msba2-common/tools/README.txt index 8fd6adb012..7b64d7be45 100644 --- a/boards/msba2-common/tools/README.txt +++ b/boards/msba2-common/tools/README.txt @@ -140,5 +140,3 @@ of the following: If you get "Command not found" when trying to run "gtk-config", this is a sure sign that you do not have GTK+ 1.2 installed. - - diff --git a/boards/msba2-common/tools/armtools.txt b/boards/msba2-common/tools/armtools.txt index c91a4853f7..8dd7519d67 100644 --- a/boards/msba2-common/tools/armtools.txt +++ b/boards/msba2-common/tools/armtools.txt @@ -1,4 +1,4 @@ -This directory contains flash & terminal-utilities for use with +This directory contains flash & terminal-utilities for use with the msb_av2 platform used by the FeuerWhere-Project. Usage: diff --git a/boards/msba2-common/tools/flash.cmd b/boards/msba2-common/tools/flash.cmd index e957ca2b65..9cbd45ac3f 100755 --- a/boards/msba2-common/tools/flash.cmd +++ b/boards/msba2-common/tools/flash.cmd @@ -1,2 +1,2 @@ -fm.exe "COM(%1, 230400) DEVICE(LPC2387, 16.000000) HARDWARE(BOOTEXEC, 50, 100) HIGHSPEED(0, 230400) ERASEUSED(%2, PROTECTISP) HEXFILE(%2, NOCHECKSUMS, NOFILL, PROTECTISP) RESET" -sleep 2 +fm.exe "COM(%1, 230400) DEVICE(LPC2387, 16.000000) HARDWARE(BOOTEXEC, 50, 100) HIGHSPEED(0, 230400) ERASEUSED(%2, PROTECTISP) HEXFILE(%2, NOCHECKSUMS, NOFILL, PROTECTISP) RESET" +sleep 2 diff --git a/boards/msba2-common/tools/flashutil.sh b/boards/msba2-common/tools/flashutil.sh index c97d7c9a63..3f95d02621 100755 --- a/boards/msba2-common/tools/flashutil.sh +++ b/boards/msba2-common/tools/flashutil.sh @@ -18,7 +18,7 @@ windows_flash_fm() { echo " target mismatch: target board is \"${FTDI_ID}\", connected is ${BOARDCHECK}" exit 1 fi - + echo "Flashing ${HEXFILE} to COM${1} (${BOARDCHECK} serial ${SERIAL})" # Using FlashMagic on Windows (in separate window) cmd /C start "FlashMagic ${HEXFILE} to ${BOARDCHECK} on COM${1}" fm.exe "COM(${1}, 230400) DEVICE(LPC2387, 16.000000) HARDWARE(BOOTEXEC, 50, 100) HIGHSPEED(0, 230400) ERASEUSED(${HEXFILE}, PROTECTISP) HEXFILE(${HEXFILE}, NOCHECKSUMS, NOFILL, PROTECTISP) RESET" @@ -75,7 +75,7 @@ pids="" if [ ${PORTS} = "openocd" ]; then [ "$OPENOCD" != "" ] || exit 1 [ "$OPENOCD_IF" != "" ] || exit 1 -# echo -n "Is the board connected to the JTAG a '${FTDI_ID}' (y/n)? " +# echo -n "Is the board connected to the JTAG a '${FTDI_ID}' (y/n)? " # read REPLY # [ "$REPLY" = "y" ] || exit 1 fi diff --git a/boards/msba2-common/tools/mkbootc b/boards/msba2-common/tools/mkbootc index 4c0d9554dc..e7b61523b1 100644 --- a/boards/msba2-common/tools/mkbootc +++ b/boards/msba2-common/tools/mkbootc @@ -24,5 +24,3 @@ print C "const unsigned int ${ARGV[0]}[] = {\n"; print C "\t", join(', ', @data), "\n"; print C "};\n"; close C; - - diff --git a/boards/msba2-common/tools/mkstaticlist b/boards/msba2-common/tools/mkstaticlist index 4ad31030ca..3fd2e8915f 100644 --- a/boards/msba2-common/tools/mkstaticlist +++ b/boards/msba2-common/tools/mkstaticlist @@ -44,4 +44,3 @@ for ($i=0; $i<@arg; $i++) { } } print "\n"; - diff --git a/boards/msba2-common/tools/src/boot.h b/boards/msba2-common/tools/src/boot.h index ebca675db1..d0c0198fd5 100644 --- a/boards/msba2-common/tools/src/boot.h +++ b/boards/msba2-common/tools/src/boot.h @@ -3,7 +3,3 @@ typedef struct { int size; const int *prog; } boot_t; - - - - diff --git a/boards/msba2-common/tools/src/boot_23xx.armasm b/boards/msba2-common/tools/src/boot_23xx.armasm index 50e29957ff..c0ee73c8c6 100644 --- a/boards/msba2-common/tools/src/boot_23xx.armasm +++ b/boards/msba2-common/tools/src/boot_23xx.armasm @@ -28,5 +28,3 @@ const: .int 0xE01FC040 /* MEMMAP register */ .int 0xE01FC080 /* PLLCON */ .int 0xE01FC08C /* PLLFEED */ - - diff --git a/boards/msba2-common/tools/src/boot_2xxx.armasm b/boards/msba2-common/tools/src/boot_2xxx.armasm index 38e171520a..f5ddc511c8 100644 --- a/boards/msba2-common/tools/src/boot_2xxx.armasm +++ b/boards/msba2-common/tools/src/boot_2xxx.armasm @@ -9,7 +9,3 @@ begin: mov pc, #0 /* and then jump to the user's code */ const: .int 0xE01FC040 /* MEMMAP register */ - - - - diff --git a/boards/msba2-common/tools/src/chipinfo.c b/boards/msba2-common/tools/src/chipinfo.c index 4c418379b8..53c687faa5 100644 --- a/boards/msba2-common/tools/src/chipinfo.c +++ b/boards/msba2-common/tools/src/chipinfo.c @@ -153,4 +153,3 @@ char *lpc_return_strings[] = { "INVALID_CODE", "INVALID_BAUD_RATE", "INVALID_STOP_BIT", "CODE_READ_PROTECTION_ENABLED" }; - diff --git a/boards/msba2-common/tools/src/chipinfo.h b/boards/msba2-common/tools/src/chipinfo.h index 8c49593296..75ae81b05b 100644 --- a/boards/msba2-common/tools/src/chipinfo.h +++ b/boards/msba2-common/tools/src/chipinfo.h @@ -16,5 +16,3 @@ struct chip_info_struct { }; extern struct chip_info_struct chip_info[]; - - diff --git a/boards/msba2-common/tools/src/cksum_test.c b/boards/msba2-common/tools/src/cksum_test.c index facd6a1f3a..d5b1aacf1d 100644 --- a/boards/msba2-common/tools/src/cksum_test.c +++ b/boards/msba2-common/tools/src/cksum_test.c @@ -78,8 +78,3 @@ int main() return 0; } - - - - - diff --git a/boards/msba2-common/tools/src/control_2xxx.h b/boards/msba2-common/tools/src/control_2xxx.h index e37e2e29d5..dac78f01c1 100644 --- a/boards/msba2-common/tools/src/control_2xxx.h +++ b/boards/msba2-common/tools/src/control_2xxx.h @@ -5,4 +5,3 @@ void hard_reset_to_bootloader(void); void hard_reset_to_user_code(void); #endif // ..._H - diff --git a/boards/msba2-common/tools/src/download.c b/boards/msba2-common/tools/src/download.c index c7aab543a8..418a062131 100644 --- a/boards/msba2-common/tools/src/download.c +++ b/boards/msba2-common/tools/src/download.c @@ -1189,5 +1189,3 @@ void download_rx_term(const unsigned char *buf, int num) // while we are in the middle of downloading. Maybe // we should look for CTRL-C and abort?? } - - diff --git a/boards/msba2-common/tools/src/ihex.c b/boards/msba2-common/tools/src/ihex.c index 5f83759fa7..d257193407 100644 --- a/boards/msba2-common/tools/src/ihex.c +++ b/boards/msba2-common/tools/src/ihex.c @@ -302,14 +302,3 @@ void put_ihex_data(int addr, int len, const unsigned char *bytes) addr++; } } - - - - - - - - - - - diff --git a/boards/msba2-common/tools/src/ihex.h b/boards/msba2-common/tools/src/ihex.h index f6892381f5..7fbc58855a 100644 --- a/boards/msba2-common/tools/src/ihex.h +++ b/boards/msba2-common/tools/src/ihex.h @@ -2,6 +2,3 @@ extern int read_intel_hex(const char *filename); extern int bytes_within_range(int begin, int end); extern void get_ihex_data(int addr, int len, unsigned char *bytes); extern void put_ihex_data(int addr, int len, const unsigned char *bytes); - - - diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.c b/boards/msba2-common/tools/src/lpc2k_pgm.c index 756aa5b967..e9cd600213 100644 --- a/boards/msba2-common/tools/src/lpc2k_pgm.c +++ b/boards/msba2-common/tools/src/lpc2k_pgm.c @@ -100,4 +100,3 @@ int main(int argc, char **argv) return programming_status; } - diff --git a/boards/msba2-common/tools/src/pseudoterm.c b/boards/msba2-common/tools/src/pseudoterm.c index 24b2d33cb0..30279b6726 100644 --- a/boards/msba2-common/tools/src/pseudoterm.c +++ b/boards/msba2-common/tools/src/pseudoterm.c @@ -177,5 +177,3 @@ int main(int argc, char **argv) close_serial_port(); return 0; } - - diff --git a/boards/msba2-common/tools/src/serial.c b/boards/msba2-common/tools/src/serial.c index 9e7fee25f8..2584790276 100644 --- a/boards/msba2-common/tools/src/serial.c +++ b/boards/msba2-common/tools/src/serial.c @@ -444,9 +444,3 @@ void set_dtr(int val) printf("Error %i while setting port io flags\n", errno); } } - - - - - - diff --git a/boards/msba2-common/tools/src/settings.c b/boards/msba2-common/tools/src/settings.c index 405d648e1a..67e64c4c59 100644 --- a/boards/msba2-common/tools/src/settings.c +++ b/boards/msba2-common/tools/src/settings.c @@ -206,4 +206,3 @@ void new_crystal_setting(const char *new_xtal) write_settings_file(); } } - diff --git a/boards/msba2-common/tools/src/uuencode.c b/boards/msba2-common/tools/src/uuencode.c index 7b6856ab64..40745f05e9 100644 --- a/boards/msba2-common/tools/src/uuencode.c +++ b/boards/msba2-common/tools/src/uuencode.c @@ -118,6 +118,3 @@ static char uuchar(unsigned int val) return val; } - - - diff --git a/boards/msba2-common/tools/src/uuencode.h b/boards/msba2-common/tools/src/uuencode.h index 92fecb7d33..1626d61168 100644 --- a/boards/msba2-common/tools/src/uuencode.h +++ b/boards/msba2-common/tools/src/uuencode.h @@ -1,3 +1,2 @@ extern void uuencode(char *str, const unsigned char *data, int num); extern int uudecode(const char *str, unsigned char *data, int max); - diff --git a/boards/msba2-common/tools/termctrl.sh b/boards/msba2-common/tools/termctrl.sh index 75e87ab21e..e98afd7aa7 100755 --- a/boards/msba2-common/tools/termctrl.sh +++ b/boards/msba2-common/tools/termctrl.sh @@ -18,5 +18,5 @@ else echo "Usage:"; echo "termctrl.sh continue/pause/stop"; fi - + fi diff --git a/boards/msba2/Makefile b/boards/msba2/Makefile index 12fef1c0ed..c7a205595a 100644 --- a/boards/msba2/Makefile +++ b/boards/msba2/Makefile @@ -1,7 +1,7 @@ MODULE =$(BOARD)_base INCLUDES += -I$(RIOTBASE)/drivers/cc110x -DIRS = $(RIOTBOARD)/msba2-common +DIRS = $(RIOTBOARD)/msba2-common all: $(BINDIR)$(MODULE).a @for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ; diff --git a/boards/msba2/Makefile.include b/boards/msba2/Makefile.include index 41c42a0453..214f4602c3 100644 --- a/boards/msba2/Makefile.include +++ b/boards/msba2/Makefile.include @@ -1,4 +1,3 @@ export INCLUDES += -I$(RIOTBOARD)/msba2/include include $(RIOTBOARD)/msba2-common/Makefile.include - diff --git a/boards/native/Makefile.dep b/boards/native/Makefile.dep index fdd8ec4d90..d79ab4cc74 100644 --- a/boards/native/Makefile.dep +++ b/boards/native/Makefile.dep @@ -3,4 +3,3 @@ ifneq (,$(findstring ltc4150,$(USEMODULE))) USEMODULE += hwtimer endif endif - diff --git a/boards/native/drivers/native-led.c b/boards/native/drivers/native-led.c index fcf2fc9fb5..ff2262cc7a 100644 --- a/boards/native/drivers/native-led.c +++ b/boards/native/drivers/native-led.c @@ -48,4 +48,3 @@ void _native_LED_RED_TOGGLE(void) { printf("LED_RED_TOGGLE\n"); } - diff --git a/boards/pttu/Makefile b/boards/pttu/Makefile index 12fef1c0ed..c7a205595a 100644 --- a/boards/pttu/Makefile +++ b/boards/pttu/Makefile @@ -1,7 +1,7 @@ MODULE =$(BOARD)_base INCLUDES += -I$(RIOTBASE)/drivers/cc110x -DIRS = $(RIOTBOARD)/msba2-common +DIRS = $(RIOTBOARD)/msba2-common all: $(BINDIR)$(MODULE).a @for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ; diff --git a/boards/pttu/Makefile.include b/boards/pttu/Makefile.include index 86cabbec6e..cb34c2c317 100644 --- a/boards/pttu/Makefile.include +++ b/boards/pttu/Makefile.include @@ -1,4 +1,3 @@ export INCLUDES += -I$(RIOTBOARD)/pttu/include include $(RIOTBOARD)/msba2-common/Makefile.include - diff --git a/boards/pttu/tools/olimex-arm-usb-ocd.cfg b/boards/pttu/tools/olimex-arm-usb-ocd.cfg index 0aaba1d2bb..ec2d32e1c6 100644 --- a/boards/pttu/tools/olimex-arm-usb-ocd.cfg +++ b/boards/pttu/tools/olimex-arm-usb-ocd.cfg @@ -1,4 +1,4 @@ -# +# set CPUTAPID 0x4f1f0f0f jtag_speed 100 @@ -6,4 +6,3 @@ jtag_speed 100 source [find interface/olimex-arm-usb-ocd.cfg] #source [find target/lpc2148.cfg] source lpc2378.cfg - diff --git a/boards/pttu/tools/openocd-pttu.cfg b/boards/pttu/tools/openocd-pttu.cfg index b58392f1ee..d606006e56 100644 --- a/boards/pttu/tools/openocd-pttu.cfg +++ b/boards/pttu/tools/openocd-pttu.cfg @@ -21,38 +21,38 @@ proc mt_internal_rc {} { halt wait_halt 2 # PLL disconnect PLLCON - mww 0xE01FC080 0x01 - mww 0xE01FC08C 0xAA - mww 0xE01FC08C 0x55 + mww 0xE01FC080 0x01 + mww 0xE01FC08C 0xAA + mww 0xE01FC08C 0x55 # PLL disable PLLCON - mww 0xE01FC080 0x00 - mww 0xE01FC08C 0xAA - mww 0xE01FC08C 0x55 + mww 0xE01FC080 0x00 + mww 0xE01FC08C 0xAA + mww 0xE01FC08C 0x55 # no prescaler CCLKCFG mww 0xE01FC104 0x00 # internal RC CLKSRCSEL - mww 0xE01FC10C 0x00 + mww 0xE01FC10C 0x00 #### main oscil. CLKSRCSEL #### mww 0xE01FC10C 0x01 # remap to internal flash - mww 0xE01FC040 0x01 - sleep 100 + mww 0xE01FC040 0x01 + sleep 100 jtag_khz 500 - flash probe 0 + flash probe 0 } proc mt_flash_bin {IMGFILE OFFSET} { mt_internal_rc flash write_image erase $IMGFILE $OFFSET - sleep 100 + sleep 100 verify_image $IMGFILE $OFFSET - sleep 100 + sleep 100 } proc mt_flash_v {IMGFILE} { mt_internal_rc flash write_image erase $IMGFILE - sleep 100 + sleep 100 verify_image $IMGFILE sleep 100 } @@ -64,7 +64,7 @@ proc mt_flash {IMGFILE} { flash bank lpc2000 0x0 0x7d000 0 0 0 lpc2000_v2 4000 calc_checksum -arm7_9 dcc_downloads enable +arm7_9 dcc_downloads enable gdb_flash_program enable diff --git a/boards/pttu/tools/pttu_debug.gdb b/boards/pttu/tools/pttu_debug.gdb index 2c8ec0df14..e313287a86 100644 --- a/boards/pttu/tools/pttu_debug.gdb +++ b/boards/pttu/tools/pttu_debug.gdb @@ -1,7 +1,7 @@ #winheight regs 11 set history save on set history size 1000 -target remote localhost:3333 +target remote localhost:3333 monitor mt_internal_rc load compare-sections @@ -12,4 +12,3 @@ monitor debug_level 0 break bootloader continue d b 1 - diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include index f513dbd888..72ba39a77f 100644 --- a/boards/redbee-econotag/Makefile.include +++ b/boards/redbee-econotag/Makefile.include @@ -9,7 +9,7 @@ export CFLAGS += -std=gnu99 -march=armv4t -mtune=arm7tdmi-s -mlong-calls \ -msoft-float -mthumb-interwork -fno-strict-aliasing -fno-common \ -ffixed-r8 -ffunction-sections -ffreestanding -fno-builtin \ -nodefaultlibs -Wcast-align -Wall -Wstrict-prototypes -Wextra \ - -Os -pipe + -Os -pipe export CFLAGS_MTHUMB ?= -mthumb $(warning TODO add -mthumb) export AFLAGS = -Wa,-gstabs $(CFLAGS) diff --git a/boards/redbee-econotag/drivers/include/uart.h b/boards/redbee-econotag/drivers/include/uart.h index dc59169b24..3230154948 100644 --- a/boards/redbee-econotag/drivers/include/uart.h +++ b/boards/redbee-econotag/drivers/include/uart.h @@ -82,7 +82,7 @@ struct UART_struct { uint32_t : 27; } CTSbits; }; - + uint32_t BR; /*< BR is 32bit access only */ }; diff --git a/boards/redbee-econotag/drivers/nvm.c b/boards/redbee-econotag/drivers/nvm.c index 5d4538ef26..b55e59ebd8 100644 --- a/boards/redbee-econotag/drivers/nvm.c +++ b/boards/redbee-econotag/drivers/nvm.c @@ -10,9 +10,9 @@ #include "nvm.h" -nvm_err_t (*nvm_detect) (nvm_interface_t nvm_interface, nvm_type_t* p_nvm_type) +nvm_err_t (*nvm_detect) (nvm_interface_t nvm_interface, nvm_type_t* p_nvm_type) = (void*) 0x00006cb9; -nvm_err_t (*nvm_read) (nvm_interface_t nvm_interface, nvm_type_t nvm_type, void *p_dest, uint32_t address, uint32_t num_bytes) +nvm_err_t (*nvm_read) (nvm_interface_t nvm_interface, nvm_type_t nvm_type, void *p_dest, uint32_t address, uint32_t num_bytes) = (void*) 0x00006d69; nvm_err_t (*nvm_write) (nvm_interface_t nvm_interface, nvm_type_t nvm_type, void *p_src, uint32_t address, uint32_t numb_bytes) = (void*) 0x00006ec5; diff --git a/boards/redbee-econotag/drivers/redbee_uart.c b/boards/redbee-econotag/drivers/redbee_uart.c index 52f13e7f13..bda681bb77 100644 --- a/boards/redbee-econotag/drivers/redbee_uart.c +++ b/boards/redbee-econotag/drivers/redbee_uart.c @@ -26,7 +26,7 @@ void uart_set_baudrate(volatile struct UART_struct *uart, uint32_t baudrate) /* multiply by another 10 to get a fixed point*/ inc = ((uint64_t) baudrate * DIV_ * MOD_ * 10 / CLK_) - 10; /* add 5 and div by 10 to get a proper rounding */ - inc = (inc + 5) / 10; + inc = (inc + 5) / 10; /* disable UARTx to set baudrate */ uart->CONbits.TXE = 0; @@ -183,4 +183,3 @@ void bl_uart_init(void) { uart_init(UART1, BAUTRATE_UART1); } - diff --git a/boards/redbee-econotag/include/board.h b/boards/redbee-econotag/include/board.h index 590b3bf629..baddeb0cfe 100644 --- a/boards/redbee-econotag/include/board.h +++ b/boards/redbee-econotag/include/board.h @@ -28,4 +28,3 @@ typedef uint8_t radio_packet_length_t; #endif - diff --git a/boards/redbee-econotag/tools/mc1322x-load.pl b/boards/redbee-econotag/tools/mc1322x-load.pl index bfc1d1ffcd..81d8c2c839 100755 --- a/boards/redbee-econotag/tools/mc1322x-load.pl +++ b/boards/redbee-econotag/tools/mc1322x-load.pl @@ -22,8 +22,8 @@ my $zerolen; GetOptions ('file=s' => \$filename, 'secondfile=s' => \$second, 'zerolen' => \$zerolen, - 'terminal=s' => \$term, - 'verbose' => \$verbose, + 'terminal=s' => \$term, + 'verbose' => \$verbose, 'u|baud=s' => \$baud, 'rts=s' => \$rts, 'command=s' => \$command, @@ -77,12 +77,12 @@ my $s = 0; my $reset = 0; my $size = 0; -while(1) { - +while(1) { + my $c; my $count; my $ret = ''; my $test=''; - + if($s == 1) { print "secondary send...\n"; } - + $ob->write(pack('C','0')); if(($command ne '') && @@ -91,25 +91,25 @@ while(1) { system($command); } - if($s == 1) { - $test = 'ready'; + if($s == 1) { + $test = 'ready'; } else { $test = 'CONNECT'; } - + until($ret =~ /$test$/) { ($count,$c) = $ob->read(1); - if ($count == 0) { + if ($count == 0) { print '.'; - $ob->write(pack('C','0')); + $ob->write(pack('C','0')); next; } $ret .= $c; } print $ret . "\n"; - + if (-e $filename || (defined($zerolen) && ($s == 1))) { - + if(defined($zerolen) && ($s == 1)) { $size = 0; } else { @@ -123,7 +123,7 @@ while(1) { ((!defined($zerolen)) && ($s == 1))) { open(FILE, $filename) or die($!); print "Sending $filename\n"; - + my $i = 1; while(read(FILE, $c, 1)) { $i++; @@ -133,7 +133,7 @@ while(1) { } } } - + last if ($s==1); if((-e $second) || defined($zerolen)) { $s=1; $filename = $second; @@ -141,7 +141,7 @@ while(1) { last; } -} +} print "done sending files.\n"; @@ -168,4 +168,3 @@ $ob -> close or die "Close failed: $!\n"; ReadMode 0; undef $ob; # closes port AND frees memory in perl exit; - diff --git a/boards/telosb/Makefile.dep b/boards/telosb/Makefile.dep index 4392a18adb..4e36d0ff56 100644 --- a/boards/telosb/Makefile.dep +++ b/boards/telosb/Makefile.dep @@ -1,2 +1 @@ USEMODULE += msp430_common - diff --git a/boards/telosb/driver_cc2420.c b/boards/telosb/driver_cc2420.c index 4f3ee9a1c5..f2231c33ca 100644 --- a/boards/telosb/driver_cc2420.c +++ b/boards/telosb/driver_cc2420.c @@ -171,7 +171,7 @@ void cc2420_spi_init(void) P3DIR &= ~(0x04); /* P3.2 as input for SOMI */ P4OUT |= 0x04; /* P4.2 radio CS, hold high */ P4DIR |= 0x04; /* P4.2 radio CS, output */ - + /* Keep peripheral in reset state */ U0CTL = SWRST; @@ -179,14 +179,14 @@ void cc2420_spi_init(void) /* CKPL works also, but not CKPH+CKPL or none of them!! */ U0CTL |= CHAR + SYNC + MM; U0TCTL = CKPH + SSEL1 + SSEL0 + STC + TXEPT;; - + /* Ignore clockrate argument for now, just use clock source/2 */ /* SMCLK = 8 MHz */ U0BR0 = 0x02; /* Ensure baud rate >= 2 */ U0BR1 = 0x00; U0MCTL = 0x00; /* No modulation */ U0RCTL = 0x00; /* Reset Receive Control Register */ - + /* Enable SPI mode */ ME1 |= USPIE0; diff --git a/boards/telosb/uart.c b/boards/telosb/uart.c index f38aa5c3a2..5a670da5a0 100644 --- a/boards/telosb/uart.c +++ b/boards/telosb/uart.c @@ -115,4 +115,3 @@ interrupt(USART1RX_VECTOR) usart1irq(void) #endif } - diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include index 4ecffabafa..38d5244a6e 100644 --- a/boards/wsn430-common/Makefile.include +++ b/boards/wsn430-common/Makefile.include @@ -22,4 +22,3 @@ export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)" export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include export OFLAGS = -O ihex - diff --git a/boards/wsn430-common/board_init.c b/boards/wsn430-common/board_init.c index 9b84c699bc..deb35e4e8e 100644 --- a/boards/wsn430-common/board_init.c +++ b/boards/wsn430-common/board_init.c @@ -145,8 +145,8 @@ void msp430_init_dco(void) void board_init() { msp430_cpu_init(); msb_ports_init(); - + LED_RED_ON; - + msp430_set_cpu_speed(MCLK_8MHZ_SCLK_8MHZ); } diff --git a/boards/wsn430-common/include/board-conf.h b/boards/wsn430-common/include/board-conf.h index aedd1542a9..bf8a925373 100644 --- a/boards/wsn430-common/include/board-conf.h +++ b/boards/wsn430-common/include/board-conf.h @@ -16,7 +16,7 @@ */ #ifndef BOARD_CONF_H -#define BOARD_CONF_H +#define BOARD_CONF_H #include diff --git a/boards/wsn430-common/wsn430-uart0.c b/boards/wsn430-common/wsn430-uart0.c index ec4811ae93..8b4777115b 100644 --- a/boards/wsn430-common/wsn430-uart0.c +++ b/boards/wsn430-common/wsn430-uart0.c @@ -60,4 +60,3 @@ interrupt(USART0RX_VECTOR) usart0irq(void) { } #endif } - diff --git a/boards/wsn430-v1_3b/driver_cc110x.c b/boards/wsn430-v1_3b/driver_cc110x.c index 69b5f46898..8c2a80d509 100644 --- a/boards/wsn430-v1_3b/driver_cc110x.c +++ b/boards/wsn430-v1_3b/driver_cc110x.c @@ -169,14 +169,14 @@ void cc110x_spi_init(void) // CKPL works also, but not CKPH+CKPL or none of them!! U1CTL |= CHAR + SYNC + MM; U1TCTL = CKPH + SSEL1 + SSEL0 + STC; - + // Ignore clockrate argument for now, just use clock source/2 // SMCLK = 8 MHz U1BR0 = 0x02; // Ensure baud rate >= 2 U1BR1 = 0x00; U1MCTL = 0x00; // No modulation U1RCTL = 0x00; // Reset Receive Control Register - + // Enable SPI mode ME2 |= USPIE1; diff --git a/boards/wsn430-v1_4/driver_cc2420.c b/boards/wsn430-v1_4/driver_cc2420.c index 2d7249b85d..b8fbfef1ae 100644 --- a/boards/wsn430-v1_4/driver_cc2420.c +++ b/boards/wsn430-v1_4/driver_cc2420.c @@ -168,14 +168,14 @@ void cc2420_spi_init(void) // CKPL works also, but not CKPH+CKPL or none of them!! U1CTL |= CHAR + SYNC + MM; U1TCTL = CKPH + SSEL1 + SSEL0 + STC; - + // Ignore clockrate argument for now, just use clock source/2 // SMCLK = 8 MHz U1BR0 = 0x02; // Ensure baud rate >= 2 U1BR1 = 0x00; U1MCTL = 0x00; // No modulation U1RCTL = 0x00; // Reset Receive Control Register - + // Enable SPI mode ME2 |= USPIE1; diff --git a/core/bitarithm.c b/core/bitarithm.c index 5180f0d81e..dbd17ffeaf 100644 --- a/core/bitarithm.c +++ b/core/bitarithm.c @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @ingroup core_util * @{ @@ -69,4 +69,3 @@ number_of_bits_set(unsigned v) return c; } - diff --git a/core/cib.c b/core/cib.c index 40839388cf..d8a7c0d688 100644 --- a/core/cib.c +++ b/core/cib.c @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @ingroup core_util * @{ diff --git a/core/clist.c b/core/clist.c index 03c9b7589e..8916cffeae 100644 --- a/core/clist.c +++ b/core/clist.c @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @ingroup core_util * @{ diff --git a/core/doc.txt b/core/doc.txt index 7a8118c38f..6d683271d0 100644 --- a/core/doc.txt +++ b/core/doc.txt @@ -9,17 +9,17 @@ /** * @defgroup core Kernel * @brief The RIOT micro-kernel containing the core functionality - * + * * The kernel module contains only the basic OS functionality such as the sheduler, threading, synchronization * and IRQ-handling. The only exception is the integration of the hardware timer into this module. */ - + /** * @defgroup core_util Kernel utilities * @ingroup core * @brief Utilies and data structures used by the kernel */ - + /** * @defgroup core_internal Startup and Configuration * @ingroup core diff --git a/core/hwtimer.c b/core/hwtimer.c index 7622ec02d8..2ed9597aa3 100644 --- a/core/hwtimer.c +++ b/core/hwtimer.c @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @ingroup core_hwtimer * @{ @@ -141,7 +141,7 @@ void hwtimer_wait(unsigned long ticks) hwtimer_spin(ticks); return; } - + /* try to lock mutex again will cause the thread to go into * STATUS_MUTEX_BLOCKED until hwtimer fires the releasemutex */ mutex_lock(&mutex); @@ -217,4 +217,3 @@ int hwtimer_remove(int n) hwtimer_arch_enable_interrupt(); return 1; } - diff --git a/core/include/atomic.h b/core/include/atomic.h index 16981e9d86..f8943b0bbf 100644 --- a/core/include/atomic.h +++ b/core/include/atomic.h @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @addtogroup core_util * @{ diff --git a/core/include/bitarithm.h b/core/include/bitarithm.h index 1c074447f8..0098957fb6 100644 --- a/core/include/bitarithm.h +++ b/core/include/bitarithm.h @@ -6,7 +6,7 @@ * details. */ -/** +/** * @addtogroup core_util * @{ * diff --git a/core/include/cib.h b/core/include/cib.h index 3de2d253e0..18297e32d4 100644 --- a/core/include/cib.h +++ b/core/include/cib.h @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @addtogroup core_util * @{ diff --git a/core/include/clist.h b/core/include/clist.h index 2bdd346b55..39f2d80c29 100644 --- a/core/include/clist.h +++ b/core/include/clist.h @@ -46,4 +46,3 @@ void clist_print(clist_node_t *clist); /** @} */ #endif // __CLIST_H - diff --git a/core/include/debug.h b/core/include/debug.h index e8abd8058d..06abdbe9f2 100644 --- a/core/include/debug.h +++ b/core/include/debug.h @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @addtogroup core_util * @{ @@ -18,10 +18,10 @@ * @author Freie Universität Berlin, Computer Systems & Telematics * @author Kaspar Schleiser */ - + #ifndef __DEBUG_H #define __DEBUG_H - + #include #if ENABLE_DEBUG diff --git a/core/include/hwtimer_arch.h b/core/include/hwtimer_arch.h index 0dfba05fe2..3167e586ea 100644 --- a/core/include/hwtimer_arch.h +++ b/core/include/hwtimer_arch.h @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @addtogroup core_hwtimer * @{ @@ -18,7 +18,7 @@ * @author Heiko Will * @author Kaspar Schleiser */ - + #ifndef HWTIMER_ARCH_H_ #define HWTIMER_ARCH_H_ diff --git a/core/include/lifo.h b/core/include/lifo.h index ade1c1ef63..2bba202db0 100644 --- a/core/include/lifo.h +++ b/core/include/lifo.h @@ -42,7 +42,7 @@ void lifo_init(int *array, int n); * @brief: insert an element into the lifo * * @param array: an integer array of least i+1 size that does not - * already contain i + * already contain i * @param i: the integer value to store, between 0 and the size * of the array -1, must not be stored already * @@ -51,7 +51,7 @@ void lifo_insert(int *array, int i); /** * @brief: extract the least recently inserted element from the lifo - * + * * @param array: an integer array * * @return: -1 if the lifo is empty, the least recently diff --git a/core/include/msg.h b/core/include/msg.h index 38199c8197..e1c390afb3 100644 --- a/core/include/msg.h +++ b/core/include/msg.h @@ -18,7 +18,7 @@ * calling msg_init_queue(msg_t* array, int num). Messages sent to a thread with a non full message * queue are never dropped and the sending never blocks. Threads with a full message queue behaves * like in synchronous mode. - * + * * @{ * * @file msg.h diff --git a/core/include/sched.h b/core/include/sched.h index 66f086d855..eafecc8707 100644 --- a/core/include/sched.h +++ b/core/include/sched.h @@ -47,7 +47,7 @@ void sched_run(void); /** * @brief Set the status of the specified process * - * @param[in] process Pointer to the thread control block of the + * @param[in] process Pointer to the thread control block of the * targeted process * @param[in] status The new status of this thread */ @@ -60,8 +60,8 @@ void sched_set_status(tcb_t *process, unsigned int status); * * @param[in] current_prio The priority of the current thread * @param[in] other_prio The priority of the target thread - * @param[in] in_isr 1 if currently in interrupt context, 0 otherwise - */ + * @param[in] in_isr 1 if currently in interrupt context, 0 otherwise + */ void sched_switch(uint16_t current_prio, uint16_t other_prio, int in_isr); /** diff --git a/core/include/tcb.h b/core/include/tcb.h index 01e34e7a9d..651ed5c952 100644 --- a/core/include/tcb.h +++ b/core/include/tcb.h @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @addtogroup core_thread * @{ @@ -37,12 +37,12 @@ #define STATUS_STOPPED (0x0008) /**< has terminated */ #define STATUS_SLEEPING (0x0010) /**< sleeping */ #define STATUS_MUTEX_BLOCKED (0x0020) /**< waiting for a locked mutex */ -#define STATUS_RECEIVE_BLOCKED (0x0040) /**< waiting for a message */ -#define STATUS_SEND_BLOCKED (0x0080) /**< waiting for message to be +#define STATUS_RECEIVE_BLOCKED (0x0040) /**< waiting for a message */ +#define STATUS_SEND_BLOCKED (0x0080) /**< waiting for message to be * delivered */ #define STATUS_REPLY_BLOCKED (0x0100) /**< waiting for a message response */ #define STATUS_TIMER_WAITING (0x0200) /**< waiting for a timer to fire - * (deprecated) */ + * (deprecated) */ typedef struct tcb_t { char *sp; diff --git a/core/kernel_init.c b/core/kernel_init.c index 8474ed19f9..93fee54c41 100644 --- a/core/kernel_init.c +++ b/core/kernel_init.c @@ -84,4 +84,3 @@ void kernel_init(void) cpu_switch_context_exit(); } - diff --git a/core/oneway_malloc.c b/core/oneway_malloc.c index eca82a8a8c..bb3d596198 100644 --- a/core/oneway_malloc.c +++ b/core/oneway_malloc.c @@ -16,9 +16,9 @@ * * @file oneway_malloc.c * @brief Simple malloc wrapper for SBRK - * + * * Simple malloc implementation for plattforms without malloc in libc. - * + * * @author Kaspar Schleiser * * @} diff --git a/core/queue.c b/core/queue.c index eb35488141..18c9ac0c64 100644 --- a/core/queue.c +++ b/core/queue.c @@ -5,7 +5,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @ingroup core_util * @{ diff --git a/core/sched.c b/core/sched.c index a9b085e624..77ca892932 100644 --- a/core/sched.c +++ b/core/sched.c @@ -18,7 +18,7 @@ * * @} * - * TODO: setup dependency from SCHEDSTATISTICS to MODULE_HWTIMER + * TODO: setup dependency from SCHEDSTATISTICS to MODULE_HWTIMER */ #include diff --git a/cpu/arm_common/Makefile b/cpu/arm_common/Makefile index 68ec505674..91fd438c80 100644 --- a/cpu/arm_common/Makefile +++ b/cpu/arm_common/Makefile @@ -2,4 +2,3 @@ MODULE =arm_common CFLAGS += $(CFLAGS_BASIC) include $(RIOTBASE)/Makefile.base - diff --git a/cpu/arm_common/Makefile.include b/cpu/arm_common/Makefile.include index 21a06d3fa7..4ffd7b0de8 100644 --- a/cpu/arm_common/Makefile.include +++ b/cpu/arm_common/Makefile.include @@ -1,4 +1,3 @@ INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/ export UNDEF += $(BINDIR)syscalls.o - diff --git a/cpu/arm_common/VIC.c b/cpu/arm_common/VIC.c index 6226a4b151..8d998b21a7 100644 --- a/cpu/arm_common/VIC.c +++ b/cpu/arm_common/VIC.c @@ -94,5 +94,3 @@ unsigned enableFIQ(void) __set_cpsr(_cpsr & ~FIQ_MASK); return _cpsr; } - - diff --git a/cpu/arm_common/atomic.s b/cpu/arm_common/atomic.s index eb2612f0f6..487f4c8528 100644 --- a/cpu/arm_common/atomic.s +++ b/cpu/arm_common/atomic.s @@ -15,4 +15,3 @@ atomic_set_return: MOV r0, r2 mov pc, lr .endfunc - diff --git a/cpu/arm_common/common.s b/cpu/arm_common/common.s index 5cec2af570..ca97a64aa0 100644 --- a/cpu/arm_common/common.s +++ b/cpu/arm_common/common.s @@ -38,7 +38,7 @@ .func dINT: mrs r0, cpsr - + orr r0, r0, #NOINT /* Disable Int */ msr CPSR_c, r0 mov pc,lr @@ -83,9 +83,9 @@ ctx_switch2: ldr r1, =active_thread /* r1 = &active_thread */ ldr r1, [r1] /* r1 = *r1 = active_thread */ - str lr, [r1] /* store stack pointer in tasks tcb*/ + str lr, [r1] /* store stack pointer in tasks tcb*/ /* now the calling task has all its registers saved on its stack and it's SP is saved in its tcb */ - + /* call scheduler so active_thread points to the next task */ bl sched_run @@ -95,7 +95,7 @@ ctx_switch2: cpu_switch_context_exit: mov r0, #NOINT|SVCMODE msr cpsr, r0 - + /* call scheduler so active_thread points to the next task */ bl sched_run @@ -106,7 +106,7 @@ task_return: ldr r0, =active_thread /* r0 = &active_thread */ ldr r0, [r0] /* r0 = *r0 = active_thread */ ldr r0, [r0] - + /* restore saved spsr and return address from tasks stack */ ldmfd r0!, {r1,lr} msr SPSR, r1 @@ -125,7 +125,7 @@ arm_irq_handler: /* save interrupted tasks PC onto stack */ stmfd sp!, {lr} - + /* save all registers on isr stack */ stmfd sp!, {r0-r12} @@ -133,8 +133,8 @@ arm_irq_handler: MRS R0, SPSR STMFD SP!, {R0} - MRS R1, CPSR - MSR SPSR, R1 + MRS R1, CPSR + MSR SPSR, R1 .if CPU != mc1322x /* jump into vic interrupt */ @@ -147,10 +147,10 @@ arm_irq_handler: .endif mov pc, r0 - + /* restore spsr from stack */ LDMFD SP!, {R0} - MSR SPSR, R0 + MSR SPSR, R0 /* check if context switch was requested by irq */ ldr r0, =sched_context_switch_request @@ -160,7 +160,7 @@ arm_irq_handler: bne switch_context_int exit_irq_int: - /* recover general purpose registers */ + /* recover general purpose registers */ ldmfd sp!, {r0-r12} /* recover tasks PC into lr */ @@ -170,8 +170,7 @@ exit_irq_int: movs pc, lr switch_context_int: - /* recover general purpose registers */ + /* recover general purpose registers */ ldmfd sp!, {r0-r12} b ctx_switch2 - diff --git a/cpu/cc430/Makefile.include b/cpu/cc430/Makefile.include index 9cabdc9c4f..ae7de8cc19 100644 --- a/cpu/cc430/Makefile.include +++ b/cpu/cc430/Makefile.include @@ -1,4 +1,3 @@ INCLUDES += -I$(MAKEBASE)/cpu/cc430/include/ include $(RIOTCPU)/msp430-common/Makefile.include - diff --git a/cpu/cc430/cc430-adc.c b/cpu/cc430/cc430-adc.c index 51753bb150..c17437957b 100644 --- a/cpu/cc430/cc430-adc.c +++ b/cpu/cc430/cc430-adc.c @@ -159,5 +159,3 @@ interrupt(ADC12_VECTOR) __attribute__((naked)) adc_isr(void) __exit_isr(); } - - diff --git a/cpu/cc430/cc430-gpioint.c b/cpu/cc430/cc430-gpioint.c index 35d866401d..1ce15d4218 100644 --- a/cpu/cc430/cc430-gpioint.c +++ b/cpu/cc430/cc430-gpioint.c @@ -241,4 +241,3 @@ interrupt(PORT2_VECTOR) __attribute__((naked)) port2_isr(void) P2IE = int_enable; __exit_isr(); } - diff --git a/cpu/doc.txt b/cpu/doc.txt index 8f884e59b1..e04083a495 100644 --- a/cpu/doc.txt +++ b/cpu/doc.txt @@ -9,7 +9,7 @@ /** * @defgroup cpu CPU * @brief CPU specific implementations - * + * * This module contains all CPU specific source files. In case of multiple CPUs * sharing the same architecture, the implementation is split in a cpu specific * and a architecture specific part (eg. arm-common and lpc2387). diff --git a/cpu/lpc1768/LPC1768.ld b/cpu/lpc1768/LPC1768.ld index 0426f22764..0e7d2518d8 100644 --- a/cpu/lpc1768/LPC1768.ld +++ b/cpu/lpc1768/LPC1768.ld @@ -14,7 +14,7 @@ MEMORY * with other linker script that defines memory regions FLASH and RAM. * It references following symbols, which must be defined in code: * Reset_Handler : Entry of reset handler - * + * * It defines following symbols, which code can use without definition: * __exidx_start * __exidx_end @@ -67,7 +67,7 @@ SECTIONS KEEP(*(.eh_frame*)) } > FLASH - .ARM.extab : + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } > FLASH @@ -81,7 +81,7 @@ SECTIONS __etext = .; __sidata = __etext; - + .data : AT (__etext) { __data_start__ = .; @@ -122,7 +122,7 @@ SECTIONS *(COMMON) __bss_end__ = .; } > RAM - + __heap_size = ORIGIN(RAM) + LENGTH(RAM) - . ;/*- __stack_size;*/ .heap : { @@ -131,7 +131,7 @@ SECTIONS end = __end__; *(.heap*) . = . + __heap_size; - PROVIDE(__heap_max = .); + PROVIDE(__heap_max = .); __HeapLimit = .; } > RAM @@ -148,7 +148,7 @@ SECTIONS __StackTop = ORIGIN(RAM) + LENGTH(RAM); __StackLimit = __StackTop - SIZEOF(.stack_dummy); PROVIDE(__stack = __StackTop); - + /* Check if data + heap + stack exceeds RAM limit */ ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack") } diff --git a/cpu/lpc1768/Makefile b/cpu/lpc1768/Makefile index ed34d81c6b..0a08aff84a 100644 --- a/cpu/lpc1768/Makefile +++ b/cpu/lpc1768/Makefile @@ -1,6 +1,6 @@ MODULE =cpu -OBJECTS = system_LPC17xx.o startup_LPC17xx.o main.o +OBJECTS = system_LPC17xx.o startup_LPC17xx.o main.o CC_SYMBOLS = -DTARGET_LPC1769 -DTOOLCHAIN_GCC_ARM -DNDEBUG -D__CORTEX_M3 diff --git a/cpu/lpc1768/atom.c b/cpu/lpc1768/atom.c index 3e38145ae0..94e98fe474 100644 --- a/cpu/lpc1768/atom.c +++ b/cpu/lpc1768/atom.c @@ -1,7 +1,7 @@ /** * CPU speficic RIOT kernel function for NXP LPC1768 * - * Copyright (C) 2013 Oliver Hahm + * Copyright (C) 2013 Oliver Hahm * * This file subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more diff --git a/cpu/lpc1768/cpu.c b/cpu/lpc1768/cpu.c index a2308ae0d2..49b6116910 100644 --- a/cpu/lpc1768/cpu.c +++ b/cpu/lpc1768/cpu.c @@ -1,5 +1,5 @@ /** - * CPU specific functions for the RIOT scheduler on NXP LPC1768 + * CPU specific functions for the RIOT scheduler on NXP LPC1768 * * Copyright (C) 2013 Oliver Hahm * diff --git a/cpu/lpc1768/include/LPC17xx.h b/cpu/lpc1768/include/LPC17xx.h index bdc57c0d89..b8de826da1 100644 --- a/cpu/lpc1768/include/LPC17xx.h +++ b/cpu/lpc1768/include/LPC17xx.h @@ -1,6 +1,6 @@ /**************************************************************************//** * @file LPC17xx.h - * @brief CMSIS Cortex-M3 Core Peripheral Access Layer Header File for + * @brief CMSIS Cortex-M3 Core Peripheral Access Layer Header File for * NXP LPC17xx Device Series * @version: V1.09 * @date: 17. March 2010 @@ -10,9 +10,9 @@ * Copyright (C) 2009 ARM Limited. All rights reserved. * * @par - * ARM Limited (ARM) is supplying this software for use with Cortex-M - * processor based microcontrollers. This file can be freely distributed - * within development tools that are supporting such ARM based processors. + * ARM Limited (ARM) is supplying this software for use with Cortex-M + * processor based microcontrollers. This file can be freely distributed + * within development tools that are supporting such ARM based processors. * * @par * THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED diff --git a/cpu/lpc1768/include/cmsis.h b/cpu/lpc1768/include/cmsis.h index 2e51a087d1..fbd8c39b7c 100644 --- a/cpu/lpc1768/include/cmsis.h +++ b/cpu/lpc1768/include/cmsis.h @@ -1,6 +1,6 @@ /* mbed Microcontroller Library - CMSIS * Copyright (C) 2009-2011 ARM Limited. All rights reserved. - * + * * A generic CMSIS include header, pulling in LPC1768 specifics */ diff --git a/cpu/lpc1768/include/cpu.h b/cpu/lpc1768/include/cpu.h index d317a5b87d..a45fb1b484 100644 --- a/cpu/lpc1768/include/cpu.h +++ b/cpu/lpc1768/include/cpu.h @@ -2,7 +2,7 @@ #define CPU_H /** - * @defgroup lpc1768 NXP LPC1768 + * @defgroup lpc1768 NXP LPC1768 * @ingroup cpu * @{ */ diff --git a/cpu/lpc1768/lpc1768-lpm.c b/cpu/lpc1768/lpc1768-lpm.c index 91e8d86bf1..832e6ecd46 100644 --- a/cpu/lpc1768/lpc1768-lpm.c +++ b/cpu/lpc1768/lpc1768-lpm.c @@ -1,7 +1,7 @@ /** * LPM dummys for NXP LPC1768 * - * Copyright (C) 2013 Oliver Hahm + * Copyright (C) 2013 Oliver Hahm * * This file subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more diff --git a/cpu/lpc1768/startup.c b/cpu/lpc1768/startup.c index fffe4d5e6b..9abeb31976 100644 --- a/cpu/lpc1768/startup.c +++ b/cpu/lpc1768/startup.c @@ -8,7 +8,7 @@ *---------------------------------------------------------------------------- * * Copyright (C) 2009 ARM Limited. All rights reserved. - * Copyright (C) 2013 Oliver Hahm + * Copyright (C) 2013 Oliver Hahm * * ARM Limited (ARM) is supplying this software for use with Cortex-Mx * processor based microcontrollers. This file can be freely distributed diff --git a/cpu/lpc1768/syscalls.c b/cpu/lpc1768/syscalls.c index 11bb9707b6..f1919ab8e4 100644 --- a/cpu/lpc1768/syscalls.c +++ b/cpu/lpc1768/syscalls.c @@ -1,7 +1,7 @@ /** * Syscall implementation for NXP LPC1768 * - * Copyright (C) 2013 Oliver Hahm + * Copyright (C) 2013 Oliver Hahm * * This file subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more @@ -11,7 +11,7 @@ * @{ * @file syscalls.c * @author Oliver Hahm - * @author Alaeddine Weslati + * @author Alaeddine Weslati * @} */ @@ -148,7 +148,7 @@ int _fstat_r(struct _reent *r, int fd, struct stat * st) if (fd == STDOUT_FILENO || fd == STDERR_FILENO) { st->st_mode = S_IFCHR; ret = 0; - } + } else { r->_errno = ENODEV; } diff --git a/cpu/lpc2387/Makefile b/cpu/lpc2387/Makefile index 8b9db75619..fbee8f02d5 100644 --- a/cpu/lpc2387/Makefile +++ b/cpu/lpc2387/Makefile @@ -23,4 +23,3 @@ include $(RIOTBASE)/Makefile.base clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/cpu/lpc2387/Makefile.include b/cpu/lpc2387/Makefile.include index 92ada63482..686f4c641d 100644 --- a/cpu/lpc2387/Makefile.include +++ b/cpu/lpc2387/Makefile.include @@ -4,4 +4,3 @@ include $(RIOTCPU)/arm_common/Makefile.include include $(RIOTCPU)/lpc_common/Makefile.include export USEMODULE += arm_common lpc_common - diff --git a/cpu/lpc2387/asmfunc.s b/cpu/lpc2387/asmfunc.s index d61c6d6ca4..8c34576061 100644 --- a/cpu/lpc2387/asmfunc.s +++ b/cpu/lpc2387/asmfunc.s @@ -93,4 +93,3 @@ sb_align: BX LR .end - diff --git a/cpu/lpc2387/gpioint/Makefile b/cpu/lpc2387/gpioint/Makefile index edd98724dd..695bc04395 100644 --- a/cpu/lpc2387/gpioint/Makefile +++ b/cpu/lpc2387/gpioint/Makefile @@ -1,4 +1,3 @@ MODULE =gpioint include $(MAKEBASE)/Makefile.base - diff --git a/cpu/lpc2387/i2c/Makefile b/cpu/lpc2387/i2c/Makefile index 825b7ecde6..e1c5af410e 100644 --- a/cpu/lpc2387/i2c/Makefile +++ b/cpu/lpc2387/i2c/Makefile @@ -1,4 +1,3 @@ MODULE =i2c include $(MAKEBASE)/Makefile.base - diff --git a/cpu/lpc2387/include/i2c.h b/cpu/lpc2387/include/i2c.h index b2580d1057..8661904998 100644 --- a/cpu/lpc2387/include/i2c.h +++ b/cpu/lpc2387/include/i2c.h @@ -327,4 +327,3 @@ void i2c_enable_pull_up_resistor(uint8_t i2c_interface); void i2c_disable_pull_up_resistor(uint8_t i2c_interface); #endif /* end __I2C_H */ - diff --git a/cpu/lpc2387/include/lpc2387.h b/cpu/lpc2387/include/lpc2387.h index 43ab5e47d0..66a03d983c 100644 --- a/cpu/lpc2387/include/lpc2387.h +++ b/cpu/lpc2387/include/lpc2387.h @@ -207,4 +207,3 @@ /** @} */ #endif // __LPC2387_H - diff --git a/cpu/lpc2387/include/lpc23xx.h b/cpu/lpc2387/include/lpc23xx.h index 84e0267744..0358c26d26 100644 --- a/cpu/lpc2387/include/lpc23xx.h +++ b/cpu/lpc2387/include/lpc23xx.h @@ -1128,4 +1128,3 @@ with the spec. update in USB Device Section. */ #endif // __LPC23xx_H - diff --git a/cpu/lpc2387/linkerscript.x b/cpu/lpc2387/linkerscript.x index a369b957d5..be3f7fb985 100644 --- a/cpu/lpc2387/linkerscript.x +++ b/cpu/lpc2387/linkerscript.x @@ -11,7 +11,7 @@ This file is part of RIOT. */ /* specify the LPC2387 memory areas (see LPC2387 datasheet page 15) */ -MEMORY +MEMORY { flash : ORIGIN = 0, LENGTH = 504K /* FLASH ROM 512kByte without ISP bootloader*/ infomem : ORIGIN = 0x0007D000, LENGTH = 4K /* Last sector in FLASH ROM for config data */ @@ -30,9 +30,9 @@ __stack_usr_size = 4096; /* stack for user operation (kernel init) */ __stack_size = __stack_und_size + __stack_abt_size + __stack_fiq_size + __stack_irq_size + __stack_svc_size + __stack_usr_size; /* now define the output sections */ -SECTIONS +SECTIONS { - .text : /* collect all sections that should go into FLASH after startup */ + .text : /* collect all sections that should go into FLASH after startup */ { *(.vectors) /* Exception Vectors and branch table >= 64 bytes */ . = ALIGN(64); @@ -47,7 +47,7 @@ SECTIONS *(.init7) *(.init8) *(.init9) /* Call main(). */ - + *(.text) /* all .text sections (code) */ *(.text.*) *(.gnu.linkonce.t.*) @@ -59,9 +59,9 @@ SECTIONS . = ALIGN(4); __cfgspec_start = .; *(.cfgspec) /* configuration spec table */ - __cfgspec_end = .; + __cfgspec_end = .; . = ALIGN(4); - + __ctors_start = .; PROVIDE (_os_ctor_start = .); *(.ctors); @@ -76,7 +76,7 @@ SECTIONS *(.gnu.linkonce.r.*) *(.glue_7) /* all .glue_7 sections (no idea what these are) */ *(.glue_7t) /* all .glue_7t sections (no idea what these are) */ - + *(.fini9) *(.fini8) *(.fini7) @@ -88,10 +88,10 @@ SECTIONS *(.fini1) *(.fini0) /* Infinite loop after program termination. */ *(.fini) - + *(.gcc_except_table) - - } >flash /* put all the above into FLASH */ + + } >flash /* put all the above into FLASH */ . = ALIGN(4); /* .ARM.exidx is sorted, so has to go in its own output section. */ @@ -104,9 +104,9 @@ SECTIONS _etext = . ; /* define a global symbol _etext just after the last code byte */ - .config : + .config : { - *(.configmem) + *(.configmem) . = ALIGN(256); } >infomem . = ALIGN(4); @@ -136,7 +136,7 @@ SECTIONS /* * collect all uninitialized sections that go into RAM - */ + */ .noinit (NOLOAD) : { __noinit_start = .; @@ -159,7 +159,7 @@ SECTIONS } > ram /* put all the above in RAM (it will be cleared in the startup code */ . = ALIGN(4); /* ensure data is aligned so relocation can use 4-byte operations */ __bss_end = . ; /* define a global symbol marking the end of the .bss section */ - + /* * collect all initialized .data sections that go into RAM * initial values get placed at the end of .text in flash @@ -192,10 +192,10 @@ SECTIONS } >ram /* put all the above into RAM (but load the LMA copy into FLASH) */ . = ALIGN(4); /* ensure data is aligned so relocation can use 4-byte operations */ _edata = .; /* define a global symbol marking the end of the .data section */ - - + + /* - * Exception frames (newer linker versions generate these but they use of + * Exception frames (newer linker versions generate these but they use of * most of the RAM. */ /DISCARD/ : /* discard exception frames */ @@ -205,13 +205,13 @@ SECTIONS /* to enable exception frames */ /* - .eh_frame : + .eh_frame : { KEEP (*(.eh_frame)) } > ram . = ALIGN(4); */ - + _end = .; /* define a global symbol marking the end of application RAM */ __heap1_size = ORIGIN(ram) + LENGTH(ram) - . - __stack_size; @@ -219,16 +219,16 @@ SECTIONS { PROVIDE(__heap1_start = .); . = . + __heap1_size; - PROVIDE(__heap1_max = .); - } > ram - + PROVIDE(__heap1_max = .); + } > ram + /* * Stacks */ .stack (NOLOAD) : { PROVIDE(__stack_start = .); - + . = . + __stack_usr_size; __stack_usr_start = .; . = . + __stack_und_size; @@ -241,10 +241,10 @@ SECTIONS __stack_abt_start = .; . = . + __stack_svc_size; __stack_svc_start = .; - + PROVIDE(__stack_end = .); } > ram - + __heap2_size = LENGTH(ram_ethernet); .heap2 (NOLOAD) : { @@ -258,7 +258,7 @@ SECTIONS { *(.usbdata) } > ram_usb - + .heap3 ALIGN(0x1000) (NOLOAD) : { __heap3_size = ORIGIN(ram_usb) + LENGTH(ram_usb) - ABSOLUTE(.); @@ -267,10 +267,10 @@ SECTIONS PROVIDE(__heap3_max = .); } > ram_usb __heap_size = SIZEOF(.heap3); - - + + .batteryram (NOLOAD) : /* battery ram stays on during powerdown but needs to be handled specially */ { *(.batteryram) - } > ram_battery + } > ram_battery } diff --git a/cpu/lpc2387/mci/Makefile b/cpu/lpc2387/mci/Makefile index 22fd2a480b..970c9d87f5 100644 --- a/cpu/lpc2387/mci/Makefile +++ b/cpu/lpc2387/mci/Makefile @@ -1,4 +1,3 @@ MODULE =mci include $(MAKEBASE)/Makefile.base - diff --git a/cpu/lpc2387/rtc/Makefile b/cpu/lpc2387/rtc/Makefile index 64278b51d6..4d24181c99 100644 --- a/cpu/lpc2387/rtc/Makefile +++ b/cpu/lpc2387/rtc/Makefile @@ -1,4 +1,3 @@ MODULE =rtc include $(MAKEBASE)/Makefile.base - diff --git a/cpu/lpc2387/tools/openocd-lpc2387.cfg b/cpu/lpc2387/tools/openocd-lpc2387.cfg index 1d6813b040..eb04523cb9 100644 --- a/cpu/lpc2387/tools/openocd-lpc2387.cfg +++ b/cpu/lpc2387/tools/openocd-lpc2387.cfg @@ -1,13 +1,13 @@ -if { [info exists CHIPNAME] } { - set _CHIPNAME $CHIPNAME -} else { +if { [info exists CHIPNAME] } { + set _CHIPNAME $CHIPNAME +} else { set _CHIPNAME lpc2378 } -if { [info exists ENDIAN] } { - set _ENDIAN $ENDIAN -} else { +if { [info exists ENDIAN] } { + set _ENDIAN $ENDIAN +} else { set _ENDIAN little } @@ -22,7 +22,7 @@ if { [info exists CPUTAPID ] } { jtag_nsrst_delay 200 jtag_ntrst_delay 200 -# NOTE!!! LPCs need reset pulled while RTCK is low. 0 to activate +# NOTE!!! LPCs need reset pulled while RTCK is low. 0 to activate # JTAG, power-on reset is not enough, i.e. you need to perform a # reset before being able to talk to the LPC2378, attach is not # possible. @@ -40,10 +40,9 @@ $_TARGETNAME configure -event reset-init { # Force target into ARM state soft_reset_halt #do not remap 0x0000-0x0020 to anything but the flash - mwb 0xE01FC040 0x01 + mwb 0xE01FC040 0x01 } #flash bank lpc2000 0 0 #flash bank lpc2000 0x0 0x7d000 0 0 0 lpc2000_v2 14765 - diff --git a/cpu/lpc_common/Makefile b/cpu/lpc_common/Makefile index b8ccbfb0ef..7c6b421300 100644 --- a/cpu/lpc_common/Makefile +++ b/cpu/lpc_common/Makefile @@ -1,4 +1,3 @@ MODULE =lpc_common include $(RIOTBASE)/Makefile.base - diff --git a/cpu/lpc_common/lpc_syscalls.c b/cpu/lpc_common/lpc_syscalls.c index e590949739..4e21c2ab09 100644 --- a/cpu/lpc_common/lpc_syscalls.c +++ b/cpu/lpc_common/lpc_syscalls.c @@ -38,7 +38,7 @@ static const caddr_t heap_start[NUM_HEAPS] = {(caddr_t)&__heap1_start,(caddr_t)& /** @} */ /*-----------------------------------------------------------------------------------*/ -void heap_stats(void) +void heap_stats(void) { for(int i = 0; i < NUM_HEAPS; i++) printf("# heap %i: %p -- %p -> %p (%li of %li free)\n", i, heap_start[i], heap[i], heap_max[i], diff --git a/cpu/mc1322x/Makefile b/cpu/mc1322x/Makefile index cb7f2993a0..9bb19b004b 100644 --- a/cpu/mc1322x/Makefile +++ b/cpu/mc1322x/Makefile @@ -15,4 +15,3 @@ include $(RIOTBASE)/Makefile.base clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/cpu/mc1322x/adc/Makefile b/cpu/mc1322x/adc/Makefile index 7cdb51ecb5..4e1bdca68c 100644 --- a/cpu/mc1322x/adc/Makefile +++ b/cpu/mc1322x/adc/Makefile @@ -1,4 +1,4 @@ -INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/adc/include +INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/adc/include MODULE =mc1322x_adc diff --git a/cpu/mc1322x/asm/asm.c b/cpu/mc1322x/asm/asm.c index 989a6176a7..ce8b4a7c51 100644 --- a/cpu/mc1322x/asm/asm.c +++ b/cpu/mc1322x/asm/asm.c @@ -42,9 +42,9 @@ void asm_turn_off(void) * This function blocks until the encryption/decryption finished after 13 clocks. * * \param keys The 128 bit key. \sa asm_keys_t - * \param data A 128 bit block to encrypt/decrypt. Holds the encrypted/decrypted - * data when finished \sa asm_data_t - * \param ctr Structure holding the counter for the encryption/decrpytion. The user + * \param data A 128 bit block to encrypt/decrypt. Holds the encrypted/decrypted + * data when finished \sa asm_data_t + * \param ctr Structure holding the counter for the encryption/decrpytion. The user * is responsible to provide a decend counter function. \sa asm_ctr_t */ void asm_ctr_encryption_blocking(asm_keys_t *keys, asm_data_t *data, asm_ctr_t *ctr) @@ -146,7 +146,7 @@ void asm_ctr_cbc_mac_init(asm_keys_t *keys) * Updates a MAC stream and encrypts data. * \param data Structure holding 128 bits of data to use in MAC stream and to encrypt. Holds the encrypted data when finished. \sa asm_data_t - * \param ctr Structure holding the counter for the encryption/decrpytion. The user + * \param ctr Structure holding the counter for the encryption/decrpytion. The user * is responsible to provide a decend counter function. \sa asm_ctr_t */ void asm_ctr_cbc_mac_update(asm_data_t *data, asm_ctr_t *ctr) diff --git a/cpu/mc1322x/asm/include/asm.h b/cpu/mc1322x/asm/include/asm.h index dc301b6f7d..150070ec7c 100644 --- a/cpu/mc1322x/asm/include/asm.h +++ b/cpu/mc1322x/asm/include/asm.h @@ -51,7 +51,7 @@ struct ASM_struct { uint32_t CONTROL_1; ///< Control 1 register struct ASM_CONTROL_1 { uint32_t ON: 1; ///< Turn ASM module on - uint32_t NORMAL_MODE: 1;///< exit boot mode + uint32_t NORMAL_MODE: 1;///< exit boot mode uint32_t BYPASS: 1; ///< Data passes through unmodified uint32_t : 21; uint32_t CBC: 1; ///< enable CBC-MAC mode diff --git a/cpu/mc1322x/gpio.c b/cpu/mc1322x/gpio.c index 197e9351e4..5d92a26c12 100644 --- a/cpu/mc1322x/gpio.c +++ b/cpu/mc1322x/gpio.c @@ -10,13 +10,13 @@ #include "gpio.h" -static inline void gpio_pad_dir(volatile uint64_t data) +static inline void gpio_pad_dir(volatile uint64_t data) { GPIO->PAD_DIR0 = (data & 0xffffffff); GPIO->PAD_DIR1 = (data >> 32); } -static inline void gpio_data(volatile uint64_t data) +static inline void gpio_data(volatile uint64_t data) { GPIO->DATA0 = (data & 0xffffffff); GPIO->DATA1 = (data >> 32); @@ -31,45 +31,44 @@ static inline uint64_t gpio_data_get(volatile uint64_t bits) { return rdata; } -static inline void gpio_pad_pu_en(volatile uint64_t data) +static inline void gpio_pad_pu_en(volatile uint64_t data) { GPIO->PAD_PU_EN0 = (data & 0xffffffff); GPIO->PAD_PU_EN1 = (data >> 32); } -static inline void gpio_data_sel(volatile uint64_t data) +static inline void gpio_data_sel(volatile uint64_t data) { GPIO->DATA_SEL0 = (data & 0xffffffff); GPIO->DATA_SEL1 = (data >> 32); } -static inline void gpio_pad_pu_sel(volatile uint64_t data) +static inline void gpio_pad_pu_sel(volatile uint64_t data) { GPIO->PAD_PU_SEL0 = (data & 0xffffffff); GPIO->PAD_PU_SEL1 = (data >> 32); } -static inline void gpio_data_set(volatile uint64_t data) +static inline void gpio_data_set(volatile uint64_t data) { GPIO->DATA_SET0 = (data & 0xffffffff); GPIO->DATA_SET1 = (data >> 32); } -static inline void gpio_data_reset(volatile uint64_t data) +static inline void gpio_data_reset(volatile uint64_t data) { GPIO->DATA_RESET0 = (data & 0xffffffff); GPIO->DATA_RESET1 = (data >> 32); } -static inline void gpio_pad_dir_set(volatile uint64_t data) +static inline void gpio_pad_dir_set(volatile uint64_t data) { GPIO->PAD_DIR_SET0 = (data & 0xffffffff); GPIO->PAD_DIR_SET1 = (data >> 32); } -static inline void gpio_pad_dir_reset(volatile uint64_t data) +static inline void gpio_pad_dir_reset(volatile uint64_t data) { GPIO->PAD_DIR_RESET0 = (data & 0xffffffff); GPIO->PAD_DIR_RESET1 = (data >> 32); } - diff --git a/cpu/mc1322x/hwtimer_cpu.c b/cpu/mc1322x/hwtimer_cpu.c index 6107426d96..4cb872611f 100644 --- a/cpu/mc1322x/hwtimer_cpu.c +++ b/cpu/mc1322x/hwtimer_cpu.c @@ -63,10 +63,10 @@ void timer_x_init(volatile struct TMR_struct* const TMRx) { /* disable comparison */ TMRx->COMP1 = 0; TMRx->CMPLD1 = 0; - + /* set counter to zero */ TMRx->CNTR = TMRx->LOAD; - + /* set timer control bits */ TMRx->CTRLbits.COUNT_MODE = 1; /* use rising edge of primary source */ TMRx->CTRLbits.PRIMARY_CNT_SOURCE = 0x0f; /* Perip. clock with 128 prescale (for 24MHz = 187500Hz) */ @@ -80,10 +80,10 @@ void timer_x_init(volatile struct TMR_struct* const TMRx) { void hwtimer_arch_init(void (*handler)(int), uint32_t fcpu) { int_handler = handler; - + /* TODO: do scaling voodoo */ (void) fcpu; - + /* disable all timers */ TMR0->ENBL = 0; timer_x_init(TMR0); @@ -115,7 +115,7 @@ void hwtimer_arch_disable_interrupt(void) { void hwtimer_arch_set(unsigned long offset, short timer) { /* get corresponding struct for the given ::timer parameter */ struct TMR_struct* tmr = (void *) TMR_BASE + (timer * TMR_OFFSET); - + /* disable IRQs and save the status register */ uint32_t cpsr = disableIRQ(); @@ -124,8 +124,8 @@ void hwtimer_arch_set(unsigned long offset, short timer) { tmr->CSCTRLbits.TCF1 = 0; /* reset compare flag */ tmr->CSCTRLbits.TCF1EN = 1; /* enable intterupts when TCF1 is set \ */ TMR0->ENBL |= (1<SCTRLbits.TCFIE = 1; /* enable interrupts when TCF is one - do we need both?*/ - + tmr->SCTRLbits.TCFIE = 1; /* enable interrupts when TCF is one - do we need both?*/ + /* restore status register */ restoreIRQ(cpsr); } @@ -134,17 +134,17 @@ void hwtimer_arch_set(unsigned long offset, short timer) { void hwtimer_arch_set_absolute(unsigned long value, short timer) { /* get corresponding struct for the given ::timer parameter */ struct TMR_struct* tmr = (void *) TMR_BASE + (timer * TMR_OFFSET); - + /* disable IRQs and save the status register */ uint32_t cpsr = disableIRQ(); - + TMR0->ENBL &= ~(1<COMP1 = value; /* load the value into the compare register */ tmr->CSCTRLbits.TCF1 = 0; /* reset compare flag */ tmr->CSCTRLbits.TCF1EN = 1; /* enable interrupts when TCF1 is set \ */ TMR0->ENBL |= (1<SCTRLbits.TCFIE = 1; /* enable interrupts when TCF is one - do we need both?*/ - + tmr->SCTRLbits.TCFIE = 1; /* enable interrupts when TCF is one - do we need both?*/ + /* restore status register */ restoreIRQ(cpsr); } @@ -153,7 +153,7 @@ void hwtimer_arch_set_absolute(unsigned long value, short timer) { void hwtimer_arch_unset(short timer) { /* get corresponding struct for the given ::timer parameter */ struct TMR_struct* tmr = (void *) TMR_BASE + (timer + TMR_OFFSET); - + tmr->CSCTRLbits.TCF1 = 0; /* reset compare flag */ tmr->CSCTRLbits.TCF1EN = 0; /* disable interrupts for TCF1 */ tmr->SCTRLbits.TCFIE = 0; /* disable interrupts for TCF */ diff --git a/cpu/mc1322x/include/cpu.h b/cpu/mc1322x/include/cpu.h index 82b307bf4a..66cf3b5edb 100644 --- a/cpu/mc1322x/include/cpu.h +++ b/cpu/mc1322x/include/cpu.h @@ -5,7 +5,7 @@ * This source code is licensed under the GNU Lesser General Public License, * Version 2. See the file LICENSE for more details. */ - + /** * @defgroup mc1322x Freescale MC1322x * @ingroup cpu @@ -13,7 +13,7 @@ */ #ifndef CPU_H -#define CPU_H +#define CPU_H /** * @defgroup mc1322x Freescale mc1322x diff --git a/cpu/mc1322x/include/gpio.h b/cpu/mc1322x/include/gpio.h index 2e42d41ee9..bde4cb5e31 100644 --- a/cpu/mc1322x/include/gpio.h +++ b/cpu/mc1322x/include/gpio.h @@ -76,12 +76,12 @@ #define TXON GPIO_44 #define RXON GPIO_45 #define ANT1 GPIO_42 -#define ANT2 GPIO_43 +#define ANT2 GPIO_43 #define VREF2H GPIO_38 #define VREF2L GPIO_39 #define VREF1H GPIO_40 #define VREF1L GPIO_41 -#define MDO0 GPIO_51 +#define MDO0 GPIO_51 #define MDO1 GPIO_52 #define MDO2 GPIO_53 #define MDO3 GPIO_54 @@ -157,4 +157,3 @@ enum { _REP(0,0) }; static volatile struct GPIO_struct * const GPIO = (void *) (0x80000000); #endif - diff --git a/cpu/mc1322x/include/mc1322x.h b/cpu/mc1322x/include/mc1322x.h index d8c7c74e0d..d4595beff4 100644 --- a/cpu/mc1322x/include/mc1322x.h +++ b/cpu/mc1322x/include/mc1322x.h @@ -9,7 +9,7 @@ */ #ifndef MC1322X_H -#define MC1322X_H +#define MC1322X_H #include diff --git a/cpu/mc1322x/mc1322x.lds b/cpu/mc1322x/mc1322x.lds index e3f5258ca3..f4706d6371 100644 --- a/cpu/mc1322x/mc1322x.lds +++ b/cpu/mc1322x/mc1322x.lds @@ -26,7 +26,7 @@ HEAP_SIZE = 4096; .text : { *(.startup) - *(.irq) + *(.irq) *(.text .stub .text.* .gnu.linkonce.t.*) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) @@ -96,7 +96,7 @@ HEAP_SIZE = 4096; /* . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE)); */ . = ALIGN(4); - . = DATA_SEGMENT_ALIGN(4,4); + . = DATA_SEGMENT_ALIGN(4,4); /* Exception handling */ .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) } @@ -153,10 +153,10 @@ HEAP_SIZE = 4096; KEEP (*(SORT(.dtors.*))) KEEP (*(.dtors)) } - .jcr : { KEEP (*(.jcr)) } + .jcr : { KEEP (*(.jcr)) } .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) } - .dynamic : { *(.dynamic) } - . = DATA_SEGMENT_RELRO_END (0, .); + .dynamic : { *(.dynamic) } + . = DATA_SEGMENT_RELRO_END (0, .); .got : { *(.got.plt) *(.got) } .data : { diff --git a/cpu/mc1322x/startup.s b/cpu/mc1322x/startup.s index c454a6cd80..614315bcc4 100644 --- a/cpu/mc1322x/startup.s +++ b/cpu/mc1322x/startup.s @@ -33,9 +33,9 @@ * */ - + /* -The following lincence is for all parts of this code done by +The following lincence is for all parts of this code done by Martin Thomas. Code from others used here may have other license terms. Copyright (C) 2004 Martin THOMAS @@ -67,7 +67,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * This file is part of RIOT. */ - + /* Standard definitions of Mode bits and Interrupt (I & F) flags in PSRs (program status registers) */ .set USR_MODE, 0x10 /* Normal User Mode */ .set FIQ_MODE, 0x11 /* FIQ Processing Fast Interrupts Mode */ @@ -82,7 +82,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .section .startup - + .set _rom_data_init, 0x108d0 .global _startup .func _startup @@ -97,7 +97,7 @@ _startup: ldr PC, IRQ_Addr /* Interrupt Request Interrupt (load from VIC) */ ldr PC, _fiq - /* these vectors are used for rom patching */ + /* these vectors are used for rom patching */ .org 0x20 .code 16 _RPTV_0_START: @@ -121,8 +121,8 @@ ROM_var_start: .word 0 ROM_var_end: .word 0 .code 32 -.align -_begin: +.align +_begin: /* FIQ mode stack */ msr CPSR_c, #(FIQ_MODE | IRQ_DISABLE | FIQ_DISABLE) ldr sp, =__fiq_stack_top__ /* set the FIQ stack pointer */ @@ -171,10 +171,10 @@ clbss_l: b kernel_init /* Exception vector handlers branching table */ -Undef_Addr: .word UNDEF_Routine -SWI_Addr: .word ctx_switch -PAbt_Addr: .word PABT_Routine -DAbt_Addr: .word DABT_Routine +Undef_Addr: .word UNDEF_Routine +SWI_Addr: .word ctx_switch +PAbt_Addr: .word PABT_Routine +DAbt_Addr: .word DABT_Routine _not_used: .word not_used IRQ_Addr: .word arm_irq_handler _fiq: .word fiq diff --git a/cpu/msp430-common/Makefile b/cpu/msp430-common/Makefile index 4d745160cd..4a029b5c36 100644 --- a/cpu/msp430-common/Makefile +++ b/cpu/msp430-common/Makefile @@ -9,4 +9,3 @@ include $(RIOTBASE)/Makefile.base clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/cpu/msp430-common/Makefile.include b/cpu/msp430-common/Makefile.include index bd2f745e30..e089341767 100644 --- a/cpu/msp430-common/Makefile.include +++ b/cpu/msp430-common/Makefile.include @@ -1,2 +1 @@ INCLUDES += -I$(MAKEBASE)/cpu/msp430-common/include/ - diff --git a/cpu/msp430-common/irq.c b/cpu/msp430-common/irq.c index 4ce238a43e..11b9661094 100644 --- a/cpu/msp430-common/irq.c +++ b/cpu/msp430-common/irq.c @@ -54,4 +54,3 @@ void restoreIRQ(unsigned int state) eINT(); } } - diff --git a/cpu/msp430-common/lpm_cpu.c b/cpu/msp430-common/lpm_cpu.c index f3ddf93436..917a930dd1 100644 --- a/cpu/msp430-common/lpm_cpu.c +++ b/cpu/msp430-common/lpm_cpu.c @@ -121,4 +121,3 @@ inline void lpm_awake(void) /* the following two functions have no actual role to play MSP430s */ inline void lpm_begin_awake(void) { } inline void lpm_end_awake(void) { } - diff --git a/cpu/msp430-common/msp430-main.c b/cpu/msp430-common/msp430-main.c index b51626b1ac..81652658c3 100644 --- a/cpu/msp430-common/msp430-main.c +++ b/cpu/msp430-common/msp430-main.c @@ -175,4 +175,3 @@ splx_(int sr) /*---------------------------------------------------------------------------*/ extern void board_init(void); - diff --git a/cpu/msp430x16x/Makefile b/cpu/msp430x16x/Makefile index 3b9fcd10ac..3e58e83807 100644 --- a/cpu/msp430x16x/Makefile +++ b/cpu/msp430x16x/Makefile @@ -11,4 +11,3 @@ include $(RIOTBASE)/Makefile.base clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/cpu/msp430x16x/Makefile.include b/cpu/msp430x16x/Makefile.include index b9dcae6d05..f847c59ebf 100644 --- a/cpu/msp430x16x/Makefile.include +++ b/cpu/msp430x16x/Makefile.include @@ -1,4 +1,3 @@ INCLUDES += -I$(RIOTCPU)/msp430x16x/include/ include $(RIOTCPU)/msp430-common/Makefile.include - diff --git a/cpu/native/Makefile b/cpu/native/Makefile index a6f241ddce..0f224273c6 100644 --- a/cpu/native/Makefile +++ b/cpu/native/Makefile @@ -23,4 +23,3 @@ $(BINDIR)%.o: %.c clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/cpu/native/Makefile.include b/cpu/native/Makefile.include index 54626e3344..193530d2a4 100644 --- a/cpu/native/Makefile.include +++ b/cpu/native/Makefile.include @@ -1,2 +1 @@ export INCLUDES += -I$(RIOTCPU)/native/include - diff --git a/cpu/native/README b/cpu/native/README index 4835a9221d..89ced7e029 100644 --- a/cpu/native/README +++ b/cpu/native/README @@ -2,7 +2,7 @@ VALGRIND SUPPORT ================ Rebuild your project using the all-valgrind target like this: - + make -B clean all-valgrind That way native will tell valgrind about RIOTs stacks and prevent diff --git a/cpu/native/include/nativenet.h b/cpu/native/include/nativenet.h index 0251b68a0e..b392a03b92 100644 --- a/cpu/native/include/nativenet.h +++ b/cpu/native/include/nativenet.h @@ -1,7 +1,7 @@ /** * nativenet transceiver interface * - * A configurable transceiver for the native port. + * A configurable transceiver for the native port. * * At the moment only the tap interface is supported, but more network * layers are intended. So the "configurable" part is a lie for now ;-) diff --git a/cpu/native/net/Makefile b/cpu/native/net/Makefile index c0c0e2b827..16c11eebde 100644 --- a/cpu/native/net/Makefile +++ b/cpu/native/net/Makefile @@ -8,4 +8,3 @@ $(BINDIR)%.o: %.c $(AD)$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o @$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d @printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d - diff --git a/cpu/native/rtc/Makefile b/cpu/native/rtc/Makefile index 64278b51d6..4d24181c99 100644 --- a/cpu/native/rtc/Makefile +++ b/cpu/native/rtc/Makefile @@ -1,4 +1,3 @@ MODULE =rtc include $(MAKEBASE)/Makefile.base - diff --git a/dist/tools/goodfet/README.txt b/dist/tools/goodfet/README.txt index 4bbcb9e8d3..e9582ad6ba 100644 --- a/dist/tools/goodfet/README.txt +++ b/dist/tools/goodfet/README.txt @@ -28,5 +28,3 @@ sudo make link # Load firmware, not yet building it locally. goodfet.bsl --fromweb goodfet.monitor test - - diff --git a/dist/tools/goodfet/goodfet.bsl b/dist/tools/goodfet/goodfet.bsl index b51fce2581..afa6840c7f 100755 --- a/dist/tools/goodfet/goodfet.bsl +++ b/dist/tools/goodfet/goodfet.bsl @@ -9,7 +9,7 @@ # based on the application note slas96b.pdf from Texas Instruments, Inc., # Volker Rzehak # additional infos from slaa089a.pdf -# +# # Forked by Travis Goodspeed for use with the GoodFET # JTAG programmer. @@ -18,7 +18,7 @@ import sys, time, string, cStringIO, struct import serial, os, glob #forked from TinyOS Telos version. -VERSION = string.split("Revision: 1.39-goodfet-8 ")[1] +VERSION = string.split("Revision: 1.39-goodfet-8 ")[1] DEBUG = 0 #disable debug messages by default @@ -260,9 +260,9 @@ class LowLevel: ERR_CMD_FAILED = "Command failed, is not defined or is not allowed" ERR_BSL_SYNC = "Bootstrap loader synchronization error" ERR_FRAME_NUMBER = "Frame sequence number error." - + z1 = 0; - + def calcChecksum(self, data, length): """Calculates a checksum of "data".""" checksum = 0 @@ -289,7 +289,7 @@ class LowLevel: self.swapRSTTEST = 0 self.telosLatch = 0 self.telosI2C = 0 - + self.protocolMode = self.MODE_BSL self.BSLMemAccessWarning = 0 #Default: no warning. self.slowmode = 0 @@ -314,7 +314,7 @@ class LowLevel: timeout = self.timeout ) if DEBUG: sys.stderr.write("using serial port %r\n" % self.serialport.portstr) - + if not self.z1: self.SetRSTpin() #enable power self.SetTESTpin() #enable power @@ -545,7 +545,7 @@ class LowLevel: self.picROMclock(0, True) #k = 1 #while not self.serial.getCTS(): - # pass + # pass #time.sleep(0.1) return recbuf @@ -562,7 +562,7 @@ class LowLevel: self.picROMclock(r) #time.sleep(0.1) return recbuf - + def picROMclock(self, masterout, slow = False): #print "setting masterout to "+str(masterout) self.serialport.setRTS(masterout) @@ -587,10 +587,10 @@ class LowLevel: Parameters: invokeBSL = 1: complete sequence invokeBSL = 0: only RST/NMI pin accessed - + By now only BSL mode is accessed ''' - + if DEBUG > 1: sys.stderr.write("* bslReset(invokeBSL=%s)\n" % invokeBSL) if invokeBSL: #sys.stderr.write("in Z1 bsl reset...\n") @@ -645,12 +645,12 @@ class LowLevel: if self.telosI2C: self.telosBReset(invokeBSL) return - + if self.z1: if DEBUG > 1: sys.stderr.write("* entering bsl with z1\n") self.bslResetZ1(invokeBSL) return - + if DEBUG > 1: sys.stderr.write("* bslReset(invokeBSL=%s)\n" % invokeBSL) self.SetRSTpin(1) #power suply @@ -699,7 +699,7 @@ class LowLevel: sys.stderr.write(" bslSync() timeout, retry ...\n") elif loopcnt == 4: #nmi may have caused the first reset to be ignored, try again - self.bslReset(0) + self.bslReset(0) self.bslReset(1) elif loopcnt > 0: if DEBUG > 1: @@ -709,7 +709,7 @@ class LowLevel: sys.stderr.write(" bslSync() timeout\n") else: #garbage if DEBUG > 1: sys.stderr.write(" bslSync() failed (0x%02x), retry ...\n" % ord(c)) - + raise BSLException(self.ERR_BSL_SYNC) #Sync. failed def bslTxRx(self, cmd, addr, length = 0, blkout = None, wait=0): @@ -860,7 +860,7 @@ class Memory: sys.stderr.write("ELF section %s at 0x%04x %d bytes\n" % (section.name, section.lma, len(section.data))) if len(section.data): self.segments.append( Segment(section.lma, section.data) ) - + def loadFile(self, filename): """fill memory with the contents of a file. file type is determined from extension""" #TODO: do a contents based detection @@ -948,7 +948,7 @@ class BootStrapLoader(LowLevel): if self.patchLoaded: self.BSLMemAccessWarning = 1 #Turn warning back on. - + def verifyBlk(self, addr, blkout, action): """verify memory against data or 0xff""" if DEBUG > 1: sys.stderr.write("* verifyBlk()\n") @@ -978,7 +978,7 @@ class BootStrapLoader(LowLevel): def readBlk(self,adr,len): """Read a block of memory.""" blkin = self.bslTxRx(self.BSL_RXBLK, addr, len(blkout)) - + def programBlk(self, addr, blkout, action): """program a memory block""" if DEBUG > 1: sys.stderr.write("* programBlk()\n") @@ -1013,7 +1013,7 @@ class BootStrapLoader(LowLevel): pstart = pstart + length currentAddr = currentAddr + length self.byteCtr = self.byteCtr + length #total sum - + def uploadData(self, startaddress, size, wait=0): """upload a datablock""" if DEBUG > 1: sys.stderr.write("* uploadData()\n") @@ -1074,12 +1074,12 @@ class BootStrapLoader(LowLevel): """start BSL, download patch if desired and needed, adjust SP if desired""" sys.stderr.write("Invoking BSL...\n") sys.stderr.flush() - + #for '30, invertTEST=0, else =1 if bslreset: self.bslReset(1) #Invoke the boot loader. - - + + self.txPasswd(self.passwd) #transmit password #Read actual bootstrap loader version. @@ -1089,12 +1089,12 @@ class BootStrapLoader(LowLevel): 16) #No. of bytes to read dev_id, bslVerHi, bslVerLo = struct.unpack(">H8xBB4x", blkin[:-2]) #cut away checksum and extract data self.dev_id=dev_id; - - + + if self.cpu is None: #cpy type forced? if deviceids.has_key(dev_id): self.cpu = deviceids[dev_id] #try to autodectect CPU type - + if DEBUG: sys.stderr.write("Autodetect successful: %04x -> %s\n" % (dev_id, self.cpu)) else: @@ -1113,7 +1113,7 @@ class BootStrapLoader(LowLevel): if self.bslVer <= 0x0130 and adjsp: #only do this on BSL where it's needed to prevent #malfunction with F4xx devices/ newer ROM-BSLs - + #Execute function within bootstrap loader #to prepare stack pointer for the following patch. #This function will lock the protected functions again. @@ -1138,7 +1138,7 @@ class BootStrapLoader(LowLevel): sys.stderr.write("Using built in BSL replacement for F1x devices\n") sys.stderr.flush() replacementBSL.loadTIText(cStringIO.StringIO(F1X_BSL)) #parse embedded BSL - + #now download the new BSL, if allowed and needed (version lower than the #the replacement) or forced if replacementBSL is not None: @@ -1200,7 +1200,7 @@ class BootStrapLoader(LowLevel): self.txPasswd(self.passwd) #update version info - #verison only valid for the internal ones, but it also makes sure + #verison only valid for the internal ones, but it also makes sure #that the patches are not applied if the user d/ls one self.bslVer = 0x0150 @@ -1229,26 +1229,26 @@ class BootStrapLoader(LowLevel): # print "%s" % firmware[self.dev_id]; # fn="/tmp/.goodfet.hex" # os.system("curl %s >%s" % (firmware[self.dev_id],fn)) - + # fw=Memory(fn); # #fw.loadIhex(open(fn,"rb")); - + # sys.stderr.write("Program ...\n") # sys.stderr.flush() # self.programData(fw, self.ACTION_PROGRAM | self.ACTION_VERIFY) # sys.stderr.write("%i bytes programmed.\n" % self.byteCtr) # sys.stderr.flush() - - + + print """ The --fromweb feature is temporarily disabled, pending a rewrite. Please grab a copy of the appropriate .hex from http://goodfet.sf.net/dist/ and flash it like so: -goodfet.bsl -e -p foo.hex +goodfet.bsl -e -p foo.hex """ - - + + def actionVerify(self): """Verify programmed data""" if self.data is not None: @@ -1301,7 +1301,7 @@ goodfet.bsl -e -p foo.hex a,l = baudconfigs[baudrate] except KeyError: raise ValueError, "baudrate not valid. valid values are %r" % baudconfigs.keys() - + sys.stderr.write("Changing baudrate to %d ...\n" % baudrate) sys.stderr.flush() self.bslTxRx(self.BSL_CHANGEBAUD, #Command: change baudrate @@ -1376,7 +1376,7 @@ General options: --swap-reset-test Swap the RST and TEST pins (used for some BSL hardware) --telos-latch Special twiddle in BSL reset for Telos hardware --telos-i2c DTR/RTS map via an I2C switch to TCK/RST in Telos Rev.B - --telos Implies options --invert-reset, --invert-test, + --telos Implies options --invert-reset, --invert-test, --swap-reset-test, and --telos-latch --telosb Implies options --swap-reset-test, --telos-i2c, --no-BSL-download, and --speed=38400 @@ -1482,23 +1482,23 @@ def main(itest=1): forceBSL = 0 dumpivt = 0 dumpinfo = 0 - + bsl.invertRST = 1 bsl.invertTEST = itest - - if(os.environ.get("board")=='telosb' or + + if(os.environ.get("board")=='telosb' or os.environ.get("board")=='telosbbt' or os.environ.get("platform")=='telosb'): bsl.swapRSTTEST = 1 bsl.telosI2C = 1 mayuseBSL = 0 - if(os.environ.get("board")=='z1' or + if(os.environ.get("board")=='z1' or os.environ.get("board")=='zolertiaz1'): bsl.z1 = 1 if(os.environ.get("board")=='apimote' or os.environ.get("board")=='apimote1'): bsl.swapRSTTEST = 1; - - + + if comPort is None and os.environ.get("GOODFET")!=None: glob_list = glob.glob(os.environ.get("GOODFET")); if len(glob_list) > 0: @@ -1755,7 +1755,7 @@ def main(itest=1): reset = 0 sys.stderr.flush() - + #prepare data to download bsl.data = Memory() #prepare downloaded data if filetype is not None: #if the filetype is given... @@ -1828,7 +1828,7 @@ def main(itest=1): hex+=("%02x "%ord(c)); hex+="\nq\n"; print hex; - + if goaddr is not None: #start user programm at specified address bsl.actionRun(goaddr) #load PC and execute diff --git a/dist/tools/linux-border_router/Makefile b/dist/tools/linux-border_router/Makefile index 4259ba610e..0960c7bd1b 100644 --- a/dist/tools/linux-border_router/Makefile +++ b/dist/tools/linux-border_router/Makefile @@ -11,7 +11,7 @@ SRC = main.c sixlowdriver.c serial.c control_2xxx.c multiplex.c flowcontrol.c se TARGETDIR = ../../bin/linux DOCDIR = ../../Documentation/linux -sixlowdriver: $(SRC) +sixlowdriver: $(SRC) mkdir -p $(TARGETDIR) &> /dev/null $(CC) $(CFLAGS) -o $(TARGETDIR)/sixlowpan $(SRC) diff --git a/dist/tools/linux-border_router/control_2xxx.h b/dist/tools/linux-border_router/control_2xxx.h index 2206b47ea3..425dde34bd 100644 --- a/dist/tools/linux-border_router/control_2xxx.h +++ b/dist/tools/linux-border_router/control_2xxx.h @@ -6,4 +6,3 @@ void hard_reset_to_bootloader(void); void hard_reset_to_user_code(void); #endif // ..._H - diff --git a/dist/tools/linux-border_router/serial.c b/dist/tools/linux-border_router/serial.c index fdb1f5bc79..45265a07ed 100644 --- a/dist/tools/linux-border_router/serial.c +++ b/dist/tools/linux-border_router/serial.c @@ -425,9 +425,3 @@ void set_dtr(int val) printf("Error %i while setting port io flags\n", errno); } } - - - - - - diff --git a/dist/tools/linux-border_router/sixlowdriver.c b/dist/tools/linux-border_router/sixlowdriver.c index d62334846f..e2e7fe25f9 100644 --- a/dist/tools/linux-border_router/sixlowdriver.c +++ b/dist/tools/linux-border_router/sixlowdriver.c @@ -325,4 +325,3 @@ int border_initialize(char *if_name, const char *ip_addr, const char *tty_dev) return 0; } - diff --git a/dist/tools/testsuite/build_and_generate_html.sh b/dist/tools/testsuite/build_and_generate_html.sh index a5807f42e8..9a23008adf 100755 --- a/dist/tools/testsuite/build_and_generate_html.sh +++ b/dist/tools/testsuite/build_and_generate_html.sh @@ -7,4 +7,3 @@ export ROOT=${ROOT:-.} ${ROOT}/tools/testsuite/svn_test_revision.sh ${REVISION} ${ROOT}/tools/testsuite/generate_html.sh - diff --git a/dist/tools/testsuite/generate_html.sh b/dist/tools/testsuite/generate_html.sh index 8944bf8f5c..6f80ca76b5 100755 --- a/dist/tools/testsuite/generate_html.sh +++ b/dist/tools/testsuite/generate_html.sh @@ -10,7 +10,7 @@ OUTFILE=${HTMLFILE:-${HOME}/riot.html} LOGDIR=${BUILDLOGS:-${HOME}/buildlogs} { -cat ${HTMLDIR}/header +cat ${HTMLDIR}/header for i in `ls -t $LOGDIR/*.log`; do ${TOOLROOT}/tools/testsuite/parse_buildlog.sh $i @@ -21,7 +21,5 @@ for i in `ls -t $LOGDIR/*.log`; do done -cat ${HTMLDIR}/footer +cat ${HTMLDIR}/footer } > ${OUTFILE} - - diff --git a/dist/tools/testsuite/html/header b/dist/tools/testsuite/html/header index 4d9384a397..5cfa2ee812 100644 --- a/dist/tools/testsuite/html/header +++ b/dist/tools/testsuite/html/header @@ -3,4 +3,3 @@ Feuerwhere Build Bot results - diff --git a/dist/tools/testsuite/parse_buildlog.sh b/dist/tools/testsuite/parse_buildlog.sh index 3ce5bf53ca..bc1bcdeef3 100755 --- a/dist/tools/testsuite/parse_buildlog.sh +++ b/dist/tools/testsuite/parse_buildlog.sh @@ -25,7 +25,7 @@ elif (($NUM_FAIL==0)); then else BUILD_STATUS="broken!" fi - + echo "

Revision: ${REVISION} Status: ${BUILD_STATUS}

" svn log --incremental -v -l 1 ${REPO}@${REVISION} | sed -e 's/$/
/' @@ -39,5 +39,3 @@ echo "
Failed builds/tests:
" grep '\[.* FAILED\]' ${LOG} | uniq | sed -e 's/$/
/' fi } | tee ${1}.parsed - - diff --git a/dist/tools/testsuite/run_tests.sh b/dist/tools/testsuite/run_tests.sh index 1344e604a3..cdf4e21353 100755 --- a/dist/tools/testsuite/run_tests.sh +++ b/dist/tools/testsuite/run_tests.sh @@ -4,13 +4,13 @@ TOOLROOT=${TOOLROOT:-.} flash() { echo "Building ${1}..." - jam -aq flash || ( echo "[BUILD FAILED] ${1}" && false ) + jam -aq flash || ( echo "[BUILD FAILED] ${1}" && false ) } run_tests() { TESTDIR=projects/${1}/tests flash ${PROJECT} || return - for tst in `ls ${TESTDIR}/`; do + for tst in `ls ${TESTDIR}/`; do echo "Project \"${1}\": Running test ${tst}..." $TESTDIR/$tst || ( echo @@ -19,7 +19,7 @@ run_tests() { done } -echo +echo echo "Running tests..." echo @@ -40,4 +40,3 @@ for i in projects/*; do } 2>&1 fi done - diff --git a/dist/tools/toolchains/build_gnuarm.sh b/dist/tools/toolchains/build_gnuarm.sh index 67b17d859f..2b9561a9a2 100755 --- a/dist/tools/toolchains/build_gnuarm.sh +++ b/dist/tools/toolchains/build_gnuarm.sh @@ -3,7 +3,7 @@ # directory to install compiled binaries into PREFIX=${HOME}/gnuarm -# directory to download source files and store intermediates +# directory to download source files and store intermediates TMP_DIR=/var/tmp GNUARM_BUILDDIR=${GNUARM_BUILDDIR:-"${TMP_DIR}/gnuarm-${USER}"} @@ -37,10 +37,10 @@ FREETMP=`df ${TMP_DIR} | awk '{ if (NR == 2) print $4}'` build_binutils() { echo "Building binutils..." - if [ ! -e .binutils_extracted ] ; then + if [ ! -e .binutils_extracted ] ; then tar -xjf ${FILES}/binutils-${BINUTILS_VER}.tar.bz2 touch .binutils_extracted - fi + fi if [[ $HOST_GCC_VER == 4.6* || $HOST_GCC_VER == 4.7* ]] then CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=unused-but-set-parameter" @@ -56,16 +56,16 @@ build_binutils() { build_gcc() { echo "Building gcc..." - if [ ! -e .gcc_extracted ] ; then + if [ ! -e .gcc_extracted ] ; then tar -xjf ${FILES}/gcc-${GCC_VER}.tar.bz2 && touch .gcc_extracted - fi + fi rm -rf gcc-build && mkdir -p gcc-build && cd gcc-build && - ../gcc-${GCC_VER}/configure --target=arm-elf --prefix=${PREFIX} --enable-interwork --enable-multilib --enable-languages="c,c++" --with-newlib --enable-lto --disable-libssp --with-headers=${GNUARM_BUILDDIR}/newlib-${NEWLIB_VER}/newlib/libc/include --enable-obsolete && - + ../gcc-${GCC_VER}/configure --target=arm-elf --prefix=${PREFIX} --enable-interwork --enable-multilib --enable-languages="c,c++" --with-newlib --enable-lto --disable-libssp --with-headers=${GNUARM_BUILDDIR}/newlib-${NEWLIB_VER}/newlib/libc/include --enable-obsolete && + make ${MAKE_THREADS} all && make install && - + cd ${GNUARM_BUILDDIR} } @@ -80,27 +80,27 @@ extract_newlib() { build_newlib() { cd ${GNUARM_BUILDDIR} && - - if [ ! -e .newlib_extracted ] ; then + + if [ ! -e .newlib_extracted ] ; then extract_newlib - fi - + fi + rm -rf newlib-build && mkdir -p newlib-build && cd newlib-build && ../newlib-${NEWLIB_VER}/configure --target=arm-elf --prefix=${PREFIX} --enable-interwork --enable-multilib --disable-newlib-supplied-syscalls --enable-newlib-reent-small --enable-newlib-io-long-long --enable-newlib-io-float && #--enable-newlib-supplied-syscalls && # options to try: --enable-newlib-reent-small make ${MAKE_THREADS} TARGET_CFLAGS=-DREENTRANT_SYSCALLS_PROVIDED all && make install && - + # generate zip-file to provide binary download cd ${PREFIX}/arm-elf && - + # # package compiled newlib for windows users. any new version must be uploaded to the # webserver. see manual arm/toolchain/windows for paths and documentation. # zip -ru newlib-${NEWLIB_VER}.zip include sys-include lib/*.a lib/thumb/*.a - + cd ${GNUARM_BUILDDIR} } @@ -115,7 +115,7 @@ build_gdb() { make ${MAKE_THREADS} all CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" && make install && - + cd ${GNUARM_BUILDDIR} } @@ -155,7 +155,7 @@ build_all() { echo "Starting in ${GNUARM_BUILDDIR}. Installing to ${PREFIX}." check_space && download && - build_binutils && + build_binutils && extract_newlib && build_gcc && build_newlib && @@ -183,4 +183,3 @@ mkdir -p ${GNUARM_BUILDDIR} cd ${GNUARM_BUILDDIR} $* - diff --git a/dist/tools/toolchains/build_gnuarm_naked.sh b/dist/tools/toolchains/build_gnuarm_naked.sh index 86a6c252a6..d237d21e19 100755 --- a/dist/tools/toolchains/build_gnuarm_naked.sh +++ b/dist/tools/toolchains/build_gnuarm_naked.sh @@ -3,7 +3,7 @@ # directory to install compiled binaries into PREFIX=${HOME}/gnuarm-naked -# directory to download source files and store intermediates +# directory to download source files and store intermediates GNUARM_BUILDDIR=${GNUARM_BUILDDIR:-"/tmp/gnuarm-naked-${USER}"} #GCC_VER=4.5.1 @@ -33,10 +33,10 @@ FILES=. build_binutils() { echo "Building binutils..." - if [ ! -e .binutils_extracted ] ; then + if [ ! -e .binutils_extracted ] ; then tar -xjf ${FILES}/binutils-${BINUTILS_VER}.tar.bz2 touch .binutils_extracted - fi + fi rm -rf binutils-build && mkdir -p binutils-build && cd binutils-build && ../binutils-${BINUTILS_VER}/configure --target=arm-elf --prefix=${PREFIX} --enable-interwork --enable-multilibi --with-float=soft --with-fpu=vfp && make ${MAKE_THREADS} all CFLAGS=-Wformat=0 && @@ -46,16 +46,16 @@ build_binutils() { build_gcc() { echo "Building gcc..." - if [ ! -e .gcc_extracted ] ; then + if [ ! -e .gcc_extracted ] ; then tar -xjf ${FILES}/gcc-core-${GCC_VER}.tar.bz2 && touch .gcc_extracted - fi + fi rm -rf gcc-build && mkdir -p gcc-build && cd gcc-build && - ../gcc-${GCC_VER}/configure --target=arm-elf --prefix=${PREFIX} --enable-interwork --enable-multilib --enable-languages="c" --enable-lto --disable-libssp --disable-hardfloat --with-float=soft --with-fpu=vfp --without-headers && - + ../gcc-${GCC_VER}/configure --target=arm-elf --prefix=${PREFIX} --enable-interwork --enable-multilib --enable-languages="c" --enable-lto --disable-libssp --disable-hardfloat --with-float=soft --with-fpu=vfp --without-headers && + make ${MAKE_THREADS} all && make install && - + cd ${GNUARM_BUILDDIR} } @@ -70,27 +70,27 @@ extract_newlib() { build_newlib() { cd ${GNUARM_BUILDDIR} && - - if [ ! -e .newlib_extracted ] ; then + + if [ ! -e .newlib_extracted ] ; then extract_newlib - fi - + fi + rm -rf newlib-build && mkdir -p newlib-build && cd newlib-build && ../newlib-${NEWLIB_VER}/configure --target=arm-elf --prefix=${PREFIX} --enable-interwork --enable-multilib --disable-newlib-supplied-syscalls --enable-newlib-reent-small --enable-newlib-io-long-long --enable-newlib-io-float --with-float=soft --with-fpu=vfp && #--enable-newlib-supplied-syscalls && # options to try: --enable-newlib-reent-small make ${MAKE_THREADS} TARGET_CFLAGS=-DREENTRANT_SYSCALLS_PROVIDED all && make install && - + # generate zip-file to provide binary download cd ${PREFIX}/arm-elf && - + # # package compiled newlib for windows users. any new version must be uploaded to the # webserver. see manual arm/toolchain/windows for paths and documentation. # zip -ru newlib-${NEWLIB_VER}.zip include sys-include lib/*.a lib/thumb/*.a - + cd ${GNUARM_BUILDDIR} } @@ -105,7 +105,7 @@ build_gdb() { make ${MAKE_THREADS} all CFLAGS=-D_FORTIFY_SOURCE=0 && make install && - + cd ${GNUARM_BUILDDIR} } @@ -134,7 +134,7 @@ download_file() { build_all() { echo "Starting in ${GNUARM_BUILDDIR}. Installing to ${PREFIX}." download && - build_binutils && + build_binutils && build_gcc && build_gdb && @@ -160,4 +160,3 @@ mkdir -p ${GNUARM_BUILDDIR} cd ${GNUARM_BUILDDIR} $* - diff --git a/doc/doxygen/riot.doxyfile b/doc/doxygen/riot.doxyfile index ad4dc35dcd..f0a46be7b1 100644 --- a/doc/doxygen/riot.doxyfile +++ b/doc/doxygen/riot.doxyfile @@ -4,19 +4,19 @@ # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = RIOT -PROJECT_NUMBER = -OUTPUT_DIRECTORY = +PROJECT_NAME = RIOT +PROJECT_NUMBER = +OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES QT_AUTOBRIEF = NO @@ -24,12 +24,12 @@ MULTILINE_CPP_IS_BRIEF = NO INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 4 -ALIASES = +ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO -EXTENSION_MAPPING = +EXTENSION_MAPPING = BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO @@ -64,14 +64,14 @@ GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = +ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES SHOW_DIRECTORIES = NO SHOW_FILES = YES SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = -LAYOUT_FILE = +FILE_VERSION_FILTER = +LAYOUT_FILE = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- @@ -81,24 +81,24 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = ../../core ../../cpu ../../boards ../../sys src/ ../../drivers INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.txt *.c *.h +FILE_PATTERNS = *.txt *.c *.h RECURSIVE = YES -EXCLUDE = +EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = */board/*/tools/* -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO -IMAGE_PATH = doxygen/ -INPUT_FILTER = -FILTER_PATTERNS = +IMAGE_PATH = doxygen/ +INPUT_FILTER = +FILTER_PATTERNS = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing @@ -116,14 +116,14 @@ VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = NO COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html -HTML_HEADER = src/riot-header.html +HTML_HEADER = src/riot-header.html HTML_FOOTER = src/riot-footer.html HTML_STYLESHEET = src/riot.css HTML_ALIGN_MEMBERS = YES @@ -132,23 +132,23 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = +CHM_FILE = +HHC_LOCATION = GENERATE_CHI = YES # -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = BINARY_TOC = YES # TOC_EXPAND = YES # GENERATE_QHP = NO -QCH_FILE = -QHP_NAMESPACE = +QCH_FILE = +QHP_NAMESPACE = QHP_VIRTUAL_FOLDER = doc -QHP_CUST_FILTER_NAME = -QHP_CUST_FILTER_ATTRS = -QHP_SECT_FILTER_ATTRS = -QHG_LOCATION = +QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = +QHG_LOCATION = DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES +GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 FORMULA_FONTSIZE = 10 #--------------------------------------------------------------------------- @@ -160,8 +160,8 @@ LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = +EXTRA_PACKAGES = +LATEX_HEADER = PDF_HYPERLINKS = YES USE_PDFLATEX = YES LATEX_BATCHMODE = NO @@ -173,8 +173,8 @@ GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- @@ -187,8 +187,8 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- GENERATE_XML = NO XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = +XML_SCHEMA = +XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output @@ -200,37 +200,37 @@ GENERATE_AUTOGEN_DEF = NO GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = PREDEFINED = __attribute__(x)= -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = +TAGFILES = +GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = NO # -MSCGEN_PATH = +MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES # DOT_FONTNAME = FreeSans DOT_FONTSIZE = 10 -DOT_FONTPATH = +DOT_FONTPATH = CLASS_GRAPH = NO # COLLABORATION_GRAPH = NO # GROUP_GRAPHS = NO # @@ -243,8 +243,8 @@ CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = NO # DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = +DOT_PATH = +DOTFILE_DIRS = DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = YES # diff --git a/doc/doxygen/src/mainpage.txt b/doc/doxygen/src/mainpage.txt index bcffeac4ed..656baaf7f8 100644 --- a/doc/doxygen/src/mainpage.txt +++ b/doc/doxygen/src/mainpage.txt @@ -195,5 +195,5 @@ * \section info_sec Community * * Whether you are looking for help with writing an application for RIOT, want to learn more about it, or just stay in the loop you are invited to join the RIOT-users mailing list. For developers who want to participate and contribute to the kernel development or integrate new MCU and platform support the [RIOT-devel mailing list](http://lists.riot-os.org/mailman/listinfo/devel) is the right place. - * + * */ diff --git a/doc/doxygen/src/riot-header.html b/doc/doxygen/src/riot-header.html index f54fa45185..489d8ea9cf 100644 --- a/doc/doxygen/src/riot-header.html +++ b/doc/doxygen/src/riot-header.html @@ -8,4 +8,3 @@ - diff --git a/doc/doxygen/src/riot.css b/doc/doxygen/src/riot.css index 54dfc81a24..d4dc31e686 100644 --- a/doc/doxygen/src/riot.css +++ b/doc/doxygen/src/riot.css @@ -185,7 +185,7 @@ TD.indexvalue { border: 1px solid #CCCCCC; } TR.memlist { - background-color: #f0f0f0; + background-color: #f0f0f0; } P.formulaDsp { text-align: center; } IMG.formulaDsp { } @@ -352,8 +352,8 @@ hr { font-size: 80%; color: #606060; font-weight: normal; -} -.memnav { +} +.memnav { background-color: #e8eef2; border: 1px solid #84b0c7; text-align: center; diff --git a/doc/riot.css b/doc/riot.css index a8f863bae7..4a59c8887f 100644 --- a/doc/riot.css +++ b/doc/riot.css @@ -19,14 +19,14 @@ h1 { color: #EEE; background-color: #BC1A29; } -h2 { +h2 { font-size: 140%; color: #EEE; background-color: #3fa687; padding: .2em 1em .2em 1em; margin: .4em -10px; } -h3 { +h3 { font-size: 140%; margin: .5em .2em; } diff --git a/drivers/Makefile b/drivers/Makefile index 4a5d79a370..f66acf8219 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -44,4 +44,3 @@ include $(RIOTBASE)/Makefile.base # remove compilation products clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/drivers/at86rf231/Makefile b/drivers/at86rf231/Makefile index c3b9d94175..393d4fd4ec 100644 --- a/drivers/at86rf231/Makefile +++ b/drivers/at86rf231/Makefile @@ -9,4 +9,3 @@ include $(RIOTBASE)/Makefile.base clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/drivers/at86rf231/at86rf231.c b/drivers/at86rf231/at86rf231.c index 6207ca6b48..5cd6f8bc66 100644 --- a/drivers/at86rf231/at86rf231.c +++ b/drivers/at86rf231/at86rf231.c @@ -173,4 +173,3 @@ void at86rf231_swap_fcf_bytes(uint8_t *buf) buf[1] = buf[2]; buf[2] = tmp; } - diff --git a/drivers/at86rf231/at86rf231_rx.c b/drivers/at86rf231/at86rf231_rx.c index d2ba93d128..3a1b0fe67c 100644 --- a/drivers/at86rf231/at86rf231_rx.c +++ b/drivers/at86rf231/at86rf231_rx.c @@ -73,4 +73,3 @@ void at86rf231_rx_handler(void) // Read IRQ to clear it at86rf231_reg_read(AT86RF231_REG__IRQ_STATUS); } - diff --git a/drivers/at86rf231/at86rf231_spi.c b/drivers/at86rf231/at86rf231_spi.c index 166bd9ee52..2a1bc3bb44 100644 --- a/drivers/at86rf231/at86rf231_spi.c +++ b/drivers/at86rf231/at86rf231_spi.c @@ -63,4 +63,3 @@ void at86rf231_write_fifo(const uint8_t *data, uint8_t length) // End the SPI transfer at86rf231_spi_unselect(); } - diff --git a/drivers/at86rf231/at86rf231_tx.c b/drivers/at86rf231/at86rf231_tx.c index 3907f83c93..b1209775ab 100644 --- a/drivers/at86rf231/at86rf231_tx.c +++ b/drivers/at86rf231/at86rf231_tx.c @@ -107,4 +107,3 @@ static void at86rf231_gen_pkt(uint8_t *buf, at86rf231_packet_t *packet) at86rf231_swap_fcf_bytes(buf); } - diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile index 46b179742b..da9308bbd5 100644 --- a/drivers/cc110x/Makefile +++ b/drivers/cc110x/Makefile @@ -1,4 +1,3 @@ MODULE =cc110x include $(MAKEBASE)/Makefile.base - diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c index cfe0f5f6bb..f8f69b13d6 100644 --- a/drivers/cc110x/cc1100_phy.c +++ b/drivers/cc110x/cc1100_phy.c @@ -287,14 +287,14 @@ int cc1100_phy_calc_wor_settings(uint16_t millis) double t_packet_interval = (double)((T_PACKET_INTERVAL) / 1000.0); /* Calculate minimal T_EVENT0: - + (1) t_rx_time > t_packet_interval (2) t_rx_time = T_EVENT0 / 2 ^ (RX_TIME + 3 + WOR_RES) ------------------------------------------------------ with RX_TIME = 0 && WOR_RES = 0 => event0_min > t_packet_interval * 8 - + t_packet_interval = 3.8 ms (@400kbit/s) - + => event0_min = Math.ceil(3.8 * 8) + 10 */ uint16_t event0_min = (uint16_t)(t_packet_interval * 8) + 1 + 10; diff --git a/drivers/cc110x_ng/Makefile b/drivers/cc110x_ng/Makefile index 66dec9d5f2..7cd2e223ba 100644 --- a/drivers/cc110x_ng/Makefile +++ b/drivers/cc110x_ng/Makefile @@ -18,4 +18,3 @@ include $(RIOTBASE)/Makefile.base clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/drivers/cc110x_ng/cc110x-defaultSettings.c b/drivers/cc110x_ng/cc110x-defaultSettings.c index 3d9b3de529..b428d1a4d3 100644 --- a/drivers/cc110x_ng/cc110x-defaultSettings.c +++ b/drivers/cc110x_ng/cc110x-defaultSettings.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 INRIA + * Copyright (C) 2013 INRIA * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more diff --git a/drivers/cc110x_ng/cc110x-internal.h b/drivers/cc110x_ng/cc110x-internal.h index 1c31545676..b1b1b6c332 100644 --- a/drivers/cc110x_ng/cc110x-internal.h +++ b/drivers/cc110x_ng/cc110x-internal.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2008 Freie Universität Berlin - * Copyright (C) 2013 INRIA + * Copyright (C) 2013 INRIA * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more diff --git a/drivers/cc110x_ng/cc110x-rx.c b/drivers/cc110x_ng/cc110x-rx.c index 0859e21318..6af93ec01f 100644 --- a/drivers/cc110x_ng/cc110x-rx.c +++ b/drivers/cc110x_ng/cc110x-rx.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 Freie Universität Berlin - * Copyright (C) 2013 INRIA + * Copyright (C) 2013 INRIA * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more diff --git a/drivers/cc110x_ng/cc110x-tx.c b/drivers/cc110x_ng/cc110x-tx.c index 3b6761a248..6db9940e5d 100644 --- a/drivers/cc110x_ng/cc110x-tx.c +++ b/drivers/cc110x_ng/cc110x-tx.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 Freie Universität Berlin - * Copyright (C) 2013 INRIA + * Copyright (C) 2013 INRIA * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more @@ -92,4 +92,3 @@ int8_t cc110x_send(cc110x_packet_t *packet) return size; } - diff --git a/drivers/cc110x_ng/cc110x.c b/drivers/cc110x_ng/cc110x.c index 41496ee22a..b54e306c07 100644 --- a/drivers/cc110x_ng/cc110x.c +++ b/drivers/cc110x_ng/cc110x.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2013 Freie Universität Berlin - * Copyright (C) 2013 INRIA + * Copyright (C) 2013 INRIA * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more @@ -204,15 +204,15 @@ char *cc110x_get_marc_state(void) * Only goes to IDLE if state was RX/WOR */ cc110x_wakeup_from_rx(); - /* Have to put radio back to WOR/RX if old radio state + /* Have to put radio back to WOR/RX if old radio state * was WOR/RX, otherwise no action is necessary */ if (old_state == RADIO_WOR || old_state == RADIO_RX) { cc110x_switch_to_rx(); } switch(state) { - /* Note: it is not possible to read back the SLEEP or XOFF state numbers - * because setting CSn low will make the chip enter the IDLE mode from the + /* Note: it is not possible to read back the SLEEP or XOFF state numbers + * because setting CSn low will make the chip enter the IDLE mode from the * SLEEP (0) or XOFF (2) states. */ case 1: return "IDLE"; diff --git a/drivers/cc110x_ng/spi/Makefile b/drivers/cc110x_ng/spi/Makefile index 5919222a88..d73874dec2 100644 --- a/drivers/cc110x_ng/spi/Makefile +++ b/drivers/cc110x_ng/spi/Makefile @@ -3,4 +3,3 @@ MODULE =cc110x_spi INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng include $(MAKEBASE)/Makefile.base - diff --git a/drivers/cc2420/Makefile b/drivers/cc2420/Makefile index 786dea6b2d..a9e952177f 100644 --- a/drivers/cc2420/Makefile +++ b/drivers/cc2420/Makefile @@ -9,4 +9,3 @@ include $(RIOTBASE)/Makefile.base clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/drivers/doc.txt b/drivers/doc.txt index dc1878227a..025bcba8cb 100644 --- a/drivers/doc.txt +++ b/drivers/doc.txt @@ -9,6 +9,6 @@ /** * @defgroup drivers Drivers * @brief Drivers for external devices as radios, sensors, memory etc. - * + * * The module contains all kind of drivers for specific devices. */ diff --git a/drivers/include/at86rf231.h b/drivers/include/at86rf231.h index 65ef56374a..58b783d0e3 100644 --- a/drivers/include/at86rf231.h +++ b/drivers/include/at86rf231.h @@ -67,4 +67,3 @@ enum { extern at86rf231_packet_t at86rf231_rx_buffer[AT86RF231_RX_BUF_SIZE]; #endif - diff --git a/drivers/include/cc110x_ng/cc110x-config.h b/drivers/include/cc110x_ng/cc110x-config.h index 6568cf117a..c518da6994 100644 --- a/drivers/include/cc110x_ng/cc110x-config.h +++ b/drivers/include/cc110x_ng/cc110x-config.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 Freie Universität Berlin - * Copyright (C) 2013 INRIA + * Copyright (C) 2013 INRIA * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more diff --git a/drivers/include/cc110x_ng/cc110x-interface.h b/drivers/include/cc110x_ng/cc110x-interface.h index ca35e310ec..5b82fc633a 100644 --- a/drivers/include/cc110x_ng/cc110x-interface.h +++ b/drivers/include/cc110x_ng/cc110x-interface.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 Freie Universität Berlin - * Copyright (C) 2013 INRIA + * Copyright (C) 2013 INRIA * * This file is subject to the terms and conditions of the GNU Lesser General * Public License. See the file LICENSE in the top level directory for more diff --git a/drivers/include/cc2420.h b/drivers/include/cc2420.h index 08ec39612b..13f1eabed3 100644 --- a/drivers/include/cc2420.h +++ b/drivers/include/cc2420.h @@ -242,4 +242,3 @@ extern cc2420_packet_t cc2420_rx_buffer[CC2420_RX_BUF_SIZE]; #endif - diff --git a/drivers/include/diskio.h b/drivers/include/diskio.h index 5ef1001fd8..61355543f8 100644 --- a/drivers/include/diskio.h +++ b/drivers/include/diskio.h @@ -6,7 +6,7 @@ * @defgroup diskio Disk IO Driver * @ingroup drivers * @brief Low level disk interface - * + * * The connection between the MCU and the SRF08 is based on the i2c-interface. * * @{ diff --git a/drivers/include/lm75a-temp-sensor.h b/drivers/include/lm75a-temp-sensor.h index fbf8039591..9af33e42f8 100644 --- a/drivers/include/lm75a-temp-sensor.h +++ b/drivers/include/lm75a-temp-sensor.h @@ -4,12 +4,12 @@ * This source code is licensed under the LGPLv2 license, * See the file LICENSE for more details. */ - + /** * @defgroup lm75a LM75A * @ingroup drivers * @brief Driver for the LM75A digital temperature sensor and thermal watchdog - * + * * The connection between the MCU and the LM75A is based on the i2c-interface. * * @{ diff --git a/drivers/include/srf02-ultrasonic-sensor.h b/drivers/include/srf02-ultrasonic-sensor.h index 95ab003a0b..0af64596ce 100644 --- a/drivers/include/srf02-ultrasonic-sensor.h +++ b/drivers/include/srf02-ultrasonic-sensor.h @@ -3,13 +3,13 @@ * * This source code is licensed under the LGPLv2 license, * See the file LICENSE for more details. - */ + */ /** * @defgroup srf02 SRF02 * @ingroup drivers * @brief Driver for the SRF02 ultrasonic range sensor - * + * * The connection between the MCU and the SRF08 is based on the i2c-interface. * * @{ diff --git a/drivers/include/srf08-ultrasonic-sensor.h b/drivers/include/srf08-ultrasonic-sensor.h index eab68fd2ab..4371d1a719 100644 --- a/drivers/include/srf08-ultrasonic-sensor.h +++ b/drivers/include/srf08-ultrasonic-sensor.h @@ -4,14 +4,14 @@ * This source code is licensed under the LGPLv2 license, * See the file LICENSE for more details. */ - + /** * @defgroup srf08 SRF08 * @ingroup drivers * @brief Driver for the SRF08 ultrasonic range sensor - * + * * The connection between the MCU and the SRF08 is based on the i2c-interface. - * + * * @{ * * @file @@ -64,8 +64,8 @@ bool srf08_init(uint8_t i2c_interface, uint32_t baud_rate); * range-finder. * The ranging results are given over the RS232-Interface. * - * @param[in] ranging_mode there are three real ranging modes, which return - * the result in inches, centimeters or microseconds. + * @param[in] ranging_mode there are three real ranging modes, which return + * the result in inches, centimeters or microseconds. * Another set of three fake ranging modes do the same * but without transmitting the burst. * @@ -111,10 +111,10 @@ uint8_t srf08_get_gain(void); /** - * @brief Get all distances measured from the SRF08 ultrasonic sensor. - * The results of a ranging can be returned in inches, centimeters - * or microseconds. The SRF08 can detect up to targets. - * This function prints the distance values over the rs232 + * @brief Get all distances measured from the SRF08 ultrasonic sensor. + * The results of a ranging can be returned in inches, centimeters + * or microseconds. The SRF08 can detect up to targets. + * This function prints the distance values over the rs232 * interface * * @param[in] range_array a pointer to a buffer holding the ranging results. diff --git a/drivers/lm75a/Makefile b/drivers/lm75a/Makefile index b9c7862ef5..f96cb2a3d6 100644 --- a/drivers/lm75a/Makefile +++ b/drivers/lm75a/Makefile @@ -1,3 +1,2 @@ MODULE =lm75a include $(MAKEBASE)/Makefile.base - diff --git a/drivers/lm75a/lm75a-temp-sensor.c b/drivers/lm75a/lm75a-temp-sensor.c index 557ee845b3..ff5a8cbd02 100644 --- a/drivers/lm75a/lm75a-temp-sensor.c +++ b/drivers/lm75a/lm75a-temp-sensor.c @@ -317,4 +317,3 @@ void lm75A_start_sensor_sampling(void (*handler)(void)) hwtimer_wait(HWTIMER_TICKS(100000)); } } - diff --git a/drivers/ltc4150/Makefile b/drivers/ltc4150/Makefile index c87af4187d..29b91b361a 100644 --- a/drivers/ltc4150/Makefile +++ b/drivers/ltc4150/Makefile @@ -1,3 +1,2 @@ MODULE =ltc4150 include $(MAKEBASE)/Makefile.base - diff --git a/drivers/sht11/Makefile b/drivers/sht11/Makefile index 71ca4388be..1f88712aa4 100644 --- a/drivers/sht11/Makefile +++ b/drivers/sht11/Makefile @@ -1,3 +1,2 @@ MODULE =sht11 include $(MAKEBASE)/Makefile.base - diff --git a/drivers/srf02/Makefile b/drivers/srf02/Makefile index 55d8977687..31ac029367 100644 --- a/drivers/srf02/Makefile +++ b/drivers/srf02/Makefile @@ -1,3 +1,2 @@ MODULE =srf02 include $(MAKEBASE)/Makefile.base - diff --git a/drivers/srf08/Makefile b/drivers/srf08/Makefile index 7980d3ed2b..92e6531754 100644 --- a/drivers/srf08/Makefile +++ b/drivers/srf08/Makefile @@ -1,3 +1,2 @@ MODULE =srf08 include $(MAKEBASE)/Makefile.base - diff --git a/drivers/srf08/srf08-ultrasonic-sensor.c b/drivers/srf08/srf08-ultrasonic-sensor.c index ab35e62421..5a6f71521c 100644 --- a/drivers/srf08/srf08-ultrasonic-sensor.c +++ b/drivers/srf08/srf08-ultrasonic-sensor.c @@ -160,4 +160,3 @@ void srf08_start_ranging(uint8_t ranging_mode) } } } - diff --git a/examples/ccn-lite-client/HOWTO b/examples/ccn-lite-client/HOWTO index 3de42cf767..5c8bd19f68 100644 --- a/examples/ccn-lite-client/HOWTO +++ b/examples/ccn-lite-client/HOWTO @@ -29,7 +29,7 @@ SHELL 1 | advanced forward (needs three [four] shells) ==================================================== -SHELL 1 | SHELL 2 | SHELL 3 +SHELL 1 | SHELL 2 | SHELL 3 ---------------------------------------------------------------------------------------------------------------------------------------------------------------- 0. create tap devices: *./cpu/native/tapsetup.sh create 3* | | 1. build ccn-lite-client: *make -B clean all* | | build ccn-lite: make clean all diff --git a/examples/rpl_udp/Makefile b/examples/rpl_udp/Makefile index f6c82e3e29..13048094da 100644 --- a/examples/rpl_udp/Makefile +++ b/examples/rpl_udp/Makefile @@ -40,8 +40,8 @@ USEMODULE += auto_init USEMODULE += shell USEMODULE += shell_commands USEMODULE += posix -USEMODULE += ps -USEMODULE += vtimer +USEMODULE += ps +USEMODULE += vtimer ifeq ($(strip $(BOARD)),native) USEMODULE += nativenet else diff --git a/examples/rpl_udp/README.md b/examples/rpl_udp/README.md index e40f006549..afb0aa0c36 100644 --- a/examples/rpl_udp/README.md +++ b/examples/rpl_udp/README.md @@ -1,7 +1,7 @@ #tl;dr command order: - + set init [r|n] server @@ -20,17 +20,17 @@ Set up a bridge for *two* tap devices to communicate over # rpl init Run the first node - + sudo ./bin/native/rpl_udp.elf tap0 -Type ``help`` to see the commands available. +Type ``help`` to see the commands available. Now you need set the node ID. This ID will be used by other nodes to address this node. > set 1 set 1 Set node ID to 1 -Init your rpl node as either a root or a node router. +Init your rpl node as either a root or a node router. > init n init n @@ -38,9 +38,9 @@ Init your rpl node as either a root or a node router. 6LoWPAN and RPL initialized. Channel set to 10 Destiny initialized - + or - + > init r init r INFO: Initialize as root on address 1 @@ -51,8 +51,8 @@ or (It is advised to start all nodes before running the root node, because the interval for sending DIOs from the root increases over time) A few seconds withing running, setting and initializing your second node, the nodes will automatically start to exchange control traffic. You should be seeing output similar to the following: - 41 CC FC 34 12 36 12 00 FF FE 00 00 02 36 12 00 FF FE 00 00 01 7A 33 3A 9B 03 F9 90 00 00 04 00 00 80 - IPv6 datagram received (next header: 3A) from fe80:0000:0000:0000:3612:00ff:fe00:0001 ICMP type: 5A ICMP code: 08 + 41 CC FC 34 12 36 12 00 FF FE 00 00 02 36 12 00 FF FE 00 00 01 7A 33 3A 9B 03 F9 90 00 00 04 00 00 80 + IPv6 datagram received (next header: 3A) from fe80:0000:0000:0000:3612:00ff:fe00:0001 ICMP type: 5A ICMP code: 08 Received packet from ID 1 Length: 34 Src: 1 diff --git a/examples/rpl_udp/demo.h b/examples/rpl_udp/demo.h index 2b831011b4..1c14977e2b 100644 --- a/examples/rpl_udp/demo.h +++ b/examples/rpl_udp/demo.h @@ -40,7 +40,7 @@ void rpl_udp_loop(char *unused); void rpl_udp_table(char *unused); /** - * @brief Shows the dodag + * @brief Shows the dodag * * @param[in] unused Guess what */ diff --git a/examples/rpl_udp/udp.c b/examples/rpl_udp/udp.c index c604c8fe4b..0515faebb7 100644 --- a/examples/rpl_udp/udp.c +++ b/examples/rpl_udp/udp.c @@ -125,5 +125,3 @@ void udp_send(char *str) destiny_socket_close(sock); } - - diff --git a/pkg/PORTING b/pkg/PORTING index 773a5206fb..3a535146df 100644 --- a/pkg/PORTING +++ b/pkg/PORTING @@ -1,5 +1,5 @@ This directory provides some porting information for libraries and programs to -use with RIOT (to build an external module). If you'd like to add a package to +use with RIOT (to build an external module). If you'd like to add a package to RIOT you need to add a directory with the name of your package to this directory. Your directory should contain at least two files: * patch.txt - Your patch of the upstream project of the package to make it diff --git a/pkg/libcoap/Makefile b/pkg/libcoap/Makefile index 1c1ba39211..089d1c2230 100644 --- a/pkg/libcoap/Makefile +++ b/pkg/libcoap/Makefile @@ -13,11 +13,11 @@ endif .PHONY: all clean patch reset -all: patch +all: patch make -C $(CURDIR)/$(PKG_NAME) patch: $(CURDIR)/$(PKG_NAME)/Makefile - + $(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME) cd $< && git apply ../patch.txt diff --git a/release-2013.08.txt b/release-2013.08.txt index 18fb07e0d0..11e50f2062 100644 --- a/release-2013.08.txt +++ b/release-2013.08.txt @@ -49,7 +49,7 @@ Hardware Support * ARM7 Freescale MC13224v (preliminary) * ARM Cortex-M4 STM32f407vgt6 (preliminary) * ARM Cortex-M3 STM32f103rey6 (preliminary) -- radio drivers +- radio drivers * TI CC1100 and CC1101 * TI CC2420 * Atmel AT86RF231 @@ -59,7 +59,7 @@ Hardware Support Known Issues ============ -#21: Deal with stdin in bordermultiplex.c +#21: Deal with stdin in bordermultiplex.c Not all supported platforms provide a stdin in the current release. However, the implementation of the 6LoWPAN border router won't work without stdin. @@ -99,5 +99,5 @@ License Free Software Foundation. * Some external sources, especially files developed by SICS are published under a separate license. - + All code files contain licensing information. diff --git a/sys/Makefile b/sys/Makefile index 95cbae2d59..f87aff2e08 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -94,7 +94,7 @@ ifneq (,$(findstring ccn_lite_client,$(USEMODULE))) DIRS += net/ccn_lite/util endif -all: $(BINDIR)$(MODULE).a +all: $(BINDIR)$(MODULE).a @for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ; include $(RIOTBASE)/Makefile.base @@ -102,4 +102,3 @@ include $(RIOTBASE)/Makefile.base # remove compilation products clean:: @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; - diff --git a/sys/auto_init/Makefile b/sys/auto_init/Makefile index 8b2b20a9fd..dc73b225e9 100644 --- a/sys/auto_init/Makefile +++ b/sys/auto_init/Makefile @@ -1,4 +1,3 @@ MODULE = auto_init include $(RIOTBASE)/Makefile.base - diff --git a/sys/bloom/Makefile b/sys/bloom/Makefile index 998fbc6c37..67d8988925 100644 --- a/sys/bloom/Makefile +++ b/sys/bloom/Makefile @@ -1,4 +1,3 @@ MODULE = bloom include $(RIOTBASE)/Makefile.base - diff --git a/sys/bloom/bloom.c b/sys/bloom/bloom.c index 02faf46eec..e8be005f63 100644 --- a/sys/bloom/bloom.c +++ b/sys/bloom/bloom.c @@ -100,4 +100,3 @@ bool bloom_check(struct bloom_t *bloom, const uint8_t *buf, size_t len) return true; /* ? */ } - diff --git a/sys/config/Makefile b/sys/config/Makefile index 93a842ac89..6e6ccce0dd 100644 --- a/sys/config/Makefile +++ b/sys/config/Makefile @@ -1,4 +1,3 @@ MODULE =config include $(RIOTBASE)/Makefile.base - diff --git a/sys/crypto/3des/3des.c b/sys/crypto/3des/3des.c index 37a7ccaba1..09426a0169 100644 --- a/sys/crypto/3des/3des.c +++ b/sys/crypto/3des/3des.c @@ -529,4 +529,3 @@ static uint8_t des3_key_setup(const uint8_t *key, struct des3_key_s *dkey) deskey(key + 16, 1, dkey->dk[0]); return 1; } - diff --git a/sys/crypto/3des/Makefile b/sys/crypto/3des/Makefile index f44efaed99..d049bc5d83 100644 --- a/sys/crypto/3des/Makefile +++ b/sys/crypto/3des/Makefile @@ -6,4 +6,3 @@ DEP = $(SRC:%.c=$(BINDIR)%.d) MODULE = crypto_3des include $(RIOTBASE)/Makefile.base - diff --git a/sys/crypto/aes/Makefile b/sys/crypto/aes/Makefile index 867aaf1c28..f387f13b02 100644 --- a/sys/crypto/aes/Makefile +++ b/sys/crypto/aes/Makefile @@ -6,4 +6,3 @@ DEP = $(SRC:%.c=$(BINDIR)%.d) MODULE = crypto_aes include $(RIOTBASE)/Makefile.base - diff --git a/sys/crypto/rc5/Makefile b/sys/crypto/rc5/Makefile index 3ae9c079bd..38207c4cc3 100644 --- a/sys/crypto/rc5/Makefile +++ b/sys/crypto/rc5/Makefile @@ -6,4 +6,3 @@ DEP = $(SRC:%.c=$(BINDIR)%.d) MODULE = crypto_rc5 include $(RIOTBASE)/Makefile.base - diff --git a/sys/crypto/sha256/Makefile b/sys/crypto/sha256/Makefile index 3642252a8f..9794942fc1 100644 --- a/sys/crypto/sha256/Makefile +++ b/sys/crypto/sha256/Makefile @@ -6,4 +6,3 @@ DEP = $(SRC:%.c=$(BINDIR)%.d) MODULE = crypto_sha256 include $(RIOTBASE)/Makefile.base - diff --git a/sys/crypto/sha256/sha256.c b/sys/crypto/sha256/sha256.c index 1c915f5386..89f81f6213 100644 --- a/sys/crypto/sha256/sha256.c +++ b/sys/crypto/sha256/sha256.c @@ -37,7 +37,7 @@ * @author Colin Percival * @author Christian Mehlis * @author Rene Kijewski - * + * * @} */ diff --git a/sys/crypto/skipjack/Makefile b/sys/crypto/skipjack/Makefile index 9f71e32369..87f66d593e 100644 --- a/sys/crypto/skipjack/Makefile +++ b/sys/crypto/skipjack/Makefile @@ -6,4 +6,3 @@ DEP = $(SRC:%.c=$(BINDIR)%.d) MODULE = crypto_skipjack include $(RIOTBASE)/Makefile.base - diff --git a/sys/crypto/twofish/Makefile b/sys/crypto/twofish/Makefile index 00cf5cccd8..7cfdd35787 100644 --- a/sys/crypto/twofish/Makefile +++ b/sys/crypto/twofish/Makefile @@ -6,4 +6,3 @@ DEP = $(SRC:%.c=$(BINDIR)%.d) MODULE = crypto_twofish include $(RIOTBASE)/Makefile.base - diff --git a/sys/include/crypto/aes.h b/sys/include/crypto/aes.h index eb58112a6b..e5ccd67f50 100644 --- a/sys/include/crypto/aes.h +++ b/sys/include/crypto/aes.h @@ -8,7 +8,7 @@ /** * @ingroup sys_crypto * @{ - * + * * @file aes.h * @brief Headers for the implementation of the AES cipher-algorithm * diff --git a/sys/include/crypto/cbcmode.h b/sys/include/crypto/cbcmode.h index 088f1b6036..22a86ad9d9 100644 --- a/sys/include/crypto/cbcmode.h +++ b/sys/include/crypto/cbcmode.h @@ -8,7 +8,7 @@ /** * @ingroup sys_crypto * @{ - * + * * @file cbcmode.h * @brief Headers of the implementation of the CBC Mode of Operation * diff --git a/sys/include/crypto/sha256.h b/sys/include/crypto/sha256.h index 3aa0ec8858..62bbbdeaf4 100644 --- a/sys/include/crypto/sha256.h +++ b/sys/include/crypto/sha256.h @@ -26,8 +26,8 @@ * * $FreeBSD: src/lib/libmd/sha256.h,v 1.1.2.1 2005/06/24 13:32:25 cperciva Exp $ */ - - + + /** * @defgroup sys_sha256 SHA264 * @ingroup sys diff --git a/sys/include/crypto/skipjack.h b/sys/include/crypto/skipjack.h index 9191053241..cf68cb4e50 100644 --- a/sys/include/crypto/skipjack.h +++ b/sys/include/crypto/skipjack.h @@ -8,7 +8,7 @@ /** * @ingroup sys_crypto * @{ - * + * * @file skipjack.h * @brief Headers for the implementation of the SkipJack cipher-algorithm * @@ -62,7 +62,7 @@ w3 = tmp; \ counter--; \ skey -= 4; } \ - + // B-RULE: #define RULE_B(skey, w1, w2, w3, w4, counter, tmp, bLeft, bRight ) { \ tmp = w1; \ diff --git a/sys/include/ps.h b/sys/include/ps.h index 824bd9949b..2b755dc184 100644 --- a/sys/include/ps.h +++ b/sys/include/ps.h @@ -4,7 +4,7 @@ * @ingroup sys * @brief Show list with all threads */ - + #ifndef __PS_H #define __PS_H diff --git a/sys/include/random.h b/sys/include/random.h index 6bebda748d..53199d4b20 100644 --- a/sys/include/random.h +++ b/sys/include/random.h @@ -4,7 +4,7 @@ * @ingroup sys * @brief Random number generator */ - + #include #ifndef PRNG_FLOAT diff --git a/sys/include/ringbuffer.h b/sys/include/ringbuffer.h index 0146abe375..17c120946d 100644 --- a/sys/include/ringbuffer.h +++ b/sys/include/ringbuffer.h @@ -1,5 +1,5 @@ /** - * Ringbuffer header + * Ringbuffer header * * Copyright (C) 2013 Freie Universität Berlin * Copyright (C) 2013 INRIA diff --git a/sys/lib/Makefile b/sys/lib/Makefile index 59bee59b8a..e4a10a72c7 100644 --- a/sys/lib/Makefile +++ b/sys/lib/Makefile @@ -1,4 +1,3 @@ MODULE =lib include $(RIOTBASE)/Makefile.base - diff --git a/sys/net/link_layer/ieee802154/ieee802154_frame.c b/sys/net/link_layer/ieee802154/ieee802154_frame.c index 031ef66cfa..866cb457da 100644 --- a/sys/net/link_layer/ieee802154/ieee802154_frame.c +++ b/sys/net/link_layer/ieee802154/ieee802154_frame.c @@ -1,5 +1,5 @@ /** - * implementation for the IEEE 802.15.4 frame format + * implementation for the IEEE 802.15.4 frame format * * Copyright (C) 2013 INRIA. * @@ -10,7 +10,7 @@ * @ingroup sixlowpan * @{ * @file ieee802154_frame.c - * @brief IEEE 802.14.4 framing operations + * @brief IEEE 802.14.4 framing operations * @author Stephan Zeisberg * @author Oliver Hahm * @} diff --git a/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c b/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c index 83bd20c22f..f83ed599f9 100644 --- a/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c +++ b/sys/net/link_layer/protocol-multiplex/protocol-multiplex.c @@ -101,7 +101,7 @@ int pm_set_handler(const pm_table_t *table, protocol_t protocol, return index; } /*---------------------------------------------------------------------------*/ -void pm_remove_handler(const pm_table_t *table, protocol_t protocol, +void pm_remove_handler(const pm_table_t *table, protocol_t protocol, packet_handler_t handler) { int i; diff --git a/sys/net/network_layer/sixlowpan/icmp.c b/sys/net/network_layer/sixlowpan/icmp.c index 8c35bb0f69..0125430ea2 100644 --- a/sys/net/network_layer/sixlowpan/icmp.c +++ b/sys/net/network_layer/sixlowpan/icmp.c @@ -62,7 +62,7 @@ #define OPT_STLLAO_MIN_LEN (8) #define OPT_STLLAO_MAX_LEN (16) /* prefix info option rfc 4.6.2 */ -#define OPT_PI_LIST_LEN (5) //TODO: initalwert suchen +#define OPT_PI_LIST_LEN (5) //TODO: initalwert suchen #define OPT_PI_TYPE (3) #define OPT_PI_LEN (4) #define OPT_PI_HDR_LEN (32) diff --git a/sys/net/network_layer/sixlowpan/ip.c b/sys/net/network_layer/sixlowpan/ip.c index fb89018551..d0e46d472c 100644 --- a/sys/net/network_layer/sixlowpan/ip.c +++ b/sys/net/network_layer/sixlowpan/ip.c @@ -151,7 +151,7 @@ uint8_t ipv6_register_packet_handler(int pid) { uint8_t i; - for (i = 0; ((i < SIXLOWIP_MAX_REGISTERED) && (sixlowip_reg[i] != pid) && + for (i = 0; ((i < SIXLOWIP_MAX_REGISTERED) && (sixlowip_reg[i] != pid) && (sixlowip_reg[i] != 0)); i++) { ; } diff --git a/sys/net/network_layer/sixlowpan/lowpan.c b/sys/net/network_layer/sixlowpan/lowpan.c index 30b254efc4..8c7201cd06 100644 --- a/sys/net/network_layer/sixlowpan/lowpan.c +++ b/sys/net/network_layer/sixlowpan/lowpan.c @@ -1734,4 +1734,3 @@ void sixlowpan_lowpan_bootstrapping(void) icmpv6_send_router_sol(OPT_SLLAO); } - diff --git a/sys/net/routing/rpl/rpl.c b/sys/net/routing/rpl/rpl.c index f27cfc4f95..24b42d5fb6 100644 --- a/sys/net/routing/rpl/rpl.c +++ b/sys/net/routing/rpl/rpl.c @@ -937,7 +937,7 @@ void rpl_send(ipv6_addr_t *destination, uint8_t *payload, uint16_t p_len, uint8_ packet_length = IPV6_HDR_LEN + p_len; if (ipv6_addr_is_multicast(&ipv6_send_buf->destaddr)) { - sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_send_buf->destaddr.uint16[4]), + sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_send_buf->destaddr.uint16[4]), (uint8_t *)ipv6_send_buf, packet_length); } @@ -960,7 +960,7 @@ void rpl_send(ipv6_addr_t *destination, uint8_t *payload, uint16_t p_len, uint8_ } } - sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(next_hop->uint16[4]), + sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(next_hop->uint16[4]), (uint8_t *)ipv6_send_buf, packet_length); } diff --git a/sys/ping/Makefile b/sys/ping/Makefile index 037060005c..35193836e3 100644 --- a/sys/ping/Makefile +++ b/sys/ping/Makefile @@ -1,4 +1,3 @@ MODULE =ping include $(RIOTBASE)/Makefile.base - diff --git a/sys/posix/Makefile b/sys/posix/Makefile index 883763c56e..f6159ae25e 100644 --- a/sys/posix/Makefile +++ b/sys/posix/Makefile @@ -1,4 +1,3 @@ MODULE =posix include $(RIOTBASE)/Makefile.base - diff --git a/sys/ps/Makefile b/sys/ps/Makefile index 9fec450f4c..ea15576f57 100644 --- a/sys/ps/Makefile +++ b/sys/ps/Makefile @@ -1,4 +1,3 @@ MODULE =ps include $(RIOTBASE)/Makefile.base - diff --git a/sys/random/Makefile b/sys/random/Makefile index 750c7bf1b2..5a6627f82b 100644 --- a/sys/random/Makefile +++ b/sys/random/Makefile @@ -2,4 +2,3 @@ INCLUDES = -I../include -I$(RIOTBASE)/core/include MODULE = random include $(RIOTBASE)/Makefile.base - diff --git a/sys/semaphore/Makefile b/sys/semaphore/Makefile index 923609e5c9..bbca845b2c 100644 --- a/sys/semaphore/Makefile +++ b/sys/semaphore/Makefile @@ -1,4 +1,3 @@ MODULE = semaphore include $(RIOTBASE)/Makefile.base - diff --git a/sys/shell/Makefile b/sys/shell/Makefile index f2cdb04897..131cbdfd15 100644 --- a/sys/shell/Makefile +++ b/sys/shell/Makefile @@ -19,4 +19,3 @@ $(BINDIR)%.o: %.c # remove compilation products clean:: @rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ) - diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile index 4792e1aee3..13beb78fef 100644 --- a/sys/shell/commands/Makefile +++ b/sys/shell/commands/Makefile @@ -36,4 +36,3 @@ DEP = $(SRC:%.c=$(BINDIR)%.d) MODULE =shell_commands include $(RIOTBASE)/Makefile.base - diff --git a/sys/shell/commands/sc_disk.c b/sys/shell/commands/sc_disk.c index 69d2a8b5da..cebe67f85b 100644 --- a/sys/shell/commands/sc_disk.c +++ b/sys/shell/commands/sc_disk.c @@ -1,5 +1,5 @@ /** - * Shell commands for accessing storage + * Shell commands for accessing storage * * Copyright (C) 2013 INRIA. * @@ -10,7 +10,7 @@ * @ingroup shell_commands * @{ * @file sc_disk.c - * @brief provides shell commands to access storage (like mmc) + * @brief provides shell commands to access storage (like mmc) * @author Oliver Hahm * @} */ diff --git a/sys/shell/commands/sc_heap.c b/sys/shell/commands/sc_heap.c index 7cc9f7a9c3..233d862a80 100644 --- a/sys/shell/commands/sc_heap.c +++ b/sys/shell/commands/sc_heap.c @@ -25,4 +25,3 @@ void _heap_handler(char *unused) (void) unused; heap_stats(); } - diff --git a/sys/shell/commands/sc_id.c b/sys/shell/commands/sc_id.c index 765e190647..863c1a9487 100644 --- a/sys/shell/commands/sc_id.c +++ b/sys/shell/commands/sc_id.c @@ -1,5 +1,5 @@ /** - * Shell commands for configuring the node id + * Shell commands for configuring the node id * * Copyright (C) 2013 INRIA. * @@ -10,7 +10,7 @@ * @ingroup shell_commands * @{ * @file sc_id.c - * @brief provides shell commands to configure node id + * @brief provides shell commands to configure node id * @author Oliver Hahm * @} */ diff --git a/sys/shell/commands/sc_ltc4150.c b/sys/shell/commands/sc_ltc4150.c index 0ae7ad9ff1..7acf7f25ce 100644 --- a/sys/shell/commands/sc_ltc4150.c +++ b/sys/shell/commands/sc_ltc4150.c @@ -1,5 +1,5 @@ /** - * Shell commands for coulomb counter + * Shell commands for coulomb counter * * Copyright (C) 2013 INRIA. * diff --git a/sys/shell/commands/sc_ps.c b/sys/shell/commands/sc_ps.c index c6afeabac5..f076b78f69 100644 --- a/sys/shell/commands/sc_ps.c +++ b/sys/shell/commands/sc_ps.c @@ -10,7 +10,7 @@ * @ingroup shell_commands * @{ * @file sc_ps.c - * @brief shows all thread information + * @brief shows all thread information * @author Oliver Hahm * @} */ @@ -23,4 +23,3 @@ void _ps_handler(char *unused) thread_print_all(); } - diff --git a/sys/shell/commands/sc_rtc.c b/sys/shell/commands/sc_rtc.c index 2b7d1bb315..56db40fbc6 100644 --- a/sys/shell/commands/sc_rtc.c +++ b/sys/shell/commands/sc_rtc.c @@ -1,5 +1,5 @@ /** - * Shell commands for real time clock + * Shell commands for real time clock * * Copyright (C) 2013 INRIA. * @@ -10,7 +10,7 @@ * @ingroup shell_commands * @{ * @file sc_rtc.c - * @brief provides shell commands to access the rtc + * @brief provides shell commands to access the rtc * @author Oliver Hahm * @} */ diff --git a/sys/shell/commands/sc_sht11.c b/sys/shell/commands/sc_sht11.c index 80c196ebfe..ce088ec562 100644 --- a/sys/shell/commands/sc_sht11.c +++ b/sys/shell/commands/sc_sht11.c @@ -1,5 +1,5 @@ /** - * Shell commands for temperature and humidity sensor + * Shell commands for temperature and humidity sensor * * Copyright (C) 2013 INRIA. * @@ -10,7 +10,7 @@ * @ingroup shell_commands * @{ * @file sc_sht11.c - * @brief provides shell commands to poll sht11 sensor + * @brief provides shell commands to poll sht11 sensor * @author Oliver Hahm * @} */ diff --git a/sys/shell/commands/shell_commands.c b/sys/shell/commands/shell_commands.c index a2aa5f038b..9762af945a 100644 --- a/sys/shell/commands/shell_commands.c +++ b/sys/shell/commands/shell_commands.c @@ -165,4 +165,3 @@ const shell_command_t _shell_command_list[] = { #endif {NULL, NULL, NULL} }; - diff --git a/sys/timex/Makefile b/sys/timex/Makefile index 76b21cf14d..fa37c25bf9 100644 --- a/sys/timex/Makefile +++ b/sys/timex/Makefile @@ -1,4 +1,3 @@ MODULE = timex include $(RIOTBASE)/Makefile.base - diff --git a/sys/timex/timex.c b/sys/timex/timex.c index 0878b54695..1a1b9d982f 100644 --- a/sys/timex/timex.c +++ b/sys/timex/timex.c @@ -8,7 +8,7 @@ * Public License. See the file LICENSE in the top level directory for more * details. */ - + /** * @file * @author Kaspar Schleiser diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile index 4fcf17425d..3c18dcb478 100644 --- a/sys/transceiver/Makefile +++ b/sys/transceiver/Makefile @@ -1,5 +1,3 @@ MODULE =transceiver include $(MAKEBASE)/Makefile.base - - diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c index e5bd66b43d..fe05b648d7 100644 --- a/sys/transceiver/transceiver.c +++ b/sys/transceiver/transceiver.c @@ -389,13 +389,13 @@ static void receive_packet(uint16_t type, uint8_t pos) * received */ if (type == RCV_PKT_CC1100) { #ifdef MODULE_CC110X_NG - receive_cc110x_packet(trans_p); + receive_cc110x_packet(trans_p); #elif MODULE_CC110X receive_cc1100_packet(trans_p); #else trans_p = NULL; #endif - } + } else if (type == RCV_PKT_MC1322X) { #ifdef MODULE_MC1322X receive_mc1322x_packet(trans_p); @@ -529,12 +529,12 @@ void receive_mc1322x_packet(radio_packet_t *trans_p) { memcpy((void*) &(data_buffer[transceiver_buffer_pos * PAYLOAD_SIZE]), maca_pkt->data, MACA_MAX_PAYLOAD_SIZE); maca_free_packet( maca_pkt ); eINT(); - + trans_p->data = (uint8_t*) &(data_buffer[transceiver_buffer_pos * MACA_MAX_PAYLOAD_SIZE]); } #endif - + #ifdef MODULE_NATIVENET void receive_nativenet_packet(radio_packet_t *trans_p) { unsigned state; @@ -742,7 +742,7 @@ static int32_t get_channel(transceiver_type_t t) #endif #ifdef MODULE_MC1322X case TRANSCEIVER_MC1322X: - ///< TODO:implement return maca_get_channel(); + ///< TODO:implement return maca_get_channel(); return -1; #endif #ifdef MODULE_NATIVENET diff --git a/sys/vtimer/Makefile b/sys/vtimer/Makefile index 35f0910438..cae67acc0d 100644 --- a/sys/vtimer/Makefile +++ b/sys/vtimer/Makefile @@ -1,4 +1,3 @@ MODULE =vtimer include $(RIOTBASE)/Makefile.base - diff --git a/sys/vtimer/vtimer.c b/sys/vtimer/vtimer.c index 6f7751b62c..ea1c368b6e 100644 --- a/sys/vtimer/vtimer.c +++ b/sys/vtimer/vtimer.c @@ -329,9 +329,9 @@ int vtimer_sleep(timex_t time) t.action = (void(*)(void *)) mutex_unlock; t.arg = (void *) &mutex; t.absolute = time; - + ret = vtimer_set(&t); - mutex_lock(&mutex); + mutex_lock(&mutex); return ret; } diff --git a/tests/test_hwtimer/tests/test_hwtimer b/tests/test_hwtimer/tests/test_hwtimer index f9f4a92e13..b746455437 100755 --- a/tests/test_hwtimer/tests/test_hwtimer +++ b/tests/test_hwtimer/tests/test_hwtimer @@ -4,45 +4,44 @@ set timeout 5 spawn pseudoterm $env(PORT) -expect { - "OK" {} +expect { + "OK" {} timeout { exit 1 } } -expect { - "set callback 1" {} +expect { + "set callback 1" {} timeout { exit 1 } } -expect { - "set callback 2" {} +expect { + "set callback 2" {} timeout { exit 1 } } -expect { - "set callback 3" {} +expect { + "set callback 3" {} timeout { exit 1 } } -expect { - "callback 1" {} +expect { + "callback 1" {} timeout { exit 1 } } -expect { - "callback 3" {} +expect { + "callback 3" {} timeout { exit 1 } } -expect { - "callback 2" {} +expect { + "callback 2" {} timeout { exit 1 } } -expect { - "hwtimer set." {} +expect { + "hwtimer set." {} timeout { exit 1 } } puts "\nTest successful!\n" - diff --git a/tests/test_irq/Makefile b/tests/test_irq/Makefile index aadfbd61d3..4fc604b6ff 100644 --- a/tests/test_irq/Makefile +++ b/tests/test_irq/Makefile @@ -14,7 +14,7 @@ ifeq (,$(findstring native,$(BOARD))) include $(RIOTBASE)/Makefile.unsupported else -## Modules to include. +## Modules to include. USEMODULE += auto_init USEMODULE += hwtimer diff --git a/tests/test_nativenet/Makefile b/tests/test_nativenet/Makefile index a69baf40e4..161280568b 100644 --- a/tests/test_nativenet/Makefile +++ b/tests/test_nativenet/Makefile @@ -14,7 +14,7 @@ ifeq (,$(findstring native,$(BOARD))) include $(RIOTBASE)/Makefile.unsupported else -## Modules to include. +## Modules to include. USEMODULE += auto_init USEMODULE += hwtimer diff --git a/tests/test_pnet/Makefile b/tests/test_pnet/Makefile index 628e1f5f23..652a395c4a 100644 --- a/tests/test_pnet/Makefile +++ b/tests/test_pnet/Makefile @@ -3,9 +3,9 @@ #### #### The Sample Filesystem Layout is: #### /this makefile -#### ../../RIOT +#### ../../RIOT #### ../../boards for board definitions (if you have one or more) -#### +#### # name of your project export PROJECT =test_pnet @@ -23,7 +23,7 @@ ifeq ($(BOARD),stm32f4discovery) include Makefile.$(BOARD) endif -## Modules to include. +## Modules to include. USEMODULE += auto_init USEMODULE += posix diff --git a/tests/test_semaphore/Makefile b/tests/test_semaphore/Makefile index 993f5687ed..4303b7324d 100644 --- a/tests/test_semaphore/Makefile +++ b/tests/test_semaphore/Makefile @@ -7,7 +7,7 @@ export BOARD ?= native # this has to be the absolute path of the RIOT-base dir export RIOTBASE = $(CURDIR)/../.. -## Modules to include. +## Modules to include. USEMODULE += semaphore include $(RIOTBASE)/Makefile.include diff --git a/tests/test_semaphore/main.c b/tests/test_semaphore/main.c index 8d782120ca..cbef1ff748 100644 --- a/tests/test_semaphore/main.c +++ b/tests/test_semaphore/main.c @@ -161,4 +161,3 @@ int main(void) test2(); puts("#########################"); } - diff --git a/tests/test_shell/Makefile b/tests/test_shell/Makefile index d09f7efc12..1328f4d732 100644 --- a/tests/test_shell/Makefile +++ b/tests/test_shell/Makefile @@ -7,7 +7,7 @@ export BOARD ?= native # this has to be the absolute path of the RIOT-base dir export RIOTBASE = $(CURDIR)/../.. -## Modules to include. +## Modules to include. USEMODULE += shell USEMODULE += shell_commands diff --git a/tests/test_shell/ReadMe.txt b/tests/test_shell/ReadMe.txt index 55266ba493..a44c1216d8 100644 --- a/tests/test_shell/ReadMe.txt +++ b/tests/test_shell/ReadMe.txt @@ -1,15 +1,15 @@ -This project shows how to use own or the system shell commands. In order to use +This project shows how to use own or the system shell commands. In order to use the system shell commands: -1. Additionally to the module: shell, shell_commands and posix, - the module for the corresponding system command is to include, e.g. - module ps for the ps command (cf. the Makefile in the project root - directory). +1. Additionally to the module: shell, shell_commands and posix, + the module for the corresponding system command is to include, e.g. + module ps for the ps command (cf. the Makefile in the project root + directory). 2. The shell must be initialized as follows: 2.1 shell_t sys_shell; - 2.2 shell_init(&shell, shell_commands, shell_bufsize, shell_readc, - shell_putchar); + 2.2 shell_init(&shell, shell_commands, shell_bufsize, shell_readc, + shell_putchar); or shell_init(&sys_shell, NULL, shell_bufsize, - shell_readc, shell_putchar); + shell_readc, shell_putchar); /* to initialize without the built-in shell commands */ 2.3 shell_run(&sys_shell); diff --git a/tests/test_shell/main.c b/tests/test_shell/main.c index e4e88071e0..0f036cd71f 100644 --- a/tests/test_shell/main.c +++ b/tests/test_shell/main.c @@ -83,4 +83,3 @@ int main(void) return 0; } - diff --git a/tests/test_shell/tests/01-basic b/tests/test_shell/tests/01-basic index fd3bf5d993..db0961ab89 100755 --- a/tests/test_shell/tests/01-basic +++ b/tests/test_shell/tests/01-basic @@ -5,25 +5,25 @@ set timeout 5 spawn pseudoterm $env(PORT) sleep 1 -send "\n" -send "\n" -expect { - ">" {} +send "\n" +send "\n" +expect { + ">" {} timeout { exit 1 } } -send "start_test\n" +send "start_test\n" expect { "\[TEST_START\]" {} timeout { exit 1 } } -expect { - ">" {} +expect { + ">" {} timeout { exit 1 } } -send "end_test\n" +send "end_test\n" expect { "\[TEST_END\]" {} timeout { exit 1 } diff --git a/tests/test_shell/tests/02-inputlength-regression b/tests/test_shell/tests/02-inputlength-regression index a93e3526ac..96ec787ec1 100755 --- a/tests/test_shell/tests/02-inputlength-regression +++ b/tests/test_shell/tests/02-inputlength-regression @@ -2,61 +2,61 @@ set timeout 1 -spawn pseudoterm $env(PORT) +spawn pseudoterm $env(PORT) sleep 1 -send "\n" -send "\n" -expect { - ">" {} +send "\n" +send "\n" +expect { + ">" {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } send "123456789012345678901234567890123456789012345678901234567890\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } @@ -67,12 +67,12 @@ expect { timeout { exit 1 } } -expect { - ">" {} +expect { + ">" {} timeout { exit 1 } } -send "end_test\n" +send "end_test\n" expect { "\[TEST_END\]" {} diff --git a/tests/test_shell/tests/02-unknown-command b/tests/test_shell/tests/02-unknown-command index d47c20cf55..2e682838e3 100755 --- a/tests/test_shell/tests/02-unknown-command +++ b/tests/test_shell/tests/02-unknown-command @@ -2,19 +2,19 @@ set timeout 2 -spawn pseudoterm $env(PORT) +spawn pseudoterm $env(PORT) sleep 1 -send "\n" -send "\n" -expect { - ">" {} +send "\n" +send "\n" +expect { + ">" {} timeout { exit 1 } } send "some_definately_unknown_command\n" -expect { - "shell: command not found." {} +expect { + "shell: command not found." {} timeout { exit 1 } } diff --git a/tests/test_thread_basic/tests/test_thread.py b/tests/test_thread_basic/tests/test_thread.py index 40df9e651e..691d3a640f 100755 --- a/tests/test_thread_basic/tests/test_thread.py +++ b/tests/test_thread_basic/tests/test_thread.py @@ -12,4 +12,3 @@ subprocess.call(['jam', 'reset'], stdout=null) child.expect ('first thread\r\n') child.expect ('second thread\r\n') print("Test successful!") - diff --git a/tests/test_thread_exit/tests/hello-world b/tests/test_thread_exit/tests/hello-world index 6f4a6ca811..e7ab2a7c31 100755 --- a/tests/test_thread_exit/tests/hello-world +++ b/tests/test_thread_exit/tests/hello-world @@ -2,12 +2,11 @@ set timeout 5 -spawn board/msba2/tools/bin/pseudoterm $env(PORT) +spawn board/msba2/tools/bin/pseudoterm $env(PORT) -expect { - "Hello World!" {} +expect { + "Hello World!" {} timeout { exit 1 } } puts "\nTest successful!\n" -