boards: convert to using newly introduced integer sized types
Convert code to use u{8,16,32,64}_t and s{8,16,32,64}_t instead of C99 integer types. Jira: ZEP-2051 Change-Id: I27d51c316144251939b20cfa6787ff7ab8035fe6 Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
parent
9a74ee1730
commit
7352c4681d
9 changed files with 38 additions and 38 deletions
|
@ -136,11 +136,11 @@
|
|||
*/
|
||||
static void __pinmux_defaults(void)
|
||||
{
|
||||
uint32_t ab_select[4]; /* A/B selection */
|
||||
uint32_t output_en[4]; /* output enabled */
|
||||
uint32_t pull_up[4]; /* pull-up enabled */
|
||||
uint32_t pio_ctrl[4]; /* PIO enable */
|
||||
uint32_t tmp;
|
||||
u32_t ab_select[4]; /* A/B selection */
|
||||
u32_t output_en[4]; /* output enabled */
|
||||
u32_t pull_up[4]; /* pull-up enabled */
|
||||
u32_t pio_ctrl[4]; /* PIO enable */
|
||||
u32_t tmp;
|
||||
|
||||
/* Read defaults at boot, as the bootloader may have already
|
||||
* configured some pins.
|
||||
|
|
|
@ -117,9 +117,9 @@
|
|||
*/
|
||||
static void arm_mps2_pinmux_defaults(void)
|
||||
{
|
||||
uint32_t gpio_0 = 0;
|
||||
uint32_t gpio_1 = 0;
|
||||
uint32_t gpio_2 = 0;
|
||||
u32_t gpio_0 = 0;
|
||||
u32_t gpio_1 = 0;
|
||||
u32_t gpio_2 = 0;
|
||||
|
||||
/* Set GPIO Alternate Functions */
|
||||
|
||||
|
|
|
@ -111,9 +111,9 @@
|
|||
*/
|
||||
#define PINMUX_MAX_REGISTERS 5
|
||||
|
||||
static void _pinmux_defaults(uint32_t base)
|
||||
static void _pinmux_defaults(u32_t base)
|
||||
{
|
||||
uint32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
|
||||
u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
|
||||
int i = 0;
|
||||
|
||||
#if !defined(CONFIG_SPI_1) && !defined(CONFIG_SPI_CS_GPIO)
|
||||
|
@ -153,7 +153,7 @@ static void _pinmux_defaults(uint32_t base)
|
|||
}
|
||||
}
|
||||
|
||||
static inline void _pinmux_pullups(uint32_t base_address)
|
||||
static inline void _pinmux_pullups(u32_t base_address)
|
||||
{
|
||||
_quark_mcu_set_mux(base_address + PINMUX_PULLUP_OFFSET, 104,
|
||||
PINMUX_PULLUP_ENABLE);
|
||||
|
|
|
@ -42,11 +42,11 @@ enum pin_level {
|
|||
|
||||
struct mux_pin {
|
||||
enum gpio_chip mux;
|
||||
uint8_t pin;
|
||||
u8_t pin;
|
||||
enum pin_level level;
|
||||
|
||||
/* Pin configuration (e.g. direction, pull up/down, etc.) */
|
||||
uint32_t cfg;
|
||||
u32_t cfg;
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -55,8 +55,8 @@ struct mux_pin {
|
|||
* edit here unless you absolutely know what you are doing
|
||||
*/
|
||||
struct mux_path {
|
||||
uint8_t io_pin;
|
||||
uint8_t func;
|
||||
u8_t io_pin;
|
||||
u8_t func;
|
||||
struct mux_pin path[5];
|
||||
};
|
||||
|
||||
|
@ -482,12 +482,12 @@ static struct mux_path _galileo_path[PINMUX_NUM_PINS * NUM_PIN_FUNCS] = {
|
|||
{ NONE, 0, DONT_CARE, (GPIO_DIR_IN) } } },
|
||||
};
|
||||
|
||||
int _galileo_pinmux_set_pin(struct device *port, uint8_t pin, uint32_t func)
|
||||
int _galileo_pinmux_set_pin(struct device *port, u8_t pin, u32_t func)
|
||||
{
|
||||
struct galileo_data * const drv_data = port->driver_data;
|
||||
|
||||
uint8_t mux_index = 0;
|
||||
uint8_t i = 0;
|
||||
u8_t mux_index = 0;
|
||||
u8_t i = 0;
|
||||
struct mux_path *enable = NULL;
|
||||
struct pin_config *mux_config = drv_data->mux_config;
|
||||
|
||||
|
@ -574,7 +574,7 @@ int _galileo_pinmux_set_pin(struct device *port, uint8_t pin, uint32_t func)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int _galileo_pinmux_get_pin(struct device *port, uint32_t pin, uint32_t *func)
|
||||
int _galileo_pinmux_get_pin(struct device *port, u32_t pin, u32_t *func)
|
||||
{
|
||||
struct galileo_data * const drv_data = port->driver_data;
|
||||
struct pin_config *mux_config = drv_data->mux_config;
|
||||
|
@ -621,8 +621,8 @@ static struct pin_config mux_config[PINMUX_NUM_PINS] = {
|
|||
};
|
||||
|
||||
static int pinmux_pullup(struct device *dev,
|
||||
uint32_t pin,
|
||||
uint8_t func)
|
||||
u32_t pin,
|
||||
u8_t func)
|
||||
{
|
||||
/*
|
||||
* Nothing to do.
|
||||
|
@ -637,8 +637,8 @@ static int pinmux_pullup(struct device *dev,
|
|||
}
|
||||
|
||||
static int pinmux_input_enable(struct device *dev,
|
||||
uint32_t pin,
|
||||
uint8_t func)
|
||||
u32_t pin,
|
||||
u8_t func)
|
||||
{
|
||||
/*
|
||||
* Nothing to do.
|
||||
|
@ -653,8 +653,8 @@ static int pinmux_input_enable(struct device *dev,
|
|||
}
|
||||
|
||||
static int pinmux_set(struct device *dev,
|
||||
uint32_t pin,
|
||||
uint32_t func)
|
||||
u32_t pin,
|
||||
u32_t func)
|
||||
{
|
||||
if (pin > PINMUX_NUM_PINS) {
|
||||
return -EINVAL;
|
||||
|
@ -664,8 +664,8 @@ static int pinmux_set(struct device *dev,
|
|||
}
|
||||
|
||||
static int pinmux_get(struct device *dev,
|
||||
uint32_t pin,
|
||||
uint32_t *func)
|
||||
u32_t pin,
|
||||
u32_t *func)
|
||||
{
|
||||
if (pin > PINMUX_NUM_PINS) {
|
||||
return -EINVAL;
|
||||
|
|
|
@ -29,8 +29,8 @@ struct galileo_data {
|
|||
|
||||
struct galileo_data galileo_pinmux_driver;
|
||||
|
||||
int _galileo_pinmux_set_pin(struct device *port, uint8_t pin, uint32_t func);
|
||||
int _galileo_pinmux_set_pin(struct device *port, u8_t pin, u32_t func);
|
||||
|
||||
int _galileo_pinmux_get_pin(struct device *port, uint32_t pin, uint32_t *func);
|
||||
int _galileo_pinmux_get_pin(struct device *port, u32_t pin, u32_t *func);
|
||||
|
||||
#endif /* __PINMUX_GALILEO_PRIV_H */
|
||||
|
|
|
@ -100,9 +100,9 @@
|
|||
* the bit description from above
|
||||
*/
|
||||
#define PINMUX_MAX_REGISTERS 5
|
||||
static void _pinmux_defaults(uint32_t base)
|
||||
static void _pinmux_defaults(u32_t base)
|
||||
{
|
||||
uint32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0};
|
||||
u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0};
|
||||
int i = 0;
|
||||
|
||||
PIN_CONFIG(mux_config, 0, PINMUX_FUNC_B);
|
||||
|
|
|
@ -64,9 +64,9 @@
|
|||
|
||||
#define PINMUX_MAX_REGISTERS 2
|
||||
|
||||
static void _pinmux_defaults(uint32_t base)
|
||||
static void _pinmux_defaults(u32_t base)
|
||||
{
|
||||
uint32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0 };
|
||||
u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0 };
|
||||
int i = 0;
|
||||
|
||||
PIN_CONFIG(mux_config, 0, PINMUX_FUNC_C);
|
||||
|
|
|
@ -100,9 +100,9 @@
|
|||
* the bit description from above
|
||||
*/
|
||||
#define PINMUX_MAX_REGISTERS 5
|
||||
static void _pinmux_defaults(uint32_t base)
|
||||
static void _pinmux_defaults(u32_t base)
|
||||
{
|
||||
uint32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0};
|
||||
u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0};
|
||||
int i = 0;
|
||||
|
||||
PIN_CONFIG(mux_config, 0, PINMUX_FUNC_B);
|
||||
|
|
|
@ -111,9 +111,9 @@
|
|||
*/
|
||||
#define PINMUX_MAX_REGISTERS 5
|
||||
|
||||
static void _pinmux_defaults(uint32_t base)
|
||||
static void _pinmux_defaults(u32_t base)
|
||||
{
|
||||
uint32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
|
||||
u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
|
||||
int i = 0;
|
||||
|
||||
#if !defined(CONFIG_SPI_1) && !defined(CONFIG_SPI_CS_GPIO)
|
||||
|
@ -153,7 +153,7 @@ static void _pinmux_defaults(uint32_t base)
|
|||
}
|
||||
}
|
||||
|
||||
static inline void _pinmux_pullups(uint32_t base_address)
|
||||
static inline void _pinmux_pullups(u32_t base_address)
|
||||
{
|
||||
_quark_mcu_set_mux(base_address + PINMUX_PULLUP_OFFSET, 104,
|
||||
PINMUX_PULLUP_ENABLE);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue