From 4c64c2f818345a689b05beeecaa743e2a7f89a43 Mon Sep 17 00:00:00 2001 From: x1nixmzeng Date: Tue, 9 Jan 2018 23:19:55 +0000 Subject: [PATCH] Removed OOVPA count suffix --- src/CxbxKrnl/HLEDataBase.cpp | 30 +++++++++++----------- src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl | 4 +-- src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl | 4 +-- src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl | 4 +-- src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl | 4 +-- src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl | 4 +-- src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl | 4 +-- src/CxbxKrnl/HLEDataBase/Xapi.OOVPA.inl | 4 +-- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 37fb0a4e7..c6744cdc7 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -81,51 +81,51 @@ const char *Sec_XNET = "XNET"; const HLEData HLEDataBase[] = { // Support inline functions in .text section - { Lib_D3D8,{ Sec_text, Sec_D3D }, D3D8_OOVPAV2, D3D8_OOVPA_COUNTV2 }, + { Lib_D3D8,{ Sec_text, Sec_D3D }, D3D8_OOVPAV2, D3D8_OOVPA_COUNT }, // Cannot support LTCG in HLE - //{ Lib_D3D8LTCG,{ Sec_D3D }, _OOVPAV2, _OOVPA_COUNTV2 }, + //{ Lib_D3D8LTCG,{ Sec_D3D }, _OOVPAV2, _OOVPA_COUNT }, // Jarupxx mention this is not a requirement? - //{ Lib_D3DX8,{ Sec_D3DX }, _OOVPAV2, _OOVPA_COUNTV2 }, + //{ Lib_D3DX8,{ Sec_D3DX }, _OOVPAV2, _OOVPA_COUNT }, // - { Lib_DSOUND,{ Sec_DSOUND }, DSound_OOVPAV2, DSound_OOVPA_COUNTV2 }, + { Lib_DSOUND,{ Sec_DSOUND }, DSound_OOVPAV2, DSound_OOVPA_COUNT }, // DSOUNDH is just meant to define hot fix, there is no seperate section - //{ Lib_DSOUNDH,{ Sec_DSOUND }, DSound_OOVPAV2, DSound_OOVPA_COUNTV2 }, + //{ Lib_DSOUNDH,{ Sec_DSOUND }, DSound_OOVPAV2, DSound_OOVPA_COUNT }, // - { Lib_XACTENG, { Sec_XACTENG }, XACTENG_OOVPAV2, XACTENG_OOVPA_COUNTV2 }, + { Lib_XACTENG, { Sec_XACTENG }, XACTENG_OOVPAV2, XACTENG_OOVPA_COUNT }, // test case: Power Drome (Unluckily, it use LTCG version of the library.) - //{ Lib_XACTENLT,{ Sec_XACTENG }, XACTENG_OOVPAV2, XACTENG_OOVPA_COUNTV2 }, + //{ Lib_XACTENLT,{ Sec_XACTENG }, XACTENG_OOVPAV2, XACTENG_OOVPA_COUNT }, // - { Lib_XAPILIB,{ Sec_text, Sec_XPP }, XAPILIB_OOVPAV2, XAPILIB_OOVPA_COUNTV2 }, + { Lib_XAPILIB,{ Sec_text, Sec_XPP }, XAPILIB_OOVPAV2, XAPILIB_OOVPA_COUNT }, // Support inline functions in .text section - { Lib_XGRAPHC,{ Sec_text, Sec_XGRPH }, XGRAPHC_OOVPAV2, XGRAPHC_OOVPA_COUNTV2 }, + { Lib_XGRAPHC,{ Sec_text, Sec_XGRPH }, XGRAPHC_OOVPAV2, XGRAPHC_OOVPA_COUNT }, // Cannot support LTCG in HLE - //{ Lib_XGRAPHCL,{ Sec_XGRPH }, XGRAPHC_OOVPAV2, XGRAPHC_OOVPA_COUNTV2 }, + //{ Lib_XGRAPHCL,{ Sec_XGRPH }, XGRAPHC_OOVPAV2, XGRAPHC_OOVPA_COUNT }, // Added Sec_text and Sec_XNET just in case. // TODO: Need to find out which function is only part of XOnlines. - { Lib_XONLINE,{ Sec_text, Sec_XONLINE, Sec_XNET }, XONLINES_OOVPAV2, XONLINES_OOVPA_COUNTV2 }, + { Lib_XONLINE,{ Sec_text, Sec_XONLINE, Sec_XNET }, XONLINES_OOVPAV2, XONLINES_OOVPA_COUNT }, // Fun fact, XONLINES are split into 2 header sections. - { Lib_XONLINES,{ Sec_text, Sec_XONLINE, Sec_XNET }, XONLINES_OOVPAV2, XONLINES_OOVPA_COUNTV2 }, + { Lib_XONLINES,{ Sec_text, Sec_XONLINE, Sec_XNET }, XONLINES_OOVPAV2, XONLINES_OOVPA_COUNT }, // Added Sec_text just in case. // TODO: Need to find out which function is only part of XNets. - { Lib_XNET,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_COUNTV2 }, + { Lib_XNET,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_COUNT }, // XNETS only has XNET, might be true. - { Lib_XNETS,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_COUNTV2 }, + { Lib_XNETS,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_COUNT }, // test case: Stake - { Lib_XNETN,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_COUNTV2 }, + { Lib_XNETN,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_COUNT }, }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl index c5ecdd9dc..4e5c1548e 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl @@ -434,8 +434,8 @@ OOVPATable D3D8_OOVPAV2[] = { }; // ****************************************************************** -// * D3D8_OOVPA_COUNTV2 +// * D3D8_OOVPA_COUNT // ****************************************************************** -const uint32 D3D8_OOVPA_COUNTV2 = OOVPA_TABLE_COUNT(D3D8_OOVPAV2); +const uint32 D3D8_OOVPA_COUNT = OOVPA_TABLE_COUNT(D3D8_OOVPAV2); #endif diff --git a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl index a9aabbc76..c2aaa0865 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl @@ -520,8 +520,8 @@ OOVPATable DSound_OOVPAV2[] = { }; // ****************************************************************** -// * DSound_OOVPA_COUNTV2 +// * DSound_OOVPA_COUNT // ****************************************************************** -const uint32 DSound_OOVPA_COUNTV2 = OOVPA_TABLE_COUNT(DSound_OOVPAV2); +const uint32 DSound_OOVPA_COUNT = OOVPA_TABLE_COUNT(DSound_OOVPAV2); #endif diff --git a/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl index 78e6fc5b2..b7c58fdb3 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.OOVPA.inl @@ -100,8 +100,8 @@ OOVPATable XGRAPHC_OOVPAV2[] = { }; // ****************************************************************** -// * XGRAPHC_OOVPA_COUNTV2 +// * XGRAPHC_OOVPA_COUNT // ****************************************************************** -const uint32 XGRAPHC_OOVPA_COUNTV2 = OOVPA_TABLE_COUNT(XGRAPHC_OOVPAV2); +const uint32 XGRAPHC_OOVPA_COUNT = OOVPA_TABLE_COUNT(XGRAPHC_OOVPAV2); #endif diff --git a/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl index cbb8f3edf..b17e263f0 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl @@ -79,8 +79,8 @@ OOVPATable XNET_OOVPAV2[] = { }; // ****************************************************************** -// * XNET_OOVPA_COUNTV2 +// * XNET_OOVPA_COUNT // ****************************************************************** -const uint32 XNET_OOVPA_COUNTV2 = OOVPA_TABLE_COUNT(XNET_OOVPAV2); +const uint32 XNET_OOVPA_COUNT = OOVPA_TABLE_COUNT(XNET_OOVPAV2); #endif diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl index 17974489d..cee1a7b04 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.OOVPA.inl @@ -93,8 +93,8 @@ OOVPATable XONLINES_OOVPAV2[] = { }; // ****************************************************************** -// * XONLINES_OOVPA_COUNTV2 +// * XONLINES_OOVPA_COUNT // ****************************************************************** -const uint32 XONLINES_OOVPA_COUNTV2 = OOVPA_TABLE_COUNT(XONLINES_OOVPAV2); +const uint32 XONLINES_OOVPA_COUNT = OOVPA_TABLE_COUNT(XONLINES_OOVPAV2); #endif diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl index ccd632104..0e0d55818 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.OOVPA.inl @@ -105,8 +105,8 @@ OOVPATable XACTENG_OOVPAV2[] = { }; // ****************************************************************** -// * XACTENG_OOVPA_COUNTV2 +// * XACTENG_OOVPA_COUNT // ****************************************************************** -const uint32 XACTENG_OOVPA_COUNTV2 = OOVPA_TABLE_COUNT(XACTENG_OOVPAV2); +const uint32 XACTENG_OOVPA_COUNT = OOVPA_TABLE_COUNT(XACTENG_OOVPAV2); #endif diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/Xapi.OOVPA.inl index 6a44941aa..68a24e1ce 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.OOVPA.inl @@ -186,8 +186,8 @@ OOVPATable XAPILIB_OOVPAV2[] = { }; // ****************************************************************** -// * XAPILIB_OOVPA_COUNTV2 +// * XAPILIB_OOVPA_COUNT // ****************************************************************** -const uint32 XAPILIB_OOVPA_COUNTV2 = OOVPA_TABLE_COUNT(XAPILIB_OOVPAV2); +const uint32 XAPILIB_OOVPA_COUNT = OOVPA_TABLE_COUNT(XAPILIB_OOVPAV2); #endif