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 2022/12/20 22:49:18 UTC
[nuttx] branch master updated: Update sam_mcan.c
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/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new bc9b476d55 Update sam_mcan.c
bc9b476d55 is described below
commit bc9b476d559f6e688a5e3cae531800fd519db1d2
Author: TimJTi <56...@users.noreply.github.com>
AuthorDate: Tue Dec 20 20:00:00 2022 +0000
Update sam_mcan.c
---
arch/arm/src/samv7/sam_mcan.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index a724dd7aca..567945447c 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -1079,7 +1079,7 @@ static const struct sam_config_s g_mcan0const =
static struct sam_mcan_s g_mcan0priv =
{
- .config = &g_mcan1const,
+ .config = &g_mcan0const,
.lock = NXMUTEX_INITIALIZER,
.txfsem = SEM_INITIALIZER(CONFIG_SAMV7_MCAN0_TXFIFOQ_SIZE),
};
@@ -1157,7 +1157,7 @@ static const struct sam_config_s g_mcan1const =
#ifdef CONFIG_SAMV7_MCAN1_LOOPBACK
.loopback = true,
#endif
- /* MCAN0 Message RAM */
+ /* MCAN1 Message RAM */
.msgram =
{
@@ -1172,13 +1172,13 @@ static const struct sam_config_s g_mcan1const =
}
};
-/* MCAN0 variable driver state */
+/* MCAN1 variable driver state */
static struct sam_mcan_s g_mcan1priv =
{
.config = &g_mcan1const,
.lock = NXMUTEX_INITIALIZER,
- .txfsem = SEM_INITIALIZER(CONFIG_SAMV7_MCAN0_TXFIFOQ_SIZE),
+ .txfsem = SEM_INITIALIZER(CONFIG_SAMV7_MCAN1_TXFIFOQ_SIZE),
};
static struct can_dev_s g_mcan1dev =