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

sScsiDevice -> sDevice

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-22 03:16:14 +00:00
parent 769bc2636e
commit 0ba49a8f6a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriver.h
+2 -2
View File
@@ -12,7 +12,7 @@ struct UsbStorageDevice
iPort = -1; iPort = -1;
iLevel = -1; iLevel = -1;
iScsiIndex = -1; iScsiIndex = -1;
sScsiDevice = ""; sDevice = "";
sSerial = "<none>"; // be different than a card with no serial sSerial = "<none>"; // be different than a card with no serial
sOsMountDir = ""; sOsMountDir = "";
m_State = STATE_NONE; m_State = STATE_NONE;
@@ -28,7 +28,7 @@ struct UsbStorageDevice
int iLevel; int iLevel;
CString sSerial; CString sSerial;
int iScsiIndex; int iScsiIndex;
CString sScsiDevice; CString sDevice;
CString sOsMountDir; // WITHOUT trailing slash CString sOsMountDir; // WITHOUT trailing slash
enum State enum State
{ {
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+5 -5
View File
@@ -336,7 +336,7 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
continue; continue;
usbd.sScsiDevice = "/dev/" + sDevice; usbd.sDevice = "/dev/" + sDevice;
/* /*
* sPath/device should be a symlink to the actual device. For USB * sPath/device should be a symlink to the actual device. For USB
@@ -456,16 +456,16 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
TrimLeft( sMountPoint ); TrimLeft( sMountPoint );
TrimRight( sMountPoint ); TrimRight( sMountPoint );
// search for the usb-storage device corresponding to the SCSI device // search for the mountpoint corresponding to the device
for( unsigned i=0; i<vDevicesOut.size(); i++ ) for( unsigned i=0; i<vDevicesOut.size(); i++ )
{ {
UsbStorageDevice& usbd = vDevicesOut[i]; UsbStorageDevice& usbd = vDevicesOut[i];
if( usbd.sScsiDevice+"1" == szScsiDevice ) // found our match if( usbd.sDevice+"1" == szScsiDevice ) // found our match
{ {
usbd.sOsMountDir = sMountPoint; usbd.sOsMountDir = sMountPoint;
LOG->Trace( "iScsiIndex: %d, sScsiDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s", LOG->Trace( "iScsiIndex: %d, sDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s",
usbd.iScsiIndex, usbd.sScsiDevice.c_str(), usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sOsMountDir.c_str() ); usbd.iScsiIndex, usbd.sDevice.c_str(), usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sOsMountDir.c_str() );
break; // stop looking for a match break; // stop looking for a match
} }