aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-04-07 15:04:06 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-04-07 15:04:06 -0400
commitf044b9af59a5db69ae8dbf8f9a1097c82c716f7f (patch)
tree8bd831eac5871090bb2e18a96761d9adc358f211
parenta2b2ddb50b16400f17d8d36dfc9f4996f466ad94 (diff)
downloadlibrambutan-f044b9af59a5db69ae8dbf8f9a1097c82c716f7f.tar.gz
librambutan-f044b9af59a5db69ae8dbf8f9a1097c82c716f7f.zip
Renaming some nvic_irq_num enumerators for better readability.
-rw-r--r--libmaple/exti.c32
-rw-r--r--libmaple/nvic.h8
2 files changed, 20 insertions, 20 deletions
diff --git a/libmaple/exti.c b/libmaple/exti.c
index 7f56712..38d3bba 100644
--- a/libmaple/exti.c
+++ b/libmaple/exti.c
@@ -46,22 +46,22 @@ typedef struct exti_channel {
} exti_channel;
static exti_channel exti_channels[] = {
- { .handler = NULL, .irq_line = NVIC_EXTI0 }, // EXTI0
- { .handler = NULL, .irq_line = NVIC_EXTI1 }, // EXTI1
- { .handler = NULL, .irq_line = NVIC_EXTI2 }, // EXTI2
- { .handler = NULL, .irq_line = NVIC_EXTI3 }, // EXTI3
- { .handler = NULL, .irq_line = NVIC_EXTI4 }, // EXTI4
- { .handler = NULL, .irq_line = NVIC_EXTI9_5 }, // EXTI5
- { .handler = NULL, .irq_line = NVIC_EXTI9_5 }, // EXTI6
- { .handler = NULL, .irq_line = NVIC_EXTI9_5 }, // EXTI7
- { .handler = NULL, .irq_line = NVIC_EXTI9_5 }, // EXTI8
- { .handler = NULL, .irq_line = NVIC_EXTI9_5 }, // EXTI9
- { .handler = NULL, .irq_line = NVIC_EXTI15_10 }, // EXTI10
- { .handler = NULL, .irq_line = NVIC_EXTI15_10 }, // EXTI11
- { .handler = NULL, .irq_line = NVIC_EXTI15_10 }, // EXTI12
- { .handler = NULL, .irq_line = NVIC_EXTI15_10 }, // EXTI13
- { .handler = NULL, .irq_line = NVIC_EXTI15_10 }, // EXTI14
- { .handler = NULL, .irq_line = NVIC_EXTI15_10 }, // EXTI15
+ { .handler = NULL, .irq_line = NVIC_EXTI0 }, // EXTI0
+ { .handler = NULL, .irq_line = NVIC_EXTI1 }, // EXTI1
+ { .handler = NULL, .irq_line = NVIC_EXTI2 }, // EXTI2
+ { .handler = NULL, .irq_line = NVIC_EXTI3 }, // EXTI3
+ { .handler = NULL, .irq_line = NVIC_EXTI4 }, // EXTI4
+ { .handler = NULL, .irq_line = NVIC_EXTI_9_5 }, // EXTI5
+ { .handler = NULL, .irq_line = NVIC_EXTI_9_5 }, // EXTI6
+ { .handler = NULL, .irq_line = NVIC_EXTI_9_5 }, // EXTI7
+ { .handler = NULL, .irq_line = NVIC_EXTI_9_5 }, // EXTI8
+ { .handler = NULL, .irq_line = NVIC_EXTI_9_5 }, // EXTI9
+ { .handler = NULL, .irq_line = NVIC_EXTI_15_10 }, // EXTI10
+ { .handler = NULL, .irq_line = NVIC_EXTI_15_10 }, // EXTI11
+ { .handler = NULL, .irq_line = NVIC_EXTI_15_10 }, // EXTI12
+ { .handler = NULL, .irq_line = NVIC_EXTI_15_10 }, // EXTI13
+ { .handler = NULL, .irq_line = NVIC_EXTI_15_10 }, // EXTI14
+ { .handler = NULL, .irq_line = NVIC_EXTI_15_10 }, // EXTI15
};
/*
diff --git a/libmaple/nvic.h b/libmaple/nvic.h
index a889f4b..df3461b 100644
--- a/libmaple/nvic.h
+++ b/libmaple/nvic.h
@@ -89,12 +89,12 @@ typedef enum nvic_irq_num {
NVIC_DMA_CH5 = 15, /**< DMA1 channel 5 */
NVIC_DMA_CH6 = 16, /**< DMA1 channel 6 */
NVIC_DMA_CH7 = 17, /**< DMA1 channel 7 */
- NVIC_ADC1_2 = 18, /**< ADC1 and ADC2 */
+ NVIC_ADC_1_2 = 18, /**< ADC1 and ADC2 */
NVIC_USB_HP_CAN_TX = 19, /**< USB high priority or CAN TX */
NVIC_USB_LP_CAN_RX0 = 20, /**< USB low priority or CAN RX0 */
NVIC_CAN_RX1 = 21, /**< CAN RX1 */
NVIC_CAN_SCE = 22, /**< CAN SCE */
- NVIC_EXTI9_5 = 23, /**< EXTI line [9:5] */
+ NVIC_EXTI_9_5 = 23, /**< EXTI line [9:5] */
NVIC_TIMER1_BRK = 24, /**< Timer 1 break */
NVIC_TIMER1_UP = 25, /**< Timer 1 update */
NVIC_TIMER1_TRG_COM = 26, /**< Timer 1 trigger and commutation */
@@ -111,7 +111,7 @@ typedef enum nvic_irq_num {
NVIC_USART1 = 37, /**< USART1 */
NVIC_USART2 = 38, /**< USART2 */
NVIC_USART3 = 39, /**< USART3 */
- NVIC_EXTI15_10 = 40, /**< EXTI line [15:10] */
+ NVIC_EXTI_15_10 = 40, /**< EXTI line [15:10] */
NVIC_RTCALARM = 41, /**< RTC alarm through EXTI line */
NVIC_USBWAKEUP = 42, /**< USB wakeup from suspend through
EXTI line */
@@ -132,7 +132,7 @@ typedef enum nvic_irq_num {
NVIC_DMA2_CH1 = 56, /**< DMA2 channel 1 */
NVIC_DMA2_CH2 = 57, /**< DMA2 channel 2 */
NVIC_DMA2_CH3 = 58, /**< DMA2 channel 3 */
- NVIC_DMA2_CH4_5 = 59, /**< DMA2 channels 4 and 5 */
+ NVIC_DMA2_CH_4_5 = 59, /**< DMA2 channels 4 and 5 */
#endif
} nvic_irq_num;