michaelh/zephyr
1
0
Fork 0
Code Releases Activity

gpio: clean up internal API function prototypes

Browse source 
Use gpio_pin_t uniformly when passing pin indexes to the driver.  Use
gpio_flags_t uniformly when passing flags to the driver.  Change name
of pin configuration function in API function table to be consistent
with other API functions.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-01-30 12:12:39 -06:00 • committed by Carles Cufí
commit 7c95d503b0
27 changed files with 145 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/gpio/gpio_cc13xx_cc26xx.c
View file

@ -42,7 +42,8 @@ static int gpio_cc13xx_cc26xx_port_clear_bits_raw(struct device *port,
u32_t mask);
static int gpio_cc13xx_cc26xx_config(struct device *port,
u32_t pin, int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
u32_t config = 0;
@ -141,7 +142,7 @@ static int gpio_cc13xx_cc26xx_port_toggle_bits(struct device *port, u32_t mask)
}
static int gpio_cc13xx_cc26xx_pin_interrupt_configure(struct device *port,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
struct gpio_cc13xx_cc26xx_data *data = port->driver_data;
@ -184,7 +185,7 @@ static int gpio_cc13xx_cc26xx_manage_callback(struct device *port,
}
static int gpio_cc13xx_cc26xx_enable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_cc13xx_cc26xx_data *data = port->driver_data;
@ -195,7 +196,7 @@ static int gpio_cc13xx_cc26xx_enable_callback(struct device *port,
}
static int gpio_cc13xx_cc26xx_disable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_cc13xx_cc26xx_data *data = port->driver_data;
@ -260,7 +261,7 @@ static int gpio_cc13xx_cc26xx_init(struct device *dev)
}
static const struct gpio_driver_api gpio_cc13xx_cc26xx_driver_api = {
.config = gpio_cc13xx_cc26xx_config,
.pin_configure = gpio_cc13xx_cc26xx_config,
.port_get_raw = gpio_cc13xx_cc26xx_port_get_raw,
.port_set_masked_raw = gpio_cc13xx_cc26xx_port_set_masked_raw,
.port_set_bits_raw = gpio_cc13xx_cc26xx_port_set_bits_raw,

11
drivers/gpio/gpio_cc32xx.c
View file

@ -70,7 +70,8 @@ static int gpio_cc32xx_port_set_bits_raw(struct device *port, u32_t mask);
static int gpio_cc32xx_port_clear_bits_raw(struct device *port, u32_t mask);
static inline int gpio_cc32xx_config(struct device *port,
u32_t pin, int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port);
unsigned long port_base = gpio_config->port_base;
@ -160,7 +161,7 @@ static int gpio_cc32xx_port_toggle_bits(struct device *port, u32_t mask)
}
static int gpio_cc32xx_pin_interrupt_configure(struct device *port,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port);
@ -209,7 +210,7 @@ static int gpio_cc32xx_manage_callback(struct device *dev,
static int gpio_cc32xx_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_cc32xx_data *data = DEV_DATA(dev);
@ -222,7 +223,7 @@ static int gpio_cc32xx_enable_callback(struct device *dev,
static int gpio_cc32xx_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_cc32xx_data *data = DEV_DATA(dev);
@ -258,7 +259,7 @@ static void gpio_cc32xx_port_isr(void *arg)
}
static const struct gpio_driver_api api_funcs = {
.config = gpio_cc32xx_config,
.pin_configure = gpio_cc32xx_config,
.port_get_raw = gpio_cc32xx_port_get_raw,
.port_set_masked_raw = gpio_cc32xx_port_set_masked_raw,
.port_set_bits_raw = gpio_cc32xx_port_set_bits_raw,

13
drivers/gpio/gpio_cmsdk_ahb.c
View file

@ -88,7 +88,7 @@ static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, u32_t mask)
return 0;
}
static int cmsdk_ahb_gpio_config(struct device *dev, u32_t mask, int flags)
static int cmsdk_ahb_gpio_config(struct device *dev, u32_t mask, gpio_flags_t flags)
{
const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config->config_info;
@ -136,13 +136,14 @@ static int cmsdk_ahb_gpio_config(struct device *dev, u32_t mask, int flags)
* @return 0 if successful, failed otherwise
*/
static int gpio_cmsdk_ahb_config(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
return cmsdk_ahb_gpio_config(dev, BIT(pin), flags);
}
static int gpio_cmsdk_ahb_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config->config_info;
@ -207,7 +208,7 @@ static int gpio_cmsdk_ahb_manage_callback(struct device *dev,
}
static int gpio_cmsdk_ahb_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config->config_info;
@ -217,7 +218,7 @@ static int gpio_cmsdk_ahb_enable_callback(struct device *dev,
}
static int gpio_cmsdk_ahb_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config->config_info;
@ -227,7 +228,7 @@ static int gpio_cmsdk_ahb_disable_callback(struct device *dev,
}
static const struct gpio_driver_api gpio_cmsdk_ahb_drv_api_funcs = {
.config = gpio_cmsdk_ahb_config,
.pin_configure = gpio_cmsdk_ahb_config,
.port_get_raw = gpio_cmsdk_ahb_port_get_raw,
.port_set_masked_raw = gpio_cmsdk_ahb_port_set_masked_raw,
.port_set_bits_raw = gpio_cmsdk_ahb_port_set_bits_raw,

11
drivers/gpio/gpio_dw.c
View file

@ -205,7 +205,7 @@ static inline u32_t dw_get_dir_port(u32_t base_addr)
}
static int gpio_dw_pin_interrupt_configure(struct device *port,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
struct gpio_dw_runtime *context = port->driver_data;
@ -302,7 +302,8 @@ static inline void dw_pin_config(struct device *port,
}
static inline int gpio_dw_config(struct device *port,
u32_t pin, int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
const struct gpio_dw_config *config = port->config->config_info;
u32_t io_flags;
@ -419,7 +420,7 @@ static inline int gpio_dw_manage_callback(struct device *port,
}
static inline int gpio_dw_enable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_dw_runtime *context = port->driver_data;
u32_t base_addr = dw_base_to_block_base(context->base_addr);
@ -436,7 +437,7 @@ static inline int gpio_dw_enable_callback(struct device *port,
}
static inline int gpio_dw_disable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_dw_runtime *context = port->driver_data;
u32_t base_addr = dw_base_to_block_base(context->base_addr);
@ -537,7 +538,7 @@ static void gpio_dw_isr(void *arg)
}
static const struct gpio_driver_api api_funcs = {
.config = gpio_dw_config,
.pin_configure = gpio_dw_config,
.port_get_raw = gpio_dw_port_get_raw,
.port_set_masked_raw = gpio_dw_port_set_masked_raw,
.port_set_bits_raw = gpio_dw_port_set_bits_raw,

11
drivers/gpio/gpio_esp32.c
View file

@ -56,7 +56,8 @@ struct gpio_esp32_data {
};
static int gpio_esp32_config(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
struct gpio_esp32_data *data = dev->driver_data;
u32_t io_pin = pin + data->port.pin_offset; /* Range from 0 - 39 */
@ -212,7 +213,7 @@ static int convert_int_type(enum gpio_int_mode mode,
}
static int gpio_esp32_pin_interrupt_configure(struct device *port,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -258,7 +259,7 @@ static int gpio_esp32_manage_callback(struct device *dev,
}
static int gpio_esp32_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_esp32_data *data = dev->driver_data;
@ -268,7 +269,7 @@ static int gpio_esp32_enable_callback(struct device *dev,
}
static int gpio_esp32_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_esp32_data *data = dev->driver_data;
@ -318,7 +319,7 @@ static int gpio_esp32_init(struct device *device)
}
static const struct gpio_driver_api gpio_esp32_driver = {
.config = gpio_esp32_config,
.pin_configure = gpio_esp32_config,
.port_get_raw = gpio_esp32_port_get_raw,
.port_set_masked_raw = gpio_esp32_port_set_masked_raw,
.port_set_bits_raw = gpio_esp32_port_set_bits_raw,

11
drivers/gpio/gpio_gecko.c
View file

@ -71,7 +71,8 @@ static inline void gpio_gecko_add_port(struct gpio_gecko_common_data *data,
}
static int gpio_gecko_configure(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
const struct gpio_gecko_config *config = dev->config->config_info;
GPIO_Port_TypeDef gpio_index = config->gpio_index;
@ -182,7 +183,7 @@ static int gpio_gecko_port_toggle_bits(struct device *dev, u32_t mask)
}
static int gpio_gecko_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_gecko_config *config = dev->config->config_info;
@ -233,7 +234,7 @@ static int gpio_gecko_manage_callback(struct device *dev,
}
static int gpio_gecko_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_gecko_data *data = dev->driver_data;
@ -244,7 +245,7 @@ static int gpio_gecko_enable_callback(struct device *dev,
}
static int gpio_gecko_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_gecko_data *data = dev->driver_data;
@ -282,7 +283,7 @@ static void gpio_gecko_common_isr(void *arg)
static const struct gpio_driver_api gpio_gecko_driver_api = {
.config = gpio_gecko_configure,
.pin_configure = gpio_gecko_configure,
.port_get_raw = gpio_gecko_port_get_raw,
.port_set_masked_raw = gpio_gecko_port_set_masked_raw,
.port_set_bits_raw = gpio_gecko_port_set_bits_raw,

6
drivers/gpio/gpio_handlers.c
View file

@ -10,7 +10,7 @@
static inline int z_vrfy_gpio_config(struct device *port,
gpio_pin_t pin, gpio_flags_t flags)
{
Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, config));
Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, pin_configure));
return z_impl_gpio_config((struct device *)port, pin, flags);
}
#include <syscalls/gpio_config_mrsh.c>
@ -69,14 +69,14 @@ static inline int z_vrfy_gpio_pin_interrupt_configure(struct device *port,
#include <syscalls/gpio_pin_interrupt_configure_mrsh.c>
static inline int z_vrfy_gpio_enable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
return z_impl_gpio_enable_callback((struct device *)port, pin);
}
#include <syscalls/gpio_enable_callback_mrsh.c>
static inline int z_vrfy_gpio_disable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
return z_impl_gpio_disable_callback((struct device *)port, pin);
}

11
drivers/gpio/gpio_ht16k33.c
View file

@ -38,7 +38,8 @@ struct gpio_ht16k33_data {
};
static int gpio_ht16k33_cfg(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
ARG_UNUSED(dev);
ARG_UNUSED(pin);
@ -105,7 +106,7 @@ static int gpio_ht16k33_port_toggle_bits(struct device *port,
}
static int gpio_ht16k33_pin_interrupt_configure(struct device *port,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode int_mode,
enum gpio_int_trig int_trig)
{
@ -136,14 +137,14 @@ static int gpio_ht16k33_manage_callback(struct device *dev,
}
static int gpio_ht16k33_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
/* All callbacks are always enabled */
return 0;
}
static int gpio_ht16k33_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
/* Individual callbacks can not be disabled */
return -ENOTSUP;
@ -180,7 +181,7 @@ static int gpio_ht16k33_init(struct device *dev)
}
static const struct gpio_driver_api gpio_ht16k33_api = {
.config = gpio_ht16k33_cfg,
.pin_configure = gpio_ht16k33_cfg,
.port_get_raw = gpio_ht16k33_port_get_raw,
.port_set_masked_raw = gpio_ht16k33_port_set_masked_raw,
.port_set_bits_raw = gpio_ht16k33_port_set_bits_raw,

12
drivers/gpio/gpio_imx.c
View file

@ -28,8 +28,8 @@ struct imx_gpio_data {
u32_t pin_callback_enables;
};
static int imx_gpio_configure(struct device *port, u32_t pin,
int flags)
static int imx_gpio_configure(struct device *port, gpio_pin_t pin,
gpio_flags_t flags)
{
const struct imx_gpio_config *config = port->config->config_info;
GPIO_Type *base = config->base;
@ -122,7 +122,7 @@ static int imx_gpio_port_toggle_bits(struct device *port, gpio_port_pins_t pins)
}
static int imx_gpio_pin_interrupt_configure(struct device *port,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -186,7 +186,7 @@ static int imx_gpio_manage_callback(struct device *port,
}
static int imx_gpio_enable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
const struct imx_gpio_config *config = port->config->config_info;
struct imx_gpio_data *data = port->driver_data;
@ -198,7 +198,7 @@ static int imx_gpio_enable_callback(struct device *port,
}
static int imx_gpio_disable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
const struct imx_gpio_config *config = port->config->config_info;
struct imx_gpio_data *data = port->driver_data;
@ -223,7 +223,7 @@ static void imx_gpio_port_isr(void *arg)
}
static const struct gpio_driver_api imx_gpio_driver_api = {
.config = imx_gpio_configure,
.pin_configure = imx_gpio_configure,
.port_get_raw = imx_gpio_port_get_raw,
.port_set_masked_raw = imx_gpio_port_set_masked_raw,
.port_set_bits_raw = imx_gpio_port_set_bits_raw,

10
drivers/gpio/gpio_intel_apl.c
View file

@ -206,7 +206,7 @@ static int gpio_intel_apl_isr(struct device *dev)
}
static int gpio_intel_apl_config(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct gpio_intel_apl_config *cfg = dev->config->config_info;
struct gpio_intel_apl_data *data = dev->driver_data;
@ -280,7 +280,7 @@ static int gpio_intel_apl_config(struct device *dev,
}
static int gpio_intel_apl_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_intel_apl_config *cfg = dev->config->config_info;
@ -369,7 +369,7 @@ static int gpio_intel_apl_manage_callback(struct device *dev,
}
static int gpio_intel_apl_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_intel_apl_config *cfg = dev->config->config_info;
u32_t raw_pin, reg;
@ -394,7 +394,7 @@ static int gpio_intel_apl_enable_callback(struct device *dev,
}
static int gpio_intel_apl_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_intel_apl_config *cfg = dev->config->config_info;
u32_t raw_pin, reg;
@ -533,7 +533,7 @@ static int gpio_intel_apl_port_get_raw(struct device *dev, u32_t *value)
}
static const struct gpio_driver_api gpio_intel_apl_api = {
.config = gpio_intel_apl_config,
.pin_configure = gpio_intel_apl_config,
.manage_callback = gpio_intel_apl_manage_callback,
.enable_callback = gpio_intel_apl_enable_callback,
.disable_callback = gpio_intel_apl_disable_callback,

6
drivers/gpio/gpio_litex.c
View file

@ -90,7 +90,7 @@ static int gpio_litex_init(struct device *dev)
}
static int gpio_litex_configure(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev);
@ -189,7 +189,7 @@ static int gpio_litex_port_toggle_bits(struct device *dev,
}
static int gpio_litex_pin_interrupt_configure(struct device *dev,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -202,7 +202,7 @@ static int gpio_litex_pin_interrupt_configure(struct device *dev,
}
static const struct gpio_driver_api gpio_litex_driver_api = {
.config = gpio_litex_configure,
.pin_configure = gpio_litex_configure,
.port_get_raw = gpio_litex_port_get_raw,
.port_set_masked_raw = gpio_litex_port_set_masked_raw,
.port_set_bits_raw = gpio_litex_port_set_bits_raw,

6
drivers/gpio/gpio_lmp90xxx.c
View file

@ -33,7 +33,7 @@ struct gpio_lmp90xxx_data {
};
static int gpio_lmp90xxx_config(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
struct gpio_lmp90xxx_data *data = dev->driver_data;
int err = 0;
@ -122,7 +122,7 @@ static int gpio_lmp90xxx_port_toggle_bits(struct device *dev,
}
static int gpio_lmp90xxx_pin_interrupt_configure(struct device *dev,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -150,7 +150,7 @@ static int gpio_lmp90xxx_init(struct device *dev)
}
static const struct gpio_driver_api gpio_lmp90xxx_api = {
.config = gpio_lmp90xxx_config,
.pin_configure = gpio_lmp90xxx_config,
.port_set_masked_raw = gpio_lmp90xxx_port_set_masked_raw,
.port_set_bits_raw = gpio_lmp90xxx_port_set_bits_raw,
.port_clear_bits_raw = gpio_lmp90xxx_port_clear_bits_raw,

10
drivers/gpio/gpio_mchp_xec.c
View file

@ -45,7 +45,7 @@ struct gpio_xec_config {
};
static int gpio_xec_configure(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct gpio_xec_config *config = dev->config->config_info;
__IO u32_t *current_pcr1;
@ -124,7 +124,7 @@ static int gpio_xec_configure(struct device *dev,
}
static int gpio_xec_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_xec_config *config = dev->config->config_info;
@ -277,7 +277,7 @@ static int gpio_xec_manage_callback(struct device *dev,
}
static int gpio_xec_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_xec_data *data = dev->driver_data;
@ -287,7 +287,7 @@ static int gpio_xec_enable_callback(struct device *dev,
}
static int gpio_xec_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_xec_data *data = dev->driver_data;
@ -317,7 +317,7 @@ static void gpio_gpio_xec_port_isr(void *arg)
}
static const struct gpio_driver_api gpio_xec_driver_api = {
.config = gpio_xec_configure,
.pin_configure = gpio_xec_configure,
.port_get_raw = gpio_xec_port_get_raw,
.port_set_masked_raw = gpio_xec_port_set_masked_raw,
.port_set_bits_raw = gpio_xec_port_set_bits_raw,

12
drivers/gpio/gpio_mcux.c
View file

@ -32,7 +32,7 @@ struct gpio_mcux_data {
};
static int gpio_mcux_configure(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct gpio_mcux_config *config = dev->config->config_info;
GPIO_Type *gpio_base = config->gpio_base;
@ -183,8 +183,8 @@ static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev,
}
static int gpio_mcux_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_mcux_config *config = dev->config->config_info;
GPIO_Type *gpio_base = config->gpio_base;
@ -226,7 +226,7 @@ static int gpio_mcux_manage_callback(struct device *dev,
}
static int gpio_mcux_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_mcux_data *data = dev->driver_data;
@ -236,7 +236,7 @@ static int gpio_mcux_enable_callback(struct device *dev,
}
static int gpio_mcux_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_mcux_data *data = dev->driver_data;
@ -263,7 +263,7 @@ static void gpio_mcux_port_isr(void *arg)
static const struct gpio_driver_api gpio_mcux_driver_api = {
.config = gpio_mcux_configure,
.pin_configure = gpio_mcux_configure,
.port_get_raw = gpio_mcux_port_get_raw,
.port_set_masked_raw = gpio_mcux_port_set_masked_raw,
.port_set_bits_raw = gpio_mcux_port_set_bits_raw,

10
drivers/gpio/gpio_mcux_igpio.c
View file

@ -29,7 +29,7 @@ struct mcux_igpio_data {
};
static int mcux_igpio_configure(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct mcux_igpio_config *config = dev->config->config_info;
GPIO_Type *base = config->base;
@ -111,7 +111,7 @@ static int mcux_igpio_port_toggle_bits(struct device *dev, u32_t mask)
}
static int mcux_igpio_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct mcux_igpio_config *config = dev->config->config_info;
@ -165,7 +165,7 @@ static int mcux_igpio_manage_callback(struct device *dev,
}
static int mcux_igpio_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct mcux_igpio_data *data = dev->driver_data;
@ -175,7 +175,7 @@ static int mcux_igpio_enable_callback(struct device *dev,
}
static int mcux_igpio_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct mcux_igpio_data *data = dev->driver_data;
@ -200,7 +200,7 @@ static void mcux_igpio_port_isr(void *arg)
}
static const struct gpio_driver_api mcux_igpio_driver_api = {
.config = mcux_igpio_configure,
.pin_configure = mcux_igpio_configure,
.port_get_raw = mcux_igpio_port_get_raw,
.port_set_masked_raw = mcux_igpio_port_set_masked_raw,
.port_set_bits_raw = mcux_igpio_port_set_bits_raw,

12
drivers/gpio/gpio_mcux_lpc.c
View file

@ -56,8 +56,8 @@ struct gpio_mcux_lpc_data {
u32_t isr_list_idx;
};
static int gpio_mcux_lpc_configure(struct device *dev, u32_t pin,
int flags)
static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin,
gpio_flags_t flags)
{
const struct gpio_mcux_lpc_config *config = dev->config->config_info;
GPIO_Type *gpio_base = config->gpio_base;
@ -227,7 +227,7 @@ static void gpio_mcux_lpc_port_isr(void *arg);
static int gpio_mcux_lpc_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_mcux_lpc_config *config = dev->config->config_info;
@ -299,7 +299,7 @@ static int gpio_mcux_lpc_manage_cb(struct device *port,
}
static int gpio_mcux_lpc_enable_cb(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_mcux_lpc_data *data = port->driver_data;
@ -309,7 +309,7 @@ static int gpio_mcux_lpc_enable_cb(struct device *port,
}
static int gpio_mcux_lpc_disable_cb(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_mcux_lpc_data *data = port->driver_data;
@ -336,7 +336,7 @@ static int gpio_mcux_lpc_init(struct device *dev)
}
static const struct gpio_driver_api gpio_mcux_lpc_driver_api = {
.config = gpio_mcux_lpc_configure,
.pin_configure = gpio_mcux_lpc_configure,
.port_get_raw = gpio_mcux_lpc_port_get_raw,
.port_set_masked_raw = gpio_mcux_lpc_port_set_masked_raw,
.port_set_bits_raw = gpio_mcux_lpc_port_set_bits_raw,

6
drivers/gpio/gpio_mmio32.c
View file

@ -30,7 +30,7 @@
#include <errno.h>
static int gpio_mmio32_config(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
struct gpio_mmio32_context *context = dev->driver_data;
const struct gpio_mmio32_config *config = context->config;
@ -143,7 +143,7 @@ static int gpio_mmio32_port_toggle_bits(struct device *dev, u32_t mask)
}
static int gpio_mmio32_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
if (mode != GPIO_INT_MODE_DISABLED) {
@ -154,7 +154,7 @@ static int gpio_mmio32_pin_interrupt_configure(struct device *dev,
}
static const struct gpio_driver_api gpio_mmio32_api = {
.config = gpio_mmio32_config,
.pin_configure = gpio_mmio32_config,
.port_get_raw = gpio_mmio32_port_get_raw,
.port_set_masked_raw = gpio_mmio32_port_set_masked_raw,
.port_set_bits_raw = gpio_mmio32_port_set_bits_raw,

10
drivers/gpio/gpio_nrfx.c
View file

@ -128,7 +128,7 @@ static int gpiote_pin_int_cfg(struct device *port, u32_t pin)
}
static int gpio_nrfx_config(struct device *port,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
NRF_GPIO_Type *reg = get_port_cfg(port)->port;
nrf_gpio_pin_pull_t pull;
@ -250,7 +250,7 @@ static int gpio_nrfx_port_toggle_bits(struct device *port, u32_t mask)
}
static int gpio_nrfx_pin_interrupt_configure(struct device *port,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
struct gpio_nrfx_data *data = get_port_data(port);
@ -296,19 +296,19 @@ static int gpio_nrfx_pin_manage_callback(struct device *port,
}
static inline int gpio_nrfx_pin_enable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
return gpio_nrfx_pin_manage_callback(port, pin, true);
}
static inline int gpio_nrfx_pin_disable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
return gpio_nrfx_pin_manage_callback(port, pin, false);
}
static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
.config = gpio_nrfx_config,
.pin_configure = gpio_nrfx_config,
.port_get_raw = gpio_nrfx_port_get_raw,
.port_set_masked_raw = gpio_nrfx_port_set_masked_raw,
.port_set_bits_raw = gpio_nrfx_port_set_bits_raw,

6
drivers/gpio/gpio_pca95xx.c
View file

@ -305,7 +305,7 @@ static int setup_pin_pullupdown(struct device *dev, u32_t pin, int flags)
* @return 0 if successful, failed otherwise
*/
static int gpio_pca95xx_config(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
int ret;
struct gpio_pca95xx_drv_data * const drv_data =
@ -441,7 +441,7 @@ static int gpio_pca95xx_port_toggle_bits(struct device *dev, u32_t mask)
}
static int gpio_pca95xx_pin_interrupt_configure(struct device *dev,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -449,7 +449,7 @@ static int gpio_pca95xx_pin_interrupt_configure(struct device *dev,
}
static const struct gpio_driver_api gpio_pca95xx_drv_api_funcs = {
.config = gpio_pca95xx_config,
.pin_configure = gpio_pca95xx_config,
.port_get_raw = gpio_pca95xx_port_get_raw,
.port_set_masked_raw = gpio_pca95xx_port_set_masked_raw,
.port_set_bits_raw = gpio_pca95xx_port_set_bits_raw,

10
drivers/gpio/gpio_rv32m1.c
View file

@ -70,7 +70,7 @@ static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev,
}
static int gpio_rv32m1_configure(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct gpio_rv32m1_config *config = dev->config->config_info;
GPIO_Type *gpio_base = config->gpio_base;
@ -206,7 +206,7 @@ static int gpio_rv32m1_port_toggle_bits(struct device *dev, u32_t mask)
}
static int gpio_rv32m1_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_rv32m1_config *config = dev->config->config_info;
@ -245,7 +245,7 @@ static int gpio_rv32m1_manage_callback(struct device *dev,
}
static int gpio_rv32m1_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_rv32m1_data *data = dev->driver_data;
@ -255,7 +255,7 @@ static int gpio_rv32m1_enable_callback(struct device *dev,
}
static int gpio_rv32m1_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_rv32m1_data *data = dev->driver_data;
@ -304,7 +304,7 @@ static int gpio_rv32m1_init(struct device *dev)
}
static const struct gpio_driver_api gpio_rv32m1_driver_api = {
.config = gpio_rv32m1_configure,
.pin_configure = gpio_rv32m1_configure,
.port_get_raw = gpio_rv32m1_port_get_raw,
.port_set_masked_raw = gpio_rv32m1_port_set_masked_raw,
.port_set_bits_raw = gpio_rv32m1_port_set_bits_raw,

15
drivers/gpio/gpio_sam.c
View file

@ -36,7 +36,8 @@ struct gpio_sam_runtime {
#define GPIO_SAM_ALL_PINS 0xFFFFFFFF
static int gpio_sam_port_configure(struct device *dev, u32_t mask, int flags)
static int gpio_sam_port_configure(struct device *dev, u32_t mask,
gpio_flags_t flags)
{
const struct gpio_sam_config * const cfg = DEV_CFG(dev);
Pio * const pio = cfg->regs;
@ -132,8 +133,8 @@ static int gpio_sam_port_configure(struct device *dev, u32_t mask, int flags)
return 0;
}
static int gpio_sam_config(struct device *dev, u32_t pin,
int flags)
static int gpio_sam_config(struct device *dev, gpio_pin_t pin,
gpio_flags_t flags)
{
return gpio_sam_port_configure(dev, BIT(pin), flags);
}
@ -241,7 +242,7 @@ static int gpio_sam_port_interrupt_configure(struct device *dev, u32_t mask,
}
static int gpio_sam_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
return gpio_sam_port_interrupt_configure(dev, BIT(pin), mode, trig);
@ -270,7 +271,7 @@ static int gpio_sam_manage_callback(struct device *port,
}
static int gpio_sam_enable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_sam_config * const cfg = DEV_CFG(port);
Pio * const pio = cfg->regs;
@ -281,7 +282,7 @@ static int gpio_sam_enable_callback(struct device *port,
}
static int gpio_sam_disable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_sam_config * const cfg = DEV_CFG(port);
Pio * const pio = cfg->regs;
@ -292,7 +293,7 @@ static int gpio_sam_disable_callback(struct device *port,
}
static const struct gpio_driver_api gpio_sam_api = {
.config = gpio_sam_config,
.pin_configure = gpio_sam_config,
.port_get_raw = gpio_sam_port_get_raw,
.port_set_masked_raw = gpio_sam_port_set_masked_raw,
.port_set_bits_raw = gpio_sam_port_set_bits_raw,

12
drivers/gpio/gpio_sam0.c
View file

@ -50,8 +50,8 @@ static void gpio_sam0_isr(u32_t pins, void *arg)
}
#endif
static int gpio_sam0_config(struct device *dev, u32_t pin,
int flags)
static int gpio_sam0_config(struct device *dev, gpio_pin_t pin,
gpio_flags_t flags)
{
const struct gpio_sam0_config *config = DEV_CFG(dev);
PortGroup *regs = config->regs;
@ -160,7 +160,7 @@ static int gpio_sam0_port_toggle_bits(struct device *dev,
#ifdef CONFIG_SAM0_EIC
static int gpio_sam0_pin_interrupt_configure(struct device *dev,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -258,14 +258,14 @@ static int gpio_sam0_manage_callback(struct device *dev,
return gpio_manage_callback(&data->callbacks, callback, set);
}
int gpio_sam0_enable_callback(struct device *dev, u32_t pin)
int gpio_sam0_enable_callback(struct device *dev, gpio_pin_t pin)
{
const struct gpio_sam0_config *config = DEV_CFG(dev);
return sam0_eic_enable_interrupt(config->id, pin);
}
int gpio_sam0_disable_callback(struct device *dev, u32_t pin)
int gpio_sam0_disable_callback(struct device *dev, gpio_pin_t pin)
{
const struct gpio_sam0_config *config = DEV_CFG(dev);
@ -282,7 +282,7 @@ static u32_t gpio_sam0_get_pending_int(struct device *dev)
#endif
static const struct gpio_driver_api gpio_sam0_api = {
.config = gpio_sam0_config,
.pin_configure = gpio_sam0_config,
.port_get_raw = gpio_sam0_port_get_raw,
.port_set_masked_raw = gpio_sam0_port_set_masked_raw,
.port_set_bits_raw = gpio_sam0_port_set_bits_raw,

12
drivers/gpio/gpio_sifive.c
View file

@ -153,8 +153,8 @@ static void gpio_sifive_irq_handler(void *arg)
* @return 0 if successful, failed otherwise
*/
static int gpio_sifive_config(struct device *dev,
u32_t pin,
int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev);
@ -244,7 +244,7 @@ static int gpio_sifive_port_toggle_bits(struct device *dev,
}
static int gpio_sifive_pin_interrupt_configure(struct device *dev,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -325,7 +325,7 @@ static int gpio_sifive_manage_callback(struct device *dev,
}
static int gpio_sifive_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev);
@ -340,7 +340,7 @@ static int gpio_sifive_enable_callback(struct device *dev,
}
static int gpio_sifive_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev);
@ -355,7 +355,7 @@ static int gpio_sifive_disable_callback(struct device *dev,
}
static const struct gpio_driver_api gpio_sifive_driver = {
.config = gpio_sifive_config,
.pin_configure = gpio_sifive_config,
.port_get_raw = gpio_sifive_port_get_raw,
.port_set_masked_raw = gpio_sifive_port_set_masked_raw,
.port_set_bits_raw = gpio_sifive_port_set_bits_raw,

10
drivers/gpio/gpio_stellaris.c
View file

@ -79,7 +79,7 @@ static void gpio_stellaris_isr(void *arg)
}
static int gpio_stellaris_configure(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
u32_t base = cfg->base;
@ -177,7 +177,7 @@ static int gpio_stellaris_port_toggle_bits(struct device *dev, u32_t mask)
}
static int gpio_stellaris_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
@ -218,7 +218,7 @@ static int gpio_stellaris_init(struct device *dev)
}
static int gpio_stellaris_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_stellaris_config * const cfg = DEV_CFG(dev);
u32_t base = cfg->base;
@ -229,7 +229,7 @@ static int gpio_stellaris_enable_callback(struct device *dev,
}
static int gpio_stellaris_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_stellaris_config * const cfg = DEV_CFG(dev);
u32_t base = cfg->base;
@ -251,7 +251,7 @@ static int gpio_stellaris_manage_callback(struct device *dev,
}
static const struct gpio_driver_api gpio_stellaris_driver_api = {
.config = gpio_stellaris_configure,
.pin_configure = gpio_stellaris_configure,
.port_get_raw = gpio_stellaris_port_get_raw,
.port_set_masked_raw = gpio_stellaris_port_set_masked_raw,
.port_set_bits_raw = gpio_stellaris_port_set_bits_raw,

10
drivers/gpio/gpio_stm32.c
View file

@ -382,7 +382,7 @@ static int gpio_stm32_port_toggle_bits(struct device *dev,
* @brief Configure pin or port
*/
static int gpio_stm32_config(struct device *dev,
u32_t pin, int flags)
gpio_pin_t pin, gpio_flags_t flags)
{
const struct gpio_stm32_config *cfg = dev->config->config_info;
int err = 0;
@ -420,7 +420,7 @@ release_lock:
}
static int gpio_stm32_pin_interrupt_configure(struct device *dev,
unsigned int pin, enum gpio_int_mode mode,
gpio_pin_t pin, enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
const struct gpio_stm32_config *cfg = dev->config->config_info;
@ -493,7 +493,7 @@ static int gpio_stm32_manage_callback(struct device *dev,
}
static int gpio_stm32_enable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_stm32_data *data = dev->driver_data;
@ -503,7 +503,7 @@ static int gpio_stm32_enable_callback(struct device *dev,
}
static int gpio_stm32_disable_callback(struct device *dev,
u32_t pin)
gpio_pin_t pin)
{
struct gpio_stm32_data *data = dev->driver_data;
@ -513,7 +513,7 @@ static int gpio_stm32_disable_callback(struct device *dev,
}
static const struct gpio_driver_api gpio_stm32_driver = {
.config = gpio_stm32_config,
.pin_configure = gpio_stm32_config,
.port_get_raw = gpio_stm32_port_get_raw,
.port_set_masked_raw = gpio_stm32_port_set_masked_raw,
.port_set_bits_raw = gpio_stm32_port_set_bits_raw,

8
drivers/gpio/gpio_sx1509b.c
View file

@ -111,8 +111,8 @@ static inline int i2c_reg_write_word_be(struct device *dev, u16_t dev_addr,
}
static int sx1509b_config(struct device *dev,
u32_t pin,
int flags)
gpio_pin_t pin,
gpio_flags_t flags)
{
const struct sx1509b_config *cfg = dev->config->config_info;
struct sx1509b_drv_data *drv_data = dev->driver_data;
@ -312,7 +312,7 @@ static int port_toggle_bits(struct device *dev,
}
static int pin_interrupt_configure(struct device *dev,
unsigned int pin,
gpio_pin_t pin,
enum gpio_int_mode mode,
enum gpio_int_trig trig)
{
@ -397,7 +397,7 @@ out:
}
static const struct gpio_driver_api api_table = {
.config = sx1509b_config,
.pin_configure = sx1509b_config,
.port_get_raw = port_get,
.port_set_masked_raw = port_set_masked,
.port_set_bits_raw = port_set_bits,

20
include/drivers/gpio.h
View file

@ -1,4 +1,5 @@
/*
* Copyright (c) 2019-2020 Nordic Semiconductor ASA
* Copyright (c) 2019 Piotr Mienkowski
* Copyright (c) 2017 ARM Ltd
* Copyright (c) 2015-2016 Intel Corporation.
@ -544,19 +545,19 @@ enum gpio_int_trig {
};
struct gpio_driver_api {
int (*config)(struct device *port, u32_t pin, int flags);
int (*pin_configure)(struct device *port, gpio_pin_t pin, gpio_flags_t flags);
int (*port_get_raw)(struct device *port, gpio_port_value_t *value);
int (*port_set_masked_raw)(struct device *port, gpio_port_pins_t mask,
gpio_port_value_t value);
int (*port_set_bits_raw)(struct device *port, gpio_port_pins_t pins);
int (*port_clear_bits_raw)(struct device *port, gpio_port_pins_t pins);
int (*port_toggle_bits)(struct device *port, gpio_port_pins_t pins);
int (*pin_interrupt_configure)(struct device *port, unsigned int pin,
int (*pin_interrupt_configure)(struct device *port, gpio_pin_t pin,
enum gpio_int_mode, enum gpio_int_trig);
int (*manage_callback)(struct device *port, struct gpio_callback *cb,
bool set);
int (*enable_callback)(struct device *port, u32_t pin);
int (*disable_callback)(struct device *port, u32_t pin);
int (*enable_callback)(struct device *port, gpio_pin_t pin);
int (*disable_callback)(struct device *port, gpio_pin_t pin);
u32_t (*get_pending_int)(struct device *dev);
};
@ -569,13 +570,13 @@ static inline int z_impl_gpio_config(struct device *port,
const struct gpio_driver_api *api =
(const struct gpio_driver_api *)port->driver_api;
return api->config(port, pin, (int)flags);
return api->pin_configure(port, pin, flags);
}
__syscall int gpio_enable_callback(struct device *port, u32_t pin);
__syscall int gpio_enable_callback(struct device *port, gpio_pin_t pin);
static inline int z_impl_gpio_enable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_driver_api *api =
(const struct gpio_driver_api *)port->driver_api;
@ -593,11 +594,10 @@ static inline int z_impl_gpio_enable_callback(struct device *port,
return api->enable_callback(port, pin);
}
__syscall int gpio_disable_callback(struct device *port,
u32_t pin);
__syscall int gpio_disable_callback(struct device *port, gpio_pin_t pin);
static inline int z_impl_gpio_disable_callback(struct device *port,
u32_t pin)
gpio_pin_t pin)
{
const struct gpio_driver_api *api =
(const struct gpio_driver_api *)port->driver_api;