Merge branch 'master' into branch-1.9

[fw/altos] / src / lpc / ao_serial_lpc.c

diff --git a/src/lpc/ao_serial_lpc.c b/src/lpc/ao_serial_lpc.c
index db0e0b0c55a3f2e22513439a4acf2a8a961b239c..2362c67421774f77a73b08c63afc8d5ee5147f36 100644 (file)
--- a/src/lpc/ao_serial_lpc.c
+++ b/src/lpc/ao_serial_lpc.c
@@ -156,6 +156,19 @@ ao_serial_init(void)
                              (0 << LPC_IOCONF_HYS) |
                              (0 << LPC_IOCONF_INV) |
                              (0 << LPC_IOCONF_OD));
+#elif SERIAL_1_13_14
+       lpc_ioconf.pio1_13 = ((LPC_IOCONF_FUNC_PIO1_13_TXD << LPC_IOCONF_FUNC) |
+                             (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) |
+                             (0 << LPC_IOCONF_HYS) |
+                             (0 << LPC_IOCONF_INV) |
+                             (0 << LPC_IOCONF_OD));
+       lpc_ioconf.pio1_14 = ((LPC_IOCONF_FUNC_PIO1_14_RXD << LPC_IOCONF_FUNC) |
+                             (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) |
+                             (0 << LPC_IOCONF_HYS) |
+                             (0 << LPC_IOCONF_INV) |
+                             (0 << LPC_IOCONF_OD));
+#else
+#error No serial pin configuration selected
 #endif
 
        /* Turn on the USART */