actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix first memory card access on startup doesn't time out

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-25 21:07:40 +00:00
parent 348468cfd7
commit 904fd6a316
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MemoryCardManager.cpp
+7
View File
@@ -567,6 +567,7 @@ void MemoryCardManager::UnlockCards()
/* Called just before reading or writing to the memory card. Should block. */ /* Called just before reading or writing to the memory card. Should block. */
void MemoryCardManager::MountCard( PlayerNumber pn ) void MemoryCardManager::MountCard( PlayerNumber pn )
{ {
LOG->Trace( "MemoryCardManager::MountCard(%i)", pn );
if( GetCardState(pn) != MEMORY_CARD_STATE_READY ) if( GetCardState(pn) != MEMORY_CARD_STATE_READY )
return; return;
ASSERT( !m_Device[pn].IsBlank() ); ASSERT( !m_Device[pn].IsBlank() );
@@ -601,6 +602,11 @@ void MemoryCardManager::MountCard( PlayerNumber pn )
{ {
FILEMAN->Mount( "dir", m_Device[pn].sOsMountDir, MEM_CARD_MOUNT_POINT_INTERNAL[pn] ); FILEMAN->Mount( "dir", m_Device[pn].sOsMountDir, MEM_CARD_MOUNT_POINT_INTERNAL[pn] );
FILEMAN->Mount( "timeout", MEM_CARD_MOUNT_POINT_INTERNAL[pn], MEM_CARD_MOUNT_POINT[pn] ); FILEMAN->Mount( "timeout", MEM_CARD_MOUNT_POINT_INTERNAL[pn], MEM_CARD_MOUNT_POINT[pn] );
/* We just created a worker thread. Reset the timeout, or those threads
* won't time out. This is a hack; we should really be creating the timeout
* driver on startup. */
this->PauseMountingThread();
} }
else else
{ {
@@ -615,6 +621,7 @@ void MemoryCardManager::MountCard( PlayerNumber pn )
* reading the profile. Should never block; use FlushAndReset to block until writes complete. */ * reading the profile. Should never block; use FlushAndReset to block until writes complete. */
void MemoryCardManager::UnmountCard( PlayerNumber pn ) void MemoryCardManager::UnmountCard( PlayerNumber pn )
{ {
LOG->Trace( "MemoryCardManager::UnmountCard(%i)", pn );
if ( m_Device[pn].IsBlank() ) if ( m_Device[pn].IsBlank() )
return; return;