From 501b5765964affe9b48c88a5b580bd321170cc38 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Sat, 19 Nov 2011 18:48:57 +0100 Subject: Avoid symbol conflicts from usart.h and xbee.h. --- hal/usart.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'hal/usart.h') diff --git a/hal/usart.h b/hal/usart.h index 8fde39a..484d89e 100644 --- a/hal/usart.h +++ b/hal/usart.h @@ -1,13 +1,11 @@ #ifndef USART_H #define USART_H -template<> -void interrupt() { - USART1.DR; - //GPIOB.ODR ^= 1 << 1; -} +#include "stm32.h" +#include "interrupt.h" +#include "thread.h" -void usart_enable() { +inline void usart_enable() { RCC.enable(RCC.USART1); USART1.BRR = 625; // 115200 baud USART1.CR1 = 0x202c; @@ -15,7 +13,7 @@ void usart_enable() { Interrupt::enable(Interrupt::USART1); } -void usart_send(uint8_t data) { +inline void usart_send(uint8_t data) { while(!(USART1.SR & 0x80)) { Thread::yield(); } // Wait for TXE. -- cgit v1.2.3