diff options
Diffstat (limited to 'src/devices/cpu/psx')
-rw-r--r-- | src/devices/cpu/psx/dma.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/dma.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/irq.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/irq.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/mdec.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/mdec.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/psx.cpp | 22 | ||||
-rw-r--r-- | src/devices/cpu/psx/psx.h | 14 | ||||
-rw-r--r-- | src/devices/cpu/psx/rcnt.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/rcnt.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/psx/sio.cpp | 6 | ||||
-rw-r--r-- | src/devices/cpu/psx/sio.h | 6 |
12 files changed, 32 insertions, 32 deletions
diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp index 0a901228944..5b4e12d760b 100644 --- a/src/devices/cpu/psx/dma.cpp +++ b/src/devices/cpu/psx/dma.cpp @@ -29,7 +29,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c DEFINE_DEVICE_TYPE(PSX_DMA, psxdma_device, "psxdma", "Sony PSX DMA") -psxdma_device::psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psxdma_device::psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_DMA, tag, owner, clock), 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 0d81d67da7d..35f1480006c 100644 --- a/src/devices/cpu/psx/dma.h +++ b/src/devices/cpu/psx/dma.h @@ -21,7 +21,7 @@ public: typedef delegate<void (uint32_t *, uint32_t, int32_t)> read_delegate; typedef delegate<void (uint32_t *, uint32_t, int32_t)> write_delegate; - psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); //configuration helpers auto irq() { return m_irq_handler.bind(); } diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp index d14e8f7cdc0..7207daa83c7 100644 --- a/src/devices/cpu/psx/irq.cpp +++ b/src/devices/cpu/psx/irq.cpp @@ -32,7 +32,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c DEFINE_DEVICE_TYPE(PSX_IRQ, psxirq_device, "psxirq", "Sony PSX IRQ") -psxirq_device::psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psxirq_device::psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_IRQ, tag, owner, clock), 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 b4ee28e712a..2708a0584a2 100644 --- a/src/devices/cpu/psx/irq.h +++ b/src/devices/cpu/psx/irq.h @@ -18,7 +18,7 @@ DECLARE_DEVICE_TYPE(PSX_IRQ, psxirq_device) class psxirq_device : public device_t { public: - psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // configuration helpers auto irq() { return m_irq_handler.bind(); } diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp index 8b4421e4062..a2aa588175b 100644 --- a/src/devices/cpu/psx/mdec.cpp +++ b/src/devices/cpu/psx/mdec.cpp @@ -32,7 +32,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c DEFINE_DEVICE_TYPE(PSX_MDEC, psxmdec_device, "psxmdec", "Sony PSX MDEC") -psxmdec_device::psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +psxmdec_device::psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_MDEC, tag, owner, clock), 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 8d9da890069..a597c3e69c1 100644 --- a/src/devices/cpu/psx/mdec.h +++ b/src/devices/cpu/psx/mdec.h @@ -18,7 +18,7 @@ DECLARE_DEVICE_TYPE(PSX_MDEC, psxmdec_device) class psxmdec_device : public device_t { public: - psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void write(offs_t offset, uint32_t data); uint32_t read(offs_t offset); diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp index 1e7ed448c2e..cb51a087212 100644 --- a/src/devices/cpu/psx/psx.cpp +++ b/src/devices/cpu/psx/psx.cpp @@ -1784,7 +1784,7 @@ void psxcpu_device::psxcpu_internal_map(address_map &map) // psxcpu_device - constructor //------------------------------------------------- -psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock ) : +psxcpu_device::psxcpu_device( const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock ) : cpu_device( mconfig, type, tag, owner, clock ), m_program_config( "program", ENDIANNESS_LITTLE, 32, 32, 0, address_map_constructor(FUNC(psxcpu_device::psxcpu_internal_map), this)), m_gpu_read_handler( *this ), @@ -1799,32 +1799,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, const char *tag, device_t *owner, uint32_t clock ) +cxd8530aq_device::cxd8530aq_device( const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock ) : psxcpu_device( mconfig, CXD8530AQ, tag, owner, clock) { } -cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) +cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock ) : psxcpu_device( mconfig, CXD8530BQ, tag, owner, clock) { } -cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) +cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock ) : psxcpu_device( mconfig, CXD8530CQ, tag, owner, clock) { } -cxd8661r_device::cxd8661r_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) +cxd8661r_device::cxd8661r_device( const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock ) : psxcpu_device( mconfig, CXD8661R, tag, owner, clock) { } -cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) +cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock ) : psxcpu_device( mconfig, CXD8606BQ, tag, owner, clock) { } -cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) +cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock ) : psxcpu_device( mconfig, CXD8606CQ, tag, owner, clock) { } @@ -3450,17 +3450,17 @@ device_memory_interface::space_config_vector psxcpu_device::memory_space_config( void psxcpu_device::device_add_mconfig(machine_config &config) { - auto &irq(PSX_IRQ(config, "irq", 0)); + auto &irq(PSX_IRQ(config, "irq")); irq.irq().set_inputline(DEVICE_SELF, PSXCPU_IRQ0); - auto &dma(PSX_DMA(config, "dma", 0)); + auto &dma(PSX_DMA(config, "dma")); dma.irq().set("irq", FUNC(psxirq_device::intin3)); - auto &mdec(PSX_MDEC(config, "mdec", 0)); + auto &mdec(PSX_MDEC(config, "mdec")); dma.install_write_handler(0, psxdma_device::write_delegate(&psxmdec_device::dma_write, &mdec)); dma.install_read_handler(1, psxdma_device::write_delegate(&psxmdec_device::dma_read, &mdec)); - auto &rcnt(PSX_RCNT(config, "rcnt", 0)); + auto &rcnt(PSX_RCNT(config, "rcnt")); rcnt.irq0().set("irq", FUNC(psxirq_device::intin4)); rcnt.irq1().set("irq", FUNC(psxirq_device::intin5)); rcnt.irq2().set("irq", FUNC(psxirq_device::intin6)); diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index 4ab779d9139..73e756ae332 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -168,7 +168,7 @@ protected: static constexpr unsigned ICACHE_ENTRIES = 0x400; static constexpr unsigned DCACHE_ENTRIES = 0x100; - psxcpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + psxcpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -325,42 +325,42 @@ class cxd8530aq_device : public psxcpu_device { public: // construction/destruction - cxd8530aq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cxd8530aq_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class cxd8530bq_device : public psxcpu_device { public: // construction/destruction - cxd8530bq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cxd8530bq_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class cxd8530cq_device : public psxcpu_device { public: // construction/destruction - cxd8530cq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cxd8530cq_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class cxd8661r_device : public psxcpu_device { public: // construction/destruction - cxd8661r_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cxd8661r_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class cxd8606bq_device : public psxcpu_device { public: // construction/destruction - cxd8606bq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cxd8606bq_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class cxd8606cq_device : public psxcpu_device { public: // construction/destruction - cxd8606cq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cxd8606cq_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; // device type definition diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp index 02e55dd5333..cdd71510846 100644 --- a/src/devices/cpu/psx/rcnt.cpp +++ b/src/devices/cpu/psx/rcnt.cpp @@ -29,7 +29,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c DEFINE_DEVICE_TYPE(PSX_RCNT, psxrcnt_device, "psxrcnt", "Sony PSX RCNT") -psxrcnt_device::psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psxrcnt_device::psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_RCNT, tag, owner, clock), 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 8e0a471f4e1..61e1e852195 100644 --- a/src/devices/cpu/psx/rcnt.h +++ b/src/devices/cpu/psx/rcnt.h @@ -27,7 +27,7 @@ DECLARE_DEVICE_TYPE(PSX_RCNT, psxrcnt_device) class psxrcnt_device : public device_t { public: - psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // configuration helpers auto irq0() { return m_irq0_handler.bind(); } diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index 46b73d6b3a9..fc71b4d8055 100644 --- a/src/devices/cpu/psx/sio.cpp +++ b/src/devices/cpu/psx/sio.cpp @@ -30,17 +30,17 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c DEFINE_DEVICE_TYPE(PSX_SIO0, psxsio0_device, "psxsio0", "Sony PSX SIO-0") DEFINE_DEVICE_TYPE(PSX_SIO1, psxsio1_device, "psxsio1", "Sony PSX SIO-1") -psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : psxsio_device(mconfig, PSX_SIO0, tag, owner, clock) { } -psxsio1_device::psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psxsio1_device::psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : psxsio_device(mconfig, PSX_SIO1, tag, owner, clock) { } -psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock), 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), diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h index 482a8081d6a..afe6a3dceec 100644 --- a/src/devices/cpu/psx/sio.h +++ b/src/devices/cpu/psx/sio.h @@ -50,7 +50,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_dsr); protected: - psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -86,13 +86,13 @@ private: class psxsio0_device : public psxsio_device { public: - psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class psxsio1_device : public psxsio_device { public: - psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; #endif // MAME_CPU_PSX_SIO_H |