Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / lpc / lpc.h

diff --git a/src/lpc/lpc.h b/src/lpc/lpc.h
index 2493a1ff4c1b2360b8beebb0f88b2bbe58ec2bf3..49034c1c564e71107ff5586c5acdbe74fb3c621c 100644 (file)
--- a/src/lpc/lpc.h
+++ b/src/lpc/lpc.h
@@ -131,7 +131,7 @@ extern struct lpc_ioconf lpc_ioconf;
 /* PIO0_6 */
 #define  LPC_IOCONF_FUNC_PIO0_6                0
 #define  LPC_IOCONF_FUNC_USB_CONNECT   1
-#define  LPC_IOCONF_FUNC_SCK0          2
+#define  LPC_IOCONF_FUNC_PIO0_6_SCK0   2
 
 /* PIO0_7 */
 #define  LPC_IOCONF_FUNC_PIO0_7                0
@@ -150,7 +150,7 @@ extern struct lpc_ioconf lpc_ioconf;
 /* PIO0_10 */
 #define  LPC_IOCONF_FUNC_SWCLK         0
 #define  LPC_IOCONF_FUNC_PIO0_10       1
-#define  LPC_IOCONF_FUNC_SCK0          2
+#define  LPC_IOCONF_FUNC_PIO0_10_SCK0  2
 #define  LPC_IOCONF_FUNC_CT16B0_MAT2   3
 
 /* PIO0_11 */
@@ -1212,4 +1212,14 @@ extern struct lpc_ct32b lpc_ct32b0, lpc_ct32b1;
 #define LPC_CT32B_PWMC_PWMEN2  2
 #define LPC_CT32B_PWMC_PWMEN3  3
 
+#define LPC_CT32B_EMR_EMC0     4
+#define LPC_CT32B_EMR_EMC1     6
+#define LPC_CT32B_EMR_EMC2     8
+#define LPC_CT32B_EMR_EMC3     10
+
+#define LPC_CT32B_EMR_EMC_NOTHING      0
+#define LPC_CT32B_EMR_EMC_CLEAR                1
+#define LPC_CT32B_EMR_EMC_SET          2
+#define LPC_CT32B_EMR_EMC_TOGGLE       3
+
 #endif /* _LPC_H_ */