altos: Eliminate 'pin' field from GPIO functions

[fw/altos] / src / drivers / ao_button.c

diff --git a/src/drivers/ao_button.c b/src/drivers/ao_button.c
index 1be788a0c98b040b0c4dc0f211c29640cedb6927..c8103e884d3cd47bfacb5909a0034acafa41a325 100644 (file)
--- a/src/drivers/ao_button.c
+++ b/src/drivers/ao_button.c
@@ -37,10 +37,17 @@ static struct ao_button_state       ao_button_state[AO_BUTTON_COUNT];
 
 #define port(q)        AO_BUTTON_ ## q ## _PORT
 #define bit(q) AO_BUTTON_ ## q
-#define pin(q) AO_BUTTON_ ## q ## _PIN
 
+#ifndef AO_BUTTON_INVERTED
+#define AO_BUTTON_INVERTED     1
+#endif
+
+#if AO_BUTTON_INVERTED
 /* pins are inverted */
-#define ao_button_value(b)     !ao_gpio_get(port(b), bit(b), pin(b))
+#define ao_button_value(b)     !ao_gpio_get(port(b), bit(b))
+#else
+#define ao_button_value(b)     ao_gpio_get(port(b), bit(b))
+#endif
 
 static uint8_t
 _ao_button_get(uint8_t b)
@@ -60,6 +67,39 @@ _ao_button_get(uint8_t b)
 #endif
 #if AO_BUTTON_COUNT > 4
        case 4: return ao_button_value(4);
+#endif
+#if AO_BUTTON_COUNT > 5
+       case 5: return ao_button_value(5);
+#endif
+#if AO_BUTTON_COUNT > 6
+       case 6: return ao_button_value(6);
+#endif
+#if AO_BUTTON_COUNT > 7
+       case 7: return ao_button_value(7);
+#endif
+#if AO_BUTTON_COUNT > 8
+       case 8: return ao_button_value(8);
+#endif
+#if AO_BUTTON_COUNT > 9
+       case 9: return ao_button_value(9);
+#endif
+#if AO_BUTTON_COUNT > 10
+       case 10: return ao_button_value(10);
+#endif
+#if AO_BUTTON_COUNT > 11
+       case 11: return ao_button_value(11);
+#endif
+#if AO_BUTTON_COUNT > 12
+       case 12: return ao_button_value(12);
+#endif
+#if AO_BUTTON_COUNT > 13
+       case 13: return ao_button_value(13);
+#endif
+#if AO_BUTTON_COUNT > 14
+       case 14: return ao_button_value(14);
+#endif
+#if AO_BUTTON_COUNT > 15
+       case 15: return ao_button_value(15);
 #endif
        }
        return 0;
@@ -93,6 +133,12 @@ _ao_button_init(uint8_t b)
 
 }
 
+uint8_t
+ao_button_get(uint8_t b)
+{
+       return ao_button_state[b].value;
+}
+
 static void
 ao_button_isr(void)
 {
@@ -130,4 +176,40 @@ ao_button_init(void)
 #if AO_BUTTON_COUNT > 4
        init(4);
 #endif
+#if AO_BUTTON_COUNT > 5
+       init(5);
+#endif
+#if AO_BUTTON_COUNT > 6
+       init(6);
+#endif
+#if AO_BUTTON_COUNT > 7
+       init(7);
+#endif
+#if AO_BUTTON_COUNT > 8
+       init(8);
+#endif
+#if AO_BUTTON_COUNT > 9
+       init(9);
+#endif
+#if AO_BUTTON_COUNT > 10
+       init(10);
+#endif
+#if AO_BUTTON_COUNT > 11
+       init(11);
+#endif
+#if AO_BUTTON_COUNT > 12
+       init(12);
+#endif
+#if AO_BUTTON_COUNT > 13
+       init(13);
+#endif
+#if AO_BUTTON_COUNT > 14
+       init(14);
+#endif
+#if AO_BUTTON_COUNT > 15
+       init(15);
+#endif
+#if AO_BUTTON_COUNT > 16
+       #error too many buttons
+#endif
 }