compile fix

This commit is contained in:
Glenn Maynard
2004-02-27 00:31:06 +00:00
parent fdca2937a0
commit ddc2c030d0
+5 -5
View File
@@ -187,8 +187,8 @@ void MemoryCardManager::AssignUnassignedCards()
{
for( i=0; i<vUnassignedDevices.size(); i++ )
{
UsbStorageDevice &usd = vUnassignedDevices[i];
if( usd.sOsMountDir.CompareNoCase(PREFSMAN->m_sMemoryCardOsMountPoint[p]) == 0 ) // match
UsbStorageDevice &usbd = vUnassignedDevices[i];
if( usbd.sOsMountDir.CompareNoCase(PREFSMAN->m_sMemoryCardOsMountPoint[p]) == 0 ) // match
{
LOG->Trace( "dir match: iUsbStorageIndex: %d, iBus: %d, iDeviceOnBus: %d, iPortOnHub: %d",
usbd.iUsbStorageIndex, usbd.iBus, usbd.iDeviceOnBus, usbd.iPortOnHub );
@@ -200,14 +200,14 @@ void MemoryCardManager::AssignUnassignedCards()
// search for USB bus match
for( i=0; i<vUnassignedDevices.size(); i++ )
{
UsbStorageDevice &usd = vUnassignedDevices[i];
UsbStorageDevice &usbd = vUnassignedDevices[i];
if( PREFSMAN->m_iMemoryCardUsbBus[p] != -1 &&
PREFSMAN->m_iMemoryCardUsbBus[p] != usd.iBus )
PREFSMAN->m_iMemoryCardUsbBus[p] != usbd.iBus )
continue; // not a match
if( PREFSMAN->m_iMemoryCardUsbPort[p] != -1 &&
PREFSMAN->m_iMemoryCardUsbPort[p] != usd.iPortOnHub )
PREFSMAN->m_iMemoryCardUsbPort[p] != usbd.iPortOnHub )
continue; // not a match
LOG->Trace( "bus/port match: iUsbStorageIndex: %d, iBus: %d, iDeviceOnBus: %d, iPortOnHub: %d",