From 6694e697885a5cc94094bfa04b6c55caf425aeb1 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sat, 5 Nov 2016 18:10:46 +0000 Subject: [PATCH] Make Launchpad unused pins configurable --- platform/srf06-cc26xx/launchpad/board.c | 8 +------- platform/srf06-cc26xx/launchpad/cc1310/board.h | 9 +++++++++ platform/srf06-cc26xx/launchpad/cc2650/board.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/platform/srf06-cc26xx/launchpad/board.c b/platform/srf06-cc26xx/launchpad/board.c index 6482212d8..9779809ae 100644 --- a/platform/srf06-cc26xx/launchpad/board.c +++ b/platform/srf06-cc26xx/launchpad/board.c @@ -66,13 +66,7 @@ LPM_MODULE(launchpad_module, NULL, NULL, wakeup_handler, LPM_DOMAIN_NONE); static void configure_unused_pins(void) { - uint32_t pins[] = { - BOARD_IOID_CS, BOARD_IOID_TDO, BOARD_IOID_TDI, BOARD_IOID_DIO12, - BOARD_IOID_DIO15, BOARD_IOID_DIO21, BOARD_IOID_DIO22, BOARD_IOID_DIO23, - BOARD_IOID_DIO24, BOARD_IOID_DIO25, BOARD_IOID_DIO26, BOARD_IOID_DIO27, - BOARD_IOID_DIO28, BOARD_IOID_DIO29, BOARD_IOID_DIO30, - IOID_UNUSED - }; + uint32_t pins[] = BOARD_UNUSED_PINS; uint32_t *pin; diff --git a/platform/srf06-cc26xx/launchpad/cc1310/board.h b/platform/srf06-cc26xx/launchpad/cc1310/board.h index 9c750e0f9..a4b2efbba 100644 --- a/platform/srf06-cc26xx/launchpad/cc1310/board.h +++ b/platform/srf06-cc26xx/launchpad/cc1310/board.h @@ -178,6 +178,7 @@ * Those values are not meant to be modified by the user * @{ */ +#define BOARD_IOID_DIO1 IOID_1 #define BOARD_IOID_CS IOID_11 #define BOARD_IOID_TDO IOID_16 #define BOARD_IOID_TDI IOID_17 @@ -193,6 +194,14 @@ #define BOARD_IOID_DIO28 IOID_28 #define BOARD_IOID_DIO29 IOID_29 #define BOARD_IOID_DIO30 IOID_30 + +#define BOARD_UNUSED_PINS { \ + BOARD_IOID_DIO1, BOARD_IOID_CS, BOARD_IOID_TDO, BOARD_IOID_TDI, \ + BOARD_IOID_DIO12, BOARD_IOID_DIO15, BOARD_IOID_DIO21, BOARD_IOID_DIO22, \ + BOARD_IOID_DIO23, BOARD_IOID_DIO24, BOARD_IOID_DIO25, BOARD_IOID_DIO26, \ + BOARD_IOID_DIO27, BOARD_IOID_DIO28, BOARD_IOID_DIO29, BOARD_IOID_DIO30, \ + IOID_UNUSED \ + } /** @} */ /*---------------------------------------------------------------------------*/ /** diff --git a/platform/srf06-cc26xx/launchpad/cc2650/board.h b/platform/srf06-cc26xx/launchpad/cc2650/board.h index d71896c3c..9b9d00bf0 100644 --- a/platform/srf06-cc26xx/launchpad/cc2650/board.h +++ b/platform/srf06-cc26xx/launchpad/cc2650/board.h @@ -178,6 +178,8 @@ * Those values are not meant to be modified by the user * @{ */ +#define BOARD_IOID_DIO0 IOID_0 +#define BOARD_IOID_DIO1 IOID_1 #define BOARD_IOID_CS IOID_11 #define BOARD_IOID_TDO IOID_16 #define BOARD_IOID_TDI IOID_17 @@ -193,6 +195,14 @@ #define BOARD_IOID_DIO28 IOID_28 #define BOARD_IOID_DIO29 IOID_29 #define BOARD_IOID_DIO30 IOID_30 + +#define BOARD_UNUSED_PINS { \ + BOARD_IOID_DIO0, BOARD_IOID_DIO1, BOARD_IOID_CS, BOARD_IOID_TDO, \ + BOARD_IOID_TDI, BOARD_IOID_DIO12, BOARD_IOID_DIO15, BOARD_IOID_DIO21, \ + BOARD_IOID_DIO22, BOARD_IOID_DIO23, BOARD_IOID_DIO24, BOARD_IOID_DIO25, \ + BOARD_IOID_DIO26, BOARD_IOID_DIO27, BOARD_IOID_DIO28, BOARD_IOID_DIO29, \ + BOARD_IOID_DIO30, IOID_UNUSED \ + } /** @} */ /*---------------------------------------------------------------------------*/ /**