sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

char driver CAN: add tx_confirm function in upperCAN driver.

Browse Source 
add tx_confirm function in upperCAN driver1

Signed-off-by: zhaohaiyang1 <zhaohaiyang1@xiaomi.com>
This commit is contained in:
zhaohaiyang1 2024-06-17 23:03:59 +08:00 committed by Lup Yuen Lee
parent 63515d584b
commit 45bb7a9c1c
13 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/at32/at32_can.c
View File

@ -1586,7 +1586,7 @@ static int at32can_rxinterrupt(struct can_dev_s *dev, int rxmb)
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; /* Error reporting not supported */ hdr.ch_error = 0; /* Error reporting not supported */
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* Extract the RTR bit */ /* Extract the RTR bit */
@ -1895,7 +1895,7 @@ static int at32can_sceinterrupt(int irq, void *context, void *arg)
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
hdr.ch_extid = 0; hdr.ch_extid = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* And provide the error report to the upper half logic */ /* And provide the error report to the upper half logic */

2
arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
View File

@ -1356,7 +1356,7 @@ static void can_interrupt(struct lpc17_40_can_s *dev)
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
hdr.ch_extid = ((rfs & CAN_RFS_FF) != 0); hdr.ch_extid = ((rfs & CAN_RFS_FF) != 0);
#else #else
hdr.ch_unused = 0; hdr.ch_tcf = 0;
if ((rfs & CAN_RFS_FF) != 0) if ((rfs & CAN_RFS_FF) != 0)
{ {

2
arch/arm/src/sama5/sam_can.c
View File

@ -1318,7 +1318,7 @@ static inline void can_rxinterrupt(struct can_dev_s *dev, int mbndx,
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; /* Error reporting not supported */ hdr.ch_error = 0; /* Error reporting not supported */
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* And provide the CAN message to the upper half logic */ /* And provide the CAN message to the upper half logic */

14
arch/arm/src/sama5/sam_mcan.c
View File

@ -3459,14 +3459,14 @@ static void mcan_error(struct can_dev_s *dev, uint32_t status)
{ {
/* Format the CAN header for the error report. */ /* Format the CAN header for the error report. */
hdr.ch_id = errbits; hdr.ch_id = errbits;
hdr.ch_dlc = CAN_ERROR_DLC; hdr.ch_dlc = CAN_ERROR_DLC;
hdr.ch_rtr = 0; hdr.ch_rtr = 0;
hdr.ch_error = 1; hdr.ch_error = 1;
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
hdr.ch_extid = 0; hdr.ch_extid = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* And provide the error report to the upper half logic */ /* And provide the error report to the upper half logic */
@ -3628,7 +3628,7 @@ static void mcan_receive(struct can_dev_s *dev, uint32_t *rxbuffer,
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; hdr.ch_error = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
if ((regval & BUFFER_R0_RTR) != 0) if ((regval & BUFFER_R0_RTR) != 0)
{ {

6
arch/arm/src/samv7/sam_mcan.c
View File

@ -3483,7 +3483,7 @@ static void mcan_error(struct can_dev_s *dev, uint32_t status)
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
hdr.ch_extid = 0; hdr.ch_extid = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* And provide the error report to the upper half logic */ /* And provide the error report to the upper half logic */
@ -3535,9 +3535,9 @@ static void mcan_receive(struct can_dev_s *dev, uint32_t *rxbuffer,
reginfo("R0: %08" PRIx32 "\n", regval); reginfo("R0: %08" PRIx32 "\n", regval);
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; hdr.ch_error = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
if ((regval & BUFFER_R0_RTR) != 0) if ((regval & BUFFER_R0_RTR) != 0)
{ {

4
arch/arm/src/stm32/stm32_can.c
View File

@ -1581,7 +1581,7 @@ static int stm32can_rxinterrupt(struct can_dev_s *dev, int rxmb)
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; /* Error reporting not supported */ hdr.ch_error = 0; /* Error reporting not supported */
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* Extract the RTR bit */ /* Extract the RTR bit */
@ -1890,7 +1890,7 @@ static int stm32can_sceinterrupt(int irq, void *context, void *arg)
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
hdr.ch_extid = 0; hdr.ch_extid = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* And provide the error report to the upper half logic */ /* And provide the error report to the upper half logic */

4
arch/arm/src/stm32/stm32_fdcan.c
View File

@ -2801,7 +2801,7 @@ static void fdcan_error(struct can_dev_s *dev, uint32_t status)
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
hdr.ch_extid = 0; hdr.ch_extid = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* And provide the error report to the upper half logic */ /* And provide the error report to the upper half logic */
@ -2846,7 +2846,7 @@ static void fdcan_receive(struct can_dev_s *dev,
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; hdr.ch_error = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* Extract the RTR bit */ /* Extract the RTR bit */

2
arch/arm/src/stm32f7/stm32_can.c
View File

@ -1518,7 +1518,7 @@ static int stm32can_rxinterrupt(struct can_dev_s *dev, int rxmb)
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; /* Error reporting not supported */ hdr.ch_error = 0; /* Error reporting not supported */
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* Extract the RTR bit */ /* Extract the RTR bit */

2
arch/arm/src/stm32l4/stm32l4_can.c
View File

@ -1445,7 +1445,7 @@ static int stm32l4can_rxinterrupt(int irq, void *context, int rxmb)
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; /* Error reporting not supported */ hdr.ch_error = 0; /* Error reporting not supported */
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* Extract the RTR bit */ /* Extract the RTR bit */

11
drivers/can/Kconfig
View File

@ -59,6 +59,17 @@ config CAN_NPENDINGRTR
---help--- ---help---
The size of the list of pending RTR requests. Default: 4 The size of the list of pending RTR requests. Default: 4
config CAN_TXCONFIRM
bool "can txconfirm ability"
default n
---help---
this section enables the can txconfirm ability.
Enabling this feature adds support for the can txconfirm
ability, the ability is used from CAN interrupt handler
when the transfer is complete, the ability will notify all
readers that the canid has been transferred.
config CAN_TXREADY config CAN_TXREADY
bool "can_txready interface" bool "can_txready interface"
default n default n

13
drivers/can/can.c
View File

@ -408,7 +408,7 @@ static ssize_t can_read(FAR struct file *filep, FAR char *buffer,
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
msg->cm_hdr.ch_extid = 0; msg->cm_hdr.ch_extid = 0;
#endif #endif
msg->cm_hdr.ch_unused = 0; msg->cm_hdr.ch_tcf = 0;
memset(&(msg->cm_data), 0, CAN_ERROR_DLC); memset(&(msg->cm_data), 0, CAN_ERROR_DLC);
msg->cm_data[5] = fifo->rx_error; msg->cm_data[5] = fifo->rx_error;
@ -1219,7 +1219,11 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr,
memcpy(&waitmsg->cm_hdr, hdr, sizeof(struct can_hdr_s)); memcpy(&waitmsg->cm_hdr, hdr, sizeof(struct can_hdr_s));
nbytes = can_dlc2bytes(hdr->ch_dlc); nbytes = can_dlc2bytes(hdr->ch_dlc);
memcpy(waitmsg->cm_data, data, nbytes); if (nbytes)
{
memcpy(waitmsg->cm_data, data, nbytes);
}
dev->cd_npendrtr--; dev->cd_npendrtr--;
/* Restart the waiting thread and mark the entry unused */ /* Restart the waiting thread and mark the entry unused */
@ -1260,7 +1264,10 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr,
sizeof(struct can_hdr_s)); sizeof(struct can_hdr_s));
nbytes = can_dlc2bytes(hdr->ch_dlc); nbytes = can_dlc2bytes(hdr->ch_dlc);
memcpy(fifo->rx_buffer[fifo->rx_tail].cm_data, data, nbytes); if (nbytes)
{
memcpy(fifo->rx_buffer[fifo->rx_tail].cm_data, data, nbytes);
}
/* Increment the tail of the circular buffer */ /* Increment the tail of the circular buffer */

4
drivers/can/mcp2515.c
View File

@ -2031,7 +2031,7 @@ static void mcp2515_error(FAR struct can_dev_s *dev, uint8_t status,
#ifdef CONFIG_CAN_EXTID #ifdef CONFIG_CAN_EXTID
hdr.ch_extid = 0; hdr.ch_extid = 0;
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* And provide the error report to the upper half logic */ /* And provide the error report to the upper half logic */
@ -2141,7 +2141,7 @@ static void mcp2515_receive(FAR struct can_dev_s *dev, uint8_t offset)
#ifdef CONFIG_CAN_ERRORS #ifdef CONFIG_CAN_ERRORS
hdr.ch_error = 0; /* Error reporting not supported */ hdr.ch_error = 0; /* Error reporting not supported */
#endif #endif
hdr.ch_unused = 0; hdr.ch_tcf = 0;
/* Extract the RTR bit */ /* Extract the RTR bit */

4
include/nuttx/can/can.h
View File

@ -589,7 +589,7 @@ begin_packed_struct struct can_hdr_s
uint8_t ch_brs : 1; /* Bit Rate Switch */ uint8_t ch_brs : 1; /* Bit Rate Switch */
uint8_t ch_esi : 1; /* Error State Indicator */ uint8_t ch_esi : 1; /* Error State Indicator */
#endif #endif
uint8_t ch_unused : 1; /* FIXME: This field is useless, kept for backward compatibility */ uint8_t ch_tcf : 1; /* Tx confirmation flag */
} end_packed_struct; } end_packed_struct;
#else #else
@ -606,7 +606,7 @@ begin_packed_struct struct can_hdr_s
uint8_t ch_brs : 1; /* Bit Rate Switch */ uint8_t ch_brs : 1; /* Bit Rate Switch */
uint8_t ch_esi : 1; /* Error State Indicator */ uint8_t ch_esi : 1; /* Error State Indicator */
#endif #endif
uint8_t ch_unused : 1; /* FIXME: This field is useless, kept for backward compatibility */ uint8_t ch_tcf : 1; /* Tx confirmation flag */
} end_packed_struct; } end_packed_struct;
#endif #endif