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

UsbStorageDevice::STATE_WRITE_ERROR -> UsbStorageDevice::STATE_ERROR

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-22 05:15:59 +00:00
parent ef21deb661
commit 85313caf7c
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MemoryCardManager.cpp
+1 -1
View File
@@ -456,7 +456,7 @@ void MemoryCardManager::CheckStateChanges()
state = MEMORY_CARD_STATE_CHECKING; state = MEMORY_CARD_STATE_CHECKING;
break; break;
case UsbStorageDevice::STATE_WRITE_ERROR: case UsbStorageDevice::STATE_ERROR:
state = MEMORY_CARD_STATE_ERROR; state = MEMORY_CARD_STATE_ERROR;
break; break;
stepmania/src/arch/MemoryCard/MemoryCardDriver.h
+1 -1
View File
@@ -43,7 +43,7 @@ struct UsbStorageDevice
/* We can't write to the device; it may be write-protected, use a filesystem /* We can't write to the device; it may be write-protected, use a filesystem
* that we don't understand, unformatted, etc. */ * that we don't understand, unformatted, etc. */
STATE_WRITE_ERROR, STATE_ERROR,
/* The device is ready and usable. sName is filled in, if available. */ /* The device is ready and usable. sName is filled in, if available. */
STATE_READY, STATE_READY,
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+2 -2
View File
@@ -243,9 +243,9 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
ExecuteCommand( sCommand ); ExecuteCommand( sCommand );
} }
else else
d.m_State = UsbStorageDevice::STATE_WRITE_ERROR; d.m_State = UsbStorageDevice::STATE_ERROR;
LOG->Trace( "WriteTest: %s, Name: %s", d.m_State == UsbStorageDevice::STATE_WRITE_ERROR? "failed":"succeeded", d.sName.c_str() ); LOG->Trace( "WriteTest: %s, Name: %s", d.m_State == UsbStorageDevice::STATE_ERROR? "failed":"succeeded", d.sName.c_str() );
} }
} }
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStora
UsbStorageDevice usbd; UsbStorageDevice usbd;
usbd.SetOsMountDir( sDrive ); usbd.SetOsMountDir( sDrive );
usbd.m_State = TestWrite( sDrive )? UsbStorageDevice::STATE_READY:UsbStorageDevice::STATE_WRITE_ERROR; usbd.m_State = TestWrite( sDrive )? UsbStorageDevice::STATE_READY:UsbStorageDevice::STATE_ERROR;
// read name // read name
this->Mount( &usbd ); this->Mount( &usbd );