UsbStorageDevice::STATE_WRITE_ERROR -> UsbStorageDevice::STATE_ERROR
This commit is contained in:
@@ -456,7 +456,7 @@ void MemoryCardManager::CheckStateChanges()
|
||||
state = MEMORY_CARD_STATE_CHECKING;
|
||||
break;
|
||||
|
||||
case UsbStorageDevice::STATE_WRITE_ERROR:
|
||||
case UsbStorageDevice::STATE_ERROR:
|
||||
state = MEMORY_CARD_STATE_ERROR;
|
||||
break;
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ struct UsbStorageDevice
|
||||
|
||||
/* We can't write to the device; it may be write-protected, use a filesystem
|
||||
* that we don't understand, unformatted, etc. */
|
||||
STATE_WRITE_ERROR,
|
||||
STATE_ERROR,
|
||||
|
||||
/* The device is ready and usable. sName is filled in, if available. */
|
||||
STATE_READY,
|
||||
|
||||
@@ -243,9 +243,9 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
|
||||
ExecuteCommand( sCommand );
|
||||
}
|
||||
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() );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -89,7 +89,7 @@ bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStora
|
||||
|
||||
UsbStorageDevice usbd;
|
||||
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
|
||||
this->Mount( &usbd );
|
||||
|
||||
Reference in New Issue
Block a user