nudge closer to Windows driver
This commit is contained in:
@@ -167,9 +167,8 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
|
|||||||
|
|
||||||
vector<UsbStorageDevice> vOld = m_vDevicesLastSeen; // copy
|
vector<UsbStorageDevice> vOld = m_vDevicesLastSeen; // copy
|
||||||
GetUSBStorageDevices( vStorageDevicesOut );
|
GetUSBStorageDevices( vStorageDevicesOut );
|
||||||
vector<UsbStorageDevice> &vNew = vStorageDevicesOut;
|
|
||||||
|
|
||||||
// check for connects
|
// log connects
|
||||||
FOREACH( UsbStorageDevice, vNew, newd )
|
FOREACH( UsbStorageDevice, vNew, newd )
|
||||||
{
|
{
|
||||||
vector<UsbStorageDevice>::iterator iter = find( vOld.begin(), vOld.end(), *newd );
|
vector<UsbStorageDevice>::iterator iter = find( vOld.begin(), vOld.end(), *newd );
|
||||||
@@ -206,8 +205,7 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
|
|||||||
{
|
{
|
||||||
if( !bMount )
|
if( !bMount )
|
||||||
{
|
{
|
||||||
/* We can't check it now. Keep the checking state and check it when
|
/* We can't check it now. Keep STATE_CHECKING, and check it when we can. */
|
||||||
* we can. */
|
|
||||||
d.m_State = UsbStorageDevice::STATE_CHECKING;
|
d.m_State = UsbStorageDevice::STATE_CHECKING;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -240,7 +238,7 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_vDevicesLastSeen = vNew;
|
m_vDevicesLastSeen = vStorageDevicesOut;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user