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 2021/11/27 19:06:57 UTC
[incubator-nuttx] branch master updated: boards/same70-xplained: fix usage of SAMV71XULT instead of SAME70XPLAINED
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
The following commit(s) were added to refs/heads/master by this push:
new 919aece boards/same70-xplained: fix usage of SAMV71XULT instead of SAME70XPLAINED
919aece is described below
commit 919aeced30b99d0edf58871c8ead7a4b48024f4b
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sat Nov 27 15:55:35 2021 +0200
boards/same70-xplained: fix usage of SAMV71XULT instead of SAME70XPLAINED
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
boards/arm/samv7/same70-xplained/src/sam_automount.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/boards/arm/samv7/same70-xplained/src/sam_automount.c b/boards/arm/samv7/same70-xplained/src/sam_automount.c
index 8ce6d58..ff65f13 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_automount.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_automount.c
@@ -92,17 +92,17 @@ static bool sam_inserted(FAR const struct automount_lower_s *lower);
* Private Data
****************************************************************************/
-#ifdef CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT
+#ifdef CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT
static struct sam_automount_state_s g_hsmci0state;
static const struct sam_automount_config_s g_hsmci0config =
{
.lower =
{
- .fstype = CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT_FSTYPE,
- .blockdev = CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT_BLKDEV,
- .mountpoint = CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT_MOUNTPOINT,
- .ddelay = MSEC2TICK(CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT_DDELAY),
- .udelay = MSEC2TICK(CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT_UDELAY),
+ .fstype = CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT_FSTYPE,
+ .blockdev = CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT_BLKDEV,
+ .mountpoint = CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT_MOUNTPOINT,
+ .ddelay = MSEC2TICK(CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT_DDELAY),
+ .udelay = MSEC2TICK(CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT_UDELAY),
.attach = sam_attach,
.enable = sam_enable,
.inserted = sam_inserted
@@ -256,7 +256,7 @@ void sam_automount_initialize(void)
finfo("Initializing automounter(s)\n");
-#ifdef CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT
+#ifdef CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT
/* Initialize the HSMCI0 auto-mounter */
handle = automount_initialize(&g_hsmci0config.lower);
@@ -298,7 +298,7 @@ void sam_automount_event(int slotno, bool inserted)
FAR const struct sam_automount_config_s *config;
FAR struct sam_automount_state_s *state;
-#ifdef CONFIG_SAMV71XULT_HSMCI0_AUTOMOUNT
+#ifdef CONFIG_SAME70XPLAINED_HSMCI0_AUTOMOUNT
/* Is this a change in the HSMCI0 insertion state? */
if (slotno == HSMCI0_SLOTNO)