diff options
Diffstat (limited to 'src/devices/cpu/avr8')
-rw-r--r-- | src/devices/cpu/avr8/avr8.cpp | 16 | ||||
-rw-r--r-- | src/devices/cpu/avr8/avr8.h | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp index f650a53bbb3..85afb1482bd 100644 --- a/src/devices/cpu/avr8/avr8.cpp +++ b/src/devices/cpu/avr8/avr8.cpp @@ -642,7 +642,7 @@ void attiny15_device::attiny15_internal_map(address_map &map) // atmega88_device - constructor //------------------------------------------------- -atmega88_device::atmega88_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atmega88_device::atmega88_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : avr8_device(mconfig, tag, owner, clock, ATMEGA88, 0x0fff, address_map_constructor(FUNC(atmega88_device::atmega88_internal_map), this), 3) { } @@ -651,7 +651,7 @@ atmega88_device::atmega88_device(const machine_config &mconfig, const char *tag, // atmega168_device - constructor //------------------------------------------------- -atmega168_device::atmega168_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atmega168_device::atmega168_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : avr8_device(mconfig, tag, owner, clock, ATMEGA168, 0x1fff, address_map_constructor(FUNC(atmega168_device::atmega168_internal_map), this), 3) { } @@ -660,7 +660,7 @@ atmega168_device::atmega168_device(const machine_config &mconfig, const char *ta // atmega328_device - constructor //------------------------------------------------- -atmega328_device::atmega328_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atmega328_device::atmega328_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : avr8_device(mconfig, tag, owner, clock, ATMEGA328, 0x7fff, address_map_constructor(FUNC(atmega328_device::atmega328_internal_map), this), 3) { } @@ -669,7 +669,7 @@ atmega328_device::atmega328_device(const machine_config &mconfig, const char *ta // atmega644_device - constructor //------------------------------------------------- -atmega644_device::atmega644_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atmega644_device::atmega644_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : avr8_device(mconfig, tag, owner, clock, ATMEGA644, 0xffff, address_map_constructor(FUNC(atmega644_device::atmega644_internal_map), this), 3) { } @@ -678,7 +678,7 @@ atmega644_device::atmega644_device(const machine_config &mconfig, const char *ta // atmega1280_device - constructor //------------------------------------------------- -atmega1280_device::atmega1280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atmega1280_device::atmega1280_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : avr8_device(mconfig, tag, owner, clock, ATMEGA1280, 0x1ffff, address_map_constructor(FUNC(atmega1280_device::atmega1280_internal_map), this), 6) { } @@ -687,7 +687,7 @@ atmega1280_device::atmega1280_device(const machine_config &mconfig, const char * // atmega2560_device - constructor //------------------------------------------------- -atmega2560_device::atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +atmega2560_device::atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : avr8_device(mconfig, tag, owner, clock, ATMEGA2560, 0x1ffff, address_map_constructor(FUNC(atmega2560_device::atmega2560_internal_map), this), 6) { } @@ -696,7 +696,7 @@ atmega2560_device::atmega2560_device(const machine_config &mconfig, const char * // attiny15_device - constructor //------------------------------------------------- -attiny15_device::attiny15_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +attiny15_device::attiny15_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : avr8_device(mconfig, tag, owner, clock, ATTINY15, 0x03ff, address_map_constructor(FUNC(attiny15_device::attiny15_internal_map), this), 2) { } @@ -705,7 +705,7 @@ attiny15_device::attiny15_device(const machine_config &mconfig, const char *tag, // avr8_device - constructor //------------------------------------------------- -avr8_device::avr8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, const device_type type, uint32_t addr_mask, address_map_constructor internal_map, int32_t num_timers) +avr8_device::avr8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, const device_type type, uint32_t addr_mask, address_map_constructor internal_map, int32_t num_timers) : cpu_device(mconfig, type, tag, owner, clock) , m_shifted_pc(0) , m_program_config("program", ENDIANNESS_LITTLE, 8, 22) diff --git a/src/devices/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h index 85f05e8cea6..758cd1cf945 100644 --- a/src/devices/cpu/avr8/avr8.h +++ b/src/devices/cpu/avr8/avr8.h @@ -45,7 +45,7 @@ public: template<uint8_t Port> auto gpio_in() { return m_gpio_in_cb[Port].bind(); } protected: - avr8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, const device_type type, uint32_t address_mask, address_map_constructor internal_map, int32_t num_timers); + avr8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, const device_type type, uint32_t address_mask, address_map_constructor internal_map, int32_t num_timers); typedef void (avr8_device::*op_func) (uint16_t op); @@ -319,7 +319,7 @@ class atmega88_device : public avr8_device { public: // construction/destruction - atmega88_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atmega88_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void atmega88_internal_map(address_map &map); }; @@ -329,7 +329,7 @@ class atmega168_device : public avr8_device { public: // construction/destruction - atmega168_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atmega168_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void update_interrupt(int source) override; void atmega168_internal_map(address_map &map); @@ -341,7 +341,7 @@ class atmega328_device : public avr8_device { public: // construction/destruction - atmega328_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atmega328_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void update_interrupt(int source) override; void atmega328_internal_map(address_map &map); @@ -353,7 +353,7 @@ class atmega644_device : public avr8_device { public: // construction/destruction - atmega644_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atmega644_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void update_interrupt(int source) override; void atmega644_internal_map(address_map &map); @@ -365,7 +365,7 @@ class atmega1280_device : public avr8_device { public: // construction/destruction - atmega1280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atmega1280_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void update_interrupt(int source) override; void atmega1280_internal_map(address_map &map); @@ -377,7 +377,7 @@ class atmega2560_device : public avr8_device { public: // construction/destruction - atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void update_interrupt(int source) override; void atmega2560_internal_map(address_map &map); @@ -389,7 +389,7 @@ class attiny15_device : public avr8_device { public: // construction/destruction - attiny15_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + attiny15_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void attiny15_internal_map(address_map &map); }; |