diff options
Diffstat (limited to 'src/mame/drivers/cybiko.cpp')
-rw-r--r-- | src/mame/drivers/cybiko.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index cec1030e999..0259c65c7cc 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -64,7 +64,7 @@ ToDo: void cybiko_state::cybikov1_mem(address_map &map) { map(0x000000, 0x007fff).rom(); - map(0x600000, 0x600001).rw(this, FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); + map(0x600000, 0x600001).rw(FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); // AM_RANGE( 0xe00000, 0xe07fff ) AM_READ( cybikov1_key_r ) } @@ -106,18 +106,18 @@ void cybiko_state::cybikov2_mem(address_map &map) { map(0x000000, 0x007fff).rom(); map(0x100000, 0x13ffff).r("flash2", FUNC(sst_39vf020_device::read)).mirror(0x0c0000); - map(0x600000, 0x600001).rw(this, FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)).mirror(0x1ffffe); - map(0xe00000, 0xffdbff).r(this, FUNC(cybiko_state::cybikov2_key_r)); + map(0x600000, 0x600001).rw(FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)).mirror(0x1ffffe); + map(0xe00000, 0xffdbff).r(FUNC(cybiko_state::cybikov2_key_r)); } // 2048 kbyte ram + 512 kbyte memory mapped flash void cybiko_state::cybikoxt_mem(address_map &map) { map(0x000000, 0x007fff).rom().mirror(0x038000); - map(0x100000, 0x100001).rw(this, FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); - map(0x200000, 0x200003).w(this, FUNC(cybiko_state::cybiko_usb_w)); + map(0x100000, 0x100001).rw(FUNC(cybiko_state::cybiko_lcd_r), FUNC(cybiko_state::cybiko_lcd_w)); + map(0x200000, 0x200003).w(FUNC(cybiko_state::cybiko_usb_w)); map(0x600000, 0x67ffff).r("flashxt", FUNC(sst_39vf400a_device::read)).mirror(0x180000); - map(0xe00000, 0xefffff).r(this, FUNC(cybiko_state::cybikoxt_key_r)); + map(0xe00000, 0xefffff).r(FUNC(cybiko_state::cybikoxt_key_r)); } WRITE16_MEMBER(cybiko_state::serflash_w) @@ -187,25 +187,25 @@ READ16_MEMBER(cybiko_state::port0_r) void cybiko_state::cybikov1_io(address_map &map) { - map(h8_device::PORT_3, h8_device::PORT_3).w(this, FUNC(cybiko_state::serflash_w)); - map(h8_device::PORT_F, h8_device::PORT_F).rw(this, FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); - map(h8_device::ADC_1, h8_device::ADC_1).r(this, FUNC(cybiko_state::adc1_r)); - map(h8_device::ADC_2, h8_device::ADC_2).r(this, FUNC(cybiko_state::adc2_r)); + map(h8_device::PORT_3, h8_device::PORT_3).w(FUNC(cybiko_state::serflash_w)); + map(h8_device::PORT_F, h8_device::PORT_F).rw(FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); + map(h8_device::ADC_1, h8_device::ADC_1).r(FUNC(cybiko_state::adc1_r)); + map(h8_device::ADC_2, h8_device::ADC_2).r(FUNC(cybiko_state::adc2_r)); } void cybiko_state::cybikov2_io(address_map &map) { - map(h8_device::PORT_1, h8_device::PORT_1).r(this, FUNC(cybiko_state::port0_r)); - map(h8_device::PORT_3, h8_device::PORT_3).w(this, FUNC(cybiko_state::serflash_w)); - map(h8_device::PORT_F, h8_device::PORT_F).rw(this, FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); - map(h8_device::ADC_1, h8_device::ADC_1).r(this, FUNC(cybiko_state::adc1_r)); - map(h8_device::ADC_2, h8_device::ADC_2).r(this, FUNC(cybiko_state::adc2_r)); + map(h8_device::PORT_1, h8_device::PORT_1).r(FUNC(cybiko_state::port0_r)); + map(h8_device::PORT_3, h8_device::PORT_3).w(FUNC(cybiko_state::serflash_w)); + map(h8_device::PORT_F, h8_device::PORT_F).rw(FUNC(cybiko_state::clock_r), FUNC(cybiko_state::clock_w)); + map(h8_device::ADC_1, h8_device::ADC_1).r(FUNC(cybiko_state::adc1_r)); + map(h8_device::ADC_2, h8_device::ADC_2).r(FUNC(cybiko_state::adc2_r)); } void cybiko_state::cybikoxt_io(address_map &map) { - map(h8_device::PORT_A, h8_device::PORT_A).r(this, FUNC(cybiko_state::xtpower_r)); - map(h8_device::PORT_F, h8_device::PORT_F).rw(this, FUNC(cybiko_state::xtclock_r), FUNC(cybiko_state::xtclock_w)); + map(h8_device::PORT_A, h8_device::PORT_A).r(FUNC(cybiko_state::xtpower_r)); + map(h8_device::PORT_F, h8_device::PORT_F).rw(FUNC(cybiko_state::xtclock_r), FUNC(cybiko_state::xtclock_w)); } ///////////////// |