You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/06/16 18:35:56 UTC
[incubator-nuttx] 05/05: FlexCAN C89 Style initialization
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6a19f037564966b6cbe4007083986500366a8c03
Author: Peter van der Perk <pe...@nxp.com>
AuthorDate: Tue Jun 16 19:05:46 2020 +0200
FlexCAN C89 Style initialization
---
arch/arm/src/kinetis/kinetis_flexcan.c | 36 ++++++++++++++++++++++------------
arch/arm/src/s32k1xx/s32k1xx_flexcan.c | 36 ++++++++++++++++++++++------------
2 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/arch/arm/src/kinetis/kinetis_flexcan.c b/arch/arm/src/kinetis/kinetis_flexcan.c
index 3d7d478..e50f13a 100644
--- a/arch/arm/src/kinetis/kinetis_flexcan.c
+++ b/arch/arm/src/kinetis/kinetis_flexcan.c
@@ -601,6 +601,16 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
/* Attempt to write frame */
uint32_t mbi = 0;
+ uint32_t mb_bit;
+ uint32_t regval;
+#ifdef CONFIG_NET_CAN_CANFD
+ uint32_t *frame_data_word;
+ uint32_t i;
+#endif
+#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE
+ int32_t timeout;
+#endif
+
if ((getreg32(priv->base + KINETIS_CAN_ESR2_OFFSET) &
(CAN_ESR2_IMB | CAN_ESR2_VPS)) ==
(CAN_ESR2_IMB | CAN_ESR2_VPS))
@@ -610,7 +620,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
mbi -= RXMBCOUNT;
}
- uint32_t mb_bit = 1 << (RXMBCOUNT + mbi);
+ mb_bit = 1 << (RXMBCOUNT + mbi);
while (mbi < TXMBCOUNT)
{
@@ -631,7 +641,6 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
}
#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE
- int32_t timeout = 0;
struct timespec ts;
clock_systimespec(&ts);
@@ -664,6 +673,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
{
priv->txmb[mbi].deadline.tv_sec = 0;
priv->txmb[mbi].deadline.tv_usec = 0;
+ timeout = -1;
}
}
#endif
@@ -717,9 +727,8 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
cs.dlc = len_to_can_dlc[frame->len];
- uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
+ frame_data_word = (uint32_t *)&frame->data[0];
- uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
mb->data[i].w00 = __builtin_bswap32(frame_data_word[i]);
@@ -729,7 +738,6 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
mb->cs = cs; /* Go. */
- uint32_t regval;
regval = getreg32(priv->base + KINETIS_CAN_IMASK1_OFFSET);
regval |= mb_bit;
putreg32(regval, priv->base + KINETIS_CAN_IMASK1_OFFSET);
@@ -833,6 +841,10 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv,
{
uint32_t mb_index;
struct mb_s *rf;
+#ifdef CONFIG_NET_CAN_CANFD
+ uint32_t *frame_data_word;
+ uint32_t i;
+#endif
while ((mb_index = arm_lsb(flags)) != 32)
{
@@ -862,9 +874,8 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv,
frame->len = can_dlc_to_len[rf->cs.dlc];
- uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
+ frame_data_word = (uint32_t *)&frame->data[0];
- uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
frame_data_word[i] = __builtin_bswap32(rf->data[i].w00);
@@ -970,17 +981,16 @@ 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;
+ uint32_t mb_bit;
flags = getreg32(priv->base + KINETIS_CAN_IFLAG1_OFFSET);
flags &= IFLAG1_TX;
- #warning Missing logic
-
- /* FIXME First Process Error aborts */
+ /* TODO First Process Error aborts */
/* Process TX completions */
- uint32_t mb_bit = 1 << RXMBCOUNT;
+ mb_bit = 1 << RXMBCOUNT;
for (mbi = 0; flags && mbi < TXMBCOUNT; mbi++)
{
if (flags & mb_bit)
@@ -1708,6 +1718,9 @@ int kinetis_caninitialize(int intf)
struct kinetis_driver_s *priv;
int ret;
uint32_t regval;
+#ifdef TX_TIMEOUT_WQ
+ uint32_t i;
+#endif
switch (intf)
{
@@ -1857,7 +1870,6 @@ int kinetis_caninitialize(int intf)
priv->dev.d_private = (void *)priv; /* Used to recover private state from dev */
#ifdef TX_TIMEOUT_WQ
- uint32_t i;
for (i = 0; i < TXMBCOUNT; i++)
{
priv->txtimeout[i] = wd_create(); /* Create TX timeout timer */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c
index 55c01a5..75cc252 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c
@@ -602,6 +602,16 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv)
/* Attempt to write frame */
uint32_t mbi = 0;
+ uint32_t mb_bit;
+ uint32_t regval;
+#ifdef CONFIG_NET_CAN_CANFD
+ uint32_t *frame_data_word;
+ uint32_t i;
+#endif
+#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE
+ int32_t timeout;
+#endif
+
if ((getreg32(priv->base + S32K1XX_CAN_ESR2_OFFSET) &
(CAN_ESR2_IMB | CAN_ESR2_VPS)) ==
(CAN_ESR2_IMB | CAN_ESR2_VPS))
@@ -611,7 +621,7 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv)
mbi -= RXMBCOUNT;
}
- uint32_t mb_bit = 1 << (RXMBCOUNT + mbi);
+ mb_bit = 1 << (RXMBCOUNT + mbi);
while (mbi < TXMBCOUNT)
{
@@ -632,7 +642,6 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv)
}
#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE
- int32_t timeout = 0;
struct timespec ts;
clock_systimespec(&ts);
@@ -665,6 +674,7 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv)
{
priv->txmb[mbi].deadline.tv_sec = 0;
priv->txmb[mbi].deadline.tv_usec = 0;
+ timeout = -1;
}
}
#endif
@@ -718,9 +728,8 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv)
cs.dlc = len_to_can_dlc[frame->len];
- uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
+ frame_data_word = (uint32_t *)&frame->data[0];
- uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
mb->data[i].w00 = __builtin_bswap32(frame_data_word[i]);
@@ -730,7 +739,6 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv)
mb->cs = cs; /* Go. */
- uint32_t regval;
regval = getreg32(priv->base + S32K1XX_CAN_IMASK1_OFFSET);
regval |= mb_bit;
putreg32(regval, priv->base + S32K1XX_CAN_IMASK1_OFFSET);
@@ -834,6 +842,10 @@ static void s32k1xx_receive(FAR struct s32k1xx_driver_s *priv,
{
uint32_t mb_index;
struct mb_s *rf;
+#ifdef CONFIG_NET_CAN_CANFD
+ uint32_t *frame_data_word;
+ uint32_t i;
+#endif
while ((mb_index = arm_lsb(flags)) != 32)
{
@@ -863,9 +875,8 @@ static void s32k1xx_receive(FAR struct s32k1xx_driver_s *priv,
frame->len = can_dlc_to_len[rf->cs.dlc];
- uint32_t *frame_data_word = (uint32_t *)&frame->data[0];
+ frame_data_word = (uint32_t *)&frame->data[0];
- uint32_t i;
for (i = 0; i < (frame->len + 4 - 1) / 4; i++)
{
frame_data_word[i] = __builtin_bswap32(rf->data[i].w00);
@@ -971,17 +982,16 @@ 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;
+ uint32_t mb_bit;
flags = getreg32(priv->base + S32K1XX_CAN_IFLAG1_OFFSET);
flags &= IFLAG1_TX;
- #warning Missing logic
-
- /* FIXME First Process Error aborts */
+ /* TODO First Process Error aborts */
/* Process TX completions */
- uint32_t mb_bit = 1 << RXMBCOUNT;
+ mb_bit = 1 << RXMBCOUNT;
for (mbi = 0; flags && mbi < TXMBCOUNT; mbi++)
{
if (flags & mb_bit)
@@ -1708,6 +1718,9 @@ int s32k1xx_netinitialize(int intf)
{
struct s32k1xx_driver_s *priv;
int ret;
+#ifdef TX_TIMEOUT_WQ
+ uint32_t i;
+#endif
switch (intf)
{
@@ -1851,7 +1864,6 @@ int s32k1xx_netinitialize(int intf)
priv->dev.d_private = (void *)priv; /* Used to recover private state from dev */
#ifdef TX_TIMEOUT_WQ
- uint32_t i;
for (i = 0; i < TXMBCOUNT; i++)
{
priv->txtimeout[i] = wd_create(); /* Create TX timeout timer */