diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/cc40.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/cc40.cpp')
-rw-r--r-- | src/mame/drivers/cc40.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index e333a96ba3a..9440d942c8a 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -408,11 +408,11 @@ INPUT_CHANGED_MEMBER(cc40_state::sysram_size_changed) static INPUT_PORTS_START( cc40 ) PORT_START("RAMSIZE") - PORT_CONFNAME( 0x07, 0x01, "RAM Chip 1") PORT_CHANGED_MEMBER(DEVICE_SELF, cc40_state, sysram_size_changed, 0) + PORT_CONFNAME( 0x07, 0x01, "RAM Chip 1") PORT_CHANGED_MEMBER(DEVICE_SELF, cc40_state, sysram_size_changed, (void *)0) PORT_CONFSETTING( 0x00, "None" ) PORT_CONFSETTING( 0x01, "2KB" ) PORT_CONFSETTING( 0x04, "8KB" ) - PORT_CONFNAME( 0x70, 0x10, "RAM Chip 2") PORT_CHANGED_MEMBER(DEVICE_SELF, cc40_state, sysram_size_changed, 1) + PORT_CONFNAME( 0x70, 0x10, "RAM Chip 2") PORT_CHANGED_MEMBER(DEVICE_SELF, cc40_state, sysram_size_changed, (void *)1) PORT_CONFSETTING( 0x00, "None" ) // note: invalid configuration, unless Chip 1 is also 0x00 PORT_CONFSETTING( 0x10, "2KB" ) PORT_CONFSETTING( 0x40, "8KB" ) @@ -598,33 +598,33 @@ MACHINE_CONFIG_START(cc40_state::cc40) NVRAM(config, "sysram.2", nvram_device::DEFAULT_ALL_0); /* video hardware */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD)); - screen.set_refresh_hz(60); // arbitrary - screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); - screen.set_size(6*31+1, 9*1+1+1); - screen.set_visarea_full(); + MCFG_SCREEN_ADD("screen", LCD) + MCFG_SCREEN_REFRESH_RATE(60) // arbitrary + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_SIZE(6*31+1, 9*1+1+1) + MCFG_SCREEN_VISIBLE_AREA(0, 6*31, 0, 9*1+1) config.set_default_layout(layout_cc40); - screen.set_screen_update("hd44780", FUNC(hd44780_device::screen_update)); - screen.set_palette("palette"); + MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) + MCFG_SCREEN_PALETTE("palette") PALETTE(config, "palette", FUNC(cc40_state::cc40_palette), 3); - hd44780_device &hd44780(HD44780(config, "hd44780", 0)); - hd44780.set_lcd_size(2, 16); // 2*16 internal - hd44780.set_pixel_update_cb(FUNC(cc40_state::cc40_pixel_update), this); + MCFG_HD44780_ADD("hd44780") + MCFG_HD44780_LCD_SIZE(2, 16) // 2*16 internal + MCFG_HD44780_PIXEL_UPDATE_CB(cc40_state, cc40_pixel_update) /* sound hardware */ SPEAKER(config, "speaker").front_center(); - DAC_1BIT(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25); - voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); - vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); + MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) + MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) + MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) /* cartridge */ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "cc40_cart") MCFG_GENERIC_EXTENSIONS("bin,rom,256") MCFG_GENERIC_LOAD(cc40_state, cc40_cartridge) - SOFTWARE_LIST(config, "cart_list").set_original("cc40_cart"); + MCFG_SOFTWARE_LIST_ADD("cart_list", "cc40_cart") MACHINE_CONFIG_END |