diff options
| author | bnewbold <bnewbold@robocracy.org> | 2010-08-31 17:39:46 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-08-31 17:39:46 -0400 |
| commit | 02d7b08f0497096f21e41922e0efb54c4ef33bab (patch) | |
| tree | a7e04293efcba70f37cffcd03c0fcc4c0be7858a /libmaple/util.c | |
| parent | b2dd49c3141d8a21a4e7c7ef51dee7329f847c30 (diff) | |
| parent | e03d58f4dab4176514924baa3a1ff430bf5819b8 (diff) | |
| download | librambutan-02d7b08f0497096f21e41922e0efb54c4ef33bab.tar.gz librambutan-02d7b08f0497096f21e41922e0efb54c4ef33bab.zip | |
Merge maple-native changes into portable
This compiles for both maple and maple_native but is untested.
Diffstat (limited to 'libmaple/util.c')
| -rw-r--r-- | libmaple/util.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libmaple/util.c b/libmaple/util.c index 8c25257..61beab8 100644 --- a/libmaple/util.c +++ b/libmaple/util.c @@ -36,13 +36,6 @@ #include "adc.h" #include "timers.h" -#define ERROR_LED_PORT GPIOC_BASE -#define ERROR_LED_PIN 15 -#define ERROR_USART_NUM 1 -#define ERROR_USART_BAUD 9600 -#define ERROR_TX_PIN 10 -#define ERROR_TX_PORT GPIOA_BASE - /* Error assert + fade */ void _fail(const char* file, int line, const char* exp) { int32 slope = 1; @@ -60,9 +53,7 @@ void _fail(const char* file, int line, const char* exp) { adc_disable(); /* Turn off all usarts */ - usart_disable(1); - usart_disable(2); - usart_disable(3); + usart_disable_all(); /* Initialize the error usart */ gpio_set_mode(ERROR_TX_PORT, ERROR_TX_PIN, GPIO_MODE_AF_OUTPUT_PP); |