Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove some ROM_LOAD_OPTIONAL, clean up some miscellaneous stuff (nw)

Browse Source
This commit is contained in:
Vas Crabb 2018-10-31 14:35:30 +11:00
parent c71e942d95
commit 23910629f0
7 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/bus/coco/coco_fdc.cpp
View File

@ -399,7 +399,7 @@ WRITE8_MEMBER(coco_fdc_device_base::scs_write)
ROM_START(coco_fdc)
ROM_REGION(0x4000, "eprom", ROMREGION_ERASE00)
ROM_LOAD_OPTIONAL("disk10.rom", 0x0000, 0x2000, CRC(b4f9968e) SHA1(04115be3f97952b9d9310b52f806d04f80b40d03))
ROM_LOAD("disk10.rom", 0x0000, 0x2000, CRC(b4f9968e) SHA1(04115be3f97952b9d9310b52f806d04f80b40d03))
ROM_END
namespace
@ -433,7 +433,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(COCO_FDC, coco_family_fdc_device_base, coco_fdc_devic
ROM_START(coco_fdc_v11)
ROM_REGION(0x8000, "eprom", ROMREGION_ERASE00)
ROM_LOAD_OPTIONAL("disk11.rom", 0x0000, 0x2000, CRC(0b9c5415) SHA1(10bdc5aa2d7d7f205f67b47b19003a4bd89defd1))
ROM_LOAD("disk11.rom", 0x0000, 0x2000, CRC(0b9c5415) SHA1(10bdc5aa2d7d7f205f67b47b19003a4bd89defd1))
ROM_RELOAD(0x2000, 0x2000)
ROM_RELOAD(0x4000, 0x2000)
ROM_RELOAD(0x6000, 0x2000)

6
src/devices/bus/coco/dragon_fdc.cpp
View File

@ -367,7 +367,7 @@ WRITE8_MEMBER(premier_fdc_device_base::scs_write)
ROM_START(dragon_fdc)
ROM_REGION(0x4000, "eprom", ROMREGION_ERASE00)
ROM_LOAD_OPTIONAL("ddos10.rom", 0x0000, 0x2000, CRC(b44536f6) SHA1(a8918c71d319237c1e3155bb38620acb114a80bc))
ROM_LOAD("ddos10.rom", 0x0000, 0x2000, CRC(b44536f6) SHA1(a8918c71d319237c1e3155bb38620acb114a80bc))
ROM_END
namespace
@ -399,7 +399,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(DRAGON_FDC, device_cococart_interface, dragon_fdc_dev
ROM_START(premier_fdc)
ROM_REGION(0x4000, "eprom", ROMREGION_ERASE00)
ROM_LOAD_OPTIONAL("deltados.rom", 0x0000, 0x2000, CRC(149eb4dd) SHA1(eb686ce6afe63e4d4011b333a882ca812c69307f))
ROM_LOAD("deltados.rom", 0x0000, 0x2000, CRC(149eb4dd) SHA1(eb686ce6afe63e4d4011b333a882ca812c69307f))
ROM_END
namespace
@ -431,7 +431,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(PREMIER_FDC, device_cococart_interface, premier_fdc_d
ROM_START(sdtandy_fdc)
ROM_REGION(0x4000, "eprom", ROMREGION_ERASE00)
ROM_LOAD_OPTIONAL("sdtandy.rom", 0x0000, 0x2000, CRC(5d7779b7) SHA1(ca03942118f2deab2f6c8a89b8a4f41f2d0b94f1))
ROM_LOAD("sdtandy.rom", 0x0000, 0x2000, CRC(5d7779b7) SHA1(ca03942118f2deab2f6c8a89b8a4f41f2d0b94f1))
ROM_END
namespace

18
src/devices/machine/mb87030.cpp
View File

@ -2,22 +2,24 @@
// copyright-holders:Sven Schnelle
#include "emu.h"
#define VERBOSE 0
#include "logmacro.h"
#include "mb87030.h"
//#define VERBOSE 1
#include "logmacro.h"
DEFINE_DEVICE_TYPE(MB87030, mb87030_device, "mb87030", "Fujitsu MB87030 SCSI controller")
mb87030_device::mb87030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
mb87030_device(mconfig, MB87030, tag, owner, clock)
mb87030_device(mconfig, MB87030, tag, owner, clock)
{
}
mb87030_device::mb87030_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
nscsi_device(mconfig, type, tag, owner, clock),
m_irq_handler(*this),
m_dreq_handler(*this)
nscsi_device(mconfig, type, tag, owner, clock),
m_irq_handler(*this),
m_dreq_handler(*this)
{
}
@ -71,7 +73,7 @@ void mb87030_device::device_reset()
auto mb87030_device::get_state_name(State state) const
{
switch(state) {
switch (state) {
case State::Idle:
return "Idle";
case State::ArbitrationWaitBusFree:
@ -504,7 +506,7 @@ void mb87030_device::update_ints()
READ8_MEMBER(mb87030_device::bdid_r)
{
LOG("%s %02X\n", __FUNCTION__, (1 << m_bdid));
return (1 << m_bdid);
return 1 << m_bdid;
}
WRITE8_MEMBER(mb87030_device::bdid_w)

2
src/mame/drivers/jtc.cpp
View File

@ -910,7 +910,7 @@ ROM_START( jtc )
ROM_REGION( 0x10000, UB8830D_TAG, 0 )
ROM_LOAD( "u883rom.bin", 0x0000, 0x0800, CRC(2453c8c1) SHA1(816f5d08f8064b69b1779eb6661fde091aa58ba8) )
ROM_LOAD( "os2k_0800.bin", 0x0800, 0x0800, CRC(c81a2e19) SHA1(97c3b36c7b555081e084403e8f800fc9dbf5e68d) ) // u2716c1.bin
ROM_LOAD_OPTIONAL( "u2716c2.bin", 0x2000, 0x0800, NO_DUMP ) // doesn't seem to be needed?
ROM_LOAD( "u2716c2.bin", 0x2000, 0x0800, NO_DUMP ) // doesn't seem to be needed?
ROM_END
ROM_START( jtces88 )

4
src/mame/drivers/wswan.cpp
View File

@ -193,12 +193,12 @@ MACHINE_CONFIG_END
ROM_START( wswan )
ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASEFF )
// ROM_LOAD_OPTIONAL( "ws_bios.bin", 0x0000, 0x0001, NO_DUMP )
// ROM_LOAD( "ws_bios.bin", 0x0000, 0x0001, NO_DUMP )
ROM_END
ROM_START( wscolor )
ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASEFF )
// ROM_LOAD_OPTIONAL( "wsc_bios.bin", 0x0000, 0x0001, NO_DUMP )
// ROM_LOAD( "wsc_bios.bin", 0x0000, 0x0001, NO_DUMP )
ROM_END
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME

10
src/mame/includes/combatsc.h
View File

@ -5,6 +5,10 @@
Combat School
*************************************************************************/
#ifndef MAME_INCLUDES_COMBATSC_H
#define MAME_INCLUDES_COMBATSC_H
#pragma once
#include "machine/gen_latch.h"
#include "sound/upd7759.h"
@ -16,8 +20,8 @@
class combatsc_state : public driver_device
{
public:
combatsc_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
combatsc_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_k007121_1(*this, "k007121_1"),
@ -122,3 +126,5 @@ public:
void combatscb_map(address_map &map);
void combatscb_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_COMBATSC_H

15
src/mame/includes/fantland.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia
#ifndef MAME_INCLUDES_FANTLAND_H
#define MAME_INCLUDES_FANTLAND_H
#pragma once
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
@ -18,7 +22,8 @@ public:
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"),
m_spriteram(*this, "spriteram", 0),
m_spriteram2(*this, "spriteram2", 0) { }
m_spriteram2(*this, "spriteram2", 0)
{ }
void fantland(machine_config &config);
void wheelrun(machine_config &config);
@ -27,10 +32,6 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(wheelrun_wheel_r);
protected:
/* memory pointers */
// uint8_t * m_spriteram; // currently directly used in a 16bit map...
// uint8_t * m_spriteram_2; // currently directly used in a 16bit map...
/* misc */
uint8_t m_nmi_enable;
@ -42,8 +43,10 @@ protected:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
/* memory pointers */
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_spriteram2;
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_WRITE8_MEMBER(soundlatch_w);
virtual void machine_start() override;
@ -104,3 +107,5 @@ private:
void main_map(address_map &map);
void sound_map(address_map &map);
};
#endif // MAME_INCLUDES_FANTLAND_H