diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h index 9e25b122f0..727523d59c 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h @@ -81,7 +81,6 @@ public: * before any access to the device, and before TestWrite. */ virtual bool Mount( UsbStorageDevice* pDevice ) = 0; virtual void Unmount( UsbStorageDevice* pDevice ) = 0; - virtual void Flush( UsbStorageDevice* pDevice ) = 0; /* 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 f612b966d4..6e4817f537 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp @@ -308,16 +308,6 @@ void MemoryCardDriverThreaded_Linux::Unmount( UsbStorageDevice* pDevice ) ExecuteCommand( sCommand ); } -void MemoryCardDriverThreaded_Linux::Flush( UsbStorageDevice* pDevice ) -{ - if( pDevice->sDevice.empty() ) - return; - - // "sync" will only flush all file systems at the same time. -Chris - // That's OK. - ExecuteCommand( "sync" ); -} - /* * (c) 2003-2005 Chris Danford, Glenn Maynard * All rights reserved. diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h index 185cfd00d8..9e5a17efa6 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h @@ -9,7 +9,6 @@ public: virtual bool DoOneUpdate( bool bMount, vector& vStorageDevicesOut ); virtual bool Mount( UsbStorageDevice* pDevice ); virtual void Unmount( UsbStorageDevice* pDevice ); - virtual void Flush( UsbStorageDevice* pDevice ); protected: void GetUSBStorageDevices( vector& vDevicesOut ); diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.cpp index 33cee3c60c..6cd0c14ddd 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.cpp @@ -18,7 +18,7 @@ MemoryCardDriverThreaded_OSX::~MemoryCardDriverThreaded_OSX() DarwinMCHelpers::Stop(); } -void MemoryCardDriverThreaded_OSX::Flush( UsbStorageDevice *pDevice ) +void MemoryCardDriverThreaded_OSX::Unmount( UsbStorageDevice *pDevice ) { if( pDevice->iRefNum == -1 ) return; diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.h b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.h index 16c88e3384..be05321089 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_OSX.h @@ -9,8 +9,7 @@ public: MemoryCardDriverThreaded_OSX(); ~MemoryCardDriverThreaded_OSX(); bool Mount( UsbStorageDevice *pDevice ) { return true; } - void Unmount( UsbStorageDevice *pDevice ) { } - void Flush( UsbStorageDevice *pDevice ); + void Unmount( UsbStorageDevice *pDevice ); protected: bool USBStorageDevicesChanged(); diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp index 697fff559d..407dd30cd2 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp @@ -130,13 +130,6 @@ void MemoryCardDriverThreaded_Windows::Unmount( UsbStorageDevice* pDevice ) // nothing to do here... } -void MemoryCardDriverThreaded_Windows::Flush( UsbStorageDevice* pDevice ) -{ - // Do we need anything here? I don't lose data if ejecting - // soon after a write. From the activity LED, it looks like - // Windows flushes automatically every ~2 seconds. -Chris -} - /* * (c) 2003-2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h index 7cf618a214..389dd07b8e 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.h @@ -12,7 +12,6 @@ public: virtual bool Mount( UsbStorageDevice* pDevice ); virtual void Unmount( UsbStorageDevice* pDevice ); - virtual void Flush( UsbStorageDevice* pDevice ); private: void GetUSBStorageDevices( vector& vDevicesOut );