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

break out MemoryCardDriverThreaded_Windows::GetUSBStorageDevices

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-10 01:24:11 +00:00
parent 908e60fc0a
commit e94119a957
2 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
+63 -66
View File
@@ -75,6 +75,68 @@ static bool IsFloppyDrive( char c )
return false; return false;
} }
void MemoryCardDriverThreaded_Windows::GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
{
const int MAX_DRIVES = 26;
CString sDrives;
for( int i=0; i<MAX_DRIVES; ++i )
{
DWORD mask = (1 << i);
if( !(m_dwLastLogicalDrives & mask) )
continue; // drive letter is invalid
if( IsFloppyDrive(i+'a') )
continue;
CString sDrive = ssprintf( "%c:\\", 'a'+i%26 );
if( GetDriveType(sDrive) != DRIVE_REMOVABLE ) // is a removable drive
continue;
if( !sDrives.empty() )
sDrives += ", ";
sDrives += sDrive;
CString sVolumeLabel;
if( !TestReady(sDrive, sVolumeLabel) )
continue;
vDevicesOut.push_back( UsbStorageDevice() );
UsbStorageDevice &usbd = vDevicesOut.back();
usbd.SetOsMountDir( sDrive );
usbd.sVolumeLabel = sVolumeLabel;
if( TestWrite(sDrive) )
usbd.m_State = UsbStorageDevice::STATE_READY;
else
usbd.SetError( "MountFailed" );
// find volume size
DWORD dwSectorsPerCluster;
DWORD dwBytesPerSector;
DWORD dwNumberOfFreeClusters;
DWORD dwTotalNumberOfClusters;
if( GetDiskFreeSpace(
sDrive,
&dwSectorsPerCluster,
&dwBytesPerSector,
&dwNumberOfFreeClusters,
&dwTotalNumberOfClusters ) )
{
usbd.iVolumeSizeMB = (int)roundf( dwTotalNumberOfClusters * (float)dwSectorsPerCluster * dwBytesPerSector / (1024*1024) );
}
// read name
this->Mount( &usbd );
FILEMAN->Mount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL );
FILEMAN->Mount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT );
usbd.bIsNameAvailable = PROFILEMAN->FastLoadProfileNameFromMemoryCard( TEMP_MOUNT_POINT, usbd.sName );
FILEMAN->Unmount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT );
FILEMAN->Unmount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL );
}
LOG->Trace( "Found drives: %s", sDrives.c_str() );
}
bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStorageDevice>& vStorageDevicesOut ) bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStorageDevice>& vStorageDevicesOut )
{ {
DWORD dwNewLogicalDrives = ::GetLogicalDrives(); DWORD dwNewLogicalDrives = ::GetLogicalDrives();
@@ -86,73 +148,8 @@ bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStora
m_dwLastLogicalDrives = dwNewLogicalDrives; m_dwLastLogicalDrives = dwNewLogicalDrives;
{ GetUSBStorageDevices( vStorageDevicesOut );
vector<UsbStorageDevice> vNewStorageDevices;
const int MAX_DRIVES = 26;
CString sDrives;
for( int i=0; i<MAX_DRIVES; ++i )
{
DWORD mask = (1 << i);
if( !(dwNewLogicalDrives & mask) )
continue; // drive letter is invalid
if( IsFloppyDrive(i+'a') )
continue;
CString sDrive = ssprintf( "%c:\\", 'a'+i%26 );
if( GetDriveType(sDrive) != DRIVE_REMOVABLE ) // is a removable drive
continue;
if( !sDrives.empty() )
sDrives += ", ";
sDrives += sDrive;
CString sVolumeLabel;
if( !TestReady(sDrive, sVolumeLabel) )
continue;
vNewStorageDevices.push_back( UsbStorageDevice() );
UsbStorageDevice &usbd = vNewStorageDevices.back();
usbd.SetOsMountDir( sDrive );
usbd.sVolumeLabel = sVolumeLabel;
if( TestWrite(sDrive) )
usbd.m_State = UsbStorageDevice::STATE_READY;
else
usbd.SetError( "MountFailed" );
// find volume size
DWORD dwSectorsPerCluster;
DWORD dwBytesPerSector;
DWORD dwNumberOfFreeClusters;
DWORD dwTotalNumberOfClusters;
if( GetDiskFreeSpace(
sDrive,
&dwSectorsPerCluster,
&dwBytesPerSector,
&dwNumberOfFreeClusters,
&dwTotalNumberOfClusters ) )
{
usbd.iVolumeSizeMB = (int)roundf( dwTotalNumberOfClusters * (float)dwSectorsPerCluster * dwBytesPerSector / (1024*1024) );
}
// read name
this->Mount( &usbd );
FILEMAN->Mount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL );
FILEMAN->Mount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT );
usbd.bIsNameAvailable = PROFILEMAN->FastLoadProfileNameFromMemoryCard( TEMP_MOUNT_POINT, usbd.sName );
FILEMAN->Unmount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT );
FILEMAN->Unmount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL );
}
CHECKPOINT;
vStorageDevicesOut = vNewStorageDevices;
CHECKPOINT;
LOG->Trace( "Found drives: %s", sDrives.c_str() );
}
return true; return true;
} }
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h
+2
View File
@@ -17,6 +17,8 @@ public:
virtual void Reset(); virtual void Reset();
private: private:
void GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut );
DWORD m_dwLastLogicalDrives; DWORD m_dwLastLogicalDrives;
}; };