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

remove iScsiIndex

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-22 05:24:19 +00:00
parent 85313caf7c
commit 0d9b7c943a
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MemoryCardManager.cpp
+2 -2
View File
@@ -393,8 +393,8 @@ void MemoryCardManager::Update( float fDelta )
PREFSMAN->m_iMemoryCardUsbLevel[p] != d->iLevel ) PREFSMAN->m_iMemoryCardUsbLevel[p] != d->iLevel )
continue; // not a match continue; // not a match
LOG->Trace( "Player %i: device match: iScsiIndex: %d, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s", LOG->Trace( "Player %i: device match: sDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s",
p+1, d->iScsiIndex, d->iBus, d->iLevel, d->iPort, d->sOsMountDir.c_str() ); p+1, d->sDevice.c_str(), d->iBus, d->iLevel, d->iPort, d->sOsMountDir.c_str() );
assigned_device = *d; // save a copy assigned_device = *d; // save a copy
vUnassignedDevices.erase( d ); // remove the device so we don't match it for another player vUnassignedDevices.erase( d ); // remove the device so we don't match it for another player
stepmania/src/arch/MemoryCard/MemoryCardDriver.h
-2
View File
@@ -11,7 +11,6 @@ struct UsbStorageDevice
iBus = -1; iBus = -1;
iPort = -1; iPort = -1;
iLevel = -1; iLevel = -1;
iScsiIndex = -1;
sDevice = ""; sDevice = "";
sSerial = "<none>"; // be different than a card with no serial sSerial = "<none>"; // be different than a card with no serial
sOsMountDir = ""; sOsMountDir = "";
@@ -27,7 +26,6 @@ struct UsbStorageDevice
int iPort; int iPort;
int iLevel; int iLevel;
CString sSerial; CString sSerial;
int iScsiIndex;
CString sDevice; CString sDevice;
CString sOsMountDir; // WITHOUT trailing slash CString sOsMountDir; // WITHOUT trailing slash
enum State enum State
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+2 -2
View File
@@ -464,8 +464,8 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
{ {
usbd.sOsMountDir = sMountPoint; usbd.sOsMountDir = sMountPoint;
LOG->Trace( "iScsiIndex: %d, sDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s", LOG->Trace( "sDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s",
usbd.iScsiIndex, usbd.sDevice.c_str(), usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sOsMountDir.c_str() ); 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
} }