summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/psx
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/psx')
-rw-r--r--src/devices/cpu/psx/dma.cpp2
-rw-r--r--src/devices/cpu/psx/dma.h2
-rw-r--r--src/devices/cpu/psx/irq.cpp2
-rw-r--r--src/devices/cpu/psx/irq.h2
-rw-r--r--src/devices/cpu/psx/mdec.cpp2
-rw-r--r--src/devices/cpu/psx/mdec.h2
-rw-r--r--src/devices/cpu/psx/psx.cpp14
-rw-r--r--src/devices/cpu/psx/psx.h14
-rw-r--r--src/devices/cpu/psx/rcnt.cpp2
-rw-r--r--src/devices/cpu/psx/rcnt.h2
-rw-r--r--src/devices/cpu/psx/sio.cpp32
-rw-r--r--src/devices/cpu/psx/sio.h6
12 files changed, 41 insertions, 41 deletions
diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp
index 948ca96dba2..f2f048c39ff 100644
--- a/src/devices/cpu/psx/dma.cpp
+++ b/src/devices/cpu/psx/dma.cpp
@@ -27,7 +27,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_DMA = &device_creator<psxdma_device>;
-psxdma_device::psxdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+psxdma_device::psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSX_DMA, "Sony PSX DMA", tag, owner, clock, "psxdma", __FILE__), m_ram( ), m_ramsize(0), m_dpcp(0), m_dicr(0),
m_irq_handler(*this)
{
diff --git a/src/devices/cpu/psx/dma.h b/src/devices/cpu/psx/dma.h
index 792810f561c..e241dfac9ac 100644
--- a/src/devices/cpu/psx/dma.h
+++ b/src/devices/cpu/psx/dma.h
@@ -37,7 +37,7 @@ struct psx_dma_channel
class psxdma_device : public device_t
{
public:
- psxdma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxdma_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp
index 72c55f2614a..4a2293d758c 100644
--- a/src/devices/cpu/psx/irq.cpp
+++ b/src/devices/cpu/psx/irq.cpp
@@ -29,7 +29,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_IRQ = &device_creator<psxirq_device>;
-psxirq_device::psxirq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+psxirq_device::psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSX_IRQ, "Sony PSX IRQ", tag, owner, clock, "psxirq", __FILE__), n_irqdata(0), n_irqmask(0),
m_irq_handler(*this)
{
diff --git a/src/devices/cpu/psx/irq.h b/src/devices/cpu/psx/irq.h
index 97ccb96b681..69e95207230 100644
--- a/src/devices/cpu/psx/irq.h
+++ b/src/devices/cpu/psx/irq.h
@@ -22,7 +22,7 @@ extern const device_type PSX_IRQ;
class psxirq_device : public device_t
{
public:
- psxirq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxirq_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp
index d732719b524..3c0148525d5 100644
--- a/src/devices/cpu/psx/mdec.cpp
+++ b/src/devices/cpu/psx/mdec.cpp
@@ -30,7 +30,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_MDEC = &device_creator<psxmdec_device>;
-psxmdec_device::psxmdec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+psxmdec_device::psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PSX_MDEC, "Sony PSX MDEC", tag, owner, clock, "psxmdec", __FILE__), n_decoded(0), n_offset(0), n_0_command(0), n_0_address(0), n_0_size(0), n_1_command(0), n_1_status(0)
{
}
diff --git a/src/devices/cpu/psx/mdec.h b/src/devices/cpu/psx/mdec.h
index 594b9a73a48..e3065bacb95 100644
--- a/src/devices/cpu/psx/mdec.h
+++ b/src/devices/cpu/psx/mdec.h
@@ -24,7 +24,7 @@ extern const device_type PSX_MDEC;
class psxmdec_device : public device_t
{
public:
- psxmdec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE32_MEMBER( write );
DECLARE_READ32_MEMBER( read );
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index f0dc65f180b..c3e2e340d24 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -1745,7 +1745,7 @@ ADDRESS_MAP_END
// psxcpu_device - constructor
//-------------------------------------------------
-psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source ) :
+psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source ) :
cpu_device( mconfig, type, name, tag, owner, clock, shortname, source ),
m_program_config( "program", ENDIANNESS_LITTLE, 32, 32, 0, ADDRESS_MAP_NAME( psxcpu_internal_map ) ),
m_gpu_read_handler( *this ),
@@ -1759,32 +1759,32 @@ psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, c
m_disable_rom_berr = false;
}
-cxd8530aq_device::cxd8530aq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+cxd8530aq_device::cxd8530aq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8530AQ", tag, owner, clock, "cxd8530aq", __FILE__ )
{
}
-cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8530BQ", tag, owner, clock, "cxd8530bq", __FILE__ )
{
}
-cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8530CQ", tag, owner, clock, "cxd8530cq", __FILE__ )
{
}
-cxd8661r_device::cxd8661r_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+cxd8661r_device::cxd8661r_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8661R, "CXD8661R", tag, owner, clock, "cxd8661r", __FILE__ )
{
}
-cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8606BQ, "CXD8606BQ", tag, owner, clock, "cxd8606bq", __FILE__ )
{
}
-cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: psxcpu_device( mconfig, CXD8606CQ, "CXD8606CQ", tag, owner, clock, "cxd8606cq", __FILE__ )
{
}
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
index c80e8d0bcc6..98b15819f32 100644
--- a/src/devices/cpu/psx/psx.h
+++ b/src/devices/cpu/psx/psx.h
@@ -200,7 +200,7 @@ public:
void set_disable_rom_berr(bool mode);
protected:
- psxcpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ psxcpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -357,42 +357,42 @@ class cxd8530aq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8530aq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8530aq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8530bq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8530bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8530bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8530cq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8530cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8530cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8661r_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8661r_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8661r_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8606bq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8606bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8606bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class cxd8606cq_device : public psxcpu_device
{
public:
// construction/destruction
- cxd8606cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cxd8606cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp
index f19240797aa..f3e34a7cff8 100644
--- a/src/devices/cpu/psx/rcnt.cpp
+++ b/src/devices/cpu/psx/rcnt.cpp
@@ -26,7 +26,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_RCNT = &device_creator<psxrcnt_device>;
-psxrcnt_device::psxrcnt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+psxrcnt_device::psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PSX_RCNT, "Sony PSX RCNT", tag, owner, clock, "psxrcnt", __FILE__),
m_irq0_handler(*this),
m_irq1_handler(*this),
diff --git a/src/devices/cpu/psx/rcnt.h b/src/devices/cpu/psx/rcnt.h
index 87151834632..b3b610ed8a8 100644
--- a/src/devices/cpu/psx/rcnt.h
+++ b/src/devices/cpu/psx/rcnt.h
@@ -43,7 +43,7 @@ struct psx_root
class psxrcnt_device : public device_t
{
public:
- psxrcnt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq0_handler(device_t &device, _Object object) { return downcast<psxrcnt_device &>(device).m_irq0_handler.set_callback(object); }
diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp
index 63b05dca64d..ba057dd01e1 100644
--- a/src/devices/cpu/psx/sio.cpp
+++ b/src/devices/cpu/psx/sio.cpp
@@ -27,17 +27,17 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c
const device_type PSX_SIO0 = &device_creator<psxsio0_device>;
const device_type PSX_SIO1 = &device_creator<psxsio1_device>;
-psxsio0_device::psxsio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
psxsio_device(mconfig, PSX_SIO0, "Sony PSX SIO-0", tag, owner, clock, "psxsio0", __FILE__)
{
}
-psxsio1_device::psxsio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+psxsio1_device::psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
psxsio_device(mconfig, PSX_SIO1, "Sony PSX SIO-1", tag, owner, clock, "psxsio1", __FILE__)
{
}
-psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_status(SIO_STATUS_TX_EMPTY | SIO_STATUS_TX_RDY), m_mode(0), m_control(0), m_baud(0),
m_rxd(1), m_tx_data(0), m_rx_data(0), m_tx_shift(0), m_rx_shift(0), m_tx_bits(0), m_rx_bits(0), m_timer(nullptr),
@@ -88,7 +88,7 @@ void psxsio_device::device_start()
void psxsio_device::sio_interrupt()
{
- verboselog( *this, 1, "sio_interrupt( %s )\n", tag().c_str() );
+ verboselog( *this, 1, "sio_interrupt( %s )\n", tag() );
m_status |= SIO_STATUS_IRQ;
m_irq_handler(1);
}
@@ -120,18 +120,18 @@ void psxsio_device::sio_timer_adjust()
if( m_baud != 0 && n_prescaler != 0 )
{
n_time = attotime::from_hz(33868800) * (n_prescaler * m_baud);
- verboselog( *this, 2, "sio_timer_adjust( %s ) = %s ( %d x %d )\n", tag().c_str(), n_time.as_string(), n_prescaler, m_baud );
+ verboselog( *this, 2, "sio_timer_adjust( %s ) = %s ( %d x %d )\n", tag(), n_time.as_string(), n_prescaler, m_baud );
}
else
{
n_time = attotime::never;
- verboselog( *this, 0, "sio_timer_adjust( %s ) invalid baud rate ( %d x %d )\n", tag().c_str(), n_prescaler, m_baud );
+ verboselog( *this, 0, "sio_timer_adjust( %s ) invalid baud rate ( %d x %d )\n", tag(), n_prescaler, m_baud );
}
}
else
{
n_time = attotime::never;
- verboselog( *this, 2, "sio_timer_adjust( %s ) finished\n", tag().c_str() );
+ verboselog( *this, 2, "sio_timer_adjust( %s ) finished\n", tag() );
}
m_timer->adjust( n_time );
@@ -213,7 +213,7 @@ WRITE32_MEMBER( psxsio_device::write )
switch( offset % 4 )
{
case 0:
- verboselog( *this, 1, "psx_sio_w %s data %02x (%08x)\n", tag().c_str(), data, mem_mask );
+ verboselog( *this, 1, "psx_sio_w %s data %02x (%08x)\n", tag(), data, mem_mask );
m_tx_data = data;
m_status &= ~( SIO_STATUS_TX_RDY );
m_status &= ~( SIO_STATUS_TX_EMPTY );
@@ -226,11 +226,11 @@ WRITE32_MEMBER( psxsio_device::write )
if( ACCESSING_BITS_0_15 )
{
m_mode = data & 0xffff;
- verboselog( *this, 1, "psx_sio_w %s mode %04x\n", tag().c_str(), data & 0xffff );
+ verboselog( *this, 1, "psx_sio_w %s mode %04x\n", tag(), data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( *this, 1, "psx_sio_w %s control %04x\n", tag().c_str(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_w %s control %04x\n", tag(), data >> 16 );
m_control = data >> 16;
if( ( m_control & SIO_CONTROL_RESET ) != 0 )
@@ -275,7 +275,7 @@ WRITE32_MEMBER( psxsio_device::write )
if( ACCESSING_BITS_16_31 )
{
m_baud = data >> 16;
- verboselog( *this, 1, "psx_sio_w %s baud %04x\n", tag().c_str(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_w %s baud %04x\n", tag(), data >> 16 );
}
break;
default:
@@ -294,13 +294,13 @@ READ32_MEMBER( psxsio_device::read )
data = m_rx_data;
m_status &= ~( SIO_STATUS_RX_RDY );
m_rx_data = 0xff;
- verboselog( *this, 1, "psx_sio_r %s data %02x (%08x)\n", tag().c_str(), data, mem_mask );
+ verboselog( *this, 1, "psx_sio_r %s data %02x (%08x)\n", tag(), data, mem_mask );
break;
case 1:
data = m_status;
if( ACCESSING_BITS_0_15 )
{
- verboselog( *this, 1, "psx_sio_r %s status %04x\n", tag().c_str(), data & 0xffff );
+ verboselog( *this, 1, "psx_sio_r %s status %04x\n", tag(), data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
@@ -311,11 +311,11 @@ READ32_MEMBER( psxsio_device::read )
data = ( m_control << 16 ) | m_mode;
if( ACCESSING_BITS_0_15 )
{
- verboselog( *this, 1, "psx_sio_r %s mode %04x\n", tag().c_str(), data & 0xffff );
+ verboselog( *this, 1, "psx_sio_r %s mode %04x\n", tag(), data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( *this, 1, "psx_sio_r %s control %04x\n", tag().c_str(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_r %s control %04x\n", tag(), data >> 16 );
}
break;
case 3:
@@ -326,7 +326,7 @@ READ32_MEMBER( psxsio_device::read )
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( *this, 1, "psx_sio_r %s baud %04x\n", tag().c_str(), data >> 16 );
+ verboselog( *this, 1, "psx_sio_r %s baud %04x\n", tag(), data >> 16 );
}
break;
default:
diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h
index 04c578a50c6..93d8428bc9e 100644
--- a/src/devices/cpu/psx/sio.h
+++ b/src/devices/cpu/psx/sio.h
@@ -52,7 +52,7 @@ extern const device_type PSX_SIO1;
class psxsio_device : public device_t
{
public:
- psxsio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ psxsio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxsio_device &>(device).m_irq_handler.set_callback(object); }
@@ -101,13 +101,13 @@ private:
class psxsio0_device : public psxsio_device
{
public:
- psxsio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class psxsio1_device : public psxsio_device
{
public:
- psxsio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
#endif