SQUASHME: make Travis happy

RIOT-OS · Nov 20, 2014 · 92d64a6 · 92d64a6
1 parent 3210ff2
commit 92d64a6
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 15 deletions.
diff --git a/cpu/stm32l1/include/cpu-conf.h b/cpu/stm32l1/include/cpu-conf.h
@@ -23,6 +23,10 @@
 
 #include "stm32l1xx.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @name Kernel configuration
  *
@@ -68,5 +72,9 @@ void cpu_clock_scale(uint32_t source, uint32_t target, uint32_t *prescale);
 
 #define TRANSCEIVER_BUFFER_SIZE (3)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CPU_CONF_H */
 /** @} */
diff --git a/cpu/stm32l1/include/hwtimer_cpu.h b/cpu/stm32l1/include/hwtimer_cpu.h
@@ -19,15 +19,23 @@
 #ifndef HWTIMER_CPU_H_
 #define HWTIMER_CPU_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @name Hardware timer configuration
  * @{
  */
-#define HWTIMER_MAXTIMERS   	(4)             /**< the CPU implementation supports 4 HW timers */
-#define HWTIMER_SPEED       	(1000000U)      /**< the HW timer runs with 1MHz */
-#define HWTIMER_MAXTICKS    	(0xFFFFFFFF)    /**< 32-bit timer */
-#define HWTIMER_WAIT_OVERHEAD 	(3)
+#define HWTIMER_MAXTIMERS       (4)             /**< the CPU implementation supports 4 HW timers */
+#define HWTIMER_SPEED           (1000000U)      /**< the HW timer runs with 1MHz */
+#define HWTIMER_MAXTICKS        (0xFFFFFFFF)    /**< 32-bit timer */
+#define HWTIMER_WAIT_OVERHEAD   (3)
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* HWTIMER_CPU_H_ */
 /** @} */
diff --git a/cpu/stm32l1/include/stm32l1xx.h b/cpu/stm32l1/include/stm32l1xx.h
@@ -47,7 +47,7 @@
   * @{
   */
 
-/** @addtogroup stm32l1xx
+/** @addtogroup cpu_specific_stm32l1xx
   * @{
   */
 
@@ -58,7 +58,7 @@
  extern "C" {
 #endif
 
-/** @addtogroup Library_configuration_section
+/** @addtogroup cpu_specific_Library_configuration_section
   * @{
   */
 
@@ -287,7 +287,7 @@ typedef enum IRQn
 // #include "system_stm32l1xx.h"
 #include <stdint.h>
 
-/** @addtogroup Exported_types
+/** @addtogroup cpu_specific_Exported_types
   * @{
   */
 
@@ -342,7 +342,7 @@ typedef enum {ERROR = 0, SUCCESS = !ERROR} ErrorStatus;
   * @}
   */
 
-/** @addtogroup Peripheral_registers_structures
+/** @addtogroup cpu_specific_Peripheral_registers_structures
   * @{
   */
 
@@ -902,7 +902,7 @@ typedef struct
   * @}
   */
 
-/** @addtogroup Peripheral_memory_map
+/** @addtogroup cpu_specific_Peripheral_memory_map
   * @{
   */
 
@@ -997,7 +997,7 @@ typedef struct
   * @}
   */
 
-/** @addtogroup Peripheral_declaration
+/** @addtogroup cpu_specific_Peripheral_declaration
   * @{
   */
 
@@ -1077,11 +1077,11 @@ typedef struct
   * @}
   */
 
-/** @addtogroup Exported_constants
+/** @addtogroup cpu_specific_Exported_constants
   * @{
   */
 
-/** @addtogroup Peripheral_Registers_Bits_Definition
+/** @addtogroup cpu_specific_Peripheral_Registers_Bits_Definition
   * @{
   */
 
@@ -6638,7 +6638,7 @@ typedef struct
   #include "stm32l1xx_conf.h"
 #endif
 
-/** @addtogroup Exported_macro
+/** @addtogroup cpu_specific_Exported_macro
   * @{
   */
 

diff --git a/cpu/stm32l1/periph/cpuid.c b/cpu/stm32l1/periph/cpuid.c
@@ -23,7 +23,7 @@
 
 void cpuid_get(void *id)
 {
-    memcpy(id, (void *)(0x1ffff7e8), CPUID_ID_LEN);
+    memcpy(id, (void *)(0x1ff800d0), CPUID_ID_LEN);
 }
 
 /** @} */
diff --git a/cpu/stm32l1/periph/timer.c b/cpu/stm32l1/periph/timer.c
@@ -95,7 +95,6 @@ int timer_init(tim_t dev, unsigned int ticks_per_us, void (*callback)(int))
     /* set auto-reload and prescaler values and load new values */
     timer0->ARR = TIMER_0_MAX_VALUE;
     timer0->PSC = TIMER_0_PRESCALER * ticks_per_us;
-    // timer->EGR |= TIM_EGR_UG;
 
     /* configure slave timer1 */
     /* get input trigger */

diff --git a/cpu/stm32l1/periph/uart.c b/cpu/stm32l1/periph/uart.c
@@ -140,6 +140,8 @@ int uart_init_blocking(uart_t uart, uint32_t baudrate)
             UART_2_PORT_CLKEN();
             break;
 #endif
+        default:
+            return -1;
     }
 
     /* uart_configure RX and TX pins, set pin to use alternative function mode */
@@ -219,6 +221,8 @@ int uart_write(uart_t uart, char data)
             dev = UART_2_DEV;
             break;
 #endif
+        default:
+            return -1;
     }
 
     if (dev->SR & USART_SR_TXE) {

diff --git a/dist/tools/licenses/patterns/mcd-st-liberty b/dist/tools/licenses/patterns/mcd-st-liberty
@@ -0,0 +1 @@
+Licensed under MCD-ST Liberty SW License Agreement V2, \(the "License"\); You may not use this file except in compliance with the License\. You may obtain a copy of the License at: http: www\.st\.com software_license_agreement_liberty_v2 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\. See the License for the specific language governing permissions and limitations under the License\.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Licensed under MCD-ST Liberty SW License Agreement V2, \(the "License"\); You may not use this file except in compliance with the License\. You may obtain a copy of the License at: http: www\.st\.com software_license_agreement_liberty_v2 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\. See the License for the specific language governing permissions and limitations under the License\.