Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-01 22:53:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

SAMV7 MCAN: Fix receipt of RTR requests. From Frank Benkert

Browse source
This commit is contained in:
Frank Benkert 2015-11-04 08:03:27 -06:00 • committed by Gregory Nutt
parent 1299160d1d
commit 9cbbfe7e59
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
arch/arm/src/samv7/sam_mcan.c
View file

@ -3045,10 +3045,18 @@ static void mcan_receive(FAR struct can_dev_s *dev, FAR uint32_t *rxbuffer,
regval = *rxbuffer++;
canregdbg("R0: %08x\n", regval);
hdr.ch_rtr = 0;
hdr.ch_error = 0;
hdr.ch_unused = 0;
if ((regval & BUFFER_R0_RTR) != 0)
{
hdr.ch_rtr = true;
}
else
{
hdr.ch_rtr = false;
}
#ifdef CONFIG_CAN_EXTID
if ((regval & BUFFER_R0_XTD) != 0)
{
@ -3466,14 +3474,11 @@ static int mcan_hw_initialize(struct sam_mcan_s *priv)
/* Global Filter Configuration:
*
* ANFS=0: Store all rejected extended frame in RX FIFO0
* ANFE=0: Store all rejected extended frame in RX FIFO0
* FFSE=1: Reject all remote frames with 11-bit standard IDs.
* RRFE=1: Reject all remote frames with 29-bit extended IDs.
* ANFS=0: Store all non matching standard frame in RX FIFO0
* ANFE=0: Store all non matching extended frame in RX FIFO0
*/
regval = MCAN_GFC_RRFE | MCAN_GFC_RRFS | MCAN_GFC_ANFE_RX_FIFO0 |
MCAN_GFC_ANFS_RX_FIFO0;
regval = MCAN_GFC_ANFE_RX_FIFO0 | MCAN_GFC_ANFS_RX_FIFO0;
mcan_putreg(priv, SAM_MCAN_GFC_OFFSET, regval);
/* Extended ID Filter AND mask */