From a8167ab17da01f517d76e0cd0c701cfb9321a151 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 25 Jun 2019 15:53:57 -0400 Subject: [PATCH] cleanup: include/: move pinmux.h to drivers/pinmux.h move pinmux.h to drivers/pinmux.h and create a shim for backward-compatibility. No functional changes to the headers. A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES. Related to #16539 Signed-off-by: Anas Nashif --- boards/arm/96b_argonkey/pinmux.c | 2 +- boards/arm/96b_carbon/pinmux.c | 2 +- boards/arm/96b_neonkey/pinmux.c | 2 +- boards/arm/96b_stm32_sensor_mez/pinmux.c | 2 +- boards/arm/96b_wistrio/pinmux.c | 2 +- .../adafruit_feather_m0_basic_proto/pinmux.c | 2 +- boards/arm/adafruit_trinket_m0/pinmux.c | 2 +- boards/arm/arduino_zero/pinmux.c | 2 +- boards/arm/atsamd20_xpro/pinmux.c | 2 +- boards/arm/atsamd21_xpro/pinmux.c | 2 +- boards/arm/atsamr21_xpro/pinmux.c | 2 +- boards/arm/b_l072z_lrwan1/pinmux.c | 2 +- boards/arm/cc2650_sensortag/pinmux.c | 2 +- boards/arm/cc3220sf_launchxl/pinmux.c | 2 +- boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c | 2 +- boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c | 2 +- boards/arm/disco_l475_iot1/pinmux.c | 2 +- boards/arm/dragino_lsn50/pinmux.c | 2 +- boards/arm/frdm_k64f/pinmux.c | 2 +- boards/arm/frdm_kl25z/pinmux.c | 2 +- boards/arm/frdm_kw41z/pinmux.c | 2 +- boards/arm/hexiwear_k64/pinmux.c | 2 +- boards/arm/hexiwear_kw40z/pinmux.c | 2 +- boards/arm/lpcxpresso54114/pinmux.c | 2 +- boards/arm/lpcxpresso55s69/pinmux.c | 2 +- boards/arm/mec15xxevb_assy6853/pinmux.c | 2 +- boards/arm/mikroe_mini_m4_for_stm32/pinmux.c | 2 +- boards/arm/mps2_an385/pinmux.c | 2 +- boards/arm/nucleo_f030r8/pinmux.c | 2 +- boards/arm/nucleo_f070rb/pinmux.c | 2 +- boards/arm/nucleo_f091rc/pinmux.c | 2 +- boards/arm/nucleo_f103rb/pinmux.c | 2 +- boards/arm/nucleo_f207zg/pinmux.c | 2 +- boards/arm/nucleo_f302r8/pinmux.c | 2 +- boards/arm/nucleo_f334r8/pinmux.c | 2 +- boards/arm/nucleo_f401re/pinmux.c | 2 +- boards/arm/nucleo_f411re/pinmux.c | 2 +- boards/arm/nucleo_f412zg/pinmux.c | 2 +- boards/arm/nucleo_f413zh/pinmux.c | 2 +- boards/arm/nucleo_f429zi/pinmux.c | 2 +- boards/arm/nucleo_f446re/pinmux.c | 2 +- boards/arm/nucleo_f746zg/pinmux.c | 2 +- boards/arm/nucleo_f756zg/pinmux.c | 2 +- boards/arm/nucleo_l053r8/pinmux.c | 2 +- boards/arm/nucleo_l073rz/pinmux.c | 2 +- boards/arm/nucleo_l432kc/pinmux.c | 2 +- boards/arm/nucleo_l476rg/pinmux.c | 2 +- boards/arm/nucleo_l496zg/pinmux.c | 2 +- boards/arm/nucleo_l4r5zi/pinmux.c | 2 +- boards/arm/nucleo_wb55rg/pinmux.c | 2 +- boards/arm/olimex_stm32_e407/pinmux.c | 2 +- boards/arm/olimex_stm32_h407/pinmux.c | 2 +- boards/arm/olimex_stm32_p405/pinmux.c | 2 +- boards/arm/olimexino_stm32/pinmux.c | 2 +- boards/arm/stm3210c_eval/pinmux.c | 2 +- boards/arm/stm32373c_eval/pinmux.c | 2 +- boards/arm/stm32_min_dev/pinmux.c | 2 +- boards/arm/stm32f072_eval/pinmux.c | 2 +- boards/arm/stm32f072b_disco/pinmux.c | 2 +- boards/arm/stm32f0_disco/pinmux.c | 2 +- boards/arm/stm32f3_disco/pinmux.c | 2 +- boards/arm/stm32f411e_disco/pinmux.c | 2 +- boards/arm/stm32f412g_disco/pinmux.c | 2 +- boards/arm/stm32f429i_disc1/pinmux.c | 2 +- boards/arm/stm32f469i_disco/pinmux.c | 2 +- boards/arm/stm32f4_disco/pinmux.c | 2 +- boards/arm/stm32f723e_disco/pinmux.c | 2 +- boards/arm/stm32f746g_disco/pinmux.c | 2 +- boards/arm/stm32f769i_disco/pinmux.c | 2 +- boards/arm/stm32l476g_disco/pinmux.c | 2 +- boards/arm/stm32l496g_disco/pinmux.c | 2 +- boards/arm/stm32mp157c_dk2/pinmux.c | 2 +- boards/arm/twr_ke18f/pinmux.c | 2 +- boards/arm/usb_kw24d512/pinmux.c | 2 +- boards/arm/v2m_beetle/pinmux.c | 2 +- boards/arm/v2m_musca/pinmux.c | 2 +- boards/arm/v2m_musca_b1/pinmux.c | 2 +- boards/riscv32/hifive1/pinmux.c | 2 +- boards/riscv32/hifive1_revb/pinmux.c | 2 +- boards/riscv32/rv32m1_vega/pinmux.c | 2 +- boards/x86/arduino_101/pinmux.c | 2 +- boards/x86/galileo/pinmux.c | 2 +- boards/x86/quark_se_c1000_devboard/pinmux.c | 2 +- boards/x86/tinytile/pinmux.c | 2 +- boards/xtensa/intel_s1000_crb/pinmux.c | 2 +- drivers/gpio/gpio_esp32.c | 2 +- drivers/gpio/gpio_stm32.c | 2 +- drivers/pinmux/pinmux_cc13xx_cc26xx.c | 2 +- drivers/pinmux/pinmux_cc2650.c | 2 +- drivers/pinmux/pinmux_esp32.c | 2 +- drivers/pinmux/pinmux_intel_s1000.c | 2 +- drivers/pinmux/pinmux_mchp_xec.c | 2 +- drivers/pinmux/pinmux_mcux.c | 2 +- drivers/pinmux/pinmux_mcux_lpc.c | 2 +- drivers/pinmux/pinmux_qmsi.c | 2 +- drivers/pinmux/pinmux_rv32m1.c | 2 +- drivers/pinmux/pinmux_sam0.c | 2 +- drivers/pinmux/pinmux_sifive.c | 2 +- drivers/pinmux/stm32/pinmux_stm32.c | 2 +- include/drivers/pinmux.h | 118 ++++++++++++++++++ include/pinmux.h | 111 +--------------- tests/drivers/aio/api/src/test_callback.c | 2 +- .../pinmux/pinmux_basic_api/src/pinmux_gpio.c | 2 +- 103 files changed, 223 insertions(+), 208 deletions(-) create mode 100644 include/drivers/pinmux.h diff --git a/boards/arm/96b_argonkey/pinmux.c b/boards/arm/96b_argonkey/pinmux.c index 154f0ac7a24..03fd927b7a0 100644 --- a/boards/arm/96b_argonkey/pinmux.c +++ b/boards/arm/96b_argonkey/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/96b_carbon/pinmux.c b/boards/arm/96b_carbon/pinmux.c index 09aa8f08ee0..d234b39b25c 100644 --- a/boards/arm/96b_carbon/pinmux.c +++ b/boards/arm/96b_carbon/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/96b_neonkey/pinmux.c b/boards/arm/96b_neonkey/pinmux.c index 8c9743b6e91..8e8205c797e 100644 --- a/boards/arm/96b_neonkey/pinmux.c +++ b/boards/arm/96b_neonkey/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/96b_stm32_sensor_mez/pinmux.c b/boards/arm/96b_stm32_sensor_mez/pinmux.c index a661d28b138..12ed1979a17 100644 --- a/boards/arm/96b_stm32_sensor_mez/pinmux.c +++ b/boards/arm/96b_stm32_sensor_mez/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/96b_wistrio/pinmux.c b/boards/arm/96b_wistrio/pinmux.c index 987f1e9dff6..a649e785ffe 100644 --- a/boards/arm/96b_wistrio/pinmux.c +++ b/boards/arm/96b_wistrio/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c b/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c index 0c17717e78f..657b1473049 100644 --- a/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c +++ b/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include static int board_pinmux_init(struct device *dev) { diff --git a/boards/arm/adafruit_trinket_m0/pinmux.c b/boards/arm/adafruit_trinket_m0/pinmux.c index 5187fd4da42..31a998f0ef7 100644 --- a/boards/arm/adafruit_trinket_m0/pinmux.c +++ b/boards/arm/adafruit_trinket_m0/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include static int board_pinmux_init(struct device *dev) { diff --git a/boards/arm/arduino_zero/pinmux.c b/boards/arm/arduino_zero/pinmux.c index ff39453c5e4..bf7579cf574 100644 --- a/boards/arm/arduino_zero/pinmux.c +++ b/boards/arm/arduino_zero/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include static int board_pinmux_init(struct device *dev) { diff --git a/boards/arm/atsamd20_xpro/pinmux.c b/boards/arm/atsamd20_xpro/pinmux.c index 3c6237fc088..14c786f1593 100644 --- a/boards/arm/atsamd20_xpro/pinmux.c +++ b/boards/arm/atsamd20_xpro/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include static int board_pinmux_init(struct device *dev) { diff --git a/boards/arm/atsamd21_xpro/pinmux.c b/boards/arm/atsamd21_xpro/pinmux.c index c732102511f..2d988d77d89 100644 --- a/boards/arm/atsamd21_xpro/pinmux.c +++ b/boards/arm/atsamd21_xpro/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include static int board_pinmux_init(struct device *dev) { diff --git a/boards/arm/atsamr21_xpro/pinmux.c b/boards/arm/atsamr21_xpro/pinmux.c index 53d8bbbe7a1..93b5b4f5c14 100644 --- a/boards/arm/atsamr21_xpro/pinmux.c +++ b/boards/arm/atsamr21_xpro/pinmux.c @@ -6,7 +6,7 @@ */ #include -#include +#include static int board_pinmux_init(struct device *dev) { diff --git a/boards/arm/b_l072z_lrwan1/pinmux.c b/boards/arm/b_l072z_lrwan1/pinmux.c index d5f99a90451..0e2807da933 100644 --- a/boards/arm/b_l072z_lrwan1/pinmux.c +++ b/boards/arm/b_l072z_lrwan1/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "pinmux/stm32/pinmux_stm32.h" diff --git a/boards/arm/cc2650_sensortag/pinmux.c b/boards/arm/cc2650_sensortag/pinmux.c index b722f0445ea..0686ba34eb8 100644 --- a/boards/arm/cc2650_sensortag/pinmux.c +++ b/boards/arm/cc2650_sensortag/pinmux.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include "board.h" diff --git a/boards/arm/cc3220sf_launchxl/pinmux.c b/boards/arm/cc3220sf_launchxl/pinmux.c index ec2345cda5c..5f07e931c63 100644 --- a/boards/arm/cc3220sf_launchxl/pinmux.c +++ b/boards/arm/cc3220sf_launchxl/pinmux.c @@ -57,7 +57,7 @@ #include -#include "pinmux.h" +#include #include #include diff --git a/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c b/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c index 2e8257c4d90..24aec0a958f 100644 --- a/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c +++ b/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c b/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c index 2e8257c4d90..24aec0a958f 100644 --- a/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c +++ b/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/disco_l475_iot1/pinmux.c b/boards/arm/disco_l475_iot1/pinmux.c index 2b14d20b39e..6851c1729a8 100644 --- a/boards/arm/disco_l475_iot1/pinmux.c +++ b/boards/arm/disco_l475_iot1/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/dragino_lsn50/pinmux.c b/boards/arm/dragino_lsn50/pinmux.c index e04f1baf969..1f959181b40 100644 --- a/boards/arm/dragino_lsn50/pinmux.c +++ b/boards/arm/dragino_lsn50/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "pinmux/stm32/pinmux_stm32.h" diff --git a/boards/arm/frdm_k64f/pinmux.c b/boards/arm/frdm_k64f/pinmux.c index 21174dd5d38..56a7478c598 100644 --- a/boards/arm/frdm_k64f/pinmux.c +++ b/boards/arm/frdm_k64f/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int frdm_k64f_pinmux_init(struct device *dev) diff --git a/boards/arm/frdm_kl25z/pinmux.c b/boards/arm/frdm_kl25z/pinmux.c index bd8b661904b..0cd62570b5b 100644 --- a/boards/arm/frdm_kl25z/pinmux.c +++ b/boards/arm/frdm_kl25z/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int frdm_kl25z_pinmux_init(struct device *dev) diff --git a/boards/arm/frdm_kw41z/pinmux.c b/boards/arm/frdm_kw41z/pinmux.c index 8729b27b462..82fff8cdff7 100644 --- a/boards/arm/frdm_kw41z/pinmux.c +++ b/boards/arm/frdm_kw41z/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int frdm_kw41z_pinmux_init(struct device *dev) diff --git a/boards/arm/hexiwear_k64/pinmux.c b/boards/arm/hexiwear_k64/pinmux.c index 5870033b1c5..5aa29d17482 100644 --- a/boards/arm/hexiwear_k64/pinmux.c +++ b/boards/arm/hexiwear_k64/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include diff --git a/boards/arm/hexiwear_kw40z/pinmux.c b/boards/arm/hexiwear_kw40z/pinmux.c index 281305efecf..b2a6eccc9ed 100644 --- a/boards/arm/hexiwear_kw40z/pinmux.c +++ b/boards/arm/hexiwear_kw40z/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int hexiwear_kw40z_pinmux_init(struct device *dev) diff --git a/boards/arm/lpcxpresso54114/pinmux.c b/boards/arm/lpcxpresso54114/pinmux.c index 8ee1b2b51c9..eb1abb2b4da 100644 --- a/boards/arm/lpcxpresso54114/pinmux.c +++ b/boards/arm/lpcxpresso54114/pinmux.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include #include diff --git a/boards/arm/lpcxpresso55s69/pinmux.c b/boards/arm/lpcxpresso55s69/pinmux.c index c0c49ba3eeb..fd24f1f4768 100644 --- a/boards/arm/lpcxpresso55s69/pinmux.c +++ b/boards/arm/lpcxpresso55s69/pinmux.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include #include diff --git a/boards/arm/mec15xxevb_assy6853/pinmux.c b/boards/arm/mec15xxevb_assy6853/pinmux.c index 715d858b7ed..b5a013bde72 100644 --- a/boards/arm/mec15xxevb_assy6853/pinmux.c +++ b/boards/arm/mec15xxevb_assy6853/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "soc.h" diff --git a/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c b/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c index 16268e0bc86..0cd221643c4 100644 --- a/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c +++ b/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/mps2_an385/pinmux.c b/boards/arm/mps2_an385/pinmux.c index a0c9cac4d40..aa21e62bcf8 100644 --- a/boards/arm/mps2_an385/pinmux.c +++ b/boards/arm/mps2_an385/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/boards/arm/nucleo_f030r8/pinmux.c b/boards/arm/nucleo_f030r8/pinmux.c index 2e24884ece3..e38daae487f 100644 --- a/boards/arm/nucleo_f030r8/pinmux.c +++ b/boards/arm/nucleo_f030r8/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "pinmux/pinmux.h" diff --git a/boards/arm/nucleo_f070rb/pinmux.c b/boards/arm/nucleo_f070rb/pinmux.c index 6bd3fb697ff..25b092cff28 100644 --- a/boards/arm/nucleo_f070rb/pinmux.c +++ b/boards/arm/nucleo_f070rb/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "pinmux/pinmux.h" diff --git a/boards/arm/nucleo_f091rc/pinmux.c b/boards/arm/nucleo_f091rc/pinmux.c index a73f5284dba..7f6363d964c 100644 --- a/boards/arm/nucleo_f091rc/pinmux.c +++ b/boards/arm/nucleo_f091rc/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f103rb/pinmux.c b/boards/arm/nucleo_f103rb/pinmux.c index 6190e70cb2d..6470a31a73d 100644 --- a/boards/arm/nucleo_f103rb/pinmux.c +++ b/boards/arm/nucleo_f103rb/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f207zg/pinmux.c b/boards/arm/nucleo_f207zg/pinmux.c index f200b805578..650d603edeb 100644 --- a/boards/arm/nucleo_f207zg/pinmux.c +++ b/boards/arm/nucleo_f207zg/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f302r8/pinmux.c b/boards/arm/nucleo_f302r8/pinmux.c index b2de1953452..29bc186b021 100644 --- a/boards/arm/nucleo_f302r8/pinmux.c +++ b/boards/arm/nucleo_f302r8/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f334r8/pinmux.c b/boards/arm/nucleo_f334r8/pinmux.c index d906cc5e1c4..a598ade6d7e 100644 --- a/boards/arm/nucleo_f334r8/pinmux.c +++ b/boards/arm/nucleo_f334r8/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f401re/pinmux.c b/boards/arm/nucleo_f401re/pinmux.c index 5670ca529e6..abbc3922393 100644 --- a/boards/arm/nucleo_f401re/pinmux.c +++ b/boards/arm/nucleo_f401re/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f411re/pinmux.c b/boards/arm/nucleo_f411re/pinmux.c index f5dd55c01f1..ade1a801a48 100644 --- a/boards/arm/nucleo_f411re/pinmux.c +++ b/boards/arm/nucleo_f411re/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f412zg/pinmux.c b/boards/arm/nucleo_f412zg/pinmux.c index 0416128c843..dce1e5da710 100644 --- a/boards/arm/nucleo_f412zg/pinmux.c +++ b/boards/arm/nucleo_f412zg/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f413zh/pinmux.c b/boards/arm/nucleo_f413zh/pinmux.c index 1185254fc67..39bb2c95630 100644 --- a/boards/arm/nucleo_f413zh/pinmux.c +++ b/boards/arm/nucleo_f413zh/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f429zi/pinmux.c b/boards/arm/nucleo_f429zi/pinmux.c index 9bc0b1a4202..40be2e4d348 100644 --- a/boards/arm/nucleo_f429zi/pinmux.c +++ b/boards/arm/nucleo_f429zi/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f446re/pinmux.c b/boards/arm/nucleo_f446re/pinmux.c index 9f2f5f8ae00..17fd2d9aa94 100644 --- a/boards/arm/nucleo_f446re/pinmux.c +++ b/boards/arm/nucleo_f446re/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f746zg/pinmux.c b/boards/arm/nucleo_f746zg/pinmux.c index b365f3632a2..6e88a19449e 100644 --- a/boards/arm/nucleo_f746zg/pinmux.c +++ b/boards/arm/nucleo_f746zg/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_f756zg/pinmux.c b/boards/arm/nucleo_f756zg/pinmux.c index 916f3c6e77f..81d0f4c6182 100644 --- a/boards/arm/nucleo_f756zg/pinmux.c +++ b/boards/arm/nucleo_f756zg/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_l053r8/pinmux.c b/boards/arm/nucleo_l053r8/pinmux.c index d53217d460a..fe98d03c242 100644 --- a/boards/arm/nucleo_l053r8/pinmux.c +++ b/boards/arm/nucleo_l053r8/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_l073rz/pinmux.c b/boards/arm/nucleo_l073rz/pinmux.c index bc79f3e018e..3c1d2ff1e22 100644 --- a/boards/arm/nucleo_l073rz/pinmux.c +++ b/boards/arm/nucleo_l073rz/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_l432kc/pinmux.c b/boards/arm/nucleo_l432kc/pinmux.c index 1bf631215ce..cb7c7fcd6f3 100644 --- a/boards/arm/nucleo_l432kc/pinmux.c +++ b/boards/arm/nucleo_l432kc/pinmux.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_l476rg/pinmux.c b/boards/arm/nucleo_l476rg/pinmux.c index 000a17e344b..d4a3cdfe613 100644 --- a/boards/arm/nucleo_l476rg/pinmux.c +++ b/boards/arm/nucleo_l476rg/pinmux.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_l496zg/pinmux.c b/boards/arm/nucleo_l496zg/pinmux.c index 46bad0be724..c093e527142 100644 --- a/boards/arm/nucleo_l496zg/pinmux.c +++ b/boards/arm/nucleo_l496zg/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_l4r5zi/pinmux.c b/boards/arm/nucleo_l4r5zi/pinmux.c index 6d2f45e515f..5bb21ded140 100644 --- a/boards/arm/nucleo_l4r5zi/pinmux.c +++ b/boards/arm/nucleo_l4r5zi/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/nucleo_wb55rg/pinmux.c b/boards/arm/nucleo_wb55rg/pinmux.c index 00e946a063f..48cbfcfb554 100644 --- a/boards/arm/nucleo_wb55rg/pinmux.c +++ b/boards/arm/nucleo_wb55rg/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/olimex_stm32_e407/pinmux.c b/boards/arm/olimex_stm32_e407/pinmux.c index 64fd0b96b60..406d22d33b2 100644 --- a/boards/arm/olimex_stm32_e407/pinmux.c +++ b/boards/arm/olimex_stm32_e407/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/olimex_stm32_h407/pinmux.c b/boards/arm/olimex_stm32_h407/pinmux.c index 728e192875f..b14bcf2135b 100644 --- a/boards/arm/olimex_stm32_h407/pinmux.c +++ b/boards/arm/olimex_stm32_h407/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/olimex_stm32_p405/pinmux.c b/boards/arm/olimex_stm32_p405/pinmux.c index b6fbb1256fd..7fb43ab2706 100644 --- a/boards/arm/olimex_stm32_p405/pinmux.c +++ b/boards/arm/olimex_stm32_p405/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/olimexino_stm32/pinmux.c b/boards/arm/olimexino_stm32/pinmux.c index 9dcc83334d7..b913339045c 100644 --- a/boards/arm/olimexino_stm32/pinmux.c +++ b/boards/arm/olimexino_stm32/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm3210c_eval/pinmux.c b/boards/arm/stm3210c_eval/pinmux.c index 55dbebb8af5..ec7f706b56a 100644 --- a/boards/arm/stm3210c_eval/pinmux.c +++ b/boards/arm/stm3210c_eval/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32373c_eval/pinmux.c b/boards/arm/stm32373c_eval/pinmux.c index 1bd484c1c35..ca6d4e12a64 100644 --- a/boards/arm/stm32373c_eval/pinmux.c +++ b/boards/arm/stm32373c_eval/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32_min_dev/pinmux.c b/boards/arm/stm32_min_dev/pinmux.c index ecc5d590605..0483ca8eb2f 100644 --- a/boards/arm/stm32_min_dev/pinmux.c +++ b/boards/arm/stm32_min_dev/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f072_eval/pinmux.c b/boards/arm/stm32f072_eval/pinmux.c index be0662931a1..5aa44edb9ae 100644 --- a/boards/arm/stm32f072_eval/pinmux.c +++ b/boards/arm/stm32f072_eval/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "pinmux/stm32/pinmux_stm32.h" diff --git a/boards/arm/stm32f072b_disco/pinmux.c b/boards/arm/stm32f072b_disco/pinmux.c index 65f3dc7015a..73578d2ac6f 100644 --- a/boards/arm/stm32f072b_disco/pinmux.c +++ b/boards/arm/stm32f072b_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "pinmux/pinmux.h" diff --git a/boards/arm/stm32f0_disco/pinmux.c b/boards/arm/stm32f0_disco/pinmux.c index 3e434a78607..f60ec5fbb77 100644 --- a/boards/arm/stm32f0_disco/pinmux.c +++ b/boards/arm/stm32f0_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "pinmux/pinmux.h" diff --git a/boards/arm/stm32f3_disco/pinmux.c b/boards/arm/stm32f3_disco/pinmux.c index f8827fdab81..32f7779f24a 100644 --- a/boards/arm/stm32f3_disco/pinmux.c +++ b/boards/arm/stm32f3_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f411e_disco/pinmux.c b/boards/arm/stm32f411e_disco/pinmux.c index 45aadb5b2b6..8453627287e 100644 --- a/boards/arm/stm32f411e_disco/pinmux.c +++ b/boards/arm/stm32f411e_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f412g_disco/pinmux.c b/boards/arm/stm32f412g_disco/pinmux.c index fb200014a30..b2cac829eab 100644 --- a/boards/arm/stm32f412g_disco/pinmux.c +++ b/boards/arm/stm32f412g_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f429i_disc1/pinmux.c b/boards/arm/stm32f429i_disc1/pinmux.c index 0d8bde78ee3..442336ba550 100644 --- a/boards/arm/stm32f429i_disc1/pinmux.c +++ b/boards/arm/stm32f429i_disc1/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f469i_disco/pinmux.c b/boards/arm/stm32f469i_disco/pinmux.c index 3440e76354f..35288d68c18 100644 --- a/boards/arm/stm32f469i_disco/pinmux.c +++ b/boards/arm/stm32f469i_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f4_disco/pinmux.c b/boards/arm/stm32f4_disco/pinmux.c index 6208971ba29..af296187371 100644 --- a/boards/arm/stm32f4_disco/pinmux.c +++ b/boards/arm/stm32f4_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f723e_disco/pinmux.c b/boards/arm/stm32f723e_disco/pinmux.c index 17778c4ab17..2133338d9c7 100644 --- a/boards/arm/stm32f723e_disco/pinmux.c +++ b/boards/arm/stm32f723e_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f746g_disco/pinmux.c b/boards/arm/stm32f746g_disco/pinmux.c index fdf08d56e15..713bd859d5c 100644 --- a/boards/arm/stm32f746g_disco/pinmux.c +++ b/boards/arm/stm32f746g_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32f769i_disco/pinmux.c b/boards/arm/stm32f769i_disco/pinmux.c index 18701719df3..90eb7cb4bff 100644 --- a/boards/arm/stm32f769i_disco/pinmux.c +++ b/boards/arm/stm32f769i_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32l476g_disco/pinmux.c b/boards/arm/stm32l476g_disco/pinmux.c index 6e76b3925dc..4369e885426 100644 --- a/boards/arm/stm32l476g_disco/pinmux.c +++ b/boards/arm/stm32l476g_disco/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32l496g_disco/pinmux.c b/boards/arm/stm32l496g_disco/pinmux.c index 017ed797878..fbdf062bf06 100644 --- a/boards/arm/stm32l496g_disco/pinmux.c +++ b/boards/arm/stm32l496g_disco/pinmux.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/stm32mp157c_dk2/pinmux.c b/boards/arm/stm32mp157c_dk2/pinmux.c index e885413577f..2de233b312b 100644 --- a/boards/arm/stm32mp157c_dk2/pinmux.c +++ b/boards/arm/stm32mp157c_dk2/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/boards/arm/twr_ke18f/pinmux.c b/boards/arm/twr_ke18f/pinmux.c index d0016eb0702..3859a7b8dfb 100644 --- a/boards/arm/twr_ke18f/pinmux.c +++ b/boards/arm/twr_ke18f/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int twr_ke18f_pinmux_init(struct device *dev) diff --git a/boards/arm/usb_kw24d512/pinmux.c b/boards/arm/usb_kw24d512/pinmux.c index 06941d5fee6..cbbb6fea97f 100644 --- a/boards/arm/usb_kw24d512/pinmux.c +++ b/boards/arm/usb_kw24d512/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int usb_kw24d512_pinmux_init(struct device *dev) diff --git a/boards/arm/v2m_beetle/pinmux.c b/boards/arm/v2m_beetle/pinmux.c index e0f1cfbe8bb..5c3ce8d9f1e 100644 --- a/boards/arm/v2m_beetle/pinmux.c +++ b/boards/arm/v2m_beetle/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/boards/arm/v2m_musca/pinmux.c b/boards/arm/v2m_musca/pinmux.c index 22ce77dffb5..bef4cdf7166 100644 --- a/boards/arm/v2m_musca/pinmux.c +++ b/boards/arm/v2m_musca/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/boards/arm/v2m_musca_b1/pinmux.c b/boards/arm/v2m_musca_b1/pinmux.c index 2bacf75c284..841d773d992 100644 --- a/boards/arm/v2m_musca_b1/pinmux.c +++ b/boards/arm/v2m_musca_b1/pinmux.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/boards/riscv32/hifive1/pinmux.c b/boards/riscv32/hifive1/pinmux.c index ef357767ef3..6e36f159fc6 100644 --- a/boards/riscv32/hifive1/pinmux.c +++ b/boards/riscv32/hifive1/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int hifive1_pinmux_init(struct device *dev) diff --git a/boards/riscv32/hifive1_revb/pinmux.c b/boards/riscv32/hifive1_revb/pinmux.c index b1acaa2a043..605645da960 100644 --- a/boards/riscv32/hifive1_revb/pinmux.c +++ b/boards/riscv32/hifive1_revb/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int hifive1_revb_pinmux_init(struct device *dev) diff --git a/boards/riscv32/rv32m1_vega/pinmux.c b/boards/riscv32/rv32m1_vega/pinmux.c index 804bbfdc594..3c27f5a1422 100644 --- a/boards/riscv32/rv32m1_vega/pinmux.c +++ b/boards/riscv32/rv32m1_vega/pinmux.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static int rv32m1_vega_pinmux_init(struct device *dev) diff --git a/boards/x86/arduino_101/pinmux.c b/boards/x86/arduino_101/pinmux.c index 0079270be61..86242dc8513 100644 --- a/boards/x86/arduino_101/pinmux.c +++ b/boards/x86/arduino_101/pinmux.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include "pinmux/pinmux.h" diff --git a/boards/x86/galileo/pinmux.c b/boards/x86/galileo/pinmux.c index 7e4e3163f3f..fdf8a8359e6 100644 --- a/boards/x86/galileo/pinmux.c +++ b/boards/x86/galileo/pinmux.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/x86/quark_se_c1000_devboard/pinmux.c b/boards/x86/quark_se_c1000_devboard/pinmux.c index 9937563edb8..f518f132444 100644 --- a/boards/x86/quark_se_c1000_devboard/pinmux.c +++ b/boards/x86/quark_se_c1000_devboard/pinmux.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "pinmux/pinmux.h" diff --git a/boards/x86/tinytile/pinmux.c b/boards/x86/tinytile/pinmux.c index b5595810fb8..c85e59cbf8e 100644 --- a/boards/x86/tinytile/pinmux.c +++ b/boards/x86/tinytile/pinmux.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include "pinmux/pinmux.h" diff --git a/boards/xtensa/intel_s1000_crb/pinmux.c b/boards/xtensa/intel_s1000_crb/pinmux.c index c34cc74947c..93fa51738e5 100644 --- a/boards/xtensa/intel_s1000_crb/pinmux.c +++ b/boards/xtensa/intel_s1000_crb/pinmux.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "iomux.h" /* diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c index d0d891aa382..b0a3ae89215 100644 --- a/drivers/gpio/gpio_esp32.c +++ b/drivers/gpio/gpio_esp32.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "gpio_utils.h" diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c index 71645e1a747..a6a3377a44d 100644 --- a/drivers/gpio/gpio_stm32.c +++ b/drivers/gpio/gpio_stm32.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/pinmux/pinmux_cc13xx_cc26xx.c b/drivers/pinmux/pinmux_cc13xx_cc26xx.c index 4f1eaa94088..0d38e99c440 100644 --- a/drivers/pinmux/pinmux_cc13xx_cc26xx.c +++ b/drivers/pinmux/pinmux_cc13xx_cc26xx.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include diff --git a/drivers/pinmux/pinmux_cc2650.c b/drivers/pinmux/pinmux_cc2650.c index d0f30bf8813..65807200513 100644 --- a/drivers/pinmux/pinmux_cc2650.c +++ b/drivers/pinmux/pinmux_cc2650.c @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/pinmux/pinmux_esp32.c b/drivers/pinmux/pinmux_esp32.c index a796e59b004..beeb9e518b1 100644 --- a/drivers/pinmux/pinmux_esp32.c +++ b/drivers/pinmux/pinmux_esp32.c @@ -11,7 +11,7 @@ #include #include -#include +#include /* DR_REG_IO_MUX_BASE is a 32-bit constant. Define a pin mux table * using only offsets, in order to reduce ROM footprint. diff --git a/drivers/pinmux/pinmux_intel_s1000.c b/drivers/pinmux/pinmux_intel_s1000.c index b413c813607..94e0c581432 100644 --- a/drivers/pinmux/pinmux_intel_s1000.c +++ b/drivers/pinmux/pinmux_intel_s1000.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include static volatile u32_t *iomux_ctrl_regs = (volatile u32_t *)DT_PINMUX_BASE_ADDR; diff --git a/drivers/pinmux/pinmux_mchp_xec.c b/drivers/pinmux/pinmux_mchp_xec.c index d703be3f52a..2db0503a983 100644 --- a/drivers/pinmux/pinmux_mchp_xec.c +++ b/drivers/pinmux/pinmux_mchp_xec.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include static const u32_t valid_ctrl_masks[NUM_MCHP_GPIO_PORTS] = { diff --git a/drivers/pinmux/pinmux_mcux.c b/drivers/pinmux/pinmux_mcux.c index 26f0fff4024..9656c210289 100644 --- a/drivers/pinmux/pinmux_mcux.c +++ b/drivers/pinmux/pinmux_mcux.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/pinmux/pinmux_mcux_lpc.c b/drivers/pinmux/pinmux_mcux_lpc.c index 0117f8b8b58..1d5ade90f94 100644 --- a/drivers/pinmux/pinmux_mcux_lpc.c +++ b/drivers/pinmux/pinmux_mcux_lpc.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/pinmux/pinmux_qmsi.c b/drivers/pinmux/pinmux_qmsi.c index d61483caff3..308e81ddab1 100644 --- a/drivers/pinmux/pinmux_qmsi.c +++ b/drivers/pinmux/pinmux_qmsi.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include "qm_pinmux.h" diff --git a/drivers/pinmux/pinmux_rv32m1.c b/drivers/pinmux/pinmux_rv32m1.c index 4acdd97fee4..be37816f2ed 100644 --- a/drivers/pinmux/pinmux_rv32m1.c +++ b/drivers/pinmux/pinmux_rv32m1.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/pinmux/pinmux_sam0.c b/drivers/pinmux/pinmux_sam0.c index 950427941a6..9cb83036a6e 100644 --- a/drivers/pinmux/pinmux_sam0.c +++ b/drivers/pinmux/pinmux_sam0.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include struct pinmux_sam0_config { diff --git a/drivers/pinmux/pinmux_sifive.c b/drivers/pinmux/pinmux_sifive.c index 1b80c03f357..e44113e41b5 100644 --- a/drivers/pinmux/pinmux_sifive.c +++ b/drivers/pinmux/pinmux_sifive.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include struct pinmux_sifive_config { diff --git a/drivers/pinmux/stm32/pinmux_stm32.c b/drivers/pinmux/stm32/pinmux_stm32.c index a4550543cef..f70bee26ff1 100644 --- a/drivers/pinmux/stm32/pinmux_stm32.c +++ b/drivers/pinmux/stm32/pinmux_stm32.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/drivers/pinmux.h b/include/drivers/pinmux.h new file mode 100644 index 00000000000..67aeb646ee6 --- /dev/null +++ b/include/drivers/pinmux.h @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2015 Intel Corporation + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * @file + * Public APIs for Pinmux drivers + */ + +#ifndef ZEPHYR_INCLUDE_DRIVERS_PINMUX_H_ +#define ZEPHYR_INCLUDE_DRIVERS_PINMUX_H_ + +/** + * @brief Pinmux Interface + * @defgroup pinmux_interface Pinmux Interface + * @ingroup io_interfaces + * @{ + */ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define PINMUX_FUNC_A 0 +#define PINMUX_FUNC_B 1 +#define PINMUX_FUNC_C 2 +#define PINMUX_FUNC_D 3 +#define PINMUX_FUNC_E 4 +#define PINMUX_FUNC_F 5 +#define PINMUX_FUNC_G 6 +#define PINMUX_FUNC_H 7 + +#define PINMUX_PULLUP_ENABLE (0x1) +#define PINMUX_PULLUP_DISABLE (0x0) + +#define PINMUX_INPUT_ENABLED (0x1) +#define PINMUX_OUTPUT_ENABLED (0x0) + +/** + * @typedef pmux_set + * @brief Callback API upon setting a PIN's function + * See pinmux_pin_set() for argument description + */ +typedef int (*pmux_set)(struct device *dev, u32_t pin, u32_t func); +/** + * @typedef pmux_get + * @brief Callback API upon getting a PIN's function + * See pinmux_pin_get() for argument description + */ +typedef int (*pmux_get)(struct device *dev, u32_t pin, u32_t *func); +/** + * @typedef pmux_pullup + * @brief Callback API upon setting a PIN's pullup + * See pinmix_pin_pullup() for argument description + */ +typedef int (*pmux_pullup)(struct device *dev, u32_t pin, u8_t func); +/** + * @typedef pmux_input + * @brief Callback API upon setting a PIN's input function + * See pinmux_input() for argument description + */ +typedef int (*pmux_input)(struct device *dev, u32_t pin, u8_t func); + +struct pinmux_driver_api { + pmux_set set; + pmux_get get; + pmux_pullup pullup; + pmux_input input; +}; + +static inline int pinmux_pin_set(struct device *dev, u32_t pin, u32_t func) +{ + const struct pinmux_driver_api *api = + (const struct pinmux_driver_api *)dev->driver_api; + + return api->set(dev, pin, func); +} + +static inline int pinmux_pin_get(struct device *dev, u32_t pin, u32_t *func) +{ + const struct pinmux_driver_api *api = + (const struct pinmux_driver_api *)dev->driver_api; + + return api->get(dev, pin, func); +} + +static inline int pinmux_pin_pullup(struct device *dev, u32_t pin, u8_t func) +{ + const struct pinmux_driver_api *api = + (const struct pinmux_driver_api *)dev->driver_api; + + return api->pullup(dev, pin, func); +} + +static inline int pinmux_pin_input_enable(struct device *dev, u32_t pin, + u8_t func) +{ + const struct pinmux_driver_api *api = + (const struct pinmux_driver_api *)dev->driver_api; + + return api->input(dev, pin, func); +} + +#ifdef __cplusplus +} +#endif + +/** + * + * @} + */ + +#endif /* ZEPHYR_INCLUDE_DRIVERS_PINMUX_H_ */ diff --git a/include/pinmux.h b/include/pinmux.h index 24bc3d1bca2..fbde2c297d1 100644 --- a/include/pinmux.h +++ b/include/pinmux.h @@ -1,118 +1,15 @@ /* - * Copyright (c) 2015 Intel Corporation + * Copyright (c) 2019 Intel Corporation * * SPDX-License-Identifier: Apache-2.0 */ - -/** - * @file - * Public APIs for Pinmux drivers - */ - #ifndef ZEPHYR_INCLUDE_PINMUX_H_ #define ZEPHYR_INCLUDE_PINMUX_H_ -/** - * @brief Pinmux Interface - * @defgroup pinmux_interface Pinmux Interface - * @ingroup io_interfaces - * @{ - */ - -#include -#include - -#ifdef __cplusplus -extern "C" { +#ifndef CONFIG_COMPAT_INCLUDES +#warning "This header file has moved, include instead." #endif -#define PINMUX_FUNC_A 0 -#define PINMUX_FUNC_B 1 -#define PINMUX_FUNC_C 2 -#define PINMUX_FUNC_D 3 -#define PINMUX_FUNC_E 4 -#define PINMUX_FUNC_F 5 -#define PINMUX_FUNC_G 6 -#define PINMUX_FUNC_H 7 - -#define PINMUX_PULLUP_ENABLE (0x1) -#define PINMUX_PULLUP_DISABLE (0x0) - -#define PINMUX_INPUT_ENABLED (0x1) -#define PINMUX_OUTPUT_ENABLED (0x0) - -/** - * @typedef pmux_set - * @brief Callback API upon setting a PIN's function - * See pinmux_pin_set() for argument description - */ -typedef int (*pmux_set)(struct device *dev, u32_t pin, u32_t func); -/** - * @typedef pmux_get - * @brief Callback API upon getting a PIN's function - * See pinmux_pin_get() for argument description - */ -typedef int (*pmux_get)(struct device *dev, u32_t pin, u32_t *func); -/** - * @typedef pmux_pullup - * @brief Callback API upon setting a PIN's pullup - * See pinmix_pin_pullup() for argument description - */ -typedef int (*pmux_pullup)(struct device *dev, u32_t pin, u8_t func); -/** - * @typedef pmux_input - * @brief Callback API upon setting a PIN's input function - * See pinmux_input() for argument description - */ -typedef int (*pmux_input)(struct device *dev, u32_t pin, u8_t func); - -struct pinmux_driver_api { - pmux_set set; - pmux_get get; - pmux_pullup pullup; - pmux_input input; -}; - -static inline int pinmux_pin_set(struct device *dev, u32_t pin, u32_t func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; - - return api->set(dev, pin, func); -} - -static inline int pinmux_pin_get(struct device *dev, u32_t pin, u32_t *func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; - - return api->get(dev, pin, func); -} - -static inline int pinmux_pin_pullup(struct device *dev, u32_t pin, u8_t func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; - - return api->pullup(dev, pin, func); -} - -static inline int pinmux_pin_input_enable(struct device *dev, u32_t pin, - u8_t func) -{ - const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; - - return api->input(dev, pin, func); -} - -#ifdef __cplusplus -} -#endif - -/** - * - * @} - */ +#include #endif /* ZEPHYR_INCLUDE_PINMUX_H_ */ diff --git a/tests/drivers/aio/api/src/test_callback.c b/tests/drivers/aio/api/src/test_callback.c index 966845a4a10..e4e7f543bd0 100644 --- a/tests/drivers/aio/api/src/test_callback.c +++ b/tests/drivers/aio/api/src/test_callback.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #define AIO_CMP_DEV_NAME CONFIG_AIO_COMPARATOR_0_NAME diff --git a/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c b/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c index 7d791d26584..61ce166c5d7 100644 --- a/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c +++ b/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c @@ -25,7 +25,7 @@ */ #include -#include +#include #include #define PINMUX_NAME CONFIG_PINMUX_NAME