diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-15 22:29:45 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-16 01:17:21 -0500 |
| commit | 2764748208816043a3149eae3a433d02325a1a36 (patch) | |
| tree | cc5afb0af0c6f1d2282db08d3dad1dae9b4d33e6 /libmaple/usart.h | |
| parent | 1fb0e0d727089e23d4b30e1efba5410dc4b4da14 (diff) | |
| parent | 620740bf1986311041a40bd2992d1b549f84b2ba (diff) | |
| download | librambutan-2764748208816043a3149eae3a433d02325a1a36.tar.gz librambutan-2764748208816043a3149eae3a433d02325a1a36.zip | |
Merge branch 'nzmichaelh-master' into master.
This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs.
Conflicts:
libmaple/adc.h
libmaple/libmaple.h
libmaple/ring_buffer.h
Diffstat (limited to 'libmaple/usart.h')
| -rw-r--r-- | libmaple/usart.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmaple/usart.h b/libmaple/usart.h index 49978e9..0ca3f55 100644 --- a/libmaple/usart.h +++ b/libmaple/usart.h @@ -77,11 +77,11 @@ extern struct usart_dev usart_dev_table[]; static inline void usart_putc(uint8 usart_num, uint8 byte) { usart_port *port = usart_dev_table[usart_num].base; - port->DR = byte; - - /* Wait for transmission to complete */ + /* Wait for the buffer to empty */ while ((port->SR & USART_TXE) == 0) ; + + port->DR = byte; } /** |