From 7d0e8b676d09e47d2f2efa501c50be695987095b Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Tue, 3 Jun 2014 18:49:01 +0000 Subject: [PATCH] Tidy up drivers --- src/burn/burn.h | 1 + src/burn/drv/irem/d_m107.cpp | 4 ++-- src/burn/drv/pre90s/d_xain.cpp | 10 +++++----- src/burn/drv/pst90s/d_suprnova.cpp | 16 ++++++++-------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/burn/burn.h b/src/burn/burn.h index b664b4bae..a60474c83 100644 --- a/src/burn/burn.h +++ b/src/burn/burn.h @@ -480,6 +480,7 @@ void IpsApplyPatches(UINT8* base, char* rom_name); #define HARDWARE_KANEKO16 (HARDWARE_PREFIX_KANEKO | 0x10000) #define HARDWARE_KANEKO_MISC (HARDWARE_PREFIX_KANEKO | 0x20000) +#define HARDWARE_KANEKO_SKNS (HARDWARE_PREFIX_KANEKO | 0x30000) #define HARDWARE_PACMAN (HARDWARE_PREFIX_PACMAN) diff --git a/src/burn/drv/irem/d_m107.cpp b/src/burn/drv/irem/d_m107.cpp index b4b10ad38..93896017b 100644 --- a/src/burn/drv/irem/d_m107.cpp +++ b/src/burn/drv/irem/d_m107.cpp @@ -1482,7 +1482,7 @@ static INT32 wpksocInit() return DrvInit(wpksocRomLoad, leagueman_decryption_table, 1, 0x80, 0x200000, 0x400000); } -struct BurnDriver BurnDrvWpksoc = { +struct BurnDriverD BurnDrvWpksoc = { "wpksoc", NULL, NULL, NULL, "1995", "World PK Soccer\0", NULL, "Jaleco", "M107", NULL, NULL, NULL, NULL, @@ -1523,7 +1523,7 @@ static struct BurnRomInfo kftgoalRomDesc[] = { STD_ROM_PICK(kftgoal) STD_ROM_FN(kftgoal) -struct BurnDriver BurnDrvKftgoal = { +struct BurnDriverD BurnDrvKftgoal = { "kftgoal", "wpksoc", NULL, NULL, "1995", "Kick for the Goal\0", NULL, "Jaleco", "M107", NULL, NULL, NULL, NULL, diff --git a/src/burn/drv/pre90s/d_xain.cpp b/src/burn/drv/pre90s/d_xain.cpp index 36fdfd0bc..7427a9e08 100644 --- a/src/burn/drv/pre90s/d_xain.cpp +++ b/src/burn/drv/pre90s/d_xain.cpp @@ -1102,7 +1102,7 @@ struct BurnDriver BurnDrvXsleena = { "xsleena", NULL, NULL, NULL, "1986", "Xain'd Sleena (World)\0", NULL, "Technos Japan (Taito license)", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_PRE90S, GBF_HORSHOOT, 0, + BDF_GAME_WORKING, 2, HARDWARE_TECHNOS, GBF_HORSHOOT, 0, NULL, xsleenaRomInfo, xsleenaRomName, NULL, NULL, DrvInputInfo, DrvDIPInfo, DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200, 256, 240, 4, 3 @@ -1159,7 +1159,7 @@ struct BurnDriver BurnDrvXsleenaj = { "xsleenaj", "xsleena", NULL, NULL, "1986", "Xain'd Sleena (Japan)\0", NULL, "Technos Japan", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_PRE90S, GBF_HORSHOOT, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TECHNOS, GBF_HORSHOOT, 0, NULL, xsleenajRomInfo, xsleenajRomName, NULL, NULL, DrvInputInfo, DrvDIPInfo, DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200, 256, 240, 4, 3 @@ -1216,7 +1216,7 @@ struct BurnDriver BurnDrvSolarwar = { "solarwar", "xsleena", NULL, NULL, "1986", "Solar-Warrior (US)\0", NULL, "Technos Japan (Taito / Memetron license)", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_PRE90S, GBF_HORSHOOT, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TECHNOS, GBF_HORSHOOT, 0, NULL, solarwarRomInfo, solarwarRomName, NULL, NULL, DrvInputInfo, DrvDIPInfo, DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200, 256, 240, 4, 3 @@ -1267,11 +1267,11 @@ static struct BurnRomInfo xsleenabRomDesc[] = { STD_ROM_PICK(xsleenab) STD_ROM_FN(xsleenab) -struct BurnDriver BurnDrvXsleenab = { +struct BurnDriverD BurnDrvXsleenab = { "xsleenab", "xsleena", NULL, NULL, "1986", "Xain'd Sleena (bootleg)\0", NULL, "bootleg", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_MISC_PRE90S, GBF_HORSHOOT, 0, + BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TECHNOS, GBF_HORSHOOT, 0, NULL, xsleenabRomInfo, xsleenabRomName, NULL, NULL, DrvInputInfo, DrvDIPInfo, DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200, 256, 240, 4, 3 diff --git a/src/burn/drv/pst90s/d_suprnova.cpp b/src/burn/drv/pst90s/d_suprnova.cpp index 92fb25def..f32c3cfac 100644 --- a/src/burn/drv/pst90s/d_suprnova.cpp +++ b/src/burn/drv/pst90s/d_suprnova.cpp @@ -2063,7 +2063,7 @@ struct BurnDriver BurnDrvSkns = { "skns", NULL, NULL, NULL, "1996", "Super Kaneko Nova System BIOS\0", "BIOS only", "Kaneko", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_BOARDROM, 0, HARDWARE_MISC_POST90S, GBF_BIOS, 0, + BDF_BOARDROM, 0, HARDWARE_KANEKO_SKNS, GBF_BIOS, 0, NULL, sknsRomInfo, sknsRomName, NULL, NULL, SknsInputInfo, SknsDIPInfo, SknsInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x8000, 320, 240, 4, 3 @@ -2151,7 +2151,7 @@ struct BurnDriver BurnDrvCyvern = { "cyvern", NULL, "skns", NULL, "1998", "Cyvern (US)\0", NULL, "Kaneko", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0, + BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_KANEKO_SKNS, GBF_VERSHOOT, 0, NULL, cyvernRomInfo, cyvernRomName, NULL, NULL, CyvernInputInfo, CyvernDIPInfo, CyvernInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x8000, 240, 320, 3, 4 @@ -2161,7 +2161,7 @@ struct BurnDriver BurnDrvCyvernJ = { "cyvernj", "cyvern", "skns", NULL, "1998", "Cyvern (Japan)\0", NULL, "Kaneko", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0, + BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_KANEKO_SKNS, GBF_VERSHOOT, 0, NULL, cyvernjRomInfo, cyvernjRomName, NULL, NULL, CyvernInputInfo, CyvernDIPInfo, CyvernJInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x8000, 240, 320, 3, 4 @@ -2211,7 +2211,7 @@ struct BurnDriver BurnDrvGutsn = { "gutsn", NULL, "skns", NULL, "2000", "Guts'n (Japan)\0", "Imperfect inputs", "Kaneko / Kouyousha", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_MISC, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO_SKNS, GBF_MISC, 0, NULL, gutsnRomInfo, gutsnRomName, NULL, NULL, SknsInputInfo, SknsDIPInfo, GutsnInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x8000, 320, 240, 4, 3 @@ -2270,11 +2270,11 @@ static int SengekisInit() return DrvInit(SengekisLoadRoms, 2 /*asia*/, 0x2000000); } -struct BurnDriver BurnDrvSengekis = { +struct BurnDriverD BurnDrvSengekis = { "sengekis", NULL, "skns", NULL, "1997", "Sengeki Striker (Asia)\0", "Game crashes!", "Kaneko / Warashi", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_MISC_POST90S, GBF_MISC, 0, + BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_KANEKO_SKNS, GBF_MISC, 0, NULL, sengekisRomInfo, sengekisRomName, NULL, NULL, SknsInputInfo, SknsDIPInfo, SengekisInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x8000, 240, 320, 3, 4 @@ -2313,11 +2313,11 @@ static int SengekisjInit() return DrvInit(SengekisLoadRoms, 0 /*japan*/, 0x2000000); } -struct BurnDriver BurnDrvSengekisj = { +struct BurnDriverD BurnDrvSengekisj = { "sengekisj", "sengekis", "skns", NULL, "1997", "Sengeki Striker (Japan)\0", "Game crashes!", "Kaneko / Warashi", "Miscellaneous", NULL, NULL, NULL, NULL, - BDF_CLONE | BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_MISC_POST90S, GBF_MISC, 0, + BDF_CLONE | BDF_ORIENTATION_VERTICAL | SCREEN_FLIP, 2, HARDWARE_KANEKO_SKNS, GBF_MISC, 0, NULL, sengekisjRomInfo, sengekisjRomName, NULL, NULL, SknsInputInfo, SknsDIPInfo, SengekisjInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x8000, 240, 320, 3, 4