diff options
Diffstat (limited to 'usart/src')
| -rw-r--r-- | usart/src/main.c | 12 | ||||
| -rw-r--r-- | usart/src/usart.c | 34 |
2 files changed, 31 insertions, 15 deletions
diff --git a/usart/src/main.c b/usart/src/main.c index 5e33876..5af52ed 100644 --- a/usart/src/main.c +++ b/usart/src/main.c @@ -1,3 +1,4 @@ + #include "clock.h" #include "delay.h" #include "gpio.h" @@ -34,7 +35,7 @@ int enable_usart2(uint32_t baud_rate) USART2.c_r3 = 0; usart_set_divisor(&USART2, 16000000 / baud_rate); - usart_set_enabled(&USART2, USART_ENABLE_TX_RX); + usart_set_enabled(&USART2, USART_ENABLE_TX | USART_ENABLE_RX); } int enable_usart1(uint32_t baud_rate) @@ -82,12 +83,11 @@ int main() gpio_output_pin_t pin1 = set_gpio_pin_output(port_b, PIN_1); /* Enable a higher clock frequency. */ - // set_system_clock_MHz(80); + set_system_clock_MHz(80); - enable_usart2(9600); + enable_usart2(115200); pin_on(pin3); - while (true) { - usart_transmit_byte(&USART2, 0x32); - } + usart_transmit_str(&USART2, "Hello, World\n"); + for(;;); } diff --git a/usart/src/usart.c b/usart/src/usart.c index 23dbd95..eddfbe7 100644 --- a/usart/src/usart.c +++ b/usart/src/usart.c @@ -40,16 +40,15 @@ void usart_set_parity(__IO usart_t* usart, usart_parity_t parity) void usart_set_enabled(__IO usart_t* usart, usart_enable_t enabled) { uint32_t c_r1 = usart->c_r1; - /* Clear relevant bits. */ - c_r1 &= ~USART_ENABLE_TX_RX; - /* Set TX/RX enabled, but not actually USART enabled. */ - c_r1 |= (enabled & ~1); - - /* Set usart enabled bit separately. */ - c_r1 |= enabled & 1; - - usart->c_r1 = c_r1; + if (!enabled) { + usart->c1_bf.ue = 0; + } else { + /* Set the rx enabled. */ + usart->c1_bf.re = !!(enabled & USART_ENABLE_RX); + usart->c1_bf.te = !!(enabled & USART_ENABLE_TX); + usart->c1_bf.ue = 1; + } } void usart_transmit_byte(__IO usart_t* usart, uint8_t byte) @@ -62,3 +61,20 @@ void usart_transmit_byte(__IO usart_t* usart, uint8_t byte) while (!(usart->is_r & BIT(7))) ; } + +void usart_transmit_bytes(__IO usart_t* usart, const uint8_t* bytes, uint32_t n) +{ + while (n --) { + usart_transmit_byte(usart, *(bytes ++)); + } +} + +void usart_transmit_str(__IO usart_t* usart, const char* str) +{ + while (*str) { + if (*str == '\n') { + usart_transmit_byte(usart, '\r'); + } + usart_transmit_byte(usart, *(str ++)); + } +} |