Skip to content

SDMMC - Peripheral manager implementation #8289

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 5, 2023
Merged

SDMMC - Peripheral manager implementation #8289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8521812
sdmmc periman implemented
P-R-O-C-H-Y Jun 5, 2023
3b77fe0
save pins when SOC_SDMMC_USE_IOMUX
P-R-O-C-H-Y Jun 5, 2023
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
Next Next commit
sdmmc periman implemented
  • Loading branch information
@P-R-O-C-H-Y
P-R-O-C-H-Y committed Jun 5, 2023
commit 852181250cf0c7ae5ee0ed70744982fc21655203
47 changes: 45 additions & 2 deletions libraries/SD_MMC/src/SD_MMC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
#include "sdmmc_cmd.h"
#include "soc/sdmmc_pins.h"
#include "ff.h"
#include "esp32-hal-periman.h"

using namespace fs;


SDMMCFS::SDMMCFS(FSImplPtr impl)
: FS(impl), _card(nullptr)
{
Expand All @@ -43,6 +43,14 @@ SDMMCFS::SDMMCFS(FSImplPtr impl)
#endif // defined(SOC_SDMMC_USE_GPIO_MATRIX) && defined(BOARD_HAS_SDMMC)
}

bool SDMMCFS::sdmmcDetachBus(void * bus_pointer){
SDMMCFS *bus = (SDMMCFS *) bus_pointer;
if(bus->_card) {
bus->end();
}
return true;
}

bool SDMMCFS::setPins(int clk, int cmd, int d0)
{
return setPins(clk, cmd, d0, GPIO_NUM_NC, GPIO_NUM_NC, GPIO_NUM_NC);
Expand Down Expand Up @@ -89,17 +97,28 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit, bool format_if_mount
if(_card) {
return true;
}
perimanSetBusDeinit(ESP32_BUS_TYPE_SDMMC, SDMMCFS::sdmmcDetachBus);

//mount
sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
#ifdef SOC_SDMMC_USE_GPIO_MATRIX
// SoC supports SDMMC pin configuration via GPIO matrix.
// Chech that the pins have been set either in the constructor or setPins function.
// Check that the pins have been set either in the constructor or setPins function.
if (_pin_cmd == -1 || _pin_clk == -1 || _pin_d0 == -1
|| (!mode1bit && (_pin_d1 == -1 || _pin_d2 == -1 || _pin_d3 == -1))) {
log_e("SDMMCFS: some SD pins are not set");
return false;
}

if(!perimanSetPinBus(_pin_cmd, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(_pin_clk, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(_pin_d0, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!mode1bit) {
if(!perimanSetPinBus(_pin_d1, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(_pin_d2, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(_pin_d3, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
}

slot_config.clk = (gpio_num_t) _pin_clk;
slot_config.cmd = (gpio_num_t) _pin_cmd;
slot_config.d0 = (gpio_num_t) _pin_d0;
Expand All @@ -115,6 +134,8 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit, bool format_if_mount
#ifdef BOARD_HAS_1BIT_SDMMC
mode1bit = true;
#endif
_mode1bit = mode1bit;

if(mode1bit) {
host.flags = SDMMC_HOST_FLAG_1BIT; //use 1-line SD mode
slot_config.width = 1;
Expand Down Expand Up @@ -142,7 +163,21 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit, bool format_if_mount
return false;
}
_impl->mountpoint(mountpoint);

if(!perimanSetPinBus(_pin_cmd, ESP32_BUS_TYPE_SDMMC, (void *)(this))){ goto err; }
if(!perimanSetPinBus(_pin_clk, ESP32_BUS_TYPE_SDMMC, (void *)(this))){ goto err; }
if(!perimanSetPinBus(_pin_d0, ESP32_BUS_TYPE_SDMMC, (void *)(this))){ goto err; }
if(!mode1bit) {
if(!perimanSetPinBus(_pin_d1, ESP32_BUS_TYPE_SDMMC, (void *)(this))){ goto err; }
if(!perimanSetPinBus(_pin_d2, ESP32_BUS_TYPE_SDMMC, (void *)(this))){ goto err; }
if(!perimanSetPinBus(_pin_d3, ESP32_BUS_TYPE_SDMMC, (void *)(this))){ goto err; }
}
return true;

err:
log_e("Failed to set all pins bus to SDMMC");
SDMMCFS::sdmmcDetachBus((void *)(this));
return false;
}

void SDMMCFS::end()
Expand All @@ -151,6 +186,14 @@ void SDMMCFS::end()
esp_vfs_fat_sdcard_unmount(_impl->mountpoint(), _card);
_impl->mountpoint(NULL);
_card = NULL;
perimanSetPinBus(_pin_cmd, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(_pin_clk, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(_pin_d0, ESP32_BUS_TYPE_INIT, NULL);
if(!_mode1bit) {
perimanSetPinBus(_pin_d1, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(_pin_d2, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(_pin_d3, ESP32_BUS_TYPE_INIT, NULL);
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions libraries/SD_MMC/src/SD_MMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class SDMMCFS : public FS
int8_t _pin_d2 = -1;
int8_t _pin_d3 = -1;
#endif
bool _mode1bit = false;

public:
SDMMCFS(FSImplPtr impl);
Expand All @@ -56,6 +57,9 @@ class SDMMCFS : public FS
uint64_t cardSize();
uint64_t totalBytes();
uint64_t usedBytes();

private:
static bool sdmmcDetachBus(void * bus_pointer);
};

}
Expand Down