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

SAMV7 MCAN: Correct some compile errors when only MCAN1 is enabled

Browse Source
This commit is contained in:
Gregory Nutt 2015-08-05 08:07:25 -06:00
parent 1a93dadf26
commit 92f5bf01c3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/src/samv7/Kconfig
View File

@ -1616,13 +1616,6 @@ config SAMV7_MCAN0_TXBUFFER_64BYTES
endchoice # MCAN0 TX buffer element size
config SAMV7_MCAN0_TXEVENTFIFO_SIZE
int "MCAN0 TX event FIFO size"
default 0
range 0 32
---help---
Number of TX event FIFO elements for MCAN0. Zero disables TX event FIFO.
config SAMV7_MCAN0_DEDICATED_TXBUFFER_SIZE
int "MCAN0 dedicated TX buffer size"
default 0
@ -1634,12 +1627,19 @@ config SAMV7_MCAN0_DEDICATED_TXBUFFER_SIZE
NOTE: Dedicated TX buffers are not used in the current MCAN design.
config SAMV7_MCAN0_TXFIFOQ_SIZE
int "MCAN0 dedicated TX FIFO queue"
int "MCAN0 TX FIFO queue size"
default 4
range 0 32
---help---
Number of dedicated TX buffer elements for MCAN0.
config SAMV7_MCAN0_TXEVENTFIFO_SIZE
int "MCAN0 TX event FIFO size"
default 0
range 0 32
---help---
Number of TX event FIFO elements for MCAN0. Zero disables TX event FIFO.
endmenu # MCAN0 device driver options
menu "MCAN1 device driver options"

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

@ -668,7 +668,7 @@
# define MCAN1_TXEVENTFIFO_WORDS (CONFIG_SAMV7_MCAN1_TXEVENTFIFO_SIZE * 2)
# define MCAN1_TXFIFIOQ_WORDS \
(CONFIG_SAMV7_MCAN1_TXFIFOQ_SIZE * ((MCAN0_TXBUFFER_ELEMENT_SIZE/4) + 2))
(CONFIG_SAMV7_MCAN1_TXFIFOQ_SIZE * ((MCAN1_TXBUFFER_ELEMENT_SIZE/4) + 2))
/* MCAN1 Message RAM */
@ -1069,7 +1069,7 @@ static const struct sam_config_s g_mcan1const =
.nextfilters = CONFIG_SAMV7_MCAN1_NEXTFILTERS,
.nfifo0 = CONFIG_SAMV7_MCAN1_RXFIFO0_SIZE,
.nfifo1 = CONFIG_SAMV7_MCAN1_RXFIFO1_SIZE,
.nrxdedicated = CONFIG_SAMV7_MCAN0_DEDICATED_RXBUFFER_SIZE,
.nrxdedicated = CONFIG_SAMV7_MCAN1_DEDICATED_RXBUFFER_SIZE,
.ntxeventfifo = CONFIG_SAMV7_MCAN1_TXEVENTFIFO_SIZE,
.ntxdedicated = CONFIG_SAMV7_MCAN1_DEDICATED_TXBUFFER_SIZE,
.ntxfifoq = CONFIG_SAMV7_MCAN1_TXFIFOQ_SIZE,
@ -1080,7 +1080,7 @@ static const struct sam_config_s g_mcan1const =
.rxbufferecode = MCAN1_RXBUFFER_ENCODED_SIZE,
.rxbufferesize = (MCAN1_RXBUFFER_ELEMENT_SIZE / 4) + 2,
.txbufferecode = MCAN1_TXBUFFER_ENCODED_SIZE,
.txbufferesize = (MCAN0_TXBUFFER_ELEMENT_SIZE / 4) + 2,
.txbufferesize = (MCAN1_TXBUFFER_ELEMENT_SIZE / 4) + 2,
#ifdef CONFIG_SAMV7_MCAN1_LOOPBACK
.loopback = true,