From 9ff7afe86b5882881abae50bef6bb7649bdf8600 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 10 Dec 2005 02:35:10 +0000 Subject: [PATCH] remove unused Reset --- stepmania/src/MemoryCardManager.cpp | 18 ------------------ .../src/arch/MemoryCard/MemoryCardDriver.h | 1 - .../MemoryCardDriverThreaded_Linux.cpp | 4 ---- .../MemoryCardDriverThreaded_Linux.h | 1 - .../MemoryCardDriverThreaded_Windows.cpp | 5 ----- .../MemoryCardDriverThreaded_Windows.h | 1 - 6 files changed, 30 deletions(-) diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index bb37d1f9c1..7d89b6fa7e 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -84,7 +84,6 @@ public: bool Mount( const UsbStorageDevice *pDevice ); bool Unmount( const UsbStorageDevice *pDevice ); bool Flush( const UsbStorageDevice *pDevice ); - void Reset(); /* This function will not time out. */ bool StorageDevicesChanged( vector &aOut ); @@ -116,7 +115,6 @@ private: REQ_MOUNT, REQ_UNMOUNT, REQ_FLUSH, - REQ_RESET }; }; @@ -191,9 +189,6 @@ void ThreadedMemoryCardWorker::HandleRequest( int iRequest ) case REQ_FLUSH: m_pDriver->Flush( &m_RequestDevice ); break; - case REQ_RESET: - m_pDriver->Reset(); - break; } } @@ -272,17 +267,6 @@ bool ThreadedMemoryCardWorker::Flush( const UsbStorageDevice *pDevice ) 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; MemoryCardManager::MemoryCardManager() @@ -675,8 +659,6 @@ void MemoryCardManager::FlushAndReset() continue; // skip g_pWorker->Flush( &m_Device[p] ); } - - g_pWorker->Reset(); // forces cards to be re-detected */ } diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h index e7b28cbd74..92e153b75e 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h @@ -80,7 +80,6 @@ public: virtual bool Mount( UsbStorageDevice* pDevice ) = 0; virtual void Unmount( UsbStorageDevice* pDevice ) = 0; virtual void Flush( UsbStorageDevice* pDevice ) = 0; - virtual void Reset() { } /* Poll for memory card changes. If anything has changed, fill in vStorageDevicesOut * and return true. */ diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp index b0a2656219..84babdcad5 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp @@ -44,10 +44,6 @@ static bool ExecuteCommand( CCStringRef sCommand ) return ret == 0; } -void MemoryCardDriverThreaded_Linux::Reset() -{ -} - static bool ReadFile( const CString &sPath, CString &sBuf ) { sBuf.clear(); diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h index 32e583a13d..185cfd00d8 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h @@ -10,7 +10,6 @@ public: virtual bool Mount( UsbStorageDevice* pDevice ); virtual void Unmount( UsbStorageDevice* pDevice ); virtual void Flush( UsbStorageDevice* pDevice ); - virtual void Reset(); protected: void GetUSBStorageDevices( vector& vDevicesOut ); diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp index 3dcfbf9102..cc125f3531 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp @@ -49,11 +49,6 @@ bool MemoryCardDriverThreaded_Windows::TestWrite( UsbStorageDevice* pDevice ) return true; } -void MemoryCardDriverThreaded_Windows::Reset() -{ - m_dwLastLogicalDrives = 0; -} - static bool IsFloppyDrive( char c ) { char szBuf[1024]; diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h index c45aeec5dc..7cf618a214 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h @@ -13,7 +13,6 @@ public: virtual bool Mount( UsbStorageDevice* pDevice ); virtual void Unmount( UsbStorageDevice* pDevice ); virtual void Flush( UsbStorageDevice* pDevice ); - virtual void Reset(); private: void GetUSBStorageDevices( vector& vDevicesOut );