diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index 924dd83487..31f6495471 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -393,8 +393,8 @@ void MemoryCardManager::Update( float fDelta ) PREFSMAN->m_iMemoryCardUsbLevel[p] != d->iLevel ) continue; // not a match - LOG->Trace( "Player %i: device match: iScsiIndex: %d, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s", - p+1, d->iScsiIndex, d->iBus, d->iLevel, d->iPort, d->sOsMountDir.c_str() ); + LOG->Trace( "Player %i: device match: sDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s", + p+1, d->sDevice.c_str(), d->iBus, d->iLevel, d->iPort, d->sOsMountDir.c_str() ); assigned_device = *d; // save a copy vUnassignedDevices.erase( d ); // remove the device so we don't match it for another player diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h index 17a2bf3b4a..85e67307cb 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriver.h +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriver.h @@ -11,7 +11,6 @@ struct UsbStorageDevice iBus = -1; iPort = -1; iLevel = -1; - iScsiIndex = -1; sDevice = ""; sSerial = ""; // be different than a card with no serial sOsMountDir = ""; @@ -27,7 +26,6 @@ struct UsbStorageDevice int iPort; int iLevel; CString sSerial; - int iScsiIndex; CString sDevice; CString sOsMountDir; // WITHOUT trailing slash enum State diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp index 9e32c94788..4765622e18 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp @@ -464,8 +464,8 @@ void GetNewStorageDevices( vector& vDevicesOut ) { usbd.sOsMountDir = sMountPoint; - LOG->Trace( "iScsiIndex: %d, 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() ); + LOG->Trace( "sDevice: %s, iBus: %d, iLevel: %d, iPort: %d, sOsMountDir: %s", + usbd.sDevice.c_str(), usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sOsMountDir.c_str() ); break; // stop looking for a match }