diff options
Diffstat (limited to 'src/devices/machine')
-rw-r--r-- | src/devices/machine/eeprom.cpp | 4 | ||||
-rw-r--r-- | src/devices/machine/eeprom.h | 2 | ||||
-rw-r--r-- | src/devices/machine/eeprompar.cpp | 8 | ||||
-rw-r--r-- | src/devices/machine/eeprompar.h | 4 | ||||
-rw-r--r-- | src/devices/machine/eepromser.cpp | 16 | ||||
-rw-r--r-- | src/devices/machine/eepromser.h | 8 | ||||
-rw-r--r-- | src/devices/machine/ins8250.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/ins8250.h | 2 |
8 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp index 8c049264ebe..5909d6781a1 100644 --- a/src/devices/machine/eeprom.cpp +++ b/src/devices/machine/eeprom.cpp @@ -44,8 +44,8 @@ ADDRESS_MAP_END // eeprom_base_device - constructor //------------------------------------------------- -eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source) - : device_t(mconfig, devtype, name, tag, owner, 0, shortname, source), +eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) + : device_t(mconfig, devtype, name, tag, owner, 0, shortname, file), device_memory_interface(mconfig, *this), device_nvram_interface(mconfig, *this), m_cells(0), diff --git a/src/devices/machine/eeprom.h b/src/devices/machine/eeprom.h index 3fc3a3c4d75..605ff258a07 100644 --- a/src/devices/machine/eeprom.h +++ b/src/devices/machine/eeprom.h @@ -49,7 +49,7 @@ class eeprom_base_device : public device_t, { protected: // construction/destruction - eeprom_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source); + eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); public: // timing constants diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp index a03447f7cdc..df360f69b09 100644 --- a/src/devices/machine/eeprompar.cpp +++ b/src/devices/machine/eeprompar.cpp @@ -51,8 +51,8 @@ // eeprom_parallel_base_device - constructor //------------------------------------------------- -eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source) - : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, source) +eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) + : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file) { } @@ -88,8 +88,8 @@ void eeprom_parallel_base_device::device_reset() // eeprom_parallel_28xx_device - constructor //------------------------------------------------- -eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source) - : eeprom_parallel_base_device(mconfig, devtype, name, tag, owner, shortname, source) +eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) + : eeprom_parallel_base_device(mconfig, devtype, name, tag, owner, shortname, file) { } diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h index 723f896a534..814a1e5d674 100644 --- a/src/devices/machine/eeprompar.h +++ b/src/devices/machine/eeprompar.h @@ -51,7 +51,7 @@ class eeprom_parallel_base_device : public eeprom_base_device { protected: // construction/destruction - eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source); + eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); protected: // device-level overrides @@ -67,7 +67,7 @@ class eeprom_parallel_28xx_device : public eeprom_parallel_base_device { protected: // construction/destruction - eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source); + eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); public: // read/write data lines - for now we cheat and ignore the control lines, assuming diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp index 57787afa778..9419993bc29 100644 --- a/src/devices/machine/eepromser.cpp +++ b/src/devices/machine/eepromser.cpp @@ -143,8 +143,8 @@ ALLOW_SAVE_TYPE(eeprom_serial_base_device::eeprom_state); // eeprom_serial_base_device - constructor //------------------------------------------------- -eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source) - : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, source), +eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) + : eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file), m_command_address_bits(0), m_streaming_enabled(false), m_state(STATE_IN_RESET), @@ -625,8 +625,8 @@ void eeprom_serial_base_device::execute_write_command() // eeprom_serial_93cxx_device - constructor //------------------------------------------------- -eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source) - : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, source) +eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) + : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file) { } @@ -692,8 +692,8 @@ WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::di_write) { base_di_write(state); // eeprom_serial_er5911_device - constructor //------------------------------------------------- -eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source) - : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, source) +eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) + : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file) { } @@ -760,8 +760,8 @@ WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state); // eeprom_serial_x24c44_device - constructor //------------------------------------------------- -eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source) - : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, source) +eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) + : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file) { } diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h index ac40db42b7d..84c20239572 100644 --- a/src/devices/machine/eepromser.h +++ b/src/devices/machine/eepromser.h @@ -85,7 +85,7 @@ class eeprom_serial_base_device : public eeprom_base_device { protected: // construction/destruction - eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source); + eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); public: // inline configuration helpers @@ -178,7 +178,7 @@ class eeprom_serial_93cxx_device : public eeprom_serial_base_device { protected: // construction/destruction - eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source); + eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); public: // read handlers @@ -201,7 +201,7 @@ class eeprom_serial_er5911_device : public eeprom_serial_base_device { protected: // construction/destruction - eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source); + eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); public: // read handlers @@ -227,7 +227,7 @@ class eeprom_serial_x24c44_device : public eeprom_serial_base_device //async store not implemented protected: // construction/destruction - eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, std::string name, std::string tag, device_t *owner, std::string shortname, std::string source); + eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); public: // read handlers diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp index 6285eafee1e..7d6aa2a84e5 100644 --- a/src/devices/machine/ins8250.cpp +++ b/src/devices/machine/ins8250.cpp @@ -91,7 +91,7 @@ const device_type NS16450 = &device_creator<ns16450_device>; const device_type NS16550 = &device_creator<ns16550_device>; const device_type PC16552D = &device_creator<pc16552_device>; -ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname) +ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_serial_interface(mconfig, *this), m_out_tx_cb(*this), diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h index b17c4c74e85..af5c08dba15 100644 --- a/src/devices/machine/ins8250.h +++ b/src/devices/machine/ins8250.h @@ -19,7 +19,7 @@ class ins8250_uart_device : public device_t, public device_serial_interface { public: - ins8250_uart_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname); + ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); } |