AxioDL
/
kabufuda
mirror of https://github.com/AxioDL/kabufuda.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add public waitForCompletion method

This commit is contained in:
Jack Andersen 2018-06-16 10:08:13 -10:00
parent 0c012a3776
commit 37461f2165
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/kabufuda/Card.hpp
View File

@ -429,6 +429,11 @@ public:
*/ */
ECardResult getError() const; ECardResult getError() const;
/**
* @brief Block caller until any asynchronous I/O operations have completed
*/
void waitForCompletion() const;
operator bool() const { return getError() == ECardResult::READY; } operator bool() const { return getError() == ECardResult::READY; }
}; };
} }

11
lib/kabufuda/Card.cpp
View File

@ -862,8 +862,11 @@ void Card::format(ECardSlot id, ECardSize size, EEncoding encoding)
if (m_fileHandle) if (m_fileHandle)
{ {
uint32_t blockCount = (uint32_t(size) * MbitToBlocks) - 5;
m_tmpCh = m_ch; m_tmpCh = m_ch;
m_tmpCh._swapEndian(); m_tmpCh._swapEndian();
m_fileHandle.resizeQueue(5 + blockCount);
m_fileHandle.asyncWrite(0, &m_tmpCh, BlockSize, 0); m_fileHandle.asyncWrite(0, &m_tmpCh, BlockSize, 0);
m_tmpDirs[0] = m_dirs[0]; m_tmpDirs[0] = m_dirs[0];
m_tmpDirs[0].swapEndian(); m_tmpDirs[0].swapEndian();
@ -882,7 +885,6 @@ void Card::format(ECardSlot id, ECardSize size, EEncoding encoding)
DummyBlock.reset(new uint8_t[BlockSize]); DummyBlock.reset(new uint8_t[BlockSize]);
memset(DummyBlock.get(), 0xFF, BlockSize); memset(DummyBlock.get(), 0xFF, BlockSize);
} }
uint32_t blockCount = (uint32_t(size) * MbitToBlocks) - 5;
for (uint32_t i=0 ; i<blockCount ; ++i) for (uint32_t i=0 ; i<blockCount ; ++i)
m_fileHandle.asyncWrite(i + 5, DummyBlock.get(), BlockSize, BlockSize * (i + 5)); m_fileHandle.asyncWrite(i + 5, DummyBlock.get(), BlockSize, BlockSize * (i + 5));
m_dirty = false; m_dirty = false;
@ -988,4 +990,11 @@ ECardResult Card::getError() const
return ECardResult::READY; return ECardResult::READY;
} }
void Card::waitForCompletion() const
{
if (!m_fileHandle)
return;
m_fileHandle.waitForCompletion();
}
} }