actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix forced redetect of cards

Browse Source
This commit is contained in:
Chris Danford
2004-06-06 18:39:40 +00:00
parent 9d2c6d078a
commit 8eb7550bf4
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+24 -15
View File
@@ -128,9 +128,10 @@ MemoryCardDriverThreaded_Linux::MemoryCardDriverThreaded_Linux()
{ {
m_fd = open(USB_DEVICE_LIST_FILE, O_RDONLY); m_fd = open(USB_DEVICE_LIST_FILE, O_RDONLY);
if( m_fd == -1 ) if( m_fd == -1 )
{
LOG->Warn( "Failed to open \"%s\": %s", USB_DEVICE_LIST_FILE, strerror(errno) ); LOG->Warn( "Failed to open \"%s\": %s", USB_DEVICE_LIST_FILE, strerror(errno) );
}
m_bForceRedetect = false;
this->StartThread(); this->StartThread();
} }
@@ -155,7 +156,8 @@ void MemoryCardDriverThreaded_Linux::MountThreadReset()
ExecuteCommand( "rmmod usb-storage" ); ExecuteCommand( "rmmod usb-storage" );
ExecuteCommand( "modprobe usb-storage" ); ExecuteCommand( "modprobe usb-storage" );
m_vDevicesLastSeen.clear(); // redetect all devices m_vDevicesLastSeen.clear();
m_bForceRedetect = true;
} }
void MemoryCardDriverThreaded_Linux::MountThreadDoOneUpdate() void MemoryCardDriverThreaded_Linux::MountThreadDoOneUpdate()
@@ -163,19 +165,26 @@ void MemoryCardDriverThreaded_Linux::MountThreadDoOneUpdate()
if( m_fd == -1 ) if( m_fd == -1 )
return; return;
pollfd pfd = { m_fd, POLLIN, 0 }; if( m_bForceRedetect )
int ret = poll( &pfd, 1, 100 );
switch( ret )
{ {
case 1: // fall through
// file changed. Fall through. }
break; else
case 0: // no change. Poll again. {
return; pollfd pfd = { m_fd, POLLIN, 0 };
case -1: int ret = poll( &pfd, 1, 100 );
if( errno != EINTR ) switch( ret )
LOG->Warn( "Error polling: %s", strerror(errno) ); {
return; case 1:
// file changed. Fall through.
break;
case 0: // no change. Poll again.
return;
case -1:
if( errno != EINTR )
LOG->Warn( "Error polling: %s", strerror(errno) );
return;
}
} }
// TRICKY: We're waiting for a change in the USB device list, but // TRICKY: We're waiting for a change in the USB device list, but