diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 67101bfe4e..49a46413f9 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -340,7 +340,6 @@ - diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 6d0b9c9a4a..57984fa078 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -961,9 +961,6 @@ FifoPlayer - - FifoPlayer - FifoPlayer diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp index 5a1fd476a3..3cb0d25493 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp @@ -9,9 +9,62 @@ #include "Common/FileUtil.h" #include "Core/FifoPlayer/FifoDataFile.h" -#include "Core/FifoPlayer/FifoFileStruct.h" -using namespace FifoFileStruct; +enum +{ + FILE_ID = 0x0d01f1f0, + VERSION_NUMBER = 4, + MIN_LOADER_VERSION = 1, +}; + +#pragma pack(push, 1) + +struct FileHeader +{ + u32 fileId; + u32 file_version; + u32 min_loader_version; + u64 bpMemOffset; + u32 bpMemSize; + u64 cpMemOffset; + u32 cpMemSize; + u64 xfMemOffset; + u32 xfMemSize; + u64 xfRegsOffset; + u32 xfRegsSize; + u64 frameListOffset; + u32 frameCount; + u32 flags; + u64 texMemOffset; + u32 texMemSize; + u8 reserved[40]; +}; +static_assert(sizeof(FileHeader) == 128, "FileHeader should be 128 bytes"); + +struct FileFrameInfo +{ + u64 fifoDataOffset; + u32 fifoDataSize; + u32 fifoStart; + u32 fifoEnd; + u64 memoryUpdatesOffset; + u32 numMemoryUpdates; + u8 reserved[32]; +}; +static_assert(sizeof(FileFrameInfo) == 64, "FileFrameInfo should be 64 bytes"); + +struct FileMemoryUpdate +{ + u32 fifoPosition; + u32 address; + u64 dataOffset; + u32 dataSize; + u8 type; + u8 reserved[3]; +}; +static_assert(sizeof(FileMemoryUpdate) == 24, "FileMemoryUpdate should be 24 bytes"); + +#pragma pack(pop) FifoDataFile::FifoDataFile() = default; diff --git a/Source/Core/Core/FifoPlayer/FifoFileStruct.h b/Source/Core/Core/FifoPlayer/FifoFileStruct.h deleted file mode 100644 index bfe6bdb741..0000000000 --- a/Source/Core/Core/FifoPlayer/FifoFileStruct.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2011 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -#include "Common/CommonTypes.h" - -namespace FifoFileStruct -{ -enum -{ - FILE_ID = 0x0d01f1f0, - VERSION_NUMBER = 4, - MIN_LOADER_VERSION = 1, -}; - -#pragma pack(push, 4) - -union FileHeader -{ - struct - { - u32 fileId; - u32 file_version; - u32 min_loader_version; - u64 bpMemOffset; - u32 bpMemSize; - u64 cpMemOffset; - u32 cpMemSize; - u64 xfMemOffset; - u32 xfMemSize; - u64 xfRegsOffset; - u32 xfRegsSize; - u64 frameListOffset; - u32 frameCount; - u32 flags; - u64 texMemOffset; - u32 texMemSize; - }; - u32 rawData[32]; -}; - -union FileFrameInfo -{ - struct - { - u64 fifoDataOffset; - u32 fifoDataSize; - u32 fifoStart; - u32 fifoEnd; - u64 memoryUpdatesOffset; - u32 numMemoryUpdates; - }; - u32 rawData[16]; -}; - -struct FileMemoryUpdate -{ - u32 fifoPosition; - u32 address; - u64 dataOffset; - u32 dataSize; - u8 type; -}; - -#pragma pack(pop) -}