Merge pull request #2939 from gebart/pr/whitespace-fixes1

Whitespace fixes

.gitattributes

@@ -1 +1,6 @@
 *.a binary
+# Default conflict marker size is 7 which causes some of the headings in
+# release-notes.txt to trigger git diff --check: 'leftover conflict marker'
+# when the heading is exactly 7 characters long.
+*.md conflict-marker-size=100
+*.txt conflict-marker-size=100

boards/msb-430h/include/periph_conf.h

@@ -22,4 +22,3 @@
 /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
 
 #endif /* PERIPH_CONF_H */
-

boards/z1/Makefile.dep

@@ -1,2 +1 @@
 USEMODULE += msp430_common
-

cpu/cc2538/cpu.c

@@ -94,4 +94,3 @@ static void cpu_clock_init(void)
     while (!SYS_CTRL->CLOCK_STAbits.SYNC_32K);
 #endif
 }
-

cpu/nrf51822/include/nrf51.h

@@ -1,5 +1,5 @@
-
-/****************************************************************************************************//**
+/****************************************************************************************************/
+/**
  * @file     nRF51.h
  *
  * @brief    CMSIS Cortex-M0 Peripheral Access Layer Header File for
@@ -1234,6 +1234,4 @@ typedef struct {                                    /*!< GPIO Structure
 }
 #endif
 
-
 #endif  /* nRF51_H */
-

cpu/stm32f3/include/stm32f334x8.h

@@ -9,7 +9,7 @@
   *          This file contains:
   *           - Data structures and the address mapping for all peripherals
   *           - Peripheral's registers declarations and bits definition
-  *           - Macros to access peripheral’s registers hardware
+  *           - Macros to access peripheral's registers hardware
   *
   ******************************************************************************
   * @attention
@@ -7596,7 +7596,7 @@ typedef struct
  * @}
  */
 
-  /**
+/**
  * @}
  */
 

cpu/x86/x86_glue.c

@@ -134,4 +134,3 @@ ssize_t write(int fildes, const void *buf, size_t nbyte)
     (void) nbyte;
     return -1;
 }
-

dist/Dockerfile

@@ -36,4 +36,3 @@ RUN apt-get -y install subversion curl wget python p7zip unzip
 
 RUN mkdir -p /data/riotbuild
 WORKDIR /data/riotbuild
-

dist/tools/cppcheck/README.md

@@ -37,4 +37,3 @@ If this happens, you can add an "inline suppression" like this:
 
     /* cppcheck-suppress passedByValue */
     timex_t timex_add(const timex_t a, const timex_t b);
-

dist/tools/pyterm/pytermcontroller/__init__.py

@@ -1,2 +1 @@
 __all__ = ["pytermcontroller"]
-

dist/tools/pyterm/pytermcontroller/pytermcontroller.py

@@ -155,4 +155,3 @@ class Experiment():
     @staticmethod
     def sendToConnection(connection, line):
         connection.write(line + "\n")
-  

dist/tools/pyterm/testbeds/__init__.py

@@ -1,2 +1 @@
 __all__ = ["testbeds"]
-

dist/tools/pyterm/testbeds/testbeds.py

@@ -181,6 +181,3 @@ class DesVirtTestbed(Testbed):
         for node in self.namePortList:
             self.printAndCall("screen -X -S pyterm-%s quit" % (node[0]))
         self.stopDesVirtNetwork()
-
-
-            

dist/tools/sniffer/README.md

@@ -55,4 +55,3 @@ For windows you can use the optional third argument to output to a
 .pcap:
 
     $ ./rftestrx2pcap.py /dev/ttyUSB1 26 foo.pcap
-

examples/default/README.md

@@ -18,7 +18,7 @@ Finally, in order for the shell to receive input, the `uart0` module
 is used.
 
 
-usage
+Usage
 =====
 
 Build, flash and start the application:
@@ -35,8 +35,8 @@ that is `/dev/ttyUSB0`. If your port is named differently, the
 `PORT=/dev/yourport` variable can be used to override this.
 
 
-Example
-=======
+Example output
+==============
 
 The shell commands come with online help. Call `help` to see which commands
 exist and what they do.

pkg/libcoap/.gitattributes

@@ -0,0 +1,6 @@
+# Ignore whitespace errors inside these patch files by regarding them as binary.
+0001-Add-RIOT-Makefile.patch binary
+0002-Add-config.h.patch binary
+0003-Remove-two-example-programs-in-root.patch binary
+0004-Eliminate-some-compiler-warnings-and-errors.patch binary
+0005-fix-old-style-function-declarations.patch binary

pkg/micro-ecc/.gitattributes

@@ -0,0 +1,3 @@
+# Ignore whitespace errors inside these patch files by regarding them as binary.
+0001-Add-RIOT-Makefile.patch binary
+0002-Include-RIOT-Hardware-RNG-interface.patch binary

pkg/microcoap/.gitattributes

@@ -0,0 +1,4 @@
+# Ignore whitespace errors inside these patch files by regarding them as binary.
+0001-Remove-unneeded-.c-files.patch binary
+0002-Add-RIOT-Makefile.patch binary
+0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch binary

pkg/oonf_api/.gitattributes

@@ -0,0 +1,5 @@
+# Ignore whitespace errors inside these patch files by regarding them as binary.
+0001-add-RIOT-support.patch binary
+0002-port-tests-to-riot.patch binary
+0003-port-example-to-riot.patch binary
+0004-fix-conflicting-types.patch binary

pkg/openwsn/.gitattributes

@@ -0,0 +1,6 @@
+# Ignore whitespace errors inside these patch files by regarding them as binary.
+0001-Add-RIOT-Makefiles.patch binary
+0002-Add-RIOT-adaption.patch binary
+0003-Fix-old-style-definitions.patch binary
+0004-provide-openserial-dummies.patch binary
+0005-fixes-to-RIOT-adaption.patch binary

pkg/tlsf/.gitattributes

@@ -0,0 +1,2 @@
+# Ignore whitespace errors inside these patch files by regarding them as binary.
+patch.txt binary

tests/driver_nrf24l01p_lowlevel/README.md

@@ -1,30 +1,45 @@
 # Test for nrf24l01p lowlevel functions
 
 ## About
-This is a small test application to see how the lowlevel-driver functions of the proprietary nrf24l01p-transceiver work. These functions consist of general SPI and GPIO commands, which abstract the driver-functions from the used board.
+
+This is a small test application to see how the lowlevel-driver functions of
+the proprietary nrf24l01p-transceiver work. These functions consist of general
+SPI and GPIO commands, which abstract the driver-functions from the used board.
 
 ## Predefined pin mapping
-Please compare the `tests/driver_nrf24l01p_lowlevel/Makefile` for predefined pin-mappings on different boards. (In addition, you also need to connect to 3V and GND)
+
+Please compare the `tests/driver_nrf24l01p_lowlevel/Makefile` for predefined
+pin-mappings on different boards. (In addition, you also need to connect to 3V
+and GND)
 
 ## Usage
-You should be presented with the RIOT shell, providing you with commands to initialize the transceiver (command: `it`), sending one packet (command: `send`) or read out and print all registers of the transceiver as binary values (command: `prgs`). 
+
+You should be presented with the RIOT shell, providing you with commands to
+initialize the transceiver (command: `it`), sending one packet (command:
+`send`) or read out and print all registers of the transceiver as binary values
+(command: `prgs`).
 
 ### Procedure
-* take two boards and connect a transceiver to each
+
+ * take two boards and connect a transceiver to each
    (it should be also possible to use one board with different SPI-ports)
-* depending on your board, you'll maybe also need to connect a UART/tty converter 
-* build and flash the test-program to each
-* open a terminal (e.g. pyterm) for each 
-* if possible, reset the board by using the reset-button. You'll see "_Welcome to RIOT_" etc.
-* type `help` to see the description of the commands
-* initialize both with `it`
-* with one board, send a packet by typing `send`
-* in the next step you can also use `send` to send data in the other direction
-* now you can use send on both boards/transceivers to send messages between them
+ * depending on your board, you'll maybe also need to connect a UART/tty converter
+ * build and flash the test-program to each
+ * open a terminal (e.g. pyterm) for each
+ * if possible, reset the board by using the reset-button. You'll see "_Welcome to RIOT_" etc.
+ * type `help` to see the description of the commands
+ * initialize both with `it`
+ * with one board, send a packet by typing `send`
+ * in the next step you can also use `send` to send data in the other direction
+ * now you can use send on both boards/transceivers to send messages between them
 
 
 ## Expected Results
-After you did all steps described above, you should see that a 32 Byte sequence (numbers from 32...1) has been transferred from one device to the other. This sequence is printed out from the receiver after the receive interrupt occurred and the receive-procedure has been made.
+
+After you did all steps described above, you should see that a 32 Byte sequence
+(numbers from 32...1) has been transferred from one device to the other. This
+sequence is printed out from the receiver after the receive interrupt occurred
+and the receive-procedure has been made.
 
 After initialization (`it`) you should see the following output:
 

tests/hwtimer/tests/test_hwtimer.py

@@ -29,4 +29,3 @@ while hwtimers > 1:
 # term.expect("OK")
 if not term.terminate():
     term.terminate(force=True)
-

tests/periph_dac/README.md

@@ -1,11 +1,16 @@
 About
 =====
+
 This is a test application for a digital to analog converter (DAC).
 
-This test application will initialize each configured DAC and one ADC (ADC_O) device to sample with
-10-bit accuracy. The ADC is only initialized if there is one available on your board.
+This test application will initialize each configured DAC and one ADC (ADC_O)
+device to sample with 10-bit accuracy. The ADC is only initialized if there is
+one available on your board.
 
-After initialization, values from 0 to 1000 are converted through the DACs in a loop. Shortly after the digital to analog conversion of one number, the ADC_0 samples its input signal. The numbers that are given to the DACs and the numbers that are sampled by the ADC were printed to the STDOUT. 
+After initialization, values from 0 to 1000 are converted through the DACs in a
+loop. Shortly after the digital to analog conversion of one number, the ADC_0
+samples its input signal. The numbers that are given to the DACs and the
+numbers that are sampled by the ADC were printed to the STDOUT.
 
 Usage
 =====

tests/pthread/main.c

@@ -56,4 +56,3 @@ int main(void) {
     puts("main: finished");
     return 0;
 }
-

tests/pthread_cleanup/main.c

@@ -72,4 +72,3 @@ int main(void) {
     puts("Done.");
     return 0;
 }
-

tests/pthread_cooperation/main.c

@@ -75,4 +75,3 @@ int main(void)
     puts("finished");
     return 0;
 }
-

tests/thread_cooperation/main.c

@@ -101,4 +101,3 @@ int main(void)
     puts("finished");
     return 0;
 }
-

tests/unittests/tests-netdev_dummy/Makefile

@@ -1,2 +1 @@
 include $(RIOTBASE)/Makefile.base
-