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

Fix to avoid macro overloading

This commit is contained in:
x1nixmzeng 2017-01-14 16:54:32 +00:00
parent d5777a0913
commit af0238aed7
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/CxbxKrnl/EmuNV2A.cpp
View File

@ -216,7 +216,9 @@ static void update_irq()
const char *DebugNV_##DEV##(uint32_t addr) \
{ \
switch (addr) {
#define DEBUG_CASE(a, c) \
#define DEBUG_CASE(a) \
case a: return #a;
#define DEBUG_CASE_EX(a, c) \
case a: return #a##c;
#define DEBUG_END(DEV) \
default: \
@ -232,30 +234,30 @@ DEBUG_START(PMC)
DEBUG_END(PMC)
DEBUG_START(PBUS)
DEBUG_CASE(NV_PBUS_PCI_NV_0, "_VENDOR_ID");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_0, "_VENDOR_ID");
DEBUG_CASE(NV_PBUS_PCI_NV_1);
DEBUG_CASE(NV_PBUS_PCI_NV_2, "_REVISION_ID");
DEBUG_CASE(NV_PBUS_PCI_NV_3, "_LATENCY_TIMER");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_2, "_REVISION_ID");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_3, "_LATENCY_TIMER");
DEBUG_CASE(NV_PBUS_PCI_NV_4);
DEBUG_CASE(NV_PBUS_PCI_NV_5);
DEBUG_CASE(NV_PBUS_PCI_NV_6);
DEBUG_CASE(NV_PBUS_PCI_NV_7);
DEBUG_CASE(NV_PBUS_PCI_NV_11, "_SUBSYSTEM");
DEBUG_CASE(NV_PBUS_PCI_NV_12, "_ROM_BASE");
DEBUG_CASE(NV_PBUS_PCI_NV_13, "_CAP_PTR");
DEBUG_CASE(NV_PBUS_PCI_NV_14, "_RESERVED");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_11, "_SUBSYSTEM");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_12, "_ROM_BASE");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_13, "_CAP_PTR");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_14, "_RESERVED");
DEBUG_CASE(NV_PBUS_PCI_NV_15);
DEBUG_CASE(NV_PBUS_PCI_NV_16, "_SUBSYSTEM");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_16, "_SUBSYSTEM");
DEBUG_CASE(NV_PBUS_PCI_NV_17);
DEBUG_CASE(NV_PBUS_PCI_NV_18, "_AGP_STATUS");
DEBUG_CASE(NV_PBUS_PCI_NV_19, "_AGP_COMMAND");
DEBUG_CASE(NV_PBUS_PCI_NV_20, "_ROM_SHADOW");
DEBUG_CASE(NV_PBUS_PCI_NV_21, "_VGA");
DEBUG_CASE(NV_PBUS_PCI_NV_22, "_SCRATCH");
DEBUG_CASE(NV_PBUS_PCI_NV_23, "_DT_TIMEOUT");
DEBUG_CASE(NV_PBUS_PCI_NV_24, "_PME");
DEBUG_CASE(NV_PBUS_PCI_NV_25, "_POWER_STATE");
DEBUG_CASE(NV_PBUS_PCI_NV_26, "_RESERVED");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_18, "_AGP_STATUS");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_19, "_AGP_COMMAND");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_20, "_ROM_SHADOW");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_21, "_VGA");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_22, "_SCRATCH");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_23, "_DT_TIMEOUT");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_24, "_PME");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_25, "_POWER_STATE");
DEBUG_CASE_EX(NV_PBUS_PCI_NV_26, "_RESERVED");
DEBUG_END(PBUS)
DEBUG_START(PFIFO)