Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions arch/arm/src/am335x/am335x_gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,6 @@ typedef uint32_t gpio_pinset_t;
* Public Data
****************************************************************************/

/****************************************************************************
* Inline Functions
****************************************************************************/

extern const uintptr_t g_gpiobase[AM335X_GPIO_NPORTS];
#define am335x_gpion_vbase(n) (g_gpiobase[(n)])

#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
Expand All @@ -181,6 +174,13 @@ extern "C"
#define EXTERN extern
#endif

/****************************************************************************
* Inline Functions
****************************************************************************/

EXTERN const uintptr_t g_gpiobase[AM335X_GPIO_NPORTS];
#define am335x_gpion_vbase(n) (g_gpiobase[(n)])

/****************************************************************************
* Public Function Prototypes
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/common/arm_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,9 @@ uintptr_t arm_intstack_top(void);
#if defined(__ICCARM__)
/* _vectors replaced on __vector_table for IAR C-SPY Simulator */

extern const void *__vector_table[];
EXTERN const void *__vector_table[];
#else
extern const void * const _vectors[];
EXTERN const void * const _vectors[];
#endif

/* Interrupt acknowledge and dispatch */
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/kinetis/kinetis_usbhshost.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extern "C"
*
****************************************************************************/

extern void kinetis_usbhost_vbusdrive(int rhport, bool enable);
void kinetis_usbhost_vbusdrive(int rhport, bool enable);

/****************************************************************************
* Name: kinetis_setup_overcurrent
Expand All @@ -93,7 +93,7 @@ extern void kinetis_usbhost_vbusdrive(int rhport, bool enable);
*
****************************************************************************/

extern int kinetis_setup_overcurrent(xcpt_t handler, void *arg);
int kinetis_setup_overcurrent(xcpt_t handler, void *arg);

/****************************************************************************
* Name: kinetis_ehci_initialize
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/src/s32k1xx/s32k1xx_clockconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@
* Public Types
****************************************************************************/

extern const unsigned int num_of_peripheral_clocks_0;

/* Clock Configuration ******************************************************/

enum scg_system_clock_type_e
Expand Down Expand Up @@ -456,10 +454,6 @@ enum scg_system_clock_mode_e

#ifndef __ASSEMBLY__

/****************************************************************************
* Public Data
****************************************************************************/

#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
Expand All @@ -469,6 +463,12 @@ extern "C"
#define EXTERN extern
#endif

/****************************************************************************
* Public Data
****************************************************************************/

EXTERN const unsigned int num_of_peripheral_clocks_0;

/****************************************************************************
* Public Function Prototypes
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions drivers/can/mcp2515.c
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ static void mcp2515_reset_lowlevel(FAR struct mcp2515_can_s *priv)
/* Make sure that all buffers are released. */

nxsem_reset(&priv->txfsem, MCP2515_NUM_TX_BUFFERS);
priv->txbuffers = 0b111;
priv->txbuffers = (1 << MCP2515_NUM_TX_BUFFERS) - 1;

/* Define the current state and unlock */

Expand Down Expand Up @@ -2540,7 +2540,7 @@ FAR struct mcp2515_can_s *

/* Initialize bitmask */

priv->txbuffers = (1 << MCP2515_NUM_TX_BUFFERS)-1;
priv->txbuffers = (1 << MCP2515_NUM_TX_BUFFERS) - 1;

/* And put the hardware in the initial state */

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/i2c_bitbang.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ static int i2c_bitbang_wait_ack(FAR struct i2c_bitbang_dev_s *priv)
static void i2c_bitbang_send(FAR struct i2c_bitbang_dev_s *priv,
uint8_t data)
{
uint8_t bit = 0b10000000;
uint8_t bit = 1u << 7;

while (bit)
{
Expand Down
12 changes: 6 additions & 6 deletions drivers/sensors/fxos8700cq.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ static int fxos8700cq_open(FAR struct file *filep)
if (ret < 0)
{
snerr("ERROR: %02x\n", regval);
return (ret);
return ret;
}

/* m_hms[1:0]: Hybrid mode, both accelerometer and magnetometer
Expand All @@ -266,7 +266,7 @@ static int fxos8700cq_open(FAR struct file *filep)
ret = fxos8700cq_putreg8(priv, FXOS8700CQ_M_CTRL_REG1, regval);
if (ret < 0)
{
return (ret);
return ret;
}

/* hyb_autoinc_mode */
Expand All @@ -275,7 +275,7 @@ static int fxos8700cq_open(FAR struct file *filep)
ret = fxos8700cq_putreg8(priv, FXOS8700CQ_M_CTRL_REG2, regval);
if (ret < 0)
{
return (ret);
return ret;
}

/* fs[1:0]: Accelerometer full-scale range : 4G */
Expand All @@ -284,7 +284,7 @@ static int fxos8700cq_open(FAR struct file *filep)
ret = fxos8700cq_putreg8(priv, FXOS8700CQ_XYZ_DATA_CFG, regval);
if (ret < 0)
{
return (ret);
return ret;
}

/* active , lnoise , dr[2:0] */
Expand All @@ -296,7 +296,7 @@ static int fxos8700cq_open(FAR struct file *filep)
ret = fxos8700cq_putreg8(priv, FXOS8700CQ_CTRL_REG1, regval);
if (ret < 0)
{
return (ret);
return ret;
}

return OK;
Expand All @@ -319,7 +319,7 @@ static int fxos8700cq_close(FAR struct file *filep)
int ret = fxos8700cq_putreg8(priv, FXOS8700CQ_CTRL_REG1, regval);
if (ret < 0)
{
return (ret);
return ret;
}

return OK;
Expand Down
6 changes: 3 additions & 3 deletions include/nuttx/analog/adc.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
# define CONFIG_ADC_NPOLLWAITERS 2
#endif

#define ADC_RESET(dev) ((dev)->ad_ops->ao_reset((dev)))
#define ADC_SETUP(dev) ((dev)->ad_ops->ao_setup((dev)))
#define ADC_SHUTDOWN(dev) ((dev)->ad_ops->ao_shutdown((dev)))
#define ADC_RESET(dev) ((dev)->ad_ops->ao_reset(dev))
#define ADC_SETUP(dev) ((dev)->ad_ops->ao_setup(dev))
#define ADC_SHUTDOWN(dev) ((dev)->ad_ops->ao_shutdown(dev))
#define ADC_RXINT(dev,enable) ((dev)->ad_ops->ao_rxint((dev),(enable)))
#define ADC_IOCTL(dev,cmd,arg) ((dev)->ad_ops->ao_ioctl((dev),(cmd),(arg)))

Expand Down
24 changes: 12 additions & 12 deletions include/nuttx/sensors/hall3ph.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,24 @@

enum hall3_120deg_position_e
{
HALL3_120DEG_POS_1 = 0b001,
HALL3_120DEG_POS_2 = 0b011,
HALL3_120DEG_POS_3 = 0b010,
HALL3_120DEG_POS_4 = 0b110,
HALL3_120DEG_POS_5 = 0b100,
HALL3_120DEG_POS_6 = 0b101
HALL3_120DEG_POS_1 = 1, /* 0b001 */
HALL3_120DEG_POS_2 = 3, /* 0b011 */
HALL3_120DEG_POS_3 = 2, /* 0b010 */
HALL3_120DEG_POS_4 = 6, /* 0b110 */
HALL3_120DEG_POS_5 = 4, /* 0b100 */
HALL3_120DEG_POS_6 = 5 /* 0b101 */
};

/* 60-degree Hall effect sensors positions */

enum hall3_60deg_position_e
{
HALL3_60DEG_POS_1 = 0b000,
HALL3_60DEG_POS_2 = 0b001,
HALL3_60DEG_POS_3 = 0b101,
HALL3_60DEG_POS_4 = 0b111,
HALL3_60DEG_POS_5 = 0b110,
HALL3_60DEG_POS_6 = 0b010
HALL3_60DEG_POS_1 = 0, /* 0b000 */
HALL3_60DEG_POS_2 = 1, /* 0b001 */
HALL3_60DEG_POS_3 = 5, /* 0b101 */
HALL3_60DEG_POS_4 = 7, /* 0b111 */
HALL3_60DEG_POS_5 = 6, /* 0b110 */
HALL3_60DEG_POS_6 = 2 /* 0b010 */
};

/* This structure provides the "lower-half" driver operations available to
Expand Down
2 changes: 1 addition & 1 deletion include/nuttx/sensors/mpu9250.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ enum accel_config_bit
ACCEL_FS_SEL_2G = 0, /* 0b00000 */
ACCEL_FS_SEL_4G = 1, /* 0b01000 */
ACCEL_FS_SEL_8G = 2, /* 0b10000 */
ACCEL_FS_SEL_16G = 3, /* 0b11000 */
ACCEL_FS_SEL_16G = 3 /* 0b11000 */
};

/* These structures are defined elsewhere, and we don't need their
Expand Down
4 changes: 2 additions & 2 deletions net/udp/udp_callback.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev,
FAR struct iob_s *iob;
int ret;
#ifdef CONFIG_NET_IPv6
FAR struct sockaddr_in6 src_addr6 =
struct sockaddr_in6 src_addr6 =
{
0
};
#endif

#ifdef CONFIG_NET_IPv4
FAR struct sockaddr_in src_addr4 =
struct sockaddr_in src_addr4 =
{
0
};
Expand Down