diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-07-02 00:50:12 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-07-02 00:50:12 +0300 |
| commit | c6e580f7b3fa94e9707a225af50922c8daa8a6cf (patch) | |
| tree | be06ac0a62fbc3c45aeb8137e86c6b7baee4fc69 /src/Storage/MassStorage.cpp | |
| parent | e14f84e930073bd33d6ecc2ebdad9c3147ed6e18 (diff) | |
Consolidation after merge
Reverted some changes to Linux/MessageFormats.h and Linux/BinaryParser.cpp for compatibility with the existing SDF release
Added HAS_MASS_STORAGE definition
Removed lots of mass storage code when HAS_MASS_STORAGE is false
Removed non-RTOS code
Moved SPI channel usage definitions into CoreNG
Added some new CAN message formats (not used by this project yet)
Diffstat (limited to 'src/Storage/MassStorage.cpp')
| -rw-r--r-- | src/Storage/MassStorage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Storage/MassStorage.cpp b/src/Storage/MassStorage.cpp index 59d6fbe5..37bd37c8 100644 --- a/src/Storage/MassStorage.cpp +++ b/src/Storage/MassStorage.cpp @@ -14,6 +14,8 @@ static_assert(FF_MAX_LFN >= MaxFilenameLength, "FF_MAX_LFN too small"); // No function should need to take both the file table mutex and the find buffer mutex. // No function in here should be called when the caller already owns the shared SPI mutex. +#if HAS_MASS_STORAGE + // Static helper functions - not declared as class members to avoid having to include sd_mmc.h everywhere static const char* TranslateCardType(card_type_t ct) { @@ -769,8 +771,6 @@ MassStorage::InfoResult MassStorage::GetCardInfo(size_t slot, uint64_t& capacity return InfoResult::ok; } -#ifdef RTOS - // Functions called by FatFS to acquire/release mutual exclusion extern "C" { |