Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drivers/mtd_sdcard : Expose Configurations to Kconfig #13932

Merged
merged 2 commits into from
May 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ endmenu # Actuator Device Drivers

rsource "Kconfig.net"

rsource "periph_common/Kconfig"

menu "Sensor Device Drivers"
rsource "ads101x/Kconfig"
rsource "fxos8700/Kconfig"
Expand All @@ -22,6 +24,8 @@ rsource "opt3001/Kconfig"
rsource "sps30/Kconfig"
endmenu # Sensor Device Drivers

rsource "periph_common/Kconfig"
menu "Storage Device Drivers"
rsource "mtd_sdcard/Kconfig"
endmenu # Storage Device Drivers

endmenu # Drivers
15 changes: 8 additions & 7 deletions drivers/include/mtd_sdcard.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,16 @@ typedef struct {
* @{
*/
/**
* @brief Enable Skip SDCard Erase
* @brief Enable SDCard Erase
* @note SDCards handle sector erase internally so it's
* possible to directly write to the card without erasing
* the sector first.
* Attention: an erase call will therefore NOT touch the content,
* so disable this feature to ensure overriding the data.
* possible to directly write to the card without erasing
* the sector first.
* Attention: an erase call will therefore NOT touch the content,
* so enable this feature to ensure overriding the data.
* This feature is currently not supported.
*/
#ifndef MTD_SDCARD_SKIP_ERASE
#define MTD_SDCARD_SKIP_ERASE (1)
#ifdef DOXYGEN
#define CONFIG_MTD_SDCARD_ERASE
#endif
/** @} */

Expand Down
23 changes: 23 additions & 0 deletions drivers/mtd_sdcard/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright (c) 2020 Freie Universitaet Berlin
#
# This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.
#
menuconfig KCONFIG_MODULE_MTD_SDCARD
bool "Configure MTD_SDCARD driver"
depends on MODULE_MTD_SDCARD
help
Configure the MTD_SDCARD driver using Kconfig.

if KCONFIG_MODULE_MTD_SDCARD

config MTD_SDCARD_ERASE
bool "Enable SD card erase"
help
Enable this to erase sector before a data write operation.
SDCards handle sector erase internally so it's
possible to directly write to the card without erasing
the sector first hence this feature is disabled by default.

endif # KCONFIG_MODULE_MTD_SDCARD
12 changes: 7 additions & 5 deletions drivers/mtd_sdcard/mtd_sdcard.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "mtd_sdcard.h"
#include "sdcard_spi.h"
#include "sdcard_spi_internal.h"
#include "kernel_defines.h"

#include <inttypes.h>
#include <errno.h>
Expand Down Expand Up @@ -103,11 +104,12 @@ static int mtd_sdcard_erase(mtd_dev_t *dev,
(void)addr;
(void)size;

#if MTD_SDCARD_SKIP_ERASE == 1
return 0;
#else
return -ENOTSUP; /* explicit erase currently not supported */
#endif
if (!IS_ACTIVE(CONFIG_MTD_SDCARD_ERASE)) {
return 0;
}
else {
return -ENOTSUP; /* explicit erase currently not supported */
}
}

static int mtd_sdcard_power(mtd_dev_t *dev, enum mtd_power_state power)
Expand Down