r9751: fix for g++14 and add rolm as a manufacturer

This commit is contained in:
Brandon Munger 2015-12-20 19:55:06 -05:00
parent 56fcb735fe
commit cebed33843
3 changed files with 12 additions and 7 deletions

View File

@ -809,6 +809,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"robotron",
"rockwell",
"roland",
"rolm",
"sage",
"samcoupe",
"samsung",
@ -2361,6 +2362,11 @@ files {
MAME_DIR .. "src/mame/drivers/tb303.cpp",
}
createMESSProjects(_target, _subtarget, "rolm")
files {
MAME_DIR .. "src/mame/drivers/r9751.cpp",
}
createMESSProjects(_target, _subtarget, "rockwell")
files {
MAME_DIR .. "src/mame/drivers/aim65.cpp",
@ -3121,7 +3127,6 @@ files {
MAME_DIR .. "src/mame/drivers/pulsar.cpp",
MAME_DIR .. "src/mame/drivers/pv9234.cpp",
MAME_DIR .. "src/mame/drivers/qtsbc.cpp",
MAME_DIR .. "src/mame/drivers/r9751.cpp",
MAME_DIR .. "src/mame/drivers/rd100.cpp",
MAME_DIR .. "src/mame/drivers/rvoice.cpp",
MAME_DIR .. "src/mame/drivers/sacstate.cpp",

View File

@ -38,9 +38,9 @@ public:
pdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
/* Optional information overrides */
virtual machine_config_constructor device_mconfig_additions() const;
virtual ioport_constructor device_input_ports() const; //override;
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
virtual const rom_entry *device_rom_region() const override;
/* Callbacks */
template<class _Object> static devcb_base &m68k_r_callback(device_t &device, _Object object) { return downcast<pdc_device &>(device).m_m68k_r_cb.set_callback(object); }
@ -85,8 +85,8 @@ public:
UINT32 fdd_68k_dma_address; /* FDD <-> m68k DMA read/write address */
protected:
/* Device-level overrides */
virtual void device_start();
virtual void device_reset();
virtual void device_start() override;
virtual void device_reset() override;
/* Protected variables */
//UINT32 fdd_68k_dma_address;

View File

@ -99,7 +99,7 @@ private:
// functions
UINT32 swap_uint32( UINT32 val );
virtual void machine_reset();
virtual void machine_reset() override;
};