diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-10-01 11:44:29 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-10-01 11:44:29 +0000 |
commit | 3872f2482854e7e72632e187a7da71aab11d939e (patch) | |
tree | ee74842ba7a1cbc257aa175bd5c81195607bcc3e /src/mame | |
parent | 2130d6d36a4671259a81f90c22001cc1806e3b14 (diff) |
Converted VGA to be multiple devices, this will require some cleanup in future (no whatsnew)
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/calchase.c | 14 | ||||
-rw-r--r-- | src/mame/drivers/gammagic.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/gamtor.c | 15 | ||||
-rw-r--r-- | src/mame/drivers/magtouch.c | 13 | ||||
-rw-r--r-- | src/mame/drivers/midqslvr.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/pangofun.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/pcat_dyn.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/pcat_nit.c | 13 | ||||
-rw-r--r-- | src/mame/drivers/photoply.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/pntnpuzl.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/queen.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/savquest.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/su2000.c | 23 | ||||
-rw-r--r-- | src/mame/drivers/taitowlf.c | 16 | ||||
-rw-r--r-- | src/mame/drivers/voyager.c | 14 | ||||
-rw-r--r-- | src/mame/drivers/xtom3d.c | 12 |
16 files changed, 68 insertions, 148 deletions
diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c index b60ba918c42..04285f11083 100644 --- a/src/mame/drivers/calchase.c +++ b/src/mame/drivers/calchase.c @@ -175,7 +175,6 @@ public: DECLARE_DRIVER_INIT(calchase); virtual void machine_start(); virtual void machine_reset(); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -543,7 +542,7 @@ WRITE16_MEMBER(calchase_state::calchase_dac_r_w) static ADDRESS_MAP_START( calchase_map, AS_PROGRAM, 32, calchase_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(trident_mem_r, trident_mem_w, 0xffffffff) // VGA VRAM + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", trident_vga_device, mem_r, mem_w, 0xffffffff) // VGA VRAM AM_RANGE(0x000c0000, 0x000c7fff) AM_RAM AM_REGION("video_bios", 0) AM_RANGE(0x000c8000, 0x000cffff) AM_NOP //AM_RANGE(0x000d0000, 0x000d0003) AM_RAM // XYLINX - Sincronus serial communication @@ -600,9 +599,9 @@ static ADDRESS_MAP_START( calchase_io, AS_IO, 32, calchase_state ) AM_RANGE(0x02f8, 0x02ff) AM_NOP //To debug AM_RANGE(0x0320, 0x038f) AM_NOP //To debug AM_RANGE(0x03a0, 0x03a7) AM_NOP //To debug - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(trident_03c0_r, trident_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(trident_03d0_r, trident_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", trident_vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03e0, 0x03ef) AM_NOP //To debug AM_RANGE(0x0378, 0x037f) AM_NOP //To debug // AM_RANGE(0x0300, 0x03af) AM_NOP @@ -808,8 +807,6 @@ static IRQ_CALLBACK(irq_callback) return pic8259_acknowledge( state->m_pic8259_1); } -READ8_MEMBER( calchase_state::vga_setting ) { return 0xff; } // hard-code to color - void calchase_state::machine_start() { machine().device("maincpu")->execute().set_irq_acknowledge_callback(irq_callback); @@ -948,7 +945,7 @@ static MACHINE_CONFIG_START( calchase, calchase_state ) MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w) /* video hardware */ - MCFG_FRAGMENT_ADD( pcvideo_vga ) + MCFG_FRAGMENT_ADD( pcvideo_trident_vga ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") @@ -980,7 +977,6 @@ DRIVER_INIT_MEMBER(calchase_state,calchase) { m_bios_ram = auto_alloc_array(machine(), UINT32, 0x20000/4); - pc_vga_init(machine(), read8_delegate(FUNC(calchase_state::vga_setting),this)); init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, calchase_set_keyb_int); intel82439tx_init(machine()); diff --git a/src/mame/drivers/gammagic.c b/src/mame/drivers/gammagic.c index 1a80961ade0..11244897728 100644 --- a/src/mame/drivers/gammagic.c +++ b/src/mame/drivers/gammagic.c @@ -103,7 +103,6 @@ public: UINT8 m_atapi_data[ATAPI_DATA_SIZE]; DECLARE_DRIVER_INIT(gammagic); - DECLARE_READ8_MEMBER(vga_setting); }; //static void atapi_irq(running_machine &machine, int state); @@ -545,7 +544,7 @@ static WRITE32_HANDLER( atapi_w ) // Memory is mostly handled by the chipset static ADDRESS_MAP_START( gammagic_map, AS_PROGRAM, 32, gammagic_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x00100000, 0x07ffffff) AM_RAM AM_RANGE(0x08000000, 0xfffdffff) AM_NOP AM_RANGE(0xfffe0000, 0xffffffff) AM_ROM AM_REGION("user", 0x20000)/* System BIOS */ @@ -564,9 +563,9 @@ static ADDRESS_MAP_START( gammagic_io, AS_IO, 32, gammagic_state) AM_RANGE(0x00f0, 0x01ef) AM_NOP //AM_RANGE(0x01f0, 0x01f7) AM_READWRITE_LEGACY(atapi_r, atapi_w) AM_RANGE(0x01f8, 0x03ef) AM_NOP - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x0cf7) AM_NOP AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_device, read, write) AM_RANGE(0x0400, 0xffff) AM_NOP @@ -629,8 +628,6 @@ static IRQ_CALLBACK(irq_callback) return pic8259_acknowledge( state->m_pic8259_1); } -READ8_MEMBER( gammagic_state::vga_setting ) { return 0xff; } // hard-code to color - static MACHINE_START(gammagic) { gammagic_state *state = machine.driver_data<gammagic_state>(); @@ -798,7 +795,6 @@ MACHINE_CONFIG_END DRIVER_INIT_MEMBER(gammagic_state,gammagic) { - pc_vga_init(machine(), read8_delegate(FUNC(gammagic_state::vga_setting),this)); init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, gammagic_set_keyb_int); kbdc8042_init(machine(), &at8042); atapi_init(machine()); diff --git a/src/mame/drivers/gamtor.c b/src/mame/drivers/gamtor.c index fef687fcf08..7fa947ed79a 100644 --- a/src/mame/drivers/gamtor.c +++ b/src/mame/drivers/gamtor.c @@ -35,7 +35,6 @@ public: : driver_device(mconfig, type, tag){ } DECLARE_WRITE32_MEMBER(gamtor_unk_w); DECLARE_DRIVER_INIT(gaminator); - DECLARE_READ8_MEMBER(vga_setting); }; WRITE32_MEMBER(gaminator_state::gamtor_unk_w) @@ -54,11 +53,11 @@ static ADDRESS_MAP_START( gaminator_map, AS_PROGRAM, 32, gaminator_state ) /* standard VGA */ //AM_RANGE(0x40000000, 0x40000fff) AM_RAM // regs - AM_RANGE(0x400003b0, 0x400003bf) AM_READWRITE8_LEGACY(vga_port_gamtor_03b0_r, vga_port_gamtor_03b0_w, 0xffffffff) - AM_RANGE(0x400003c0, 0x400003cf) AM_READWRITE8_LEGACY(vga_port_gamtor_03c0_r, vga_port_gamtor_03c0_w, 0xffffffff) - AM_RANGE(0x400003d0, 0x400003df) AM_READWRITE8_LEGACY(vga_port_gamtor_03d0_r, vga_port_gamtor_03d0_w, 0xffffffff) + AM_RANGE(0x400003b0, 0x400003bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x400003c0, 0x400003cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x400003d0, 0x400003df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) - AM_RANGE(0x44000000, 0x4401ffff) AM_READWRITE8_LEGACY(vga_gamtor_mem_r,vga_gamtor_mem_w, 0xffffffff) // VRAM + AM_RANGE(0x44000000, 0x4401ffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) // VRAM // AM_RANGE(0x44000000, 0x44007fff) AM_RAM AM_SHARE("tmapram1") // puts strings here, looks almost like a tilemap, but where are the tiles? // AM_RANGE(0x440a0000, 0x440a1fff) AM_RAM AM_SHARE("tmapram2") // beetlem (like above, mirror?) @@ -77,7 +76,7 @@ static MACHINE_CONFIG_START( gaminator, gaminator_state ) MCFG_CPU_PROGRAM_MAP(gaminator_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaminator_state, irq6_line_hold) // irq6 seems to be needed to get past the ROM checking - MCFG_FRAGMENT_ADD( pcvideo_vga ) + MCFG_FRAGMENT_ADD( pcvideo_gamtor_vga ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* unknown sound */ @@ -1253,12 +1252,8 @@ ROM_START( llcharma ) ROM_LOAD( "llc_92_5.6-0", 0x0000, 0x2000000, CRC(c8c2a5d3) SHA1(ec23eff63871cc515ec58a894446d4d639d864e4) ) ROM_END -READ8_MEMBER(gaminator_state::vga_setting ) { return 0xff; } // hard-code to color - - DRIVER_INIT_MEMBER(gaminator_state,gaminator) { - pc_vga_init(machine(), read8_delegate(FUNC(gaminator_state::vga_setting),this)); } diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c index b9ff99128a6..d13c0aa5111 100644 --- a/src/mame/drivers/magtouch.c +++ b/src/mame/drivers/magtouch.c @@ -100,7 +100,6 @@ public: DECLARE_WRITE_LINE_MEMBER(at_com_interrupt_1); DECLARE_DRIVER_INIT(magtouch); virtual void machine_start(); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -169,7 +168,7 @@ WRITE8_MEMBER(magtouch_state::magtouch_io_w) static ADDRESS_MAP_START( magtouch_map, AS_PROGRAM, 32, magtouch_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) AM_RANGE(0x000d8000, 0x000dffff) AM_ROMBANK("rombank") AM_RANGE(0x000f0000, 0x000fffff) AM_RAM AM_REGION("bios", 0 ) @@ -180,9 +179,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( magtouch_io, AS_IO, 32, magtouch_state ) AM_IMPORT_FROM(pcat32_io_common) AM_RANGE(0x02e0, 0x02e7) AM_READWRITE8(magtouch_io_r, magtouch_io_w, 0xffffffff) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16450_0", ns16450_device, ins8250_r, ins8250_w, 0xffffffff) ADDRESS_MAP_END @@ -200,8 +199,6 @@ static void magtouch_set_keyb_int(running_machine &machine, int state) pic8259_ir1_w(machine.device("pic8259_1"), state); } -READ8_MEMBER( magtouch_state::vga_setting ) { return 0xff; } // hard-code to color - void magtouch_state::machine_start() { machine().device("maincpu")->execute().set_irq_acknowledge_callback(pcat_irq_callback); @@ -252,7 +249,7 @@ ROM_END DRIVER_INIT_MEMBER(magtouch_state,magtouch) { - pc_vga_init(machine(), read8_delegate(FUNC(magtouch_state::vga_setting),this)); } + GAME( 1995, magtouch, 0, magtouch, magtouch, magtouch_state, magtouch, ROT0, "Micro Manufacturing", "Magical Touch", GAME_NOT_WORKING | GAME_NO_SOUND ) diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c index 2fb1daebbce..6887b075d92 100644 --- a/src/mame/drivers/midqslvr.c +++ b/src/mame/drivers/midqslvr.c @@ -98,7 +98,6 @@ public: DECLARE_WRITE_LINE_MEMBER(midqslvr_pic8259_1_set_int_line); virtual void machine_start(); virtual void machine_reset(); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -535,7 +534,7 @@ static I8237_INTERFACE( dma8237_2_config ) static ADDRESS_MAP_START(midqslvr_map, AS_PROGRAM, 32, midqslvr_state) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c3fff) AM_ROMBANK("video_bank1") AM_WRITE(isa_ram1_w) AM_RANGE(0x000c4000, 0x000c7fff) AM_ROMBANK("video_bank2") AM_WRITE(isa_ram2_w) AM_RANGE(0x000e0000, 0x000e3fff) AM_ROMBANK("bios_ext1") AM_WRITE(bios_ext1_ram_w) @@ -559,9 +558,9 @@ static ADDRESS_MAP_START(midqslvr_io, AS_IO, 32, midqslvr_state) AM_RANGE(0x00e8, 0x00ef) AM_NOP AM_RANGE(0x01f0, 0x01f7) AM_READWRITE(ide_r, ide_w) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x03f7) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write) @@ -656,8 +655,6 @@ static void ide_interrupt(device_t *device, int state) pic8259_ir6_w(drvstate->m_pic8259_2, state); } -READ8_MEMBER( midqslvr_state::vga_setting ) { return 0xff; } // hard-code to color - void midqslvr_state::machine_start() { @@ -675,7 +672,6 @@ void midqslvr_state::machine_start() intel82439tx_init(machine()); kbdc8042_init(machine(), &at8042); - pc_vga_init(machine(), read8_delegate(FUNC(midqslvr_state::vga_setting),this)); } void midqslvr_state::machine_reset() diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c index 427ad517b79..fa6dbf7cc1a 100644 --- a/src/mame/drivers/pangofun.c +++ b/src/mame/drivers/pangofun.c @@ -107,13 +107,12 @@ public: DECLARE_DRIVER_INIT(pangofun); virtual void machine_start(); - DECLARE_READ8_MEMBER(vga_setting); }; static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32, pangofun_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) AM_RANGE(0x000f0000, 0x000fffff) AM_ROM AM_REGION("bios", 0 ) AM_RANGE(0x00100000, 0x00ffffff) AM_NOP @@ -124,9 +123,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pcat_io, AS_IO, 32, pangofun_state ) AM_IMPORT_FROM(pcat32_io_common) AM_RANGE(0x0070, 0x007f) AM_DEVREADWRITE8("rtc", mc146818_device, read, write, 0xffffffff) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) ADDRESS_MAP_END #define AT_KEYB_HELPER(bit, text, key1) \ @@ -168,8 +167,6 @@ static void pangofun_set_keyb_int(running_machine &machine, int state) pic8259_ir1_w(machine.device("pic8259_1"), state); } -READ8_MEMBER(pangofun_state::vga_setting ) { return 0xff; } // hard-code to color - static void set_gate_a20(running_machine &machine, int a20) { machine.device("maincpu")->execute().set_input_line(INPUT_LINE_A20, a20); @@ -247,7 +244,6 @@ ROM_END DRIVER_INIT_MEMBER(pangofun_state,pangofun) { - pc_vga_init(machine(), read8_delegate(FUNC(pangofun_state::vga_setting),this)); } GAME( 1995, pangofun, 0, pangofun, pangofun, pangofun_state, pangofun, ROT0, "InfoCube", "Pango Fun (Italy)", GAME_NOT_WORKING|GAME_NO_SOUND ) diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c index 4fe854e6316..4d4ee193e53 100644 --- a/src/mame/drivers/pcat_dyn.c +++ b/src/mame/drivers/pcat_dyn.c @@ -45,7 +45,6 @@ public: DECLARE_DRIVER_INIT(pcat_dyn); virtual void machine_start(); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -53,7 +52,7 @@ public: /* TODO: understand the proper ROM loading.*/ static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32, pcat_dyn_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) AM_RANGE(0x000c8000, 0x000cffff) AM_RAM // AM_RANGE(0x000d0000, 0x000d7fff) AM_RAM AM_REGION("disk_bios", 0) @@ -69,9 +68,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pcat_io, AS_IO, 32, pcat_dyn_state ) AM_IMPORT_FROM(pcat32_io_common) AM_RANGE(0x0070, 0x007f) AM_DEVREADWRITE8("rtc", mc146818_device, read, write, 0xffffffff) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) ADDRESS_MAP_END #define AT_KEYB_HELPER(bit, text, key1) \ @@ -113,8 +112,6 @@ static void pcat_dyn_set_keyb_int(running_machine &machine, int state) pic8259_ir1_w(machine.device("pic8259_1"), state); } -READ8_MEMBER(pcat_dyn_state::vga_setting ) { return 0xff; } // hard-code to color - static void set_gate_a20(running_machine &machine, int a20) { machine.device("maincpu")->execute().set_input_line(INPUT_LINE_A20, a20); @@ -200,7 +197,6 @@ ROM_END DRIVER_INIT_MEMBER(pcat_dyn_state,pcat_dyn) { - pc_vga_init(machine(), read8_delegate(FUNC(pcat_dyn_state::vga_setting),this)); } GAME( 1995, toursol, 0, pcat_dyn, pcat_dyn, pcat_dyn_state, pcat_dyn, ROT0, "Dynamo", "Tournament Solitaire (V1.06, 08/03/95)", GAME_NOT_WORKING|GAME_NO_SOUND ) diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c index caa77a8761f..4c09f9b3272 100644 --- a/src/mame/drivers/pcat_nit.c +++ b/src/mame/drivers/pcat_nit.c @@ -112,7 +112,6 @@ public: DECLARE_WRITE_LINE_MEMBER(at_com_interrupt_1); DECLARE_DRIVER_INIT(pcat_nit); virtual void machine_start(); - DECLARE_READ8_MEMBER(vga_setting); }; WRITE_LINE_MEMBER(pcat_nit_state::microtouch_out) @@ -183,7 +182,7 @@ WRITE8_MEMBER(pcat_nit_state::pcat_nit_rombank_w) static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32, pcat_nit_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) AM_WRITENOP AM_RANGE(0x000d0000, 0x000d3fff) AM_RAM AM_REGION("disk_bios", 0) AM_RANGE(0x000d7000, 0x000d7003) AM_WRITE8(pcat_nit_rombank_w, 0xff) @@ -211,9 +210,9 @@ static ADDRESS_MAP_START( pcat_nit_io, AS_IO, 32, pcat_nit_state ) AM_IMPORT_FROM(pcat32_io_common) AM_RANGE(0x0278, 0x027f) AM_READ8(pcat_nit_io_r, 0xffffffff) AM_WRITENOP AM_RANGE(0x0280, 0x0283) AM_READNOP - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16450_0", ns16450_device, ins8250_r, ins8250_w, 0xffffffff) ADDRESS_MAP_END @@ -231,8 +230,6 @@ static void streetg2_set_keyb_int(running_machine &machine, int state) pic8259_ir1_w(machine.device("pic8259_1"), state); } -READ8_MEMBER(pcat_nit_state::vga_setting ) { return 0xff; } // hard-code to color - void pcat_nit_state::machine_start() { machine().device("maincpu")->execute().set_irq_acknowledge_callback(pcat_irq_callback); @@ -429,8 +426,6 @@ DRIVER_INIT_MEMBER(pcat_nit_state,pcat_nit) { m_banked_nvram = auto_alloc_array(machine(), UINT8, 0x2000); machine().device<nvram_device>("nvram")->set_base(m_banked_nvram, 0x2000); - - pc_vga_init(machine(), read8_delegate(FUNC(pcat_nit_state::vga_setting),this)); } GAME( 1993, bonanza, 0, pcat_nit, pcat_nit, pcat_nit_state, pcat_nit, ROT0, "New Image Technologies", "Bonanza (Revision 3)", GAME_NOT_WORKING|GAME_NO_SOUND ) diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c index 7a6e5f85e58..04eb2f167a7 100644 --- a/src/mame/drivers/photoply.c +++ b/src/mame/drivers/photoply.c @@ -53,7 +53,6 @@ public: DECLARE_WRITE_LINE_MEMBER(at_pit8254_out2_changed); DECLARE_DRIVER_INIT(photoply); virtual void machine_start(); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -240,7 +239,7 @@ static const struct pit8253_config at_pit8254_config = static ADDRESS_MAP_START( photoply_map, AS_PROGRAM, 32, photoply_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) // VGA RAM + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) // VGA RAM AM_RANGE(0x000c0000, 0x000c7fff) AM_RAM AM_REGION("video_bios", 0) //??? AM_RANGE(0x000c8000, 0x000cffff) AM_RAM AM_REGION("video_bios", 0) AM_RANGE(0x000d0000, 0x000dffff) AM_RAM AM_REGION("ex_bios", 0) @@ -263,9 +262,9 @@ static ADDRESS_MAP_START( photoply_io, AS_IO, 32, photoply_state ) AM_RANGE(0x0278, 0x027f) AM_RAM //parallel port 2 AM_RANGE(0x0378, 0x037f) AM_RAM //parallel port //AM_RANGE(0x03bc, 0x03bf) AM_RAM //parallel port 3 - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) // AM_RANGE(0x03f4, 0x03f7) AM_READ_LEGACY(kludge_r) // fdc ADDRESS_MAP_END @@ -339,8 +338,6 @@ static GFXDECODE_START( photoply ) //there's also a 8x16 entry (just after the 8x8) GFXDECODE_END -READ8_MEMBER(photoply_state::vga_setting ) { return 0xff; } // hard-code to color - static MACHINE_CONFIG_START( photoply, photoply_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I486, 75000000) /* I486DX4, 75 or 100 Mhz */ @@ -381,7 +378,6 @@ ROM_END DRIVER_INIT_MEMBER(photoply_state,photoply) { - pc_vga_init(machine(), read8_delegate(FUNC(photoply_state::vga_setting),this)); } GAME( 199?, photoply, 0, photoply, photoply, photoply_state, photoply, ROT0, "Funworld", "Photo Play 2000 (v2.01)", GAME_NOT_WORKING|GAME_NO_SOUND ) diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 1ed4ef16134..f39ce68a4a3 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -153,7 +153,6 @@ public: DECLARE_READ16_MEMBER(pntnpuzl_eeprom_r); DECLARE_WRITE16_MEMBER(pntnpuzl_eeprom_w); DECLARE_DRIVER_INIT(pip); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -312,10 +311,10 @@ static ADDRESS_MAP_START( pntnpuzl_map, AS_PROGRAM, 16, pntnpuzl_state ) AM_RANGE(0x28001a, 0x28001b) AM_WRITENOP /* standard VGA */ - AM_RANGE(0x3a0000, 0x3bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffff) - AM_RANGE(0x3c03b0, 0x3c03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffff) - AM_RANGE(0x3c03c0, 0x3c03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffff) - AM_RANGE(0x3c03d0, 0x3c03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffff) + AM_RANGE(0x3a0000, 0x3bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffff) + AM_RANGE(0x3c03b0, 0x3c03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffff) + AM_RANGE(0x3c03c0, 0x3c03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffff) + AM_RANGE(0x3c03d0, 0x3c03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffff) AM_RANGE(0x400000, 0x407fff) AM_RAM ADDRESS_MAP_END @@ -359,8 +358,6 @@ static INPUT_PORTS_START( pntnpuzl ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D) INPUT_PORTS_END -READ8_MEMBER(pntnpuzl_state::vga_setting ) { return 0xff; } // hard-code to color - static MACHINE_CONFIG_START( pntnpuzl, pntnpuzl_state ) MCFG_CPU_ADD("maincpu", M68000, 12000000)//?? MCFG_CPU_PROGRAM_MAP(pntnpuzl_map) @@ -387,7 +384,6 @@ DRIVER_INIT_MEMBER(pntnpuzl_state,pip) // UINT16 *rom = (UINT16 *)machine().root_device().memregion("maincpu")->base(); // rom[0x2696/2] = 0x4e71; // rom[0x26a0/2] = 0x4e71; - pc_vga_init(machine(), read8_delegate(FUNC(pntnpuzl_state::vga_setting),this)); } diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c index c635f0b320c..5d8fd711435 100644 --- a/src/mame/drivers/queen.c +++ b/src/mame/drivers/queen.c @@ -95,7 +95,6 @@ public: DECLARE_WRITE8_MEMBER(at_page8_w); DECLARE_READ8_MEMBER(pc_dma_read_byte); DECLARE_WRITE8_MEMBER(pc_dma_write_byte); - DECLARE_READ8_MEMBER(vga_setting); DECLARE_READ32_MEMBER(ide_r); DECLARE_WRITE32_MEMBER(ide_w); DECLARE_READ32_MEMBER(fdc_r); @@ -518,7 +517,7 @@ static I8237_INTERFACE( dma8237_2_config ) static ADDRESS_MAP_START( queen_map, AS_PROGRAM, 32, queen_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c3fff) AM_ROMBANK("video_bank1") AM_WRITE(isa_ram1_w) AM_RANGE(0x000c4000, 0x000c7fff) AM_ROMBANK("video_bank2") AM_WRITE(isa_ram2_w) AM_RANGE(0x000e0000, 0x000e3fff) AM_ROMBANK("bios_ext1") AM_WRITE(bios_ext1_ram_w) @@ -542,9 +541,9 @@ static ADDRESS_MAP_START( queen_io, AS_IO, 32, queen_state ) AM_RANGE(0x00e8, 0x00ef) AM_NOP AM_RANGE(0x01f0, 0x01f7) AM_READWRITE(ide_r, ide_w) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x03f7) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write) @@ -639,8 +638,6 @@ static void ide_interrupt(device_t *device, int state) pic8259_ir6_w(drvstate->m_pic8259_2, state); } -READ8_MEMBER(queen_state::vga_setting ) { return 0xff; } // hard-code to color - void queen_state::machine_start() { @@ -658,7 +655,6 @@ void queen_state::machine_start() intel82439tx_init(machine()); kbdc8042_init(machine(), &at8042); - pc_vga_init(machine(), read8_delegate(FUNC(queen_state::vga_setting),this)); } void queen_state::machine_reset() diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c index fb1ef715c25..5e28d7329e2 100644 --- a/src/mame/drivers/savquest.c +++ b/src/mame/drivers/savquest.c @@ -94,7 +94,6 @@ public: DECLARE_WRITE_LINE_MEMBER(savquest_pic8259_1_set_int_line); virtual void machine_start(); virtual void machine_reset(); - DECLARE_READ8_MEMBER(vga_setting); }; // Intel 82439TX System Controller (MXTC) @@ -397,7 +396,7 @@ static I8237_INTERFACE( dma8237_2_config ) static ADDRESS_MAP_START(savquest_map, AS_PROGRAM, 32, savquest_state) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) AM_RANGE(0x000e0000, 0x000fffff) AM_ROMBANK("bank1") AM_RANGE(0x000e0000, 0x000fffff) AM_WRITE(bios_ram_w) @@ -418,9 +417,9 @@ static ADDRESS_MAP_START(savquest_io, AS_IO, 32, savquest_state) AM_RANGE(0x00e8, 0x00ef) AM_NOP AM_RANGE(0x01f0, 0x01f7) AM_READWRITE(ide_r, ide_w) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x03f7) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write) @@ -520,8 +519,6 @@ static void ide_interrupt(device_t *device, int state) pic8259_ir6_w(drvstate->m_pic8259_2, state); } -READ8_MEMBER(savquest_state::vga_setting ) { return 0xff; } // hard-code to color - void savquest_state::machine_start() { m_bios_ram = auto_alloc_array(machine(), UINT32, 0x20000/4); @@ -532,7 +529,6 @@ void savquest_state::machine_start() intel82439tx_init(machine()); kbdc8042_init(machine(), &at8042); - pc_vga_init(machine(), read8_delegate(FUNC(savquest_state::vga_setting),this)); } void savquest_state::machine_reset() diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c index 14df340fff3..f63306feb46 100644 --- a/src/mame/drivers/su2000.c +++ b/src/mame/drivers/su2000.c @@ -81,7 +81,6 @@ public: DECLARE_READ8_MEMBER(get_slave_ack); virtual void machine_start(); virtual void machine_reset(); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -93,7 +92,7 @@ public: static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32, su2000_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAMBANK("mem_bank") - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_RANGE(0x000f0000, 0x000fffff) AM_ROM AM_RANGE(0xffff0000, 0xffffffff) AM_ROM AM_REGION("maincpu", 0x0f0000) @@ -101,9 +100,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pcat_io, AS_IO, 32, su2000_state ) AM_IMPORT_FROM(pcat32_io_common) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) ADDRESS_MAP_END @@ -170,18 +169,6 @@ static void ide_interrupt(device_t *device, int state) /************************************************************* * - * VGA - * - *************************************************************/ - -READ8_MEMBER(su2000_state::vga_setting ) -{ - /* TODO */ - return 0xff; -} - -/************************************************************* - * * PIC8259 Configuration * *************************************************************/ @@ -290,8 +277,6 @@ void su2000_state::machine_start() init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, su2000_set_keyb_int); kbdc8042_init(machine(), &at8042); - - pc_vga_init(machine(), read8_delegate(FUNC(su2000_state::vga_setting),this)); } void su2000_state::machine_reset() diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index 088c8c63b5a..d446df54684 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -83,7 +83,6 @@ public: virtual void machine_reset(); virtual void palette_init(); UINT32 screen_update_taitowlf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER(vga_setting); }; #if !ENABLE_VGA @@ -457,7 +456,7 @@ static I8237_INTERFACE( dma8237_2_config ) static ADDRESS_MAP_START( taitowlf_map, AS_PROGRAM, 32, taitowlf_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM #if ENABLE_VGA - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) #else AM_RANGE(0x000a0000, 0x000bffff) AM_RAM #endif @@ -488,9 +487,9 @@ static ADDRESS_MAP_START(taitowlf_io, AS_IO, 32, taitowlf_state ) AM_RANGE(0x03b0, 0x03df) AM_NOP AM_RANGE(0x0278, 0x027b) AM_WRITE(pnp_config_w) #if ENABLE_VGA - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) #endif AM_RANGE(0x03f0, 0x03ff) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0a78, 0x0a7b) AM_WRITE(pnp_data_w) @@ -705,10 +704,6 @@ static void taitowlf_set_keyb_int(running_machine &machine, int state) pic8259_ir1_w(drvstate->m_pic8259_1, state); } -#if ENABLE_VGA -READ8_MEMBER(taitowlf_state::vga_setting ) { return 0xff; } // hard-code to color -#endif - DRIVER_INIT_MEMBER(taitowlf_state,taitowlf) { m_bios_ram = auto_alloc_array(machine(), UINT32, 0x10000/4); @@ -718,9 +713,6 @@ DRIVER_INIT_MEMBER(taitowlf_state,taitowlf) intel82439tx_init(machine()); kbdc8042_init(machine(), &at8042); - #if ENABLE_VGA - pc_vga_init(machine(), read8_delegate(FUNC(taitowlf_state::vga_setting),this)); - #endif } /*****************************************************************************/ diff --git a/src/mame/drivers/voyager.c b/src/mame/drivers/voyager.c index f632f22e167..0d7ebfc0fb6 100644 --- a/src/mame/drivers/voyager.c +++ b/src/mame/drivers/voyager.c @@ -69,7 +69,6 @@ public: DECLARE_DRIVER_INIT(voyager); virtual void machine_start(); virtual void machine_reset(); - DECLARE_READ8_MEMBER(vga_setting); }; @@ -396,7 +395,7 @@ WRITE32_MEMBER(voyager_state::bios_ram_w) static ADDRESS_MAP_START( voyager_map, AS_PROGRAM, 32, voyager_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(trident_mem_r, trident_mem_w, 0xffffffff) // VGA VRAM + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", trident_vga_device, mem_r, mem_w, 0xffffffff) // VGA VRAM AM_RANGE(0x000c0000, 0x000c7fff) AM_RAM AM_REGION("video_bios", 0) AM_RANGE(0x000c8000, 0x000cffff) AM_NOP //AM_RANGE(0x000d0000, 0x000d0003) AM_RAM // XYLINX - Sincronus serial communication @@ -446,9 +445,9 @@ static ADDRESS_MAP_START( voyager_io, AS_IO, 32, voyager_state ) AM_RANGE(0x02f8, 0x02ff) AM_NOP //To debug AM_RANGE(0x0320, 0x038f) AM_NOP //To debug AM_RANGE(0x03a0, 0x03a7) AM_NOP //To debug - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(trident_03c0_r, trident_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(trident_03d0_r, trident_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", trident_vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03e0, 0x03ef) AM_NOP //To debug AM_RANGE(0x0378, 0x037f) AM_NOP //To debug // AM_RANGE(0x0300, 0x03af) AM_NOP @@ -654,8 +653,6 @@ static IRQ_CALLBACK(irq_callback) return pic8259_acknowledge( state->m_pic8259_1); } -READ8_MEMBER(voyager_state::vga_setting ) { return 0xff; } // hard-code to color - void voyager_state::machine_start() { machine().device("maincpu")->execute().set_irq_acknowledge_callback(irq_callback); @@ -794,7 +791,7 @@ static MACHINE_CONFIG_START( voyager, voyager_state ) MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w) /* video hardware */ - MCFG_FRAGMENT_ADD( pcvideo_vga ) + MCFG_FRAGMENT_ADD( pcvideo_trident_vga ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") @@ -804,7 +801,6 @@ DRIVER_INIT_MEMBER(voyager_state,voyager) { m_bios_ram = auto_alloc_array(machine(), UINT32, 0x20000/4); - pc_vga_init(machine(), read8_delegate(FUNC(voyager_state::vga_setting),this)); init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, voyager_set_keyb_int); intel82439tx_init(machine()); diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c index 17620969dde..70e9a51575b 100644 --- a/src/mame/drivers/xtom3d.c +++ b/src/mame/drivers/xtom3d.c @@ -115,7 +115,6 @@ public: DECLARE_WRITE_LINE_MEMBER(xtom3d_pic8259_1_set_int_line); virtual void machine_start(); virtual void machine_reset(); - DECLARE_READ8_MEMBER(vga_setting); }; // Intel 82439TX System Controller (MXTC) @@ -526,7 +525,7 @@ static I8237_INTERFACE( dma8237_2_config ) static ADDRESS_MAP_START(xtom3d_map, AS_PROGRAM, 32, xtom3d_state) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_READWRITE8_LEGACY(vga_mem_r,vga_mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c3fff) AM_ROMBANK("video_bank1") AM_WRITE(isa_ram1_w) AM_RANGE(0x000c4000, 0x000c7fff) AM_ROMBANK("video_bank2") AM_WRITE(isa_ram2_w) AM_RANGE(0x000e0000, 0x000e3fff) AM_ROMBANK("bios_ext1") AM_WRITE(bios_ext1_ram_w) @@ -550,9 +549,9 @@ static ADDRESS_MAP_START(xtom3d_io, AS_IO, 32, xtom3d_state) AM_RANGE(0x00e8, 0x00ef) AM_NOP AM_RANGE(0x01f0, 0x01f7) AM_READWRITE(ide_r, ide_w) - AM_RANGE(0x03b0, 0x03bf) AM_READWRITE8_LEGACY(vga_port_03b0_r, vga_port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_READWRITE8_LEGACY(vga_port_03c0_r, vga_port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_READWRITE8_LEGACY(vga_port_03d0_r, vga_port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x03f7) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write) @@ -648,8 +647,6 @@ static void ide_interrupt(device_t *device, int state) pic8259_ir6_w(drvstate->m_pic8259_2, state); } -READ8_MEMBER(xtom3d_state::vga_setting ) { return 0xff; } // hard-code to color - void xtom3d_state::machine_start() { @@ -667,7 +664,6 @@ void xtom3d_state::machine_start() intel82439tx_init(machine()); kbdc8042_init(machine(), &at8042); - pc_vga_init(machine(), read8_delegate(FUNC(xtom3d_state::vga_setting),this)); } void xtom3d_state::machine_reset() |