summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/gba
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/gba')
-rw-r--r--src/devices/bus/gba/gba_slot.cpp2
-rw-r--r--src/devices/bus/gba/gba_slot.h4
-rw-r--r--src/devices/bus/gba/rom.cpp38
-rw-r--r--src/devices/bus/gba/rom.h38
4 files changed, 41 insertions, 41 deletions
diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp
index bb5ad11048e..e574578f700 100644
--- a/src/devices/bus/gba/gba_slot.cpp
+++ b/src/devices/bus/gba/gba_slot.cpp
@@ -532,7 +532,7 @@ void device_gba_cart_interface::nvram_alloc(uint32_t size)
//-------------------------------------------------
// gba_cart_slot_device - constructor
//-------------------------------------------------
-gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, GBA_CART_SLOT, tag, owner, clock),
device_cartrom_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h
index 70fad8e4581..e1e7fffb845 100644
--- a/src/devices/bus/gba/gba_slot.h
+++ b/src/devices/bus/gba/gba_slot.h
@@ -86,7 +86,7 @@ public:
// construction/destruction
template <typename T>
gba_cart_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
- : gba_cart_slot_device(mconfig, tag, owner, 0)
+ : gba_cart_slot_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
@@ -94,7 +94,7 @@ public:
set_fixed(false);
}
- gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~gba_cart_slot_device();
// image-level overrides
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index 643432b8433..cff51b9c308 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -36,108 +36,108 @@ DEFINE_DEVICE_TYPE(GBA_ROM_FLASH1M_RTC, gba_rom_flash1m_rtc_device, "gba_rom_fla
DEFINE_DEVICE_TYPE(GBA_ROM_3DMATRIX, gba_rom_3dmatrix_device, "gba_rom_3dmatrix", "3D Matrix Memory Mapper")
-gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_gba_cart_interface(mconfig, *this)
{
}
-gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_device(mconfig, GBA_ROM_STD, tag, owner, clock)
{
}
-gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_device(mconfig, type, tag, owner, clock)
{
}
-gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_sram_device(mconfig, GBA_ROM_SRAM, tag, owner, clock)
{
}
-gba_rom_drilldoz_device::gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_drilldoz_device::gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_sram_device(mconfig, GBA_ROM_DRILLDOZ, tag, owner, clock)
, m_rumble(*this, "Rumble")
{
}
-gba_rom_wariotws_device::gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_wariotws_device::gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_sram_device(mconfig, GBA_ROM_WARIOTWS, tag, owner, clock)
, m_rumble(*this, "Rumble")
, m_gyro_z(*this, "GYROZ")
{
}
-gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_device(mconfig, type, tag, owner, clock)
{
}
-gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_eeprom_device(mconfig, GBA_ROM_EEPROM, tag, owner, clock)
{
}
-gba_rom_yoshiug_device::gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_yoshiug_device::gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_eeprom_device(mconfig, GBA_ROM_YOSHIUG, tag, owner, clock)
, m_tilt_x(*this, "TILTX")
, m_tilt_y(*this, "TILTY")
{
}
-gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_device(mconfig, type, tag, owner, clock)
{
}
-gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_eeprom64_device(mconfig, GBA_ROM_EEPROM64, tag, owner, clock)
{
}
-gba_rom_boktai_device::gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_boktai_device::gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_eeprom64_device(mconfig, GBA_ROM_BOKTAI, tag, owner, clock)
, m_sensor(*this, "LIGHTSENSE")
{
}
-gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_device(mconfig, type, tag, owner, clock)
, m_flash_mask(0)
, m_flash(*this, "flash")
{
}
-gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_flash_device(mconfig, GBA_ROM_FLASH, tag, owner, clock)
{
}
-gba_rom_flash_rtc_device::gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_flash_rtc_device::gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_flash_device(mconfig, GBA_ROM_FLASH_RTC, tag, owner, clock)
{
}
-gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_device(mconfig, type, tag, owner, clock)
, m_flash_mask(0)
, m_flash(*this, "flash")
{
}
-gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_flash1m_device(mconfig, GBA_ROM_FLASH1M, tag, owner, clock)
{
}
-gba_rom_flash1m_rtc_device::gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_flash1m_rtc_device::gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_flash1m_device(mconfig, GBA_ROM_FLASH1M_RTC, tag, owner, clock)
{
}
-gba_rom_3dmatrix_device::gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gba_rom_3dmatrix_device::gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gba_rom_device(mconfig, GBA_ROM_3DMATRIX, tag, owner, clock)
{
}
diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h
index 3a1ac4005a1..d009f10a426 100644
--- a/src/devices/bus/gba/rom.h
+++ b/src/devices/bus/gba/rom.h
@@ -88,7 +88,7 @@ class gba_rom_device : public device_t,
{
public:
// construction/destruction
- gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint32_t read_rom(offs_t offset) override { return m_rom[offset]; }
@@ -100,7 +100,7 @@ public:
virtual void gpio_dev_write(uint16_t data, int gpio_dirs) { }
protected:
- gba_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_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;
@@ -118,14 +118,14 @@ class gba_rom_sram_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override;
virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override;
protected:
- gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
};
@@ -135,7 +135,7 @@ class gba_rom_drilldoz_device : public gba_rom_sram_device
{
public:
// construction/destruction
- gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -153,7 +153,7 @@ class gba_rom_wariotws_device : public gba_rom_sram_device
{
public:
// construction/destruction
- gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ioport_constructor device_input_ports() const override;
@@ -180,14 +180,14 @@ class gba_rom_flash_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override;
virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override;
protected:
- gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_reset() override;
@@ -206,7 +206,7 @@ class gba_rom_flash_rtc_device : public gba_rom_flash_device
{
public:
// construction/destruction
- gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual uint16_t gpio_dev_read(int gpio_dirs) override;
@@ -226,14 +226,14 @@ class gba_rom_flash1m_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override;
virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override;
protected:
- gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_reset() override;
@@ -252,7 +252,7 @@ class gba_rom_flash1m_rtc_device : public gba_rom_flash1m_device
{
public:
// construction/destruction
- gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual uint16_t gpio_dev_read(int gpio_dirs) override;
@@ -272,14 +272,14 @@ class gba_rom_eeprom_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override;
virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override;
protected:
- gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_eeprom_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;
@@ -295,7 +295,7 @@ class gba_rom_yoshiug_device : public gba_rom_eeprom_device
{
public:
// construction/destruction
- gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
@@ -322,14 +322,14 @@ class gba_rom_eeprom64_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override;
virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override;
protected:
- gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_eeprom64_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;
@@ -344,7 +344,7 @@ class gba_rom_boktai_device : public gba_rom_eeprom64_device
{
public:
// construction/destruction
- gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
@@ -369,7 +369,7 @@ class gba_rom_3dmatrix_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual void write_mapper(offs_t offset, uint32_t data) override;