Merge remote-tracking branch 'origin/telemini'

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

Conflicts:
	src/core/ao_telemetry.c
	src/core/ao_telemetry.h

Added both Mini and Metrum telemetry defines

1 files changed, 56 insertions, 0 deletions

diff --git a/src/cc1111/ao_exti.h b/src/cc1111/ao_exti.h
new file mode 100644
index 00000000..49fca5d2
--- /dev/null
+++ b/src/cc1111/ao_exti.h
@@ -0,0 +1,56 @@
+/*
+ * 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_EXTI_H_
+#define _AO_EXTI_H_
+
+#define AO_EXTI_MODE_RISING	1
+#define AO_EXTI_MODE_FALLING	2
+#define AO_EXTI_MODE_PULL_UP	4
+#define AO_EXTI_MODE_PULL_DOWN	8
+#define AO_EXTI_PRIORITY_LOW	16
+#define AO_EXTI_PRIORITY_MED	0
+#define AO_EXTI_PRIORITY_HIGH	32
+
+extern void 	(*ao_int_callback)(void);
+
+#define ao_exti_setup(gpio, pin, mode, callback) do { \
+		ao_int_callback = callback;	      \
+	} while (0)
+
+#define ao_exti_set_mode(gpio, pin, mode) do { \
+	} while (0)
+
+#define ao_exti_set_callback(port, pin, callback) do {	\
+		ao_int_callback = callback;		\
+	} while (0)
+
+#define ao_exti_init()
+
+#define ao_exti_enable(port, pin) do {		\
+		P0IFG &= ~(1 << pin);		\
+		P0IF = 0;			\
+		PICTL |= PICTL_P0IENL;		\
+		IEN1 |= IEN1_P0IE;		\
+	} while (0)
+
+#define ao_exti_disable(port, pin) do {		\
+		IEN1 &= ~IEN1_P0IE;		\
+		PICTL &= ~PICTL_P0IENL;		\
+	} while (0)
+
+#endif /* _AO_EXTI_H_ */