Here's the button driver and event queue logic

These were neglected in the commit which was supposed to include them

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/drivers/ao_button.c b/src/drivers/ao_button.c
new file mode 100644 (file)
index 0000000..a507c90
--- /dev/null
+++ b/src/drivers/ao_button.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+#include <ao_button.h>
+#include <ao_exti.h>
+#if AO_EVENT
+#include <ao_event.h>
+#define ao_button_queue(b,v)   ao_event_put_isr(AO_EVENT_BUTTON, b, v)
+#else
+#define ao_button_queue(b,v)
+#endif
+
+static uint8_t         ao_button[AO_BUTTON_COUNT];
+static AO_TICK_TYPE    ao_button_time[AO_BUTTON_COUNT];
+
+#define AO_DEBOUNCE    AO_MS_TO_TICKS(20)
+
+#define port(q)        AO_BUTTON_ ## q ## _PORT
+#define bit(q) AO_BUTTON_ ## q
+#define pin(q) AO_BUTTON_ ## q ## _PIN
+
+static void
+ao_button_do(uint8_t b, uint8_t v)
+{
+       /* Debounce */
+       if ((AO_TICK_SIGNED) (ao_tick_count - ao_button_time[b]) < AO_DEBOUNCE)
+               return;
+
+       /* pins are inverted */
+       v = !v;
+       if (ao_button[b] != v) {
+               ao_button[b] = v;
+               ao_button_time[b] = ao_tick_count;
+               ao_button_queue(b, v);
+               ao_wakeup(&ao_button[b]);
+       }
+}
+
+#define ao_button_update(b)    ao_button_do(b, ao_gpio_get(port(b), bit(b), pin(b)))
+
+static void
+ao_button_isr(void)
+{
+#if AO_BUTTON_COUNT > 0
+       ao_button_update(0);
+#endif
+#if AO_BUTTON_COUNT > 1
+       ao_button_update(1);
+#endif
+#if AO_BUTTON_COUNT > 2
+       ao_button_update(2);
+#endif
+#if AO_BUTTON_COUNT > 3
+       ao_button_update(3);
+#endif
+#if AO_BUTTON_COUNT > 4
+       ao_button_update(4);
+#endif
+}
+
+#define init(b) do {                                                   \
+               ao_enable_port(port(b));                                \
+                                                                       \
+               ao_exti_setup(port(b), bit(b),                          \
+                             AO_BUTTON_MODE|AO_EXTI_MODE_FALLING|AO_EXTI_MODE_RISING|AO_EXTI_PRIORITY_MED, \
+                             ao_button_isr);                   \
+               ao_exti_enable(port(b), bit(b));                        \
+       } while (0)
+
+void
+ao_button_init(void)
+{
+#if AO_BUTTON_COUNT > 0
+       init(0);
+#endif
+#if AO_BUTTON_COUNT > 1
+       init(1);
+#endif
+}

diff --git a/src/drivers/ao_button.h b/src/drivers/ao_button.h
new file mode 100644 (file)
index 0000000..ce349d6
--- /dev/null
+++ b/src/drivers/ao_button.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_BUTTON_H_
+#define _AO_BUTTON_H_
+
+void
+ao_button_init(void);
+
+#endif /* _AO_BUTTON_H_ */

diff --git a/src/drivers/ao_event.c b/src/drivers/ao_event.c
new file mode 100644 (file)
index 0000000..440ef2d
--- /dev/null
+++ b/src/drivers/ao_event.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+#include <ao_event.h>
+
+#define AO_EVENT_QUEUE 64
+
+#define ao_event_queue_next(n) (((n) + 1) & (AO_EVENT_QUEUE - 1))
+#define ao_event_queue_prev(n) (((n) - 1) & (AO_EVENT_QUEUE - 1))
+#define ao_event_queue_empty() (ao_event_queue_insert == ao_event_queue_remove)
+#define ao_event_queue_full()  (ao_event_queue_next(ao_event_queue_insert) == ao_event_queue_remove)
+
+/*
+ * Whether a sequence of events from the same device should be collapsed
+ */
+#define ao_event_can_collapse(type)    ((type) == AO_EVENT_QUADRATURE)
+
+struct ao_event ao_event_queue[AO_EVENT_QUEUE];
+uint8_t                ao_event_queue_insert;
+uint8_t                ao_event_queue_remove;
+
+
+uint8_t
+ao_event_get(struct ao_event *ev)
+{
+       ao_arch_critical(
+               while (ao_event_queue_empty())
+                       ao_sleep(&ao_event_queue);
+               *ev = ao_event_queue[ao_event_queue_remove];
+               ao_event_queue_remove = ao_event_queue_next(ao_event_queue_remove);
+               );
+}
+
+/* called with interrupts disabled */
+void
+ao_event_put_isr(uint8_t type, uint8_t unit, uint32_t value)
+{
+       if (!ao_event_queue_full()) {
+
+               if (ao_event_can_collapse(type) && !ao_event_queue_empty()) {
+                       uint8_t prev = ao_event_queue_prev(ao_event_queue_insert);
+
+                       if (ao_event_queue[prev].type == type &&
+                           ao_event_queue[prev].unit == unit)
+                               ao_event_queue_insert = prev;
+               }
+               ao_event_queue[ao_event_queue_insert] = (struct ao_event) {
+                       .type = type,
+                       .unit = unit,
+                       .tick = ao_tick_count,
+                       .value = value
+               };
+               ao_event_queue_insert = ao_event_queue_next(ao_event_queue_insert);
+               ao_wakeup(&ao_event_queue);
+       }
+}
+
+void
+ao_event_put(uint8_t type, uint8_t unit, uint32_t value)
+{
+       ao_arch_critical(ao_event_put_isr(type, unit, value););
+}

diff --git a/src/drivers/ao_event.h b/src/drivers/ao_event.h
new file mode 100644 (file)
index 0000000..25c49c3
--- /dev/null
+++ b/src/drivers/ao_event.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_EVENT_H_
+#define _AO_EVENT_H_
+
+#define AO_EVENT_NONE          0
+#define AO_EVENT_QUADRATURE    1
+#define AO_EVENT_BUTTON                2
+
+struct ao_event {
+       uint8_t         type;
+       uint8_t         unit;
+       uint16_t        tick;
+       uint32_t        value;
+};
+
+uint8_t
+ao_event_get(struct ao_event *ev);
+
+void
+ao_event_put_isr(uint8_t type, uint8_t unit, uint32_t value);
+
+void
+ao_event_put(uint8_t type, uint8_t unit, uint32_t value);
+
+#endif /* _AO_EVENT_H_ */