summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-04-16 08:04:20 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-04-16 08:04:20 +0000
commit67663501d7a646a5d4f43fc9c054d99bf3ce2544 (patch)
tree49beebd42271006da0c177515ecbf1f31a31b079 /src/emu/bus
parent72d93bb509f7ba670c27850f58fe10ce09844a93 (diff)
Moved eminline and related files into /src/osd since it's system related (nw)
Moved delegates into /src/lib/util to enable usage of delegates in other project parts Moved mame_printf_* calls into /src/osd/osdcore.c and renamed them to osd_printf_* Changed mess.mak to display compilation of ymmu100.ppm nicely
Diffstat (limited to 'src/emu/bus')
-rw-r--r--src/emu/bus/gba/gba_slot.c14
-rw-r--r--src/emu/bus/gba/rom.c2
-rw-r--r--src/emu/bus/megadrive/md_slot.c6
-rw-r--r--src/emu/bus/nes/nes_ines.inc4
-rw-r--r--src/emu/bus/nes/nes_pcb.inc6
-rw-r--r--src/emu/bus/nes/nes_unif.inc6
-rw-r--r--src/emu/bus/saturn/bram.c4
-rw-r--r--src/emu/bus/saturn/dram.c8
-rw-r--r--src/emu/bus/snes/bsx.c4
9 files changed, 27 insertions, 27 deletions
diff --git a/src/emu/bus/gba/gba_slot.c b/src/emu/bus/gba/gba_slot.c
index 6118f7ec097..480f40d7a02 100644
--- a/src/emu/bus/gba/gba_slot.c
+++ b/src/emu/bus/gba/gba_slot.c
@@ -188,7 +188,7 @@ bool gba_cart_slot_device::call_load()
//printf("Type: %s\n", gba_get_slot(m_type));
- mame_printf_info("GBA: Detected (XML) %s\n", pcb_name ? pcb_name : "NONE");
+ osd_printf_info("GBA: Detected (XML) %s\n", pcb_name ? pcb_name : "NONE");
}
if (m_type == GBA_SRAM)
@@ -301,7 +301,7 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
else if (!memcmp(&ROM[i], "SIIRTC_V", 8))
chip |= GBA_CHIP_RTC;
}
- mame_printf_info("GBA: Detected (ROM) %s\n", gba_chip_string(chip).cstr());
+ osd_printf_info("GBA: Detected (ROM) %s\n", gba_chip_string(chip).cstr());
// fix for games which return more than one kind of chip: either it is one of the known titles, or we default to no battery
if (gba_chip_has_conflict(chip))
@@ -312,7 +312,7 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
if (len >= 0xac + 4)
memcpy(game_code, ROM + 0xac, 4);
- mame_printf_info("GBA: Game Code \"%s\"\n", game_code);
+ osd_printf_info("GBA: Game Code \"%s\"\n", game_code);
chip &= ~(GBA_CHIP_EEPROM | GBA_CHIP_EEPROM_4K | GBA_CHIP_EEPROM_64K | GBA_CHIP_FLASH | GBA_CHIP_FLASH_1M | GBA_CHIP_FLASH_512 | GBA_CHIP_SRAM);
@@ -328,7 +328,7 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
}
}
if (!resolved)
- mame_printf_warning("GBA: NVRAM is disabled because multiple NVRAM chips were detected!\n");
+ osd_printf_warning("GBA: NVRAM is disabled because multiple NVRAM chips were detected!\n");
}
// fix for games which are known to require an eeprom with 14-bit addressing (64 kbit)
@@ -339,7 +339,7 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
if (len >= 0xac + 4)
memcpy(game_code, ROM + 0xac, 4);
- mame_printf_info("GBA: Game Code \"%s\"\n", game_code);
+ osd_printf_info("GBA: Game Code \"%s\"\n", game_code);
for (int i = 0; i < sizeof(gba_chip_fix_eeprom_list) / sizeof(gba_chip_fix_eeprom_item); i++)
{
@@ -354,11 +354,11 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
if (type & GBA_CHIP_RTC)
{
- mame_printf_verbose("game has RTC - not emulated at the moment\n");
+ osd_printf_verbose("game has RTC - not emulated at the moment\n");
chip &= ~GBA_CHIP_RTC;
}
- mame_printf_info("GBA: Emulate %s\n", gba_chip_string(chip).cstr());
+ osd_printf_info("GBA: Emulate %s\n", gba_chip_string(chip).cstr());
switch (chip)
{
diff --git a/src/emu/bus/gba/rom.c b/src/emu/bus/gba/rom.c
index 2af83930733..1abd0fe060a 100644
--- a/src/emu/bus/gba/rom.c
+++ b/src/emu/bus/gba/rom.c
@@ -395,7 +395,7 @@ void gba_eeprom_device::write(UINT32 data)
if (m_bits == 0)
{
- mame_printf_verbose("%08x: EEPROM: %02x to %x\n", machine().device("maincpu")->safe_pc(), m_eep_data, m_addr);
+ osd_printf_verbose("%08x: EEPROM: %02x to %x\n", machine().device("maincpu")->safe_pc(), m_eep_data, m_addr);
if (m_addr >= m_data_size)
fatalerror("eeprom: invalid address (%x)\n", m_addr);
diff --git a/src/emu/bus/megadrive/md_slot.c b/src/emu/bus/megadrive/md_slot.c
index 09b61e539eb..c15bcef24b1 100644
--- a/src/emu/bus/megadrive/md_slot.c
+++ b/src/emu/bus/megadrive/md_slot.c
@@ -487,7 +487,7 @@ int base_md_cart_slot_device::load_nonlist()
if (is_smd)
{
- mame_printf_debug("SMD!\n");
+ osd_printf_debug("SMD!\n");
for (int ptr = 0; ptr < (tmplen - 0x200) / 0x2000; ptr += 2)
{
@@ -500,7 +500,7 @@ int base_md_cart_slot_device::load_nonlist()
}
else if (is_md)
{
- mame_printf_debug("MD!\n");
+ osd_printf_debug("MD!\n");
for (int ptr = 0; ptr < tmplen; ptr += 2)
{
@@ -510,7 +510,7 @@ int base_md_cart_slot_device::load_nonlist()
}
else
{
- mame_printf_debug("BIN!\n");
+ osd_printf_debug("BIN!\n");
fseek(0, SEEK_SET);
fread(ROM, len);
diff --git a/src/emu/bus/nes/nes_ines.inc b/src/emu/bus/nes/nes_ines.inc
index 0a464506667..49304387c7e 100644
--- a/src/emu/bus/nes/nes_ines.inc
+++ b/src/emu/bus/nes/nes_ines.inc
@@ -745,7 +745,7 @@ void nes_cart_slot_device::call_load_ines()
if (prgout)
{
fwrite(m_cart->get_prg_base(), 1, 0x4000 * m_cart->get_prg_size(), prgout);
- mame_printf_error("Created PRG chunk\n");
+ osd_printf_error("Created PRG chunk\n");
}
fclose(prgout);
@@ -767,7 +767,7 @@ void nes_cart_slot_device::call_load_ines()
if (chrout)
{
fwrite(m_cart->get_vrom_base(), 1, m_cart->get_vrom_size(), chrout);
- mame_printf_error("Created CHR chunk\n");
+ osd_printf_error("Created CHR chunk\n");
}
fclose(chrout);
}
diff --git a/src/emu/bus/nes/nes_pcb.inc b/src/emu/bus/nes/nes_pcb.inc
index 870922634b9..b26411821b3 100644
--- a/src/emu/bus/nes/nes_pcb.inc
+++ b/src/emu/bus/nes/nes_pcb.inc
@@ -506,7 +506,7 @@ void nes_cart_slot_device::call_load_pcb()
m_cart->set_vrc_lines(nes_cart_get_line(get_feature("vrc2-pin3")),
nes_cart_get_line(get_feature("vrc2-pin4")),
(nes_cart_get_line(get_feature("vrc2-pin21")) != 10) ? 1 : 0);
-// mame_printf_error("VRC-2, pin3: A%d, pin4: A%d, pin21: %d\n", nes_cart_get_line(get_feature("vrc2-pin3")), nes_cart_get_line(get_feature("vrc2-pin4")),
+// osd_printf_error("VRC-2, pin3: A%d, pin4: A%d, pin21: %d\n", nes_cart_get_line(get_feature("vrc2-pin3")), nes_cart_get_line(get_feature("vrc2-pin4")),
// nes_cart_get_line(get_feature("vrc2-pin21")));
}
@@ -515,7 +515,7 @@ void nes_cart_slot_device::call_load_pcb()
m_cart->set_vrc_lines(nes_cart_get_line(get_feature("vrc4-pin3")),
nes_cart_get_line(get_feature("vrc4-pin4")),
0);
-// mame_printf_error("VRC-4, pin3: A%d, pin4: A%d\n", nes_cart_get_line(get_feature("vrc4-pin3"), nes_cart_get_line(get_feature("vrc4-pin4"));
+// osd_printf_error("VRC-4, pin3: A%d, pin4: A%d\n", nes_cart_get_line(get_feature("vrc4-pin3"), nes_cart_get_line(get_feature("vrc4-pin4"));
}
if (m_pcb_id == KONAMI_VRC6)
@@ -523,7 +523,7 @@ void nes_cart_slot_device::call_load_pcb()
m_cart->set_vrc_lines(nes_cart_get_line(get_feature("vrc6-pin9")),
nes_cart_get_line(get_feature("vrc6-pin10")),
0);
-// mame_printf_error("VRC-6, pin9: A%d, pin10: A%d\n", nes_cart_get_line(get_feature("vrc6-pin9"), nes_cart_get_line(get_feature("vrc6-pin10"));
+// osd_printf_error("VRC-6, pin9: A%d, pin10: A%d\n", nes_cart_get_line(get_feature("vrc6-pin9"), nes_cart_get_line(get_feature("vrc6-pin10"));
}
if (m_pcb_id == STD_HKROM || m_pcb_id == TAITO_X1_017)
diff --git a/src/emu/bus/nes/nes_unif.inc b/src/emu/bus/nes/nes_unif.inc
index e4b76d0edb7..9ac648ed1a5 100644
--- a/src/emu/bus/nes/nes_unif.inc
+++ b/src/emu/bus/nes/nes_unif.inc
@@ -477,7 +477,7 @@ void nes_cart_slot_device::call_load_unif()
}
if (small_prg) // This is not supported yet, so warn users about this
- mame_printf_error("Loaded UNIF file with non-16k PRG chunk. This is not supported in MESS yet.");
+ osd_printf_error("Loaded UNIF file with non-16k PRG chunk. This is not supported in MESS yet.");
if (vrom_size)
{
@@ -495,7 +495,7 @@ void nes_cart_slot_device::call_load_unif()
if (prgout)
{
fwrite(m_cart->get_prg_base(), 1, 0x4000 * m_cart->get_prg_size(), prgout);
- mame_printf_error("Created PRG chunk\n");
+ osd_printf_error("Created PRG chunk\n");
}
fclose(prgout);
@@ -513,7 +513,7 @@ void nes_cart_slot_device::call_load_unif()
if (chrout)
{
fwrite(m_cart->get_vrom_base(), 1, m_cart->get_vrom_size(), chrout);
- mame_printf_error("Created CHR chunk\n");
+ osd_printf_error("Created CHR chunk\n");
}
fclose(chrout);
}
diff --git a/src/emu/bus/saturn/bram.c b/src/emu/bus/saturn/bram.c
index c693084780b..64c5250b57e 100644
--- a/src/emu/bus/saturn/bram.c
+++ b/src/emu/bus/saturn/bram.c
@@ -94,7 +94,7 @@ READ32_MEMBER(saturn_bram_device::read_ext_bram)
return (m_ext_bram[offset * 2] << 16) | m_ext_bram[offset * 2 + 1];
else
{
- mame_printf_error("Battery RAM read beyond its boundary! offs: %X\n", offset);
+ osd_printf_error("Battery RAM read beyond its boundary! offs: %X\n", offset);
return 0xffffffff;
}
}
@@ -109,5 +109,5 @@ WRITE32_MEMBER(saturn_bram_device::write_ext_bram)
m_ext_bram[offset * 2 + 1] = (data & 0x000000ff) >> 0;
}
else
- mame_printf_error("Battery RAM write beyond its boundary! offs: %X data: %X\n", offset, data);
+ osd_printf_error("Battery RAM write beyond its boundary! offs: %X data: %X\n", offset, data);
}
diff --git a/src/emu/bus/saturn/dram.c b/src/emu/bus/saturn/dram.c
index 40af31cb29f..de800e60b15 100644
--- a/src/emu/bus/saturn/dram.c
+++ b/src/emu/bus/saturn/dram.c
@@ -69,7 +69,7 @@ READ32_MEMBER(saturn_dram_device::read_ext_dram0)
return m_ext_dram0[offset];
else
{
- mame_printf_error("DRAM0 read beyond its boundary! offs: %X\n", offset);
+ osd_printf_error("DRAM0 read beyond its boundary! offs: %X\n", offset);
return 0xffffffff;
}
}
@@ -80,7 +80,7 @@ READ32_MEMBER(saturn_dram_device::read_ext_dram1)
return m_ext_dram1[offset];
else
{
- mame_printf_error("DRAM1 read beyond its boundary! offs: %X\n", offset);
+ osd_printf_error("DRAM1 read beyond its boundary! offs: %X\n", offset);
return 0xffffffff;
}
}
@@ -90,7 +90,7 @@ WRITE32_MEMBER(saturn_dram_device::write_ext_dram0)
if (offset < m_size/2)
COMBINE_DATA(&m_ext_dram0[offset]);
else
- mame_printf_error("DRAM0 write beyond its boundary! offs: %X data: %X\n", offset, data);
+ osd_printf_error("DRAM0 write beyond its boundary! offs: %X data: %X\n", offset, data);
}
WRITE32_MEMBER(saturn_dram_device::write_ext_dram1)
@@ -98,5 +98,5 @@ WRITE32_MEMBER(saturn_dram_device::write_ext_dram1)
if (offset < m_size/2)
COMBINE_DATA(&m_ext_dram1[offset]);
else
- mame_printf_error("DRAM1 write beyond its boundary! offs: %X data: %X\n", offset, data);
+ osd_printf_error("DRAM1 write beyond its boundary! offs: %X data: %X\n", offset, data);
}
diff --git a/src/emu/bus/snes/bsx.c b/src/emu/bus/snes/bsx.c
index 1efa7378d25..25bedf54d6d 100644
--- a/src/emu/bus/snes/bsx.c
+++ b/src/emu/bus/snes/bsx.c
@@ -137,7 +137,7 @@ UINT8 BSX_base::read(UINT32 offset)
offset &= 0xffff;
if (offset < 0x2188 || offset >= 0x21a0)
{
- mame_printf_debug("BS-X Base Unit reg read outside correct range!\n");
+ osd_printf_debug("BS-X Base Unit reg read outside correct range!\n");
return 0x00;
}
@@ -199,7 +199,7 @@ void BSX_base::write(UINT32 offset, UINT8 data)
offset &= 0xffff;
if (offset < 0x2188 || offset >= 0x21a0)
{
- mame_printf_debug("BS-X Base Unit reg write outside correct range!\n");
+ osd_printf_debug("BS-X Base Unit reg write outside correct range!\n");
return;
}