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

(MESS) resolve conflicts in my tree

Browse Source
This commit is contained in:
Robbbert 2014-03-21 09:42:30 +00:00
parent 459234d293
commit 3ee7c95374
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mess/drivers/camplynx.c
View File

@ -87,30 +87,31 @@ class camplynx_state : public driver_device
{
public:
camplynx_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
//m_cass(*this, "cassette"),
//m_wave(*this, WAVE_TAG),
//m_printer(*this, "centronics"),
m_crtc(*this, "crtc"),
m_palette(*this, "palette")
//m_fdc(*this, "fdc")
: driver_device(mconfig, type, tag)
, m_palette(*this, "palette")
, m_maincpu(*this, "maincpu")
//, m_cass(*this, "cassette")
//, m_wave(*this, WAVE_TAG)
//, m_printer(*this, "centronics")
, m_crtc(*this, "crtc")
//, m_fdc(*this, "fdc")
{ }
DECLARE_WRITE8_MEMBER(lynx48k_bank_w);
DECLARE_WRITE8_MEMBER(lynx128k_bank_w);
DECLARE_WRITE8_MEMBER(lynx128k_irq);
DECLARE_DRIVER_INIT(lynx48k);
DECLARE_PALETTE_INIT(camplynx);
DECLARE_MACHINE_RESET(lynx128k);
required_device<palette_device> m_palette;
private:
virtual void video_start();
required_device<cpu_device> m_maincpu;
//required_device<cassette_image_device> m_cass;
//required_device<> m_wave;
//required_device<> m_printer;
required_device<mc6845_device> m_crtc;
required_device<palette_device> m_palette;
//optional_device<> m_fdc;
DECLARE_WRITE8_MEMBER(lynx48k_bank_w);
DECLARE_WRITE8_MEMBER(lynx128k_bank_w);
DECLARE_WRITE8_MEMBER(lynx128k_irq);
DECLARE_DRIVER_INIT(lynx48k);
virtual void video_start();
DECLARE_PALETTE_INIT(camplynx);
DECLARE_MACHINE_RESET(lynx128k);
};
/* These bankswitch handlers are very incomplete, just enough to get the

2
src/mess/mess.mak
View File

@ -2074,7 +2074,7 @@ $(MESSOBJ)/skeleton.a: \
$(MESS_DRIVERS)/hpz80unk.o \
$(MESS_DRIVERS)/ht68k.o \
$(MESS_DRIVERS)/hunter2.o \
$(EMU_MACHINE)/nsc810.o \
$(EMU_MACHINE)/nsc810.o \
$(MESS_DRIVERS)/ibm6580.o \
$(MESS_DRIVERS)/ie15.o \
$(MESS_DRIVERS)/if800.o \