diff options
| author | root <root@lamia.panaceas.james.local> | 2016-08-20 23:04:53 +0100 |
|---|---|---|
| committer | root <root@lamia.panaceas.james.local> | 2016-08-20 23:04:53 +0100 |
| commit | 4dfc42565c2d1f5b900d8d725126bfde886a8423 (patch) | |
| tree | 6ebfaaee2ea16bcaddae776c91b6182d33ebd3d6 /app/usart.c | |
| parent | 2565f4857ea9cdebdbba483e35a07d012aa3afce (diff) | |
| download | candlestick-4dfc42565c2d1f5b900d8d725126bfde886a8423.tar.gz candlestick-4dfc42565c2d1f5b900d8d725126bfde886a8423.tar.bz2 candlestick-4dfc42565c2d1f5b900d8d725126bfde886a8423.zip | |
tidy
Diffstat (limited to 'app/usart.c')
| -rw-r--r-- | app/usart.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/app/usart.c b/app/usart.c index 402767d..f9ea210 100644 --- a/app/usart.c +++ b/app/usart.c @@ -65,7 +65,8 @@ usart2_isr (void) ring_write_byte (&rx2_ring, data); usart1_queue (data); - if (data=='\r') usart1_queue('\n'); + if (data == '\r') + usart1_queue ('\n'); } @@ -82,8 +83,9 @@ usart2_isr (void) else { usart_send_blocking (USART2, data); - usart1_queue (data); - if (data=='\r') usart1_queue('\n'); + usart1_queue (data); + if (data == '\r') + usart1_queue ('\n'); } } @@ -115,28 +117,28 @@ usart1_tx (void *ptr, int len) { int ret; - ret = ring_write (&tx1_ring, (uint8_t *) ptr, len); + ret = ring_write (&tx1_ring, (uint8_t *) ptr, len); - if (ret < 0) - ret = -ret; + if (ret < 0) + ret = -ret; - USART_CR1 (USART1) |= USART_CR1_TXEIE; - return ret; + USART_CR1 (USART1) |= USART_CR1_TXEIE; + return ret; } int -usart2_tx ( void *buf,size_t len) +usart2_tx (void *buf, size_t len) { -int ret; - ret = ring_write (&tx2_ring, buf, len); + int ret; + ret = ring_write (&tx2_ring, buf, len); - if (ret < 0) - ret = -ret; + if (ret < 0) + ret = -ret; USART_CR1 (USART2) |= USART_CR1_TXEIE; - return ret; + return ret; } |