From 1df4d9bd97bd9375e11e62130a8c33d990164c1a Mon Sep 17 00:00:00 2001 From: Mathias Brossard Date: Tue, 8 Jun 2021 00:05:56 -0500 Subject: [PATCH] lpc11u35: fix invalid TDI and TDO pin ports This issue was raised in #502 --- source/board/override_96b_nitrogen/IO_Config_Override.h | 4 ++-- .../IO_Config_Override.h | 2 +- source/board/override_lpc11u35_reset/IO_Config_Override.h | 4 ++-- source/board/override_mtb/IO_Config_Override.h | 2 +- source/board/override_tiny/IO_Config_Override.h | 4 ++-- source/board/override_vbluno51/IO_Config_Override.h | 4 ++-- source/hic_hal/nxp/lpc11u35/IO_Config.h | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/board/override_96b_nitrogen/IO_Config_Override.h b/source/board/override_96b_nitrogen/IO_Config_Override.h index 07eaa918d..45c1fdcab 100644 --- a/source/board/override_96b_nitrogen/IO_Config_Override.h +++ b/source/board/override_96b_nitrogen/IO_Config_Override.h @@ -92,14 +92,14 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC11U35); #define PIN_SWDIO_TMS_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // TDI Pin PIO0_17 -#define PIN_TDI_PORT 17 +#define PIN_TDI_PORT 0 #define PIN_TDI_BIT 17 #define PIN_TDI (1 << PIN_TDI_BIT) #define PIN_TDI_IOCON LPC_IOCON->PIO0_17 #define PIN_TDI_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // SWO/TDO Pin PIO0_9 -#define PIN_TDO_PORT 9 +#define PIN_TDO_PORT 0 #define PIN_TDO_BIT 9 #define PIN_TDO (1 << PIN_TDO_BIT) #define PIN_TDO_IOCON LPC_IOCON->PIO0_9 diff --git a/source/board/override_lpc11u35_6LoWPAN_BorderRouter/IO_Config_Override.h b/source/board/override_lpc11u35_6LoWPAN_BorderRouter/IO_Config_Override.h index 787436713..620de1a18 100644 --- a/source/board/override_lpc11u35_6LoWPAN_BorderRouter/IO_Config_Override.h +++ b/source/board/override_lpc11u35_6LoWPAN_BorderRouter/IO_Config_Override.h @@ -92,7 +92,7 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC11U35); #define PIN_SWDIO_TMS_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // TDI Pin PIO0_17 -#define PIN_TDI_PORT 17 +#define PIN_TDI_PORT 0 #define PIN_TDI_BIT 17 #define PIN_TDI (1 << PIN_TDI_BIT) #define PIN_TDI_IOCON LPC_IOCON->PIO0_17 diff --git a/source/board/override_lpc11u35_reset/IO_Config_Override.h b/source/board/override_lpc11u35_reset/IO_Config_Override.h index 1253a58fe..233675071 100644 --- a/source/board/override_lpc11u35_reset/IO_Config_Override.h +++ b/source/board/override_lpc11u35_reset/IO_Config_Override.h @@ -92,14 +92,14 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC11U35); #define PIN_SWDIO_TMS_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // TDI Pin PIO0_17 -#define PIN_TDI_PORT 17 +#define PIN_TDI_PORT 0 #define PIN_TDI_BIT 17 #define PIN_TDI (1 << PIN_TDI_BIT) #define PIN_TDI_IOCON LPC_IOCON->PIO0_17 #define PIN_TDI_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // SWO/TDO Pin PIO0_9 -#define PIN_TDO_PORT 9 +#define PIN_TDO_PORT 0 #define PIN_TDO_BIT 9 #define PIN_TDO (1 << PIN_TDO_BIT) #define PIN_TDO_IOCON LPC_IOCON->PIO0_9 diff --git a/source/board/override_mtb/IO_Config_Override.h b/source/board/override_mtb/IO_Config_Override.h index 787436713..620de1a18 100644 --- a/source/board/override_mtb/IO_Config_Override.h +++ b/source/board/override_mtb/IO_Config_Override.h @@ -92,7 +92,7 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC11U35); #define PIN_SWDIO_TMS_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // TDI Pin PIO0_17 -#define PIN_TDI_PORT 17 +#define PIN_TDI_PORT 0 #define PIN_TDI_BIT 17 #define PIN_TDI (1 << PIN_TDI_BIT) #define PIN_TDI_IOCON LPC_IOCON->PIO0_17 diff --git a/source/board/override_tiny/IO_Config_Override.h b/source/board/override_tiny/IO_Config_Override.h index 148821d52..2b0b311af 100644 --- a/source/board/override_tiny/IO_Config_Override.h +++ b/source/board/override_tiny/IO_Config_Override.h @@ -92,14 +92,14 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC11U35); #define PIN_SWDIO_TMS_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // TDI Pin PIO0_17 -#define PIN_TDI_PORT 17 +#define PIN_TDI_PORT 0 #define PIN_TDI_BIT 17 #define PIN_TDI (1 << PIN_TDI_BIT) #define PIN_TDI_IOCON LPC_IOCON->PIO0_17 #define PIN_TDI_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // SWO/TDO Pin PIO0_9 -#define PIN_TDO_PORT 9 +#define PIN_TDO_PORT 0 #define PIN_TDO_BIT 9 #define PIN_TDO (1 << PIN_TDO_BIT) #define PIN_TDO_IOCON LPC_IOCON->PIO0_9 diff --git a/source/board/override_vbluno51/IO_Config_Override.h b/source/board/override_vbluno51/IO_Config_Override.h index 2382a8793..44214d9a0 100644 --- a/source/board/override_vbluno51/IO_Config_Override.h +++ b/source/board/override_vbluno51/IO_Config_Override.h @@ -97,14 +97,14 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC11U35); #define PIN_SWDIO_TMS_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // TDI Pin PIO0_17 -#define PIN_TDI_PORT 17 +#define PIN_TDI_PORT 0 #define PIN_TDI_BIT 17 #define PIN_TDI (1 << PIN_TDI_BIT) #define PIN_TDI_IOCON LPC_IOCON->PIO0_17 #define PIN_TDI_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // SWO/TDO Pin PIO0_9 -#define PIN_TDO_PORT 9 +#define PIN_TDO_PORT 0 #define PIN_TDO_BIT 9 #define PIN_TDO (1 << PIN_TDO_BIT) #define PIN_TDO_IOCON LPC_IOCON->PIO0_9 diff --git a/source/hic_hal/nxp/lpc11u35/IO_Config.h b/source/hic_hal/nxp/lpc11u35/IO_Config.h index 3acc7d6c6..c36fcffbb 100644 --- a/source/hic_hal/nxp/lpc11u35/IO_Config.h +++ b/source/hic_hal/nxp/lpc11u35/IO_Config.h @@ -102,14 +102,14 @@ COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC11U35); #define PIN_SWDIO_TMS_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // TDI Pin PIO0_17 -#define PIN_TDI_PORT 17 +#define PIN_TDI_PORT 0 #define PIN_TDI_BIT 17 #define PIN_TDI (1 << PIN_TDI_BIT) #define PIN_TDI_IOCON LPC_IOCON->PIO0_17 #define PIN_TDI_IOCON_INIT (FUNC_0 | PULL_UP_ENABLED) // SWO/TDO Pin PIO0_9 -#define PIN_TDO_PORT 9 +#define PIN_TDO_PORT 0 #define PIN_TDO_BIT 9 #define PIN_TDO (1 << PIN_TDO_BIT) #define PIN_TDO_IOCON LPC_IOCON->PIO0_9