diff options
| author | Perry Hung <iperry@alum.mit.edu> | 2010-08-04 08:52:30 -0400 |
|---|---|---|
| committer | Perry Hung <iperry@alum.mit.edu> | 2010-08-04 08:52:30 -0400 |
| commit | d2494611156c4ba477a1bbd1b07ba0cfc14b29e4 (patch) | |
| tree | 48782014152efa392ac0689c4098e089da52c82c /libmaple/usart.c | |
| parent | 2b7a1b40c96525cd4c6324f6e9d53845fb07a55f (diff) | |
| download | librambutan-d2494611156c4ba477a1bbd1b07ba0cfc14b29e4.tar.gz librambutan-d2494611156c4ba477a1bbd1b07ba0cfc14b29e4.zip | |
Cleaned up wirish/time, some interrupt handling refactoring:
Fixed millis(), it was just wrong, before.
Added micros(), not extensively tested.
New implementation of delayMicroseconds(). Should be more consistent
now.
Added a handful of nvic routines to enable/disable interrupts.
Cleaned up systick
Diffstat (limited to 'libmaple/usart.c')
| -rw-r--r-- | libmaple/usart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmaple/usart.c b/libmaple/usart.c index 53a6150..296a1fb 100644 --- a/libmaple/usart.c +++ b/libmaple/usart.c @@ -93,7 +93,7 @@ void usart_init(uint8 usart_num, uint32 baud) { port = usart_dev_table[usart_num].base; rcc_clk_enable(usart_dev_table[usart_num].rcc_dev_num); - nvic_enable_interrupt(usart_dev_table[usart_num].nvic_dev_num); + nvic_irq_enable(usart_dev_table[usart_num].nvic_dev_num); /* usart1 is mad fast */ clk_speed = (usart_num == USART1) ? 72000000UL : 36000000UL; |