From d87d0bcf6ea2aeb009c56b0e802ce5cc16c75fec Mon Sep 17 00:00:00 2001 From: etabeta78 Date: Thu, 5 Feb 2015 09:32:04 +0100 Subject: [PATCH 1/2] minor naming fixes. nw. --- src/mame/drivers/megadrvb.c | 2 +- src/mame/machine/315-5838_317-0229_comp.c | 2 +- src/mame/machine/315-5881_crypt.c | 2 +- src/mame/machine/315_5296.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c index 566a6c6bc5e..d79fd542687 100644 --- a/src/mame/drivers/megadrvb.c +++ b/src/mame/drivers/megadrvb.c @@ -886,4 +886,4 @@ GAME( 1996, mk3mdb, 0, megadrvb_6b, mk3mdb, md_boot_state, mk3mdb, ROT0, GAME( 1994, ssf2mdb, 0, megadrvb_6b, ssf2mdb, md_boot_state, ssf2mdb, ROT0, "bootleg / Capcom", "Super Street Fighter II - The New Challengers (bootleg of Japanese MegaDrive version)", 0) GAME( 1993, srmdb, 0, megadrvb, srmdb, md_boot_state, srmdb, ROT0, "bootleg / Konami", "Sunset Riders (bootleg of Megadrive version)", 0) GAME( 1995, topshoot, 0, md_bootleg, topshoot, md_boot_state, topshoot, ROT0, "Sun Mixing", "Top Shooter", 0) -GAME( 1993, sonic2mb, 0, megadrvb, aladmdb, md_boot_state, aladmdb, ROT0, "bootleg / Sega", "Sonic 2 (bootleg of Megadrive version)", GAME_NOT_WORKING ) +GAME( 1993, sonic2mb, 0, megadrvb, aladmdb, md_boot_state, aladmdb, ROT0, "bootleg / Sega", "Sonic The Hedgehog 2 (bootleg of Megadrive version)", GAME_NOT_WORKING ) diff --git a/src/mame/machine/315-5838_317-0229_comp.c b/src/mame/machine/315-5838_317-0229_comp.c index ca3731e9828..be5f1297dfb 100644 --- a/src/mame/machine/315-5838_317-0229_comp.c +++ b/src/mame/machine/315-5838_317-0229_comp.c @@ -39,7 +39,7 @@ extern const device_type SEGA315_5838_COMP = &device_creator; //------------------------------------------------- sega_315_5296_device::sega_315_5296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, SEGA_315_5296, "Sega 315-5296 I/O", tag, owner, clock, "315-5296", __FILE__), + : device_t(mconfig, SEGA_315_5296, "Sega 315-5296 I/O", tag, owner, clock, "315_5296", __FILE__), m_in_pa_cb(*this), m_in_pb_cb(*this), m_in_pc_cb(*this), From ccfd07b5399f6dc2185a42cb1357f18274a40240 Mon Sep 17 00:00:00 2001 From: jbu Date: Thu, 5 Feb 2015 11:00:41 +0100 Subject: [PATCH 2/2] Report core file position in case of a CHD hunk read error (nw) --- src/tools/chdman.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/chdman.c b/src/tools/chdman.c index c71f7d2b94d..9eee05b8826 100644 --- a/src/tools/chdman.c +++ b/src/tools/chdman.c @@ -2588,7 +2588,10 @@ static void do_extract_ld(parameters_t ¶ms) // read the hunk into the buffers chd_error err = input_chd.read_hunk(framenum, NULL); if (err != CHDERR_NONE) - report_error(1, "Error reading hunk %" I64FMT "d from CHD file (%s): %s\n", framenum, params.find(OPTION_INPUT)->cstr(), chd_file::error_string(err)); + { + UINT64 filepos = core_ftell(input_chd); + report_error(1, "Error reading hunk %" I64FMT "d at offset %" I64FMT "d from CHD file (%s): %s\n", framenum, filepos, params.find(OPTION_INPUT)->cstr(), chd_file::error_string(err)); + } // write audio for (int chnum = 0; chnum < channels; chnum++)