summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--hash/32x.xml10
-rw-r--r--src/lib/netlist/devices/nld_9310.cpp2
-rw-r--r--src/mame/drivers/gradius3.cpp5
-rw-r--r--src/mame/drivers/segapico.cpp28
4 files changed, 24 insertions, 21 deletions
diff --git a/hash/32x.xml b/hash/32x.xml
index a021dc6f3c5..e027eb673d7 100644
--- a/hash/32x.xml
+++ b/hash/32x.xml
@@ -28,7 +28,7 @@
<feature name="ic2" value="MPR=17352-F" />
<feature name="ic3" value="74HC139N" />
<dataarea name="rom" size="3145728">
- <rom name="mpr-17351-f.ic1" size="2097152" crc="e0ef6ebc" sha1="30258efdcacb6c49873ef7de466c1b393e27b79d" />
+ <rom name="mpr-17351-f.ic1" size="2097152" crc="e0ef6ebc" sha1="30258efdcacb6c49873ef7de466c1b393e27b79d" offset="0x000000" />
<rom name="mpr-17352-f.ic2" size="1048576" crc="c7079709" sha1="0f22e68e3013fa7e4110cddbe989986d2639833b" offset="0x200000" />
</dataarea>
</part>
@@ -72,8 +72,8 @@
<feature name="ic2" value="MPR-17350-S" />
<feature name="ic3" value="74HC139N" />
<dataarea name="rom" size="2621440">
- <rom name="mpr-17349 w79.ic1" size="2097152" crc="f1f7f657" sha1="5ab5bd1e9cd6d8d43e7cf78c3619b087c1d931c2" />
- <rom name="mpr-17350-s.ic2" size="524288" crc="55931049" sha1="3edd15d2e53b1a126559414290b8da23a7cbed5d" offset="0x200000" />
+ <rom name="mpr-17349 w79.ic1" size="2097152" crc="f1f7f657" sha1="5ab5bd1e9cd6d8d43e7cf78c3619b087c1d931c2" offset="0x000000" />
+ <rom name="mpr-17350-s.ic2" size="524288" crc="55931049" sha1="3edd15d2e53b1a126559414290b8da23a7cbed5d" offset="0x200000" />
</dataarea>
</part>
</software>
@@ -89,7 +89,7 @@
<feature name="ic2" value="MPR-17927-MX" />
<feature name="ic3" value="74HC139N" />
<dataarea name="rom" size="4194304">
- <rom name="mpr-17926-mx.ic1" size="2097152" crc="543d310f" sha1="c8510d61dfca6bcf3949ad13cef33d92118688d9" />
+ <rom name="mpr-17926-mx.ic1" size="2097152" crc="543d310f" sha1="c8510d61dfca6bcf3949ad13cef33d92118688d9" offset="0x000000" />
<rom name="mpr-17927-mx.ic2" size="2097152" crc="ecfef9e6" sha1="85a5859688742ab59ff16a8b67c872a2d2dbe076" offset="0x200000" />
</dataarea>
</part>
@@ -106,7 +106,7 @@
<feature name="ic2" value="MPR-17348 T34" />
<feature name="ic3" value="74HC139N" />
<dataarea name="rom" size="3145728">
- <rom name="mpr-17347 w72.ic1" size="2097152" crc="99e83be0" sha1="2b3e364494f6bdcae686e1535e51adee2aabca16" />
+ <rom name="mpr-17347 w72.ic1" size="2097152" crc="99e83be0" sha1="2b3e364494f6bdcae686e1535e51adee2aabca16" offset="0x000000" />
<rom name="mpr-17348 t34.ic2" size="1048576" crc="aa2f8743" sha1="db85888bf3743195c0bf41e0b3d65486c328b197" offset="0x200000" />
</dataarea>
</part>
diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp
index bb1e9cc46e3..81c26928be3 100644
--- a/src/lib/netlist/devices/nld_9310.cpp
+++ b/src/lib/netlist/devices/nld_9310.cpp
@@ -1,5 +1,5 @@
// license:GPL-2.0+
-//+opyright-holders:Couriersud
+// copyright-holders:Couriersud
/*
* nld_9310.c
*
diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp
index cb92013b72e..06aacaae97e 100644
--- a/src/mame/drivers/gradius3.cpp
+++ b/src/mame/drivers/gradius3.cpp
@@ -72,7 +72,7 @@ WRITE16_MEMBER(gradius3_state::cpuA_ctrl_w)
m_irqAen = data & 0x20;
/* other bits unknown */
- //logerror("%s: write %04x to c0000\n",machine().describe_context(),data);
+ //logerror("%s: write %04x to c0000\n",machine().describe_context(),data);
}
}
@@ -266,8 +266,7 @@ void gradius3_state::gradius3(machine_config &config)
M68000(config, m_subcpu, XTAL(10'000'000));
m_subcpu->set_addrmap(AS_PROGRAM, &gradius3_state::gradius3_map2);
TIMER(config, "scantimer").configure_scanline(FUNC(gradius3_state::gradius3_sub_scanline), "screen", 0, 1);
- /* 4 is triggered by cpu A, the others are unknown but */
- /* required for the game to run. */
+ /* 4 is triggered by cpu A, the others are unknown but required for the game to run. */
Z80(config, m_audiocpu, 3579545);
m_audiocpu->set_addrmap(AS_PROGRAM, &gradius3_state::gradius3_s_map);
diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp
index fa5e38fc88b..4e5a351d2d8 100644
--- a/src/mame/drivers/segapico.cpp
+++ b/src/mame/drivers/segapico.cpp
@@ -130,8 +130,8 @@ C = MB3514 / 9325 M36
class pico_base_state : public md_cons_state
{
public:
- pico_base_state(const machine_config &mconfig, device_type type, const char *tag)
- : md_cons_state(mconfig, type, tag),
+ pico_base_state(const machine_config &mconfig, device_type type, const char *tag) :
+ md_cons_state(mconfig, type, tag),
m_sega_315_5641_pcm(*this, "315_5641"),
m_io_page(*this, "PAGE"),
m_io_pad(*this, "PAD"),
@@ -164,9 +164,10 @@ protected:
class pico_state : public pico_base_state
{
public:
- pico_state(const machine_config &mconfig, device_type type, const char *tag)
- : pico_base_state(mconfig, type, tag),
- m_picocart(*this, "picoslot") { }
+ pico_state(const machine_config &mconfig, device_type type, const char *tag) :
+ pico_base_state(mconfig, type, tag),
+ m_picocart(*this, "picoslot")
+ { }
void pico(machine_config &config);
void picopal(machine_config &config);
@@ -562,14 +563,17 @@ S-AUDIO <-| | +-----------+ +-------+
class copera_state : public pico_base_state
{
public:
- copera_state(const machine_config &mconfig, device_type type, const char *tag)
- : pico_base_state(mconfig, type, tag),
- m_picocart(*this, "coperaslot") { }
+ copera_state(const machine_config &mconfig, device_type type, const char *tag) :
+ pico_base_state(mconfig, type, tag),
+ m_picocart(*this, "coperaslot")
+ { }
- required_device<copera_cart_slot_device> m_picocart;
- DECLARE_MACHINE_START(copera);
void copera(machine_config &config);
void copera_mem(address_map &map);
+
+private:
+ required_device<copera_cart_slot_device> m_picocart;
+ DECLARE_MACHINE_START(copera);
};
@@ -618,13 +622,13 @@ void copera_state::copera(machine_config &config)
config.device_remove("ymsnd");
MCFG_MACHINE_START_OVERRIDE( copera_state, copera )
- MCFG_MACHINE_RESET_OVERRIDE( pico_base_state, ms_megadriv )
+ MCFG_MACHINE_RESET_OVERRIDE( copera_state, ms_megadriv )
COPERA_CART_SLOT(config, m_picocart, copera_cart, nullptr);
SOFTWARE_LIST(config, "cart_list").set_original("copera");
SEGA_315_5641_PCM(config, m_sega_315_5641_pcm, upd7759_device::STANDARD_CLOCK);
- //m_sega_315_5641_pcm->drq().set(FUNC(pico_state::sound_cause_irq)); FIXME: this never worked - the MAME 315_5641 doesn't support slave mode
+ //m_sega_315_5641_pcm->drq().set(FUNC(copera_state::sound_cause_irq)); FIXME: this never worked - the MAME 315_5641 doesn't support slave mode
m_sega_315_5641_pcm->add_route(ALL_OUTPUTS, "lspeaker", 0.16);
m_sega_315_5641_pcm->add_route(ALL_OUTPUTS, "rspeaker", 0.16);
}