From e569891ef57439b5650fc520155902697adb2968 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 20 Jan 2016 22:10:18 +0100 Subject: [PATCH] backporting new code (nw) --- src/devices/machine/intelfsh.cpp | 11 +++++++++++ src/devices/machine/intelfsh.h | 2 +- src/devices/sound/s14001a_new.cpp | 2 +- src/devices/sound/s14001a_new.h | 2 +- src/devices/video/pcd8544.cpp | 2 +- src/devices/video/pcd8544.h | 2 +- src/mame/drivers/fidel6502.cpp | 2 +- src/mame/drivers/fidelz80.cpp | 2 +- src/mame/includes/fidelz80.h | 2 +- 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp index 9fdc04609c1..54f9d4f722f 100644 --- a/src/devices/machine/intelfsh.cpp +++ b/src/devices/machine/intelfsh.cpp @@ -103,6 +103,7 @@ const device_type SST_39VF020 = &device_creator; const device_type SHARP_LH28F400 = &device_creator; const device_type INTEL_E28F008SA = &device_creator; const device_type INTEL_TE28F160 = &device_creator; +const device_type INTEL_TE28F320 = &device_creator; const device_type SHARP_UNK128MBIT = &device_creator; const device_type INTEL_28F320J3D = &device_creator; const device_type INTEL_28F320J5 = &device_creator; @@ -327,6 +328,13 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type m_device_id = 0xd0; map = ADDRESS_MAP_NAME( memory_map16_16Mb ); break; + case FLASH_INTEL_TE28F320: + m_bits = 16; + m_size = 0x400000; + m_maker_id = MFG_INTEL; + m_device_id = 0x8896; + map = ADDRESS_MAP_NAME( memory_map16_32Mb ); + break; case FLASH_SHARP_UNK128MBIT: m_bits = 16; m_size = 0x800000; @@ -460,6 +468,9 @@ sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, cons intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh16_device(mconfig, INTEL_TE28F160, "Intel TE28F160 Flash", tag, owner, clock, FLASH_INTEL_TE28F160, "intel_te28f160", __FILE__) { } +intel_te28f320_device::intel_te28f320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : intelfsh16_device(mconfig, INTEL_TE28F320, "Intel TE28F320 Flash", tag, owner, clock, FLASH_INTEL_TE28F320, "intel_te28f320", __FILE__) { } + intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh16_device(mconfig, INTEL_E28F400B, "Intel E28F400B Flash", tag, owner, clock, FLASH_INTEL_E28F400B, "intel_e28f400b", __FILE__) { } diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h index d23f0a01849..437d8c946c2 100644 --- a/src/devices/machine/intelfsh.h +++ b/src/devices/machine/intelfsh.h @@ -369,7 +369,7 @@ public: class intel_te28f320_device : public intelfsh16_device { public: - intel_te28f320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + intel_te28f320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class intel_e28f400b_device : public intelfsh16_device diff --git a/src/devices/sound/s14001a_new.cpp b/src/devices/sound/s14001a_new.cpp index b6f9e889e84..6e31b57f267 100644 --- a/src/devices/sound/s14001a_new.cpp +++ b/src/devices/sound/s14001a_new.cpp @@ -109,7 +109,7 @@ and off as it normally does during speech). Once START has gone low-high-low, th // device definition const device_type S14001A_NEW = &device_creator; -s14001a_new_device::s14001a_new_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s14001a_new_device::s14001a_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S14001A_NEW, "S14001A_NEW", tag, owner, clock, "s14001a_new", __FILE__), device_sound_interface(mconfig, *this), m_SpeechRom(*this, DEVICE_SELF), diff --git a/src/devices/sound/s14001a_new.h b/src/devices/sound/s14001a_new.h index dc5c001b01c..99c6e08b998 100644 --- a/src/devices/sound/s14001a_new.h +++ b/src/devices/sound/s14001a_new.h @@ -19,7 +19,7 @@ class s14001a_new_device : public device_t, public device_sound_interface { public: - s14001a_new_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s14001a_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s14001a_new_device() {} // static configuration helpers diff --git a/src/devices/video/pcd8544.cpp b/src/devices/video/pcd8544.cpp index 840530d55de..ce0a57067a5 100644 --- a/src/devices/video/pcd8544.cpp +++ b/src/devices/video/pcd8544.cpp @@ -26,7 +26,7 @@ const device_type PCD8544 = &device_creator; // pcd8544_device - constructor //------------------------------------------------- -pcd8544_device::pcd8544_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pcd8544_device::pcd8544_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCD8544, "PCD8544", tag, owner, clock, "pcd8544", __FILE__) { } diff --git a/src/devices/video/pcd8544.h b/src/devices/video/pcd8544.h index 34270c9f9b3..2a4639d5a27 100644 --- a/src/devices/video/pcd8544.h +++ b/src/devices/video/pcd8544.h @@ -32,7 +32,7 @@ class pcd8544_device : public device_t { public: // construction/destruction - pcd8544_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pcd8544_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_screen_update_cb(device_t &device, pcd8544_screen_update_delegate _cb) { downcast(device).m_screen_update_cb = _cb; } // device interface diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index 5babcc204ec..8285d04a50e 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -28,7 +28,7 @@ class fidel6502_state : public fidelz80base_state { public: - fidel6502_state(const machine_config &mconfig, device_type type, std::string tag) + fidel6502_state(const machine_config &mconfig, device_type type, const char *tag) : fidelz80base_state(mconfig, type, tag), m_z80pio(*this, "z80pio"), m_ppi8255(*this, "ppi8255") diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index f0d3973f4b4..11535bec032 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -602,7 +602,7 @@ expect that the software reads these once on startup only. class fidelz80_state : public fidelz80base_state { public: - fidelz80_state(const machine_config &mconfig, device_type type, std::string tag) + fidelz80_state(const machine_config &mconfig, device_type type, const char *tag) : fidelz80base_state(mconfig, type, tag), m_mcu(*this, "mcu"), m_z80pio(*this, "z80pio"), diff --git a/src/mame/includes/fidelz80.h b/src/mame/includes/fidelz80.h index 160a2a8731d..dc91dc6cdaf 100644 --- a/src/mame/includes/fidelz80.h +++ b/src/mame/includes/fidelz80.h @@ -13,7 +13,7 @@ class fidelz80base_state : public driver_device { public: - fidelz80base_state(const machine_config &mconfig, device_type type, std::string tag) + fidelz80base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inp_matrix(*this, "IN"),