diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c index 77530513c51..cddc81c1714 100644 --- a/src/emu/video/mc6847.c +++ b/src/emu/video/mc6847.c @@ -541,33 +541,12 @@ const char *mc6847_friend_device::describe_context(void) // BASE DEVICE //************************************************************************** -//------------------------------------------------- -// ROM( mc6847 ) -//------------------------------------------------- - -ROM_START( mc6847 ) - ROM_REGION( 0x200, "chargen", 0 ) - ROM_LOAD( "mc6847", 0x000, 0x200, CRC(9896fba7) SHA1(d0aa6d15278deda15610d290abc7b2f113ced91f) ) -ROM_END - - -//------------------------------------------------- -// rom_region - device-specific ROM region -//------------------------------------------------- - -const rom_entry *mc6847_base_device::device_rom_region() const -{ - return ROM_NAME( mc6847 ); -} - - //------------------------------------------------- // ctor //------------------------------------------------- mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source) : mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, (type == MC6847T1_NTSC) || (type == MC6847T1_PAL), tpfs, 25+191, true, shortname, source), - m_char_rom(*this, "chargen"), m_input_cb(*this), m_black_and_white(false), m_fixed_mode(0), @@ -1863,25 +1842,6 @@ s68047_device::s68047_device(const machine_config &mconfig, const char *tag, dev } -//------------------------------------------------- -// ROM( s68047 ) -//------------------------------------------------- - -ROM_START( s68047 ) - ROM_REGION( 0x200, "chargen", 0 ) - ROM_LOAD( "s68047", 0x000, 0x200, CRC(f6587f95) SHA1(a4578c6c1cc46b9d1cf9a3b43df74cb7b8c24757) ) -ROM_END - - -//------------------------------------------------- -// rom_region - device-specific ROM region -//------------------------------------------------- - -const rom_entry *s68047_device::device_rom_region() const -{ - return ROM_NAME( s68047 ); -} - // // In the Bandai Super Vision 8000 there is a video setting // bit which causes black to be displayed as blue when css=1. @@ -1929,23 +1889,3 @@ m5c6847p1_device::m5c6847p1_device(const machine_config &mconfig, const char *ta : mc6847_base_device(mconfig, M5C6847P1, "M5C6847P-1", tag, owner, clock, ntsc_square_fontdata8x12, 262.5, "m5c6847p1", __FILE__) { } - - -//------------------------------------------------- -// ROM( m5c6847p1 ) -//------------------------------------------------- - -ROM_START( m5c6847p1 ) - ROM_REGION( 0x200, "chargen", 0 ) - ROM_LOAD( "m5c6847p-1", 0x000, 0x200, CRC(540bafe5) SHA1(1b757eb1fa0b695c233b66aa283fb3d780ab9b8b) ) -ROM_END - - -//------------------------------------------------- -// rom_region - device-specific ROM region -//------------------------------------------------- - -const rom_entry *m5c6847p1_device::device_rom_region() const -{ - return ROM_NAME( m5c6847p1 ); -} diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h index 717b40637b0..b86c8d5a4de 100644 --- a/src/emu/video/mc6847.h +++ b/src/emu/video/mc6847.h @@ -514,9 +514,6 @@ private: class mc6847_base_device : public mc6847_friend_device { public: - // optional information overrides - virtual const rom_entry *device_rom_region() const; - template static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast(device).m_input_cb.set_callback(object); } static void set_get_fixed_mode(device_t &device, UINT8 mode) { downcast(device).m_fixed_mode = mode; } @@ -559,8 +556,6 @@ protected: } private: - optional_memory_region m_char_rom; - struct video_scanline { UINT8 m_sample_count; @@ -683,9 +678,6 @@ class s68047_device : public mc6847_base_device { public: s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - - // optional information overrides - virtual const rom_entry *device_rom_region() const; void hack_black_becomes_blue(bool flag); @@ -697,9 +689,6 @@ class m5c6847p1_device : public mc6847_base_device { public: m5c6847p1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - - // optional information overrides - virtual const rom_entry *device_rom_region() const; };