From 8d0a24e738b2920ac7c320ccc802a6bfcb5b4954 Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 19 May 2017 12:58:12 -0400 Subject: bingor.cpp: Random cleanups (nw) --- src/mame/drivers/bingor.cpp | 77 +++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp index 25fc67db29c..40b7e9d1dc1 100644 --- a/src/mame/drivers/bingor.cpp +++ b/src/mame/drivers/bingor.cpp @@ -530,8 +530,6 @@ public: required_shared_ptr m_blit_ram; virtual void video_start() override; uint32_t screen_update_bingor(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(vblank_irq); - INTERRUPT_GEN_MEMBER(unk_irq); required_device m_maincpu; optional_device m_slavecpu; required_device m_palette; @@ -597,7 +595,12 @@ static ADDRESS_MAP_START( bingor_map, AS_PROGRAM, 16, bingor_state ) AM_RANGE(0x90000, 0x9ffff) AM_ROM AM_REGION("gfx", 0) AM_RANGE(0xa0300, 0xa031f) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") //wrong AM_RANGE(0xa0000, 0xaffff) AM_RAM AM_SHARE("blit_ram") - AM_RANGE(0xe0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0) + AM_RANGE(0xf0000, 0xfffff) AM_ROM AM_REGION("boot_prg", 0) +ADDRESS_MAP_END + +static ADDRESS_MAP_START( bingor2_map, AS_PROGRAM, 16, bingor_state ) + AM_RANGE(0xe0000, 0xfffff) AM_ROM AM_REGION("boot_prg", 0) // banked? + AM_IMPORT_FROM(bingor_map) ADDRESS_MAP_END static ADDRESS_MAP_START( bingor_io, AS_IO, 16, bingor_state ) @@ -658,17 +661,6 @@ static INPUT_PORTS_START( bingor ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) INPUT_PORTS_END -INTERRUPT_GEN_MEMBER(bingor_state::vblank_irq) -{ -// device.execute().set_input_line_and_vector(0,HOLD_LINE,0x08/4); // reads i/o 0x200 and puts the result in ram, pic irq? - device.execute().set_input_line_and_vector(0,HOLD_LINE,0x4c/4); // ? -} - -INTERRUPT_GEN_MEMBER(bingor_state::unk_irq) -{ - device.execute().set_input_line_and_vector(0,HOLD_LINE,0x48/4); // ? -} - static const gfx_layout bingor_layout = { @@ -690,9 +682,8 @@ static MACHINE_CONFIG_START( bingor ) MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(bingor_map) MCFG_CPU_IO_MAP(bingor_io) - MCFG_CPU_VBLANK_INT_DRIVER("screen", bingor_state, vblank_irq) - MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30) - MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, unk_irq, 30) + MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30) + // Other interrupts generated by internal timers MCFG_CPU_ADD("pic", PIC16C57, 12000000) //?? Mhz @@ -714,6 +705,11 @@ static MACHINE_CONFIG_START( bingor ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END +static MACHINE_CONFIG_DERIVED( bingor2, bingor ) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(bingor2_map) +MACHINE_CONFIG_END + static ADDRESS_MAP_START( vip2000_map, AS_PROGRAM, 16, bingor_state ) AM_RANGE(0x00000, 0x0ffff) AM_RAM @@ -721,8 +717,8 @@ static ADDRESS_MAP_START( vip2000_map, AS_PROGRAM, 16, bingor_state ) AM_RANGE(0x40000, 0x4ffff) AM_RAM AM_SHARE("blit_ram") //AM_RANGE(0x50000, 0x5ffff) AM_ROM AM_REGION("gfx", 0) AM_RANGE(0x60000, 0x60003) AM_DEVWRITE8("ymz", ymz284_device, address_data_w, 0x00ff) - AM_RANGE(0x80000, 0xbffff) AM_DEVREADWRITE("flash", intelfsh16_device, read, write) - AM_RANGE(0xe0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0) + AM_RANGE(0x80000, 0xeffff) AM_DEVREADWRITE("flash", intelfsh16_device, read, write) + AM_RANGE(0xf0000, 0xfffff) AM_ROM AM_REGION("boot_prg", 0) ADDRESS_MAP_END static ADDRESS_MAP_START( vip2000_io, AS_IO, 16, bingor_state ) @@ -770,9 +766,8 @@ static MACHINE_CONFIG_START( vip2000 ) MCFG_CPU_ADD("maincpu", I80186, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(vip2000_map) MCFG_CPU_IO_MAP(vip2000_io) - //MCFG_CPU_VBLANK_INT_DRIVER("screen", bingor_state, vblank_irq) - MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30) - //MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, unk_irq, 30) + MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30) + // Other interrupts generated by internal timers MCFG_ATMEL_49F4096_ADD("flash") @@ -794,16 +789,16 @@ static MACHINE_CONFIG_START( vip2000 ) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ284, 3000000 ) // unknown clock + MCFG_SOUND_ADD("ymz", YMZ284, 1250000) // probably clocked by square wave output of 80186 timer 0 MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END // I doubt we need to load the eeproms ROM_START( bingor1 ) - ROM_REGION( 0x20000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ - ROM_LOAD16_BYTE( "bingo v 29.4.99 l.bin", 0x010000, 0x08000, CRC(b6773bff) SHA1(74e375662730e002e05186bd77098fa0d8e43ade) ) - ROM_LOAD16_BYTE( "bingo v 29.4.99 h.bin", 0x010001, 0x08000, CRC(0e18f90a) SHA1(0743302e675f01f8ad42ac2e67ecb1c1bf870ae7) ) + ROM_REGION( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ + ROM_LOAD16_BYTE( "bingo v 29.4.99 l.bin", 0x00000, 0x08000, CRC(b6773bff) SHA1(74e375662730e002e05186bd77098fa0d8e43ade) ) + ROM_LOAD16_BYTE( "bingo v 29.4.99 h.bin", 0x00001, 0x08000, CRC(0e18f90a) SHA1(0743302e675f01f8ad42ac2e67ecb1c1bf870ae7) ) // gfx roms on this one are twice the size of the others ROM_REGION( 0x20000, "gfx", 0 ) /* blitter data? */ @@ -819,8 +814,8 @@ ROM_END ROM_START( bingor2 ) ROM_REGION( 0x20000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ - ROM_LOAD16_BYTE( "bingo roll vip2 v26.02.02_l.bin", 0x000000, 0x10000, CRC(40df6ee8) SHA1(1e90ef906e47f95ebde85b6dd32fdfe50c0564fc) ) - ROM_LOAD16_BYTE( "bingo roll vip2 v26.02.02_h.bin", 0x000001, 0x10000, CRC(9154c183) SHA1(a4060294295a9b8df07ce9fcfeefcf009e129817) ) + ROM_LOAD16_BYTE( "bingo roll vip2 v26.02.02_l.bin", 0x00000, 0x10000, CRC(40df6ee8) SHA1(1e90ef906e47f95ebde85b6dd32fdfe50c0564fc) ) + ROM_LOAD16_BYTE( "bingo roll vip2 v26.02.02_h.bin", 0x00001, 0x10000, CRC(9154c183) SHA1(a4060294295a9b8df07ce9fcfeefcf009e129817) ) ROM_REGION( 0x20000, "gfx", 0 ) /* blitter data? */ ROM_LOAD16_BYTE( "bingo roll grafik l.bin", 0x000000, 0x10000, CRC(3e753e13) SHA1(011b5f530e54332be194830c0a1d2ec31425017a) ) @@ -834,9 +829,9 @@ ROM_START( bingor2 ) ROM_END ROM_START( bingor3 ) - ROM_REGION( 0x20000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ - ROM_LOAD16_BYTE( "bellstar vip2l 27.07_1.bin", 0x010000, 0x08000, CRC(0115bca7) SHA1(0b692b46bc6641296861666f00ec0475dc7296a1) ) - ROM_LOAD16_BYTE( "bellstar vip2l 27.07_2.bin", 0x010001, 0x08000, CRC(c689aa69) SHA1(fb1f477654909f156c30a6be29f84962f4edb1c3) ) + ROM_REGION( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ + ROM_LOAD16_BYTE( "bellstar vip2l 27.07_1.bin", 0x00000, 0x08000, CRC(0115bca7) SHA1(0b692b46bc6641296861666f00ec0475dc7296a1) ) + ROM_LOAD16_BYTE( "bellstar vip2l 27.07_2.bin", 0x00001, 0x08000, CRC(c689aa69) SHA1(fb1f477654909f156c30a6be29f84962f4edb1c3) ) ROM_REGION( 0x20000, "gfx", ROMREGION_ERASE00 ) /* blitter data? */ ROM_LOAD16_BYTE( "bsg-11.10.02_l.bin", 0x000000, 0x08000, CRC(a8b22477) SHA1(92d638f0f188a43f14487989cf42195311fb2c35) ) //half size? @@ -852,9 +847,9 @@ ROM_END // this is a mix of 2 of the other sets.. I don't know if it's correct ROM_START( bingor4 ) - ROM_REGION( 0x20000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ - ROM_LOAD16_BYTE( "01.bin", 0x010000, 0x08000, CRC(0115bca7) SHA1(0b692b46bc6641296861666f00ec0475dc7296a1) ) - ROM_LOAD16_BYTE( "02.bin", 0x010001, 0x08000, CRC(c689aa69) SHA1(fb1f477654909f156c30a6be29f84962f4edb1c3) ) + ROM_REGION( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ + ROM_LOAD16_BYTE( "01.bin", 0x00000, 0x08000, CRC(0115bca7) SHA1(0b692b46bc6641296861666f00ec0475dc7296a1) ) + ROM_LOAD16_BYTE( "02.bin", 0x00001, 0x08000, CRC(c689aa69) SHA1(fb1f477654909f156c30a6be29f84962f4edb1c3) ) ROM_REGION( 0x20000, "gfx", 0 ) /* blitter data? */ ROM_LOAD16_BYTE( "bingo roll grafik l.bin", 0x000000, 0x10000, CRC(3e753e13) SHA1(011b5f530e54332be194830c0a1d2ec31425017a) ) @@ -875,9 +870,9 @@ ROM_END */ ROM_START( bingor5 ) /* BellStar V3 */ - ROM_REGION( 0x20000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ - ROM_LOAD16_BYTE( "bellstar_v3_v.3.6.02_l.bin", 0x010000, 0x08000, CRC(56b84a5d) SHA1(1bda4fb972b4f0f0575089b545bf15dfea859948) ) - ROM_LOAD16_BYTE( "bellstar_v3_v.3.6.02_h.bin", 0x010001, 0x08000, CRC(d6945bb8) SHA1(b620f1b547be03c4609bff8d06111d0ea425bae8) ) + ROM_REGION( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */ + ROM_LOAD16_BYTE( "bellstar_v3_v.3.6.02_l.bin", 0x00000, 0x08000, CRC(56b84a5d) SHA1(1bda4fb972b4f0f0575089b545bf15dfea859948) ) + ROM_LOAD16_BYTE( "bellstar_v3_v.3.6.02_h.bin", 0x00001, 0x08000, CRC(d6945bb8) SHA1(b620f1b547be03c4609bff8d06111d0ea425bae8) ) ROM_REGION( 0x20000, "gfx", ROMREGION_ERASE00 ) /* blitter data? */ ROM_LOAD16_BYTE( "b.s.grafik_11.10.02_l.bin", 0x000000, 0x08000, CRC(a8b22477) SHA1(92d638f0f188a43f14487989cf42195311fb2c35) ) //half size? @@ -892,9 +887,9 @@ ROM_END ROM_START( vip2000 ) - ROM_REGION( 0x20000, "boot_prg", ROMREGION_ERASE00 ) - ROM_LOAD16_BYTE( "VIPBIOS8L.bin", 0x010000, 0x08000, CRC(a4c2b351) SHA1(bb718584bfe32b9ed27fadfd89b4094d4bbd6d7f) ) - ROM_LOAD16_BYTE( "VIPBIOS8H.bin", 0x010001, 0x08000, CRC(7c42c5ee) SHA1(c419a834ddb245363bacfe70d31cff7c2d4a2d03) ) + ROM_REGION( 0x10000, "boot_prg", ROMREGION_ERASE00 ) + ROM_LOAD16_BYTE( "VIPBIOS8L.bin", 0x00000, 0x08000, CRC(a4c2b351) SHA1(bb718584bfe32b9ed27fadfd89b4094d4bbd6d7f) ) + ROM_LOAD16_BYTE( "VIPBIOS8H.bin", 0x00001, 0x08000, CRC(7c42c5ee) SHA1(c419a834ddb245363bacfe70d31cff7c2d4a2d03) ) ROM_REGION16_BE( 0x80000, "flash", ROMREGION_ERASE00 ) ROM_LOAD( "AT49F4096.bin", 0x00000, 0x80000, CRC(1d0fd3cf) SHA1(0ad76ea7efa31049a73cc336130cb5ca15480edd) ) @@ -915,7 +910,7 @@ ROM_END GAME( 2002, bingor1, 0, bingor, bingor, bingor_state, 0, ROT0, "", "Bingo Roll / Bell Star? (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 2002, bingor2, 0, bingor, bingor, bingor_state, 0, ROT0, "", "Bingo Roll / Bell Star? (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +GAME( 2002, bingor2, 0, bingor2, bingor, bingor_state, 0, ROT0, "", "Bingo Roll / Bell Star? (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) GAME( 2002, bingor3, 0, bingor, bingor, bingor_state, 0, ROT0, "", "Bingo Roll / Bell Star? (set 3)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) GAME( 2002, bingor4, 0, bingor, bingor, bingor_state, 0, ROT0, "", "Bingo Roll / Bell Star? (set 4)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) GAME( 2002, bingor5, 0, bingor, bingor, bingor_state, 0, ROT0, "", "Bingo Roll / Bell Star V3? (set 5)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -- cgit v1.2.3