From 4bde24584225d9ad113134cfdeba7372b293211d Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 6 Dec 2004 23:47:23 +0000
Subject: [PATCH] m_fd isn't used anymore

---
 .../MemoryCard/MemoryCardDriverThreaded_Linux.cpp   | 13 -------------
 .../MemoryCard/MemoryCardDriverThreaded_Linux.h     |  1 -
 2 files changed, 14 deletions(-)

diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
index 9523d18267..fc64498e63 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
@@ -20,7 +20,6 @@
 
 const CString TEMP_MOUNT_POINT = "@mctemp/";
 
-static const char *USB_DEVICE_LIST_FILE = "/proc/bus/usb/devices";
 static const char *ETC_MTAB = "/etc/mtab";
 
 void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut );
@@ -128,18 +127,12 @@ static bool ExecuteCommand( CCStringRef sCommand )
 
 MemoryCardDriverThreaded_Linux::MemoryCardDriverThreaded_Linux()
 {
-	m_fd = open(USB_DEVICE_LIST_FILE, O_RDONLY);
-	if( m_fd == -1 )
-		LOG->Warn( "Failed to open \"%s\": %s", USB_DEVICE_LIST_FILE, strerror(errno) );
-	
 	this->StartThread();
 }
 
 MemoryCardDriverThreaded_Linux::~MemoryCardDriverThreaded_Linux()
 {
 	this->StopThread();
-	if( m_fd != -1 )
-		close( m_fd );
 }
 
 void MemoryCardDriverThreaded_Linux::ResetUsbStorage()
@@ -196,12 +189,6 @@ bool UsbStorageDevicesChanged()
 
 void MemoryCardDriverThreaded_Linux::MountThreadDoOneUpdate()
 {
-	if( m_fd == -1 )
-	{
-		usleep( 50000 );
-		return;
-	}
-	
 	bool bNeedToDoAnyMounts = false;
 	for( unsigned i=0; i<m_vDevicesLastSeen.size(); i++ )
 	{
diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h
index 8fee79e5d1..aa42499920 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.h
@@ -16,7 +16,6 @@ protected:
 	virtual void ResetUsbStorage();
 	virtual void MountThreadDoOneUpdate();
 
-	int m_fd;
 	vector<UsbStorageDevice> m_vDevicesLastSeen;
 };