X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_exti_stm.c;h=35958cf845632e37cb9c21781e7af057bd0bf173;hp=11099b02112994d023df580d5cbb01e2748af91b;hb=5c9172ba5681ff93d63c9c263a453d0025170045;hpb=4d4ad34aec0c75c66162b992f1e52947e4685730

diff --git a/src/stm/ao_exti_stm.c b/src/stm/ao_exti_stm.c
index 11099b02..35958cf8 100644
--- a/src/stm/ao_exti_stm.c
+++ b/src/stm/ao_exti_stm.c
@@ -70,21 +70,23 @@ ao_exti_setup (struct stm_gpio *gpio, uint8_t pin, uint8_t mode, void (*callback
 	/* configure gpio to interrupt routing */
 	stm_exticr_set(gpio, pin);
 
-	/* configure pin as input, setting selected pull-up/down mode */
-	stm_moder_set(gpio, pin, STM_MODER_INPUT);
-	switch (mode & (AO_EXTI_MODE_PULL_UP|AO_EXTI_MODE_PULL_DOWN)) {
-	case 0:
-	default:
-		pupdr  = STM_PUPDR_NONE;
-		break;
-	case AO_EXTI_MODE_PULL_UP:
-		pupdr = STM_PUPDR_PULL_UP;
-		break;
-	case AO_EXTI_MODE_PULL_DOWN:
-		pupdr = STM_PUPDR_PULL_DOWN;
-		break;
+	if (!(mode & AO_EXTI_PIN_NOCONFIGURE)) {
+		/* configure pin as input, setting selected pull-up/down mode */
+		stm_moder_set(gpio, pin, STM_MODER_INPUT);
+		switch (mode & (AO_EXTI_MODE_PULL_UP|AO_EXTI_MODE_PULL_DOWN)) {
+		case 0:
+		default:
+			pupdr  = STM_PUPDR_NONE;
+			break;
+		case AO_EXTI_MODE_PULL_UP:
+			pupdr = STM_PUPDR_PULL_UP;
+			break;
+		case AO_EXTI_MODE_PULL_DOWN:
+			pupdr = STM_PUPDR_PULL_DOWN;
+			break;
+		}
+		stm_pupdr_set(gpio, pin, pupdr);
 	}
-	stm_pupdr_set(gpio, pin, pupdr);
 
 	/* Set interrupt mask and rising/falling mode */
 	stm_exti.imr &= ~mask;
@@ -117,6 +119,8 @@ ao_exti_setup (struct stm_gpio *gpio, uint8_t pin, uint8_t mode, void (*callback
 
 void
 ao_exti_set_mode(struct stm_gpio *gpio, uint8_t pin, uint8_t mode) {
+	(void) gpio;
+
 	uint32_t	mask = 1 << pin;
 	
 	if (mode & AO_EXTI_MODE_RISING)
@@ -131,12 +135,14 @@ ao_exti_set_mode(struct stm_gpio *gpio, uint8_t pin, uint8_t mode) {
 
 void
 ao_exti_set_callback(struct stm_gpio *gpio, uint8_t pin, void (*callback)()) {
+	(void) gpio;
 	ao_exti_callback[pin] = callback;
 }
 
 void
 ao_exti_enable(struct stm_gpio *gpio, uint8_t pin) {
 	uint32_t	mask = (1 << pin);
+	(void) gpio;
 	stm_exti.pr = mask;
 	stm_exti.imr |= (1 << pin);
 }
@@ -144,6 +150,7 @@ ao_exti_enable(struct stm_gpio *gpio, uint8_t pin) {
 void
 ao_exti_disable(struct stm_gpio *gpio, uint8_t pin) {
 	uint32_t	mask = (1 << pin);
+	(void) gpio;
 	stm_exti.imr &= ~mask;
 	stm_exti.pr = mask;
 }
@@ -151,10 +158,4 @@ ao_exti_disable(struct stm_gpio *gpio, uint8_t pin) {
 void
 ao_exti_init(void)
 {
-	stm_nvic_set_priority(STM_ISR_EXTI1_POS, AO_STM_NVIC_MED_PRIORITY);
-	stm_nvic_set_priority(STM_ISR_EXTI2_POS, AO_STM_NVIC_MED_PRIORITY);
-	stm_nvic_set_priority(STM_ISR_EXTI3_POS, AO_STM_NVIC_MED_PRIORITY);
-	stm_nvic_set_priority(STM_ISR_EXTI4_POS, AO_STM_NVIC_MED_PRIORITY);
-	stm_nvic_set_priority(STM_ISR_EXTI9_5_POS, AO_STM_NVIC_MED_PRIORITY);
-	stm_nvic_set_priority(STM_ISR_EXTI15_10_POS, AO_STM_NVIC_MED_PRIORITY);
 }