diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2017-06-09 12:48:45 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2017-06-09 12:48:45 +0200 |
commit | e844b01154f1d57c9736b37c085ea0b9bbb15acb (patch) | |
tree | 272d3ad1d7c9562f8c01809ab3daaafc9442435a /src/devices/bus/isa/cga.cpp | |
parent | 0b546073e758e33abb12e738ab12aaf1377f2a3e (diff) |
device_add_mconfig up to devices/bus/l* (nw)
Diffstat (limited to 'src/devices/bus/isa/cga.cpp')
-rw-r--r-- | src/devices/bus/isa/cga.cpp | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index ca5c44d92d8..2f810bdafdb 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -244,24 +244,6 @@ MC6845_UPDATE_ROW( isa8_cga_pc1512_device::crtc_update_row ) #define CGA_LCLK (XTAL_14_31818MHz/16) -static MACHINE_CONFIG_START( cga ) - MCFG_SCREEN_ADD(CGA_SCREEN_NAME, RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) - MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, isa8_cga_device, screen_update ) - - MCFG_PALETTE_ADD("palette", /* CGA_PALETTE_SETS * 16*/ 65536 ) - - MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL_14_31818MHz/8) - MCFG_MC6845_SHOW_BORDER_AREA(false) - MCFG_MC6845_CHAR_WIDTH(8) - MCFG_MC6845_UPDATE_ROW_CB(isa8_cga_device, crtc_update_row) - MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_cga_device, hsync_changed)) - MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_cga_device, vsync_changed)) - MCFG_MC6845_RECONFIGURE_CB(isa8_cga_device, reconfigure) - MCFG_VIDEO_SET_SCREEN(nullptr) -MACHINE_CONFIG_END - - ROM_START( cga ) /* IBM 1501981(CGA) and 1501985(MDA) Character rom */ ROM_REGION(0x2000,"gfx1", 0) @@ -276,14 +258,25 @@ ROM_END DEFINE_DEVICE_TYPE(ISA8_CGA, isa8_cga_device, "cga", "IBM Color/Graphics Monitor Adapter") //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// device_add_mconfig - add device configuration //------------------------------------------------- -machine_config_constructor isa8_cga_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( cga ); -} +MACHINE_CONFIG_MEMBER( isa8_cga_device::device_add_mconfig ) + MCFG_SCREEN_ADD(CGA_SCREEN_NAME, RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) + MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, isa8_cga_device, screen_update ) + + MCFG_PALETTE_ADD("palette", /* CGA_PALETTE_SETS * 16*/ 65536 ) + + MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL_14_31818MHz/8) + MCFG_MC6845_SHOW_BORDER_AREA(false) + MCFG_MC6845_CHAR_WIDTH(8) + MCFG_MC6845_UPDATE_ROW_CB(isa8_cga_device, crtc_update_row) + MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_cga_device, hsync_changed)) + MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_cga_device, vsync_changed)) + MCFG_MC6845_RECONFIGURE_CB(isa8_cga_device, reconfigure) + MCFG_VIDEO_SET_SCREEN(nullptr) +MACHINE_CONFIG_END ioport_constructor isa8_cga_device::device_input_ports() const { @@ -1916,17 +1909,15 @@ const tiny_rom_entry *isa8_cga_mc1502_device::device_rom_region() const DEFINE_DEVICE_TYPE(ISA8_CGA_M24, isa8_cga_m24_device, "cga_m24", "Olivetti M24 CGA") -static MACHINE_CONFIG_DERIVED( m24, cga ) +MACHINE_CONFIG_MEMBER( isa8_cga_m24_device::device_add_mconfig ) + isa8_cga_device::device_add_mconfig(config); + MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,462,0,400) MCFG_DEVICE_MODIFY(CGA_MC6845_NAME) MCFG_MC6845_RECONFIGURE_CB(isa8_cga_m24_device, reconfigure) MACHINE_CONFIG_END -machine_config_constructor isa8_cga_m24_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( m24 ); -} isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_cga_device(mconfig, ISA8_CGA_M24, tag, owner, clock), m_mode2(0), m_index(0) { |