X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_exti_stm.c;h=3e0b3e5c84e29953833bdf235503c68932504f98;hp=0fa241889279b58049c22b49700709fb4b054df7;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=64e2e66a5239541b15f43172655cfb3560bec79b

diff --git a/src/stm/ao_exti_stm.c b/src/stm/ao_exti_stm.c
index 0fa24188..3e0b3e5c 100644
--- a/src/stm/ao_exti_stm.c
+++ b/src/stm/ao_exti_stm.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,58 +21,73 @@
 
 static void	(*ao_exti_callback[16])(void);
 
-static void
-ao_exti_isr(void) {
-	uint32_t	pending = stm_exti.pr;
-	uint8_t		pin;
+uint32_t	ao_last_exti;
+
+static void ao_exti_one_isr(uint8_t pin) {
+	uint32_t	pending = (ao_last_exti = stm_exti.pr) & (1 << pin);
 
-	/* Clear pending interrupts */
 	stm_exti.pr = pending;
-	for (pin = 0; pin < 16 && pending; pin++) {
-		uint32_t	mask = (1 << pin);
+	if (pending && ao_exti_callback[pin])
+		(*ao_exti_callback[pin])();
+}
 
-		if (pending & mask) {
-			pending &= ~mask;
-			if (ao_exti_callback[pin])
-				(*ao_exti_callback[pin])();
-		}
+static void ao_exti_range_isr(uint8_t first, uint8_t last, uint16_t mask) {
+	uint16_t	pending = (ao_last_exti = stm_exti.pr) & mask;
+	uint8_t		pin;
+	static uint16_t	last_mask;
+	static uint8_t	last_pin;
+
+	if (pending == last_mask) {
+		stm_exti.pr = last_mask;
+		(*ao_exti_callback[last_pin])();
+		return;
 	}
+	stm_exti.pr = pending;
+	for (pin = first; pin <= last; pin++)
+		if ((pending & ((uint32_t) 1 << pin)) && ao_exti_callback[pin]) {
+			last_mask = (1 << pin);
+			last_pin = pin;
+			(*ao_exti_callback[pin])();
+		}
 }
 
-void stm_exti0_isr(void) { ao_exti_isr(); }
-void stm_exti1_isr(void) { ao_exti_isr(); }
-void stm_exti2_isr(void) { ao_exti_isr(); }
-void stm_exti3_isr(void) { ao_exti_isr(); }
-void stm_exti4_isr(void) { ao_exti_isr(); }
-void stm_exti9_5_isr(void) { ao_exti_isr(); }
-void stm_exti15_10_isr(void) { ao_exti_isr(); }
+void stm_exti0_isr(void) { ao_exti_one_isr(0); }
+void stm_exti1_isr(void) { ao_exti_one_isr(1); }
+void stm_exti2_isr(void) { ao_exti_one_isr(2); }
+void stm_exti3_isr(void) { ao_exti_one_isr(3); }
+void stm_exti4_isr(void) { ao_exti_one_isr(4); }
+void stm_exti9_5_isr(void) { ao_exti_range_isr(5, 9, 0x3e0); }
+void stm_exti15_10_isr(void) { ao_exti_range_isr(10, 15, 0xfc00); }
 
 void
 ao_exti_setup (struct stm_gpio *gpio, uint8_t pin, uint8_t mode, void (*callback)(void)) {
 	uint32_t	mask = 1 << pin;
 	uint32_t	pupdr;
 	uint8_t		irq;
+	uint8_t		prio;
 
 	ao_exti_callback[pin] = 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;
@@ -90,20 +106,52 @@ ao_exti_setup (struct stm_gpio *gpio, uint8_t pin, uint8_t mode, void (*callback
 		irq = STM_ISR_EXTI9_5_POS;
 	else
 		irq = STM_ISR_EXTI15_10_POS;
-	stm_nvic_set_priority(irq, 10);
+
+	/* Set priority */
+	prio = AO_STM_NVIC_MED_PRIORITY;
+	if (mode & AO_EXTI_PRIORITY_LOW)
+		prio = AO_STM_NVIC_LOW_PRIORITY;
+	else if (mode & AO_EXTI_PRIORITY_HIGH)
+		prio = AO_STM_NVIC_HIGH_PRIORITY;
+
+	stm_nvic_set_priority(irq, prio);
 	stm_nvic_set_enable(irq);
 }
 
+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)
+		stm_exti.rtsr |= mask;
+	else
+		stm_exti.rtsr &= ~mask;
+	if (mode & AO_EXTI_MODE_FALLING)
+		stm_exti.ftsr |= mask;
+	else
+		stm_exti.ftsr &= ~mask;
+}
+
+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);
+	stm_exti.imr |= mask;
 }
 
 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;
 }
@@ -111,10 +159,4 @@ ao_exti_disable(struct stm_gpio *gpio, uint8_t pin) {
 void
 ao_exti_init(void)
 {
-	stm_nvic_set_priority(STM_ISR_EXTI1_POS, 10);
-	stm_nvic_set_priority(STM_ISR_EXTI2_POS, 10);
-	stm_nvic_set_priority(STM_ISR_EXTI3_POS, 10);
-	stm_nvic_set_priority(STM_ISR_EXTI4_POS, 10);
-	stm_nvic_set_priority(STM_ISR_EXTI9_5_POS, 10);
-	stm_nvic_set_priority(STM_ISR_EXTI15_10_POS, 10);
 }