remove unused Reset
This commit is contained in:
@@ -84,7 +84,6 @@ public:
|
|||||||
bool Mount( const UsbStorageDevice *pDevice );
|
bool Mount( const UsbStorageDevice *pDevice );
|
||||||
bool Unmount( const UsbStorageDevice *pDevice );
|
bool Unmount( const UsbStorageDevice *pDevice );
|
||||||
bool Flush( const UsbStorageDevice *pDevice );
|
bool Flush( const UsbStorageDevice *pDevice );
|
||||||
void Reset();
|
|
||||||
|
|
||||||
/* This function will not time out. */
|
/* This function will not time out. */
|
||||||
bool StorageDevicesChanged( vector<UsbStorageDevice> &aOut );
|
bool StorageDevicesChanged( vector<UsbStorageDevice> &aOut );
|
||||||
@@ -116,7 +115,6 @@ private:
|
|||||||
REQ_MOUNT,
|
REQ_MOUNT,
|
||||||
REQ_UNMOUNT,
|
REQ_UNMOUNT,
|
||||||
REQ_FLUSH,
|
REQ_FLUSH,
|
||||||
REQ_RESET
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -191,9 +189,6 @@ void ThreadedMemoryCardWorker::HandleRequest( int iRequest )
|
|||||||
case REQ_FLUSH:
|
case REQ_FLUSH:
|
||||||
m_pDriver->Flush( &m_RequestDevice );
|
m_pDriver->Flush( &m_RequestDevice );
|
||||||
break;
|
break;
|
||||||
case REQ_RESET:
|
|
||||||
m_pDriver->Reset();
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,17 +267,6 @@ bool ThreadedMemoryCardWorker::Flush( const UsbStorageDevice *pDevice )
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ThreadedMemoryCardWorker::Reset()
|
|
||||||
{
|
|
||||||
ASSERT( TimeoutEnabled() );
|
|
||||||
|
|
||||||
/* If we're currently in a timed-out state, fail. */
|
|
||||||
if( IsTimedOut() )
|
|
||||||
return;
|
|
||||||
|
|
||||||
DoRequest( REQ_RESET );
|
|
||||||
}
|
|
||||||
|
|
||||||
static ThreadedMemoryCardWorker *g_pWorker = NULL;
|
static ThreadedMemoryCardWorker *g_pWorker = NULL;
|
||||||
|
|
||||||
MemoryCardManager::MemoryCardManager()
|
MemoryCardManager::MemoryCardManager()
|
||||||
@@ -675,8 +659,6 @@ void MemoryCardManager::FlushAndReset()
|
|||||||
continue; // skip
|
continue; // skip
|
||||||
g_pWorker->Flush( &m_Device[p] );
|
g_pWorker->Flush( &m_Device[p] );
|
||||||
}
|
}
|
||||||
|
|
||||||
g_pWorker->Reset(); // forces cards to be re-detected
|
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ public:
|
|||||||
virtual bool Mount( UsbStorageDevice* pDevice ) = 0;
|
virtual bool Mount( UsbStorageDevice* pDevice ) = 0;
|
||||||
virtual void Unmount( UsbStorageDevice* pDevice ) = 0;
|
virtual void Unmount( UsbStorageDevice* pDevice ) = 0;
|
||||||
virtual void Flush( UsbStorageDevice* pDevice ) = 0;
|
virtual void Flush( UsbStorageDevice* pDevice ) = 0;
|
||||||
virtual void Reset() { }
|
|
||||||
|
|
||||||
/* Poll for memory card changes. If anything has changed, fill in vStorageDevicesOut
|
/* Poll for memory card changes. If anything has changed, fill in vStorageDevicesOut
|
||||||
* and return true. */
|
* and return true. */
|
||||||
|
|||||||
@@ -44,10 +44,6 @@ static bool ExecuteCommand( CCStringRef sCommand )
|
|||||||
return ret == 0;
|
return ret == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryCardDriverThreaded_Linux::Reset()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool ReadFile( const CString &sPath, CString &sBuf )
|
static bool ReadFile( const CString &sPath, CString &sBuf )
|
||||||
{
|
{
|
||||||
sBuf.clear();
|
sBuf.clear();
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ public:
|
|||||||
virtual bool Mount( UsbStorageDevice* pDevice );
|
virtual bool Mount( UsbStorageDevice* pDevice );
|
||||||
virtual void Unmount( UsbStorageDevice* pDevice );
|
virtual void Unmount( UsbStorageDevice* pDevice );
|
||||||
virtual void Flush( UsbStorageDevice* pDevice );
|
virtual void Flush( UsbStorageDevice* pDevice );
|
||||||
virtual void Reset();
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut );
|
void GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut );
|
||||||
|
|||||||
@@ -49,11 +49,6 @@ bool MemoryCardDriverThreaded_Windows::TestWrite( UsbStorageDevice* pDevice )
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryCardDriverThreaded_Windows::Reset()
|
|
||||||
{
|
|
||||||
m_dwLastLogicalDrives = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool IsFloppyDrive( char c )
|
static bool IsFloppyDrive( char c )
|
||||||
{
|
{
|
||||||
char szBuf[1024];
|
char szBuf[1024];
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ public:
|
|||||||
virtual bool Mount( UsbStorageDevice* pDevice );
|
virtual bool Mount( UsbStorageDevice* pDevice );
|
||||||
virtual void Unmount( UsbStorageDevice* pDevice );
|
virtual void Unmount( UsbStorageDevice* pDevice );
|
||||||
virtual void Flush( UsbStorageDevice* pDevice );
|
virtual void Flush( UsbStorageDevice* pDevice );
|
||||||
virtual void Reset();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut );
|
void GetUSBStorageDevices( vector<UsbStorageDevice>& vDevicesOut );
|
||||||
|
|||||||
Reference in New Issue
Block a user