Style guide fixes.

Clean-up to match style guide.
dolphin-emu · Feb 14, 2015 · 91913f5 · 91913f5
1 parent 8c55f43
commit 91913f5
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI_DeviceAGP.cpp
@@ -121,7 +121,7 @@ void CEXIAgp::LoadFileToEEPROM(const std::string& filename)
 	else
 	{
 		m_eeprom_size = 0;
-		m_eeprom.resize(0);
+		m_eeprom.clear();
 	}
 
 }
@@ -134,8 +134,7 @@ void CEXIAgp::SaveFileFromEEPROM(const std::string& filename)
 		if ((m_eeprom_size == 512) || (m_eeprom_size == 8192))
 		{
 			// Handle endian write - could be done with byte access in 0xAE commands instead
-			std::vector<u8> temp_eeprom;
-			temp_eeprom.resize(m_eeprom_size);
+			std::vector<u8> temp_eeprom(m_eeprom_size);
 			for (u32 index = 0; index < (m_eeprom_size / 8); index++)
 			{
 				u64 NewVal = ((u64*)(m_eeprom.data()))[index];
@@ -145,7 +144,9 @@ void CEXIAgp::SaveFileFromEEPROM(const std::string& filename)
 			pStream.WriteBytes(temp_eeprom.data(), m_eeprom_size);
 		}
 		else
+		{
 			pStream.WriteBytes(m_eeprom.data(), m_eeprom_size);
+		}
 	}
 }
 
@@ -214,14 +215,12 @@ u32 CEXIAgp::ImmRead(u32 _uSize)
 		break;
 	case 0xAE0B0000: // read 1 bit from DMA with 6 or 14 bit address
 		// Change to byte access instead of endian file access?
-		if (m_eeprom_size == 0)
-			RomVal1 = EE_READ_FALSE;
-		else
+		RomVal1 = EE_READ_FALSE;
+		if ((m_eeprom_size != 0)
+			&& (m_eeprom_pos >= EE_IGNORE_BITS)
+			&& ((((u64*)m_eeprom.data())[(m_eeprom_cmd >> 1) & m_eeprom_add_mask]) >> ((EE_DATA_BITS - 1) - (m_eeprom_pos - EE_IGNORE_BITS))) & 0x1)
 		{
-			RomVal1 = EE_READ_FALSE;
-			if ((m_eeprom_pos >= EE_IGNORE_BITS)
-				&& (((((u64*)m_eeprom.data())[(m_eeprom_cmd >> 1) & m_eeprom_add_mask]) >> ((EE_DATA_BITS - 1) - (m_eeprom_pos - EE_IGNORE_BITS))) & 0x1))
-				RomVal1 = EE_READ_TRUE;
+			RomVal1 = EE_READ_TRUE;
 		}
 		RomVal2 = 0;
 		CRC8(&RomVal2, 1);