From 85313caf7c1fb6be5eb2c0cd4e9d7cfb61f2ce9c Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 22 Apr 2005 05:15:59 +0000
Subject: [PATCH] UsbStorageDevice::STATE_WRITE_ERROR ->
 UsbStorageDevice::STATE_ERROR

---
 stepmania/src/MemoryCardManager.cpp                           | 2 +-
 stepmania/src/arch/MemoryCard/MemoryCardDriver.h              | 2 +-
 .../src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp    | 4 ++--
 .../src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp
index fd8f7fd385..924dd83487 100644
--- a/stepmania/src/MemoryCardManager.cpp
+++ b/stepmania/src/MemoryCardManager.cpp
@@ -456,7 +456,7 @@ void MemoryCardManager::CheckStateChanges()
 				state = MEMORY_CARD_STATE_CHECKING;
 				break;
 
-			case UsbStorageDevice::STATE_WRITE_ERROR:
+			case UsbStorageDevice::STATE_ERROR:
 				state = MEMORY_CARD_STATE_ERROR;
 				break;
 
diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h
index 909fce0b05..17a2bf3b4a 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h
@@ -43,7 +43,7 @@ struct UsbStorageDevice
 
 		/* We can't write to the device; it may be write-protected, use a filesystem
 		 * that we don't understand, unformatted, etc. */
-		STATE_WRITE_ERROR,
+		STATE_ERROR,
 
 		/* The device is ready and usable.  sName is filled in, if available. */
 		STATE_READY,
diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
index 8c26102b1c..9e32c94788 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
@@ -243,9 +243,9 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
 				ExecuteCommand( sCommand );
 			}
 			else
-				d.m_State = UsbStorageDevice::STATE_WRITE_ERROR;
+				d.m_State = UsbStorageDevice::STATE_ERROR;
 
-			LOG->Trace( "WriteTest: %s, Name: %s", d.m_State == UsbStorageDevice::STATE_WRITE_ERROR? "failed":"succeeded", d.sName.c_str() );
+			LOG->Trace( "WriteTest: %s, Name: %s", d.m_State == UsbStorageDevice::STATE_ERROR? "failed":"succeeded", d.sName.c_str() );
 		}
 	}
 	
diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
index 1cb9156037..06d157a387 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
@@ -89,7 +89,7 @@ bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStora
 
 			UsbStorageDevice usbd;
 			usbd.SetOsMountDir( sDrive );
-			usbd.m_State = TestWrite( sDrive )? UsbStorageDevice::STATE_READY:UsbStorageDevice::STATE_WRITE_ERROR;
+			usbd.m_State = TestWrite( sDrive )? UsbStorageDevice::STATE_READY:UsbStorageDevice::STATE_ERROR;
 
 			// read name
 			this->Mount( &usbd );