ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #880 from cxd4/PIF-RAM-memcpy 

[core] std::memcpy() undeclared, so use memcpy().
This commit is contained in:
zilmar 2016-01-15 18:49:22 +11:00
parent 20f7384918 1b82fd0686
commit 37b212c487
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Project64-core/N64System/Mips/PifRam.cpp
View File

@ -182,13 +182,13 @@ void CPifRam::PifRamWrite()
{
ResponseValue = (ResponseValue << 8) | ((Response[(z - 1) * 2] << 4) + Response[(z - 1) * 2 + 1]);
}
std::memcpy(&m_PifRam[48], &ResponseValue, sizeof(uint64_t));
memcpy(&m_PifRam[48], &ResponseValue, sizeof(uint64_t));
ResponseValue = 0;
for (int z = 7; z > 0; z--)
{
ResponseValue = (ResponseValue << 8) | ((Response[((z + 8) - 1) * 2] << 4) + Response[((z + 8) - 1) * 2 + 1]);
}
std::memcpy(&m_PifRam[56], &ResponseValue, sizeof(uint64_t));
memcpy(&m_PifRam[56], &ResponseValue, sizeof(uint64_t));
}
break;
case 0x08:
@ -618,7 +618,7 @@ void CPifRam::ReadControllerCommand(int Control, uint8_t * Command) {
}
const uint32_t buttons = g_BaseSystem->GetButtons(Control);
std::memcpy(&Command[3], &buttons, sizeof(uint32_t));
memcpy(&Command[3], &buttons, sizeof(uint32_t));
}
break;
case 0x02: //read from controller pack