nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

FlexCAN interrupt fixes, old compiler fixes

Browse source 
SocketCAN old compiler fix
This commit is contained in:
Peter van der Perk 2020-06-16 16:26:41 +02:00 committed by Alan Carvalho de Assis
parent 4fd506efaa
commit 4eecf8561f
3 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
arch/arm/src/kinetis/kinetis_flexcan.c
View file

@ -719,7 +719,8 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
for (int i = 0; i < (frame->len + 4 - 1) / 4; i++)
uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
mb->data[i].w00 = __builtin_bswap32(frame_data_word[i]);
}
@ -863,7 +864,8 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv,
uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
for (int i = 0; i < (frame->len + 4 - 1) / 4; i++)
uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
frame_data_word[i] = __builtin_bswap32(rf->data[i].w00);
}
@ -967,6 +969,7 @@ static void kinetis_txdone(FAR void *arg)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
uint32_t flags;
uint32_t mbi;
flags = getreg32(priv->base + KINETIS_CAN_IFLAG1_OFFSET);
flags &= IFLAG1_TX;
@ -978,7 +981,7 @@ static void kinetis_txdone(FAR void *arg)
/* Process TX completions */
uint32_t mb_bit = 1 << RXMBCOUNT;
for (uint32_t mbi = 0; flags && mbi < TXMBCOUNT; mbi++)
for (mbi = 0; flags && mbi < TXMBCOUNT; mbi++)
{
if (flags & mb_bit)
{
@ -1004,7 +1007,6 @@ static void kinetis_txdone(FAR void *arg)
net_lock();
devif_poll(&priv->dev, kinetis_txpoll);
net_unlock();
up_enable_irq(priv->config->mb_irq);
}
/****************************************************************************
@ -1052,11 +1054,13 @@ static int kinetis_flexcan_interrupt(int irq, FAR void *context,
if (flags)
{
/* Disable further CAN interrupts. here can be no race
/* Disable further TX MB CAN interrupts. here can be no race
* condition here.
*/
up_disable_irq(priv->config->mb_irq);
flags = getreg32(priv->base + KINETIS_CAN_IMASK1_OFFSET);
flags &= ~(IFLAG1_TX);
putreg32(flags, priv->base + KINETIS_CAN_IMASK1_OFFSET);
work_queue(CANWORK, &priv->irqwork, kinetis_txdone, priv, 0);
}
}
@ -1084,6 +1088,7 @@ static int kinetis_flexcan_interrupt(int irq, FAR void *context,
static void kinetis_txtimeout_work(FAR void *arg)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
uint32_t mbi;
struct timespec ts;
struct timeval *now = (struct timeval *)&ts;
@ -1094,7 +1099,7 @@ static void kinetis_txtimeout_work(FAR void *arg)
* transmit function transmitted a new frame
*/
for (int mbi = 0; mbi < TXMBCOUNT; mbi++)
for (mbi = 0; mbi < TXMBCOUNT; mbi++)
{
if (priv->txmb[mbi].deadline.tv_sec != 0
&& (now->tv_sec > priv->txmb[mbi].deadline.tv_sec
@ -1183,8 +1188,10 @@ static void kinetis_setfreeze(uint32_t base, uint32_t freeze)
static uint32_t kinetis_waitmcr_change(uint32_t base, uint32_t mask,
uint32_t target_state)
{
const unsigned timeout = 1000;
for (unsigned wait_ack = 0; wait_ack < timeout; wait_ack++)
const uint32_t timeout = 1000;
uint32_t wait_ack;
for (wait_ack = 0; wait_ack < timeout; wait_ack++)
{
const bool state = (getreg32(base + KINETIS_CAN_MCR_OFFSET) & mask)
!= 0;
@ -1850,7 +1857,8 @@ int kinetis_caninitialize(int intf)
priv->dev.d_private = (void *)priv; /* Used to recover private state from dev */
#ifdef TX_TIMEOUT_WQ
for (int i = 0; i < TXMBCOUNT; i++)
uint32_t i;
for (i = 0; i < TXMBCOUNT; i++)
{
priv->txtimeout[i] = wd_create(); /* Create TX timeout timer */
}

28
arch/arm/src/s32k1xx/s32k1xx_flexcan.c
View file

@ -720,7 +720,8 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv)
uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
for (int i = 0; i < (frame->len + 4 - 1) / 4; i++)
uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
mb->data[i].w00 = __builtin_bswap32(frame_data_word[i]);
}
@ -864,7 +865,8 @@ static void s32k1xx_receive(FAR struct s32k1xx_driver_s *priv,
uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
for (int i = 0; i < (frame->len + 4 - 1) / 4; i++)
uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
frame_data_word[i] = __builtin_bswap32(rf->data[i].w00);
}
@ -968,6 +970,7 @@ static void s32k1xx_txdone(FAR void *arg)
{
FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg;
uint32_t flags;
uint32_t mbi;
flags = getreg32(priv->base + S32K1XX_CAN_IFLAG1_OFFSET);
flags &= IFLAG1_TX;
@ -979,7 +982,7 @@ static void s32k1xx_txdone(FAR void *arg)
/* Process TX completions */
uint32_t mb_bit = 1 << RXMBCOUNT;
for (uint32_t mbi = 0; flags && mbi < TXMBCOUNT; mbi++)
for (mbi = 0; flags && mbi < TXMBCOUNT; mbi++)
{
if (flags & mb_bit)
{
@ -1005,7 +1008,6 @@ static void s32k1xx_txdone(FAR void *arg)
net_lock();
devif_poll(&priv->dev, s32k1xx_txpoll);
net_unlock();
up_enable_irq(priv->config->mb_irq);
}
/****************************************************************************
@ -1053,11 +1055,13 @@ static int s32k1xx_flexcan_interrupt(int irq, FAR void *context,
if (flags)
{
/* Disable further CAN interrupts. here can be no race
/* Disable further TX MB CAN interrupts. here can be no race
* condition here.
*/
up_disable_irq(priv->config->mb_irq);
flags = getreg32(priv->base + S32K1XX_CAN_IMASK1_OFFSET);
flags &= ~(IFLAG1_TX);
putreg32(flags, priv->base + S32K1XX_CAN_IMASK1_OFFSET);
work_queue(CANWORK, &priv->irqwork, s32k1xx_txdone, priv, 0);
}
}
@ -1085,6 +1089,7 @@ static int s32k1xx_flexcan_interrupt(int irq, FAR void *context,
static void s32k1xx_txtimeout_work(FAR void *arg)
{
FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg;
uint32_t mbi;
struct timespec ts;
struct timeval *now = (struct timeval *)&ts;
@ -1095,7 +1100,7 @@ static void s32k1xx_txtimeout_work(FAR void *arg)
* transmit function transmitted a new frame
*/
for (int mbi = 0; mbi < TXMBCOUNT; mbi++)
for (mbi = 0; mbi < TXMBCOUNT; mbi++)
{
if (priv->txmb[mbi].deadline.tv_sec != 0
&& (now->tv_sec > priv->txmb[mbi].deadline.tv_sec
@ -1184,8 +1189,10 @@ static void s32k1xx_setfreeze(uint32_t base, uint32_t freeze)
static uint32_t s32k1xx_waitmcr_change(uint32_t base, uint32_t mask,
uint32_t target_state)
{
const unsigned timeout = 1000;
for (unsigned wait_ack = 0; wait_ack < timeout; wait_ack++)
const uint32_t timeout = 1000;
uint32_t wait_ack;
for (wait_ack = 0; wait_ack < timeout; wait_ack++)
{
const bool state = (getreg32(base + S32K1XX_CAN_MCR_OFFSET) & mask)
!= 0;
@ -1844,7 +1851,8 @@ int s32k1xx_netinitialize(int intf)
priv->dev.d_private = (void *)priv; /* Used to recover private state from dev */
#ifdef TX_TIMEOUT_WQ
for (int i = 0; i < TXMBCOUNT; i++)
uint32_t i;
for (i = 0; i < TXMBCOUNT; i++)
{
priv->txtimeout[i] = wd_create(); /* Create TX timeout timer */
}

3
net/can/can_recvfrom.c
View file

@ -381,7 +381,8 @@ static inline int can_readahead_timestamp(struct can_conn_s *conn,
#ifdef CONFIG_NET_CANPROTO_OPTIONS
static int can_recv_filter(struct can_conn_s *conn, canid_t id)
{
for (int i = 0; i < conn->filter_count; i++)
uint32_t i;
for (i = 0; i < conn->filter_count; i++)
{
if (conn->filters[i].can_id & CAN_INV_FILTER)
{