From f0f7aec18593e117405b494114f51dae653fc849 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 3 Apr 2022 23:23:51 -0700 Subject: [PATCH] lpc: Fix name of timer ioconf constants All iopin configuration values are per-pin, so they all need to have the pin name included in the name. Signed-off-by: Keith Packard --- src/lpc/lpc.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/lpc/lpc.h b/src/lpc/lpc.h index 1cf35dad..9dc26fc4 100644 --- a/src/lpc/lpc.h +++ b/src/lpc/lpc.h @@ -110,13 +110,13 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO0_1 */ #define LPC_IOCONF_FUNC_PIO0_1 0 #define LPC_IOCONF_FUNC_CLKOUT 1 -#define LPC_IOCONF_FUNC_CT32B0_MAT2 2 +#define LPC_IOCONF_FUNC_PIO0_1_CT32B0_MAT2 2 #define LPC_IOCONF_FUNC_USB_FTOGGLE 3 /* PIO0_2 */ #define LPC_IOCONF_FUNC_PIO0_2 0 #define LPC_IOCONF_FUNC_SSEL0 1 -#define LPC_IOCONF_FUNC_CT16B0_CAP0 2 +#define LPC_IOCONF_FUNC_PIO0_2_CT16B0_CAP0 2 /* PIO0_3 */ #define LPC_IOCONF_FUNC_PIO0_3 0 @@ -142,36 +142,36 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO0_8 */ #define LPC_IOCONF_FUNC_PIO0_8 0 #define LPC_IOCONF_FUNC_MISO0 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT0 2 +#define LPC_IOCONF_FUNC_PIO0_8_CT16B0_MAT0 2 /* PIO0_9 */ #define LPC_IOCONF_FUNC_PIO0_9 0 #define LPC_IOCONF_FUNC_MOSI0 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT1 2 +#define LPC_IOCONF_FUNC_PIO0_9_CT16B0_MAT1 2 /* PIO0_10 */ #define LPC_IOCONF_FUNC_SWCLK 0 #define LPC_IOCONF_FUNC_PIO0_10 1 #define LPC_IOCONF_FUNC_PIO0_10_SCK0 2 -#define LPC_IOCONF_FUNC_CT16B0_MAT2 3 +#define LPC_IOCONF_FUNC_PIO0_10_CT16B0_MAT2 3 /* PIO0_11 */ #define LPC_IOCONF_FUNC_TDI 0 #define LPC_IOCONF_FUNC_PIO0_11 1 #define LPC_IOCONF_FUNC_AD0 2 -#define LPC_IOCONF_FUNC_CT32B0_MAT3 3 +#define LPC_IOCONF_FUNC_PIO0_11_CT32B0_MAT3 3 /* PIO0_12 */ #define LPC_IOCONF_FUNC_TMS 0 #define LPC_IOCONF_FUNC_PIO0_12 1 #define LPC_IOCONF_FUNC_AD1 2 -#define LPC_IOCONF_FUNC_CT32B1_CAP0 3 +#define LPC_IOCONF_FUNC_PIO0_12_CT32B1_CAP0 3 /* PIO0_13 */ #define LPC_IOCONF_FUNC_TD0 0 #define LPC_IOCONF_FUNC_PIO0_13 1 #define LPC_IOCONF_FUNC_AD2 2 -#define LPC_IOCONF_FUNC_CT32B1_MAT0 3 +#define LPC_IOCONF_FUNC_PIO0_13_CT32B1_MAT0 3 /* PIO0_14 */ #define LPC_IOCONF_FUNC_TRST 0 @@ -183,12 +183,12 @@ extern struct lpc_ioconf lpc_ioconf; #define LPC_IOCONF_FUNC_SWDIO 0 #define LPC_IOCONF_FUNC_PIO0_15 1 #define LPC_IOCONF_FUNC_AD4 2 -#define LPC_IOCONF_FUNC_CT32B1_MAT2 3 +#define LPC_IOCONF_FUNC_PIO0_15_CT32B1_MAT2 3 /* PIO0_16 */ #define LPC_IOCONF_FUNC_PIO0_16 0 #define LPC_IOCONF_FUNC_AD5 1 -#define LPC_IOCONF_FUNC_CT32B1_MAT3 2 +#define LPC_IOCONF_FUNC_PIO0_16_CT32B1_MAT3 2 /* PIO0_17 */ #define LPC_IOCONF_FUNC_PIO0_17 0 @@ -208,17 +208,17 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO0_20 */ #define LPC_IOCONF_FUNC_PIO0_20 0 -#define LPC_IOCONF_FUNC_CT16B1_CAP0 1 +#define LPC_IOCONF_FUNC_PIO0_20_CT16B1_CAP0 1 /* PIO0_21 */ #define LPC_IOCONF_FUNC_PIO0_21 0 -#define LPC_IOCONF_FUNC_CT16B1_MAT0 1 +#define LPC_IOCONF_FUNC_PIO0_21_CT16B1_MAT0 1 #define LPC_IOCONF_FUNC_PIO0_21_MOSI1 2 /* PIO0_22 */ #define LPC_IOCONF_FUNC_PIO0_22 0 #define LPC_IOCONF_FUNC_AD6 1 -#define LPC_IOCONF_FUNC_CT16B1_MAT1 2 +#define LPC_IOCONF_FUNC_PIO0_22_CT16B1_MAT1 2 #define LPC_IOCONF_FUNC_PIO0_22_MISO1 3 /* PIO0_23 */ @@ -227,11 +227,11 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_0 */ #define LPC_IOCONF_FUNC_PIO1_0 0 -#define LPC_IOCONF_FUNC_CT32B1_MAT1 1 +#define LPC_IOCONF_FUNC_PIO1_0_CT32B1_MAT1 1 /* PIO1_1 */ #define LPC_IOCONF_FUNC_PIO1_1 0 -#define LPC_IOCONF_FUNC_CT32B1_MAT1 1 +#define LPC_IOCONF_FUNC_PIO1_1_CT32B1_MAT1 1 /* PIO1_2 */ #define LPC_IOCONF_FUNC_PIO1_2 0 @@ -247,7 +247,7 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_5 */ #define LPC_IOCONF_FUNC_PIO1_5 0 -#define LPC_IOCONF_FUNC_CT32B1_CAP1 1 +#define LPC_IOCONF_FUNC_PIO1_5_CT32B1_CAP1 1 /* PIO1_6 */ #define LPC_IOCONF_FUNC_PIO1_6 0 @@ -273,13 +273,13 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_13 */ #define LPC_IOCONF_FUNC_PIO1_13 0 #define LPC_IOCONF_FUNC_DTR 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT0 2 +#define LPC_IOCONF_FUNC_PIO1_13_CT16B0_MAT0 2 #define LPC_IOCONF_FUNC_PIO1_13_TXD 3 /* PIO1_14 */ #define LPC_IOCONF_FUNC_PIO1_14 0 #define LPC_IOCONF_FUNC_DSR 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT1 2 +#define LPC_IOCONF_FUNC_PIO1_14_CT16B0_MAT1 2 #define LPC_IOCONF_FUNC_PIO1_13_RXD 3 /* PIO1_15 */ @@ -291,16 +291,16 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_16 */ #define LPC_IOCONF_FUNC_PIO1_16 0 #define LPC_IOCONF_FUNC_RI 1 -#define LPC_IOCONF_FUNC_CT16B0_CAP0 2 +#define LPC_IOCONF_FUNC_PIO1_16_CT16B0_CAP0 2 /* PIO1_17 */ #define LPC_IOCONF_FUNC_PIO1_17 0 -#define LPC_IOCONF_FUNC_CT16B0_CAP1 1 +#define LPC_IOCONF_FUNC_PIO1_17_CT16B0_CAP1 1 #define LPC_IOCONF_FUNC_PIO1_17_RXD 2 /* PIO1_18 */ #define LPC_IOCONF_FUNC_PIO1_18 0 -#define LPC_IOCONF_FUNC_CT16B1_CAP1 1 +#define LPC_IOCONF_FUNC_PIO1_18_CT16B1_CAP1 1 #define LPC_IOCONF_FUNC_PIO1_18_TXD 2 /* PIO1_19 */ -- 2.47.2