adafruit-mirror/SdFat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add m_fatCount to support either 1 or 2 FAT

Browse source
This commit is contained in:
hathach 2019-07-16 12:40:21 +07:00
parent 88902b576e
commit 829f4925f4
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/FatLib/FatVolume.cpp
View file

@ -494,6 +494,7 @@ bool FatVolume::init(uint8_t part) {
DBG_FAIL_MACRO;
goto fail;
}
m_fatCount = fbs->fatCount;
m_blocksPerCluster = fbs->sectorsPerCluster;
m_clusterBlockMask = m_blocksPerCluster - 1;
// determine shift that is same as multiply by m_blocksPerCluster
@ -513,7 +514,7 @@ bool FatVolume::init(uint8_t part) {
m_rootDirEntryCount = fbs->rootDirEntryCount;
// directory start for FAT16 dataStart for FAT32
m_rootDirStart = m_fatStartBlock + fbs->fatCount * m_blocksPerFat;
m_rootDirStart = m_fatStartBlock + m_fatCount * m_blocksPerFat;
// data start for FAT16 and FAT32
m_dataStartBlock = m_rootDirStart + ((32 * fbs->rootDirEntryCount + 511)/512);
@ -577,7 +578,7 @@ bool FatVolume::wipe(print_t* pr) {
}
}
// Clear FATs.
count = fbs->fatCount*m_blocksPerFat;
count = m_fatCount * m_blocksPerFat;
lbn = m_fatStartBlock;
for (uint32_t nb = 0; nb < count; nb++) {
if (pr && (nb & 0XFF) == 0) {
@ -602,7 +603,7 @@ bool FatVolume::wipe(print_t* pr) {
goto fail;
}
if (!writeBlock(m_fatStartBlock, cache->data) ||
(fbs->fatCount == 2 && !writeBlock(m_fatStartBlock + m_blocksPerFat, cache->data))) {
(m_fatCount == 2 && !writeBlock(m_fatStartBlock + m_blocksPerFat, cache->data))) {
DBG_FAIL_MACRO;
goto fail;
}

1
src/FatLib/FatVolume.h
View file

@ -292,6 +292,7 @@ class FatVolume {
uint8_t m_clusterBlockMask; // Mask to extract block of cluster.
uint8_t m_clusterSizeShift; // Cluster count to block count shift.
uint8_t m_fatType; // Volume type (12, 16, OR 32).
uint8_t m_fatCount; // Number of FAT (1 or 2)
uint16_t m_rootDirEntryCount; // Number of entries in FAT16 root dir.
uint32_t m_allocSearchStart; // Start cluster for alloc search.
uint32_t m_blocksPerFat; // FAT size in blocks