From a734a3b8e9fbe907a4894c7c8055d3faeac2bfda Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 24 Sep 2017 11:41:45 +1000 Subject: (nw) srcclean - please use UTF-8 for source files, stuff that isn't valid UTF-8 will be nuked, and cleaning it up by hand is annoying --- src/mame/audio/vicdual.cpp | 14 ++-- src/mame/drivers/40love.cpp | 2 +- src/mame/drivers/alphatpx.cpp | 2 +- src/mame/drivers/asteroid.cpp | 4 +- src/mame/drivers/atarittl.cpp | 18 ++--- src/mame/drivers/atvtrack.cpp | 8 +-- src/mame/drivers/bigevglf.cpp | 2 +- src/mame/drivers/buggychl.cpp | 14 ++-- src/mame/drivers/cclimber.cpp | 14 ++-- src/mame/drivers/cgc7900.cpp | 42 +++++------ src/mame/drivers/dbox.cpp | 20 +++--- src/mame/drivers/dccons.cpp | 62 ++++++++-------- src/mame/drivers/deco32.cpp | 8 +-- src/mame/drivers/didact.cpp | 42 +++++------ src/mame/drivers/europc.cpp | 8 +-- src/mame/drivers/exidyttl.cpp | 28 ++++---- src/mame/drivers/flstory.cpp | 48 ++++++------- src/mame/drivers/funworld.cpp | 6 +- src/mame/drivers/gaelco2.cpp | 14 ++-- src/mame/drivers/glass.cpp | 2 +- src/mame/drivers/gstriker.cpp | 16 ++--- src/mame/drivers/hp16500.cpp | 2 +- src/mame/drivers/hp9k_3xx.cpp | 16 ++--- src/mame/drivers/itech8.cpp | 2 +- src/mame/drivers/kaneko16.cpp | 4 +- src/mame/drivers/ladyfrog.cpp | 10 +-- src/mame/drivers/mazerbla.cpp | 20 +++--- src/mame/drivers/mephisto_montec.cpp | 44 ++++++------ src/mame/drivers/miniframe.cpp | 18 ++--- src/mame/drivers/model2.cpp | 2 +- src/mame/drivers/ms32.cpp | 4 +- src/mame/drivers/msisaac.cpp | 18 ++--- src/mame/drivers/namcos2.cpp | 2 +- src/mame/drivers/notetaker.cpp | 22 +++--- src/mame/drivers/nycaptor.cpp | 2 +- src/mame/drivers/pacman.cpp | 2 +- src/mame/drivers/pc.cpp | 8 +-- src/mame/drivers/polgar.cpp | 10 +-- src/mame/drivers/psx.cpp | 2 +- src/mame/drivers/superqix.cpp | 2 +- src/mame/drivers/taitottl.cpp | 8 +-- src/mame/drivers/tnzs.cpp | 6 +- src/mame/drivers/ts816.cpp | 4 +- src/mame/drivers/vicdual.cpp | 4 +- src/mame/drivers/wallc.cpp | 10 +-- src/mame/drivers/wswan.cpp | 8 +-- src/mame/drivers/wyvernf0.cpp | 2 +- src/mame/includes/buggychl.h | 2 +- src/mame/includes/model2.h | 2 +- src/mame/layout/kdt6.lay | 6 +- src/mame/layout/mephisto_academy.lay | 78 ++++++++++---------- src/mame/layout/mephisto_lcd.lay | 66 ++++++++--------- src/mame/layout/mephisto_megaiv.lay | 126 ++++++++++++++++----------------- src/mame/layout/mephisto_milano.lay | 62 ++++++++-------- src/mame/layout/mephisto_modena.lay | 74 +++++++++---------- src/mame/layout/mephisto_montec.lay | 122 +++++++++++++++---------------- src/mame/layout/mephisto_smondial2.lay | 126 ++++++++++++++++----------------- src/mame/machine/deco_irq.cpp | 2 +- src/mame/machine/iteagle_fpga.cpp | 2 +- src/mame/machine/pce_cd.cpp | 16 ++--- src/mame/mame.lst | 10 +-- src/mame/video/gstriker.cpp | 8 +-- src/mame/video/mb60553.cpp | 14 ++-- src/mame/video/model2rd.hxx | 4 +- 64 files changed, 663 insertions(+), 663 deletions(-) (limited to 'src/mame') diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index e49c35cfb81..9c43f5f3beb 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -603,28 +603,28 @@ WRITE8_MEMBER( vicdual_state::brdrline_audio_w ) { uint8_t res = data ^ 0xff; -// if(res & 2) // low fuel, MISSING - +// if(res & 2) // low fuel, MISSING + if(res & 8) // end level m_samples->start(3, 3); - + if(res & 0x10) // moving in the brush m_samples->start(5, 5); - + if(res & 0x20) // fire m_samples->start(6, 6); - + if(res & 0x40) // car engine noise m_samples->start(4, 4); if(res & 0x80) // crashes m_samples->start(2, 2); - + //printf("%02x\n",res); } WRITE8_MEMBER( vicdual_state::brdrline_audio_aux_w ) -{ +{ if(data & 0xfc) // coin, unknown which is the trigger m_samples->start(1, 1); else // boot sample diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp index 6f6764f31db..a510e961cec 100644 --- a/src/mame/drivers/40love.cpp +++ b/src/mame/drivers/40love.cpp @@ -786,7 +786,7 @@ static MACHINE_CONFIG_START( 40love ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_TA7630_ADD("ta7630") - + MCFG_SOUND_ADD("aysnd", AY8910, 2000000) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fortyl_state, sound_control_2_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(fortyl_state, sound_control_3_w)) diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp index 08e0eb78c22..a7028cd1420 100644 --- a/src/mame/drivers/alphatpx.cpp +++ b/src/mame/drivers/alphatpx.cpp @@ -4,7 +4,7 @@ Triumph-Adler Alphatronic Px series - TODO: Doesn't do much more than showing the initial boot message + TODO: Doesn't do much more than showing the initial boot message ***************************************************************************/ diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index 7f059b6c2a9..e2d6306244c 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -987,7 +987,7 @@ ROM_START( llander ) /* Vector ROM */ ROM_LOAD( "034599-01.r3", 0x4800, 0x0800, CRC(355a9371) SHA1(6ecb40169b797d9eb623bcb17872f745b1bf20fa) ) ROM_LOAD( "034598-01.np3", 0x5000, 0x0800, CRC(9c4ffa68) SHA1(eb4ffc289d254f699f821df3146aa2c6cd78597f) ) - ROM_LOAD( "034597-01.m3", 0x5800, 0x0800, CRC(ebb744f2) SHA1(e685b094c1261a351e4e82dfb487462163f136a4) ) /* built from original Atari source code */ + ROM_LOAD( "034597-01.m3", 0x5800, 0x0800, CRC(ebb744f2) SHA1(e685b094c1261a351e4e82dfb487462163f136a4) ) /* built from original Atari source code */ /* DVG PROM */ ROM_REGION( 0x100, "user1", 0 ) @@ -1003,7 +1003,7 @@ ROM_START( llander1 ) /* Vector ROM */ ROM_LOAD( "034599-01.r3", 0x4800, 0x0800, CRC(355a9371) SHA1(6ecb40169b797d9eb623bcb17872f745b1bf20fa) ) ROM_LOAD( "034598-01.np3", 0x5000, 0x0800, CRC(9c4ffa68) SHA1(eb4ffc289d254f699f821df3146aa2c6cd78597f) ) - ROM_LOAD( "034597-01.m3", 0x5800, 0x0800, CRC(ebb744f2) SHA1(e685b094c1261a351e4e82dfb487462163f136a4) ) /* built from original Atari source code */ + ROM_LOAD( "034597-01.m3", 0x5800, 0x0800, CRC(ebb744f2) SHA1(e685b094c1261a351e4e82dfb487462163f136a4) ) /* built from original Atari source code */ /* DVG PROM */ ROM_REGION( 0x100, "user1", 0 ) diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp index 7641373cf0e..04d9c1e7aff 100644 --- a/src/mame/drivers/atarittl.cpp +++ b/src/mame/drivers/atarittl.cpp @@ -386,17 +386,17 @@ ROM_END ROM_START( gtrak10 ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "racetrack", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "racetrack", ROMREGION_ERASE00 ) ROM_LOAD( "074186.j5", 0x0000, 0x0800, CRC(3bad3280) SHA1(b83fe1a1dc6bf20717dadf576f1d817496340f8c) ) // not actually a SN74186 but an Electronic Arrays, Inc. EA4800 16K (2048 x 8) ROM. TI TMS4800 clone (EA4800). Intentionally mislabeled by Atari. ROM_END ROM_START( gtrak20 ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - ROM_REGION( 0x2000, "racetrack", ROMREGION_ERASE00 ) + ROM_REGION( 0x2000, "racetrack", ROMREGION_ERASE00 ) ROM_LOAD( "074187.b3", 0x0000, 0x0800, CRC(d38709ca) SHA1(1ea5d174dbd0faa0c8aba6b8c845c62b18d9e60b) ) ROM_LOAD( "074187a.d3", 0x0800, 0x0800, CRC(3d30654f) SHA1(119bac8ba8c300c026decf3f59a7da4e5d746648) ) ROM_LOAD( "074187b.f3", 0x1000, 0x0800, CRC(a811cc11) SHA1(a0eb3f732268e796068d1a6c96cdddd1fd7fba21) ) @@ -478,19 +478,19 @@ ROM_END ROM_START( lemans ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - ROM_REGION( 0x2000, "gfx", ROMREGION_ERASE00 ) + ROM_REGION( 0x2000, "gfx", ROMREGION_ERASE00 ) ROM_LOAD( "005837.n5", 0x0000, 0x0800, CRC(21a0c26a) SHA1(2bfe5ff415e4f252caf123ec80a32e6b8220c73a) ) - ROM_LOAD( "005838.n4", 0x0800, 0x0800, CRC(9b8fc4fd) SHA1(faf043922f0536e5a93fe6ed99d712503a8c4eb1) ) + ROM_LOAD( "005838.n4", 0x0800, 0x0800, CRC(9b8fc4fd) SHA1(faf043922f0536e5a93fe6ed99d712503a8c4eb1) ) ROM_LOAD( "005839.n6", 0x1000, 0x0800, CRC(4b1139bb) SHA1(c6418466f251054cbfe889895ec9bb55272f7575) ) ROM_END ROM_START( qwakttl ) - ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) - ROM_REGION( 0x0200, "gfx", ROMREGION_ERASE00 ) + ROM_REGION( 0x0200, "gfx", ROMREGION_ERASE00 ) ROM_LOAD( "90-2002.9k", 0x0000, 0x0200, CRC(6d3b6270) SHA1(08e295efebc56ed87f56b93b74f87fc7f1df5213) ) // 37-2530n in manual ROM_END diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index f7d9360c3cf..9b391a4d413 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/src/mame/drivers/atvtrack.cpp @@ -623,10 +623,10 @@ ROM_END ROM_START( gfootbal ) ROM_REGION( 0x4200000, "nand", ROMREGION_ERASEFF) // NAND roms, contain additional data hence the sizes - ROM_LOAD32_BYTE("k9f2808u0b.ic15", 0x00000000, 0x01080000, CRC(876ca493) SHA1(d888be59d924fe23e725c6a8aa9609e9abcab608) ) - ROM_LOAD32_BYTE("k9f2808u0b.ic20", 0x00000001, 0x01080000, CRC(df9cf6e2) SHA1(07be171c3768de8f548bceeaf3da8d3bf7cb85d3) ) - ROM_LOAD32_BYTE("k9f2808u0b.ic14", 0x00000002, 0x01080000, CRC(48d901a3) SHA1(00f151b67e5603354a97708247bed46a2f1bbe1d) ) - ROM_LOAD32_BYTE("k9f2808u0b.ic19", 0x00000003, 0x01080000, CRC(2db6c016) SHA1(490d23e338014b4e5f2f12dd04dfae2a93a15e11) ) + ROM_LOAD32_BYTE("k9f2808u0b.ic15", 0x00000000, 0x01080000, CRC(876ca493) SHA1(d888be59d924fe23e725c6a8aa9609e9abcab608) ) + ROM_LOAD32_BYTE("k9f2808u0b.ic20", 0x00000001, 0x01080000, CRC(df9cf6e2) SHA1(07be171c3768de8f548bceeaf3da8d3bf7cb85d3) ) + ROM_LOAD32_BYTE("k9f2808u0b.ic14", 0x00000002, 0x01080000, CRC(48d901a3) SHA1(00f151b67e5603354a97708247bed46a2f1bbe1d) ) + ROM_LOAD32_BYTE("k9f2808u0b.ic19", 0x00000003, 0x01080000, CRC(2db6c016) SHA1(490d23e338014b4e5f2f12dd04dfae2a93a15e11) ) ROM_REGION( 0x20000, "fpga", ROMREGION_ERASEFF) ROM_LOAD("epc1pc8.ic23", 0x0000000, 0x1ff01, CRC(752444c7) SHA1(c77e8fcfcbe15b53eda25553763bdac45f0ef7df) ) // contains configuration data for the fpga diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp index e3a33b9d967..4171b5c9316 100644 --- a/src/mame/drivers/bigevglf.cpp +++ b/src/mame/drivers/bigevglf.cpp @@ -500,7 +500,7 @@ static MACHINE_CONFIG_START( bigevglf ) // pin 1 SOLO 8' not mapped // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - + MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp index 91346d49c42..3b08782fc39 100644 --- a/src/mame/drivers/buggychl.cpp +++ b/src/mame/drivers/buggychl.cpp @@ -17,7 +17,7 @@ TODO: background, and the gradient can move around (the latter doesn't seem to be used except for making it cover the whole screen on the title screen, and start at the middle during gameplay) - Update: stage 2 is supposed to have a different gradient, how/where + Update: stage 2 is supposed to have a different gradient, how/where this is located is unknown (pen 0x20?) - Video driver is largely unoptimized - Support for the 7630's controlling the sound chip outputs (bass/treble, @@ -25,7 +25,7 @@ TODO: - The sound Z80 seems to write answers for the main Z80, but the latter doesn't seem to read them. - videoram and spriteram garbage occurs when entering into cross hatch test and exiting. - Game attempts to transfer content of videoram into spriteram/scrollram, then transfer + Game attempts to transfer content of videoram into spriteram/scrollram, then transfer back again into videoram. Maybe the host CPU cannot read contents of VRAM at all? Notes: @@ -219,11 +219,11 @@ static ADDRESS_MAP_START( buggychl_map, AS_PROGRAM, 8, buggychl_state ) AM_RANGE(0xd603, 0xd603) AM_MIRROR(0x00e4) AM_READ_PORT("IN0") /* player inputs */ AM_RANGE(0xd608, 0xd608) AM_MIRROR(0x00e4) AM_READ_PORT("WHEEL") AM_RANGE(0xd609, 0xd609) AM_MIRROR(0x00e4) AM_READ_PORT("IN1") /* coin + accelerator */ -// AM_RANGE(0xd60a, 0xd60a) AM_MIRROR(0x00e4) // other inputs, not used? -// AM_RANGE(0xd60b, 0xd60b) AM_MIRROR(0x00e4) // other inputs, not used? +// AM_RANGE(0xd60a, 0xd60a) AM_MIRROR(0x00e4) // other inputs, not used? +// AM_RANGE(0xd60b, 0xd60b) AM_MIRROR(0x00e4) // other inputs, not used? AM_RANGE(0xd610, 0xd610) AM_MIRROR(0x00e4) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) AM_DEVWRITE("soundlatch", generic_latch_8_device, write) AM_RANGE(0xd611, 0xd611) AM_MIRROR(0x00e4) AM_READ(sound_status_main_r) -// AM_RANGE(0xd613, 0xd613) AM_MIRROR(0x00e4) AM_WRITE(sound_reset_w) +// AM_RANGE(0xd613, 0xd613) AM_MIRROR(0x00e4) AM_WRITE(sound_reset_w) AM_RANGE(0xd618, 0xd618) AM_MIRROR(0x00e7) AM_WRITENOP /* accelerator clear; TODO: should we emulate the proper quadrature counter here? */ AM_RANGE(0xd700, 0xd7ff) AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0xd820, 0xd83f) AM_RAM // TODO @@ -475,7 +475,7 @@ static MACHINE_CONFIG_START( buggychl ) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // derived from ladyfrog.cpp, causes glitches? -// MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz +// MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz MCFG_SCREEN_UPDATE_DRIVER(buggychl_state, screen_update_buggychl) MCFG_SCREEN_PALETTE("palette") @@ -497,7 +497,7 @@ static MACHINE_CONFIG_START( buggychl ) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_TA7630_ADD("ta7630") - + MCFG_SOUND_ADD("ay1", YM2149, XTAL_8MHz/4) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(buggychl_state, ta7630_volbal_ay1_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(buggychl_state, port_b_0_w)) diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 4b24f781997..38d4c13bf83 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -2455,10 +2455,10 @@ ROM_START( swimmerb ) ROM_END /* - Guzzler + Guzzler - CPU/Sound Board: B102-403 - Video Board: 102-401 + CPU/Sound Board: B102-403 + Video Board: 102-401 */ ROM_START( guzzler ) @@ -2489,11 +2489,11 @@ ROM_START( guzzler ) ROM_END /* - Guzzler (Swimmer Conversion) + Guzzler (Swimmer Conversion) - CPU/Sound Board: B102-403 - Video Board: 102-401 - CPU Daughterboard: C102-405 + CPU/Sound Board: B102-403 + Video Board: 102-401 + CPU Daughterboard: C102-405 */ ROM_START( guzzlers ) /* Swimmer Conversion, 1k vs 2k romsize in maincpu */ diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp index d359a9fedb9..a34921eddef 100644 --- a/src/mame/drivers/cgc7900.cpp +++ b/src/mame/drivers/cgc7900.cpp @@ -180,33 +180,33 @@ WRITE16_MEMBER( cgc7900_state::keyboard_w ) static const int int_levels[16] = { 5, 4, 5, 4, 4, 5, 4, 5, 5, 4, 5, 4, 4, 5, 4, 5 }; static const int int_vectors[16] = { - 0x4b, 0x44, 0x4c, 0x43, 0x42, 0x4d, 0x45, 0x4a, 0x49, 0x46, 0x4e, 0x41, 0x40, 0x4f, 0x47, 0x48 + 0x4b, 0x44, 0x4c, 0x43, 0x42, 0x4d, 0x45, 0x4a, 0x49, 0x46, 0x4e, 0x41, 0x40, 0x4f, 0x47, 0x48 }; WRITE16_MEMBER( cgc7900_state::interrupt_mask_w ) { /* - bit description vec level - - 0 real time clock 4b 5 - 1 RS-449 Tx ready 44 4 - 2 BINT 2 4c 5 - 3 RS-232 Tx ready 43 4 - 4 disk 42 4 - 5 BINT 3 4d 5 - 6 bezel keys 45 4 - 7 keyboard 4a 5 - 8 RS-449 Rx ready 49 5 - 9 light pen 46 4 - 10 BINT 4 4e 5 - 11 joystick 41 4 - 12 vert. retrace 40 4 - 13 BINT 5 4f 5 - 14 BINT 1 47 4 - 15 RS-232 Rx ready 48 5 - - default mask is 0x7e3f -- RS232 Rx, RS449 Rx, keyboard, bezel. + bit description vec level + + 0 real time clock 4b 5 + 1 RS-449 Tx ready 44 4 + 2 BINT 2 4c 5 + 3 RS-232 Tx ready 43 4 + 4 disk 42 4 + 5 BINT 3 4d 5 + 6 bezel keys 45 4 + 7 keyboard 4a 5 + 8 RS-449 Rx ready 49 5 + 9 light pen 46 4 + 10 BINT 4 4e 5 + 11 joystick 41 4 + 12 vert. retrace 40 4 + 13 BINT 5 4f 5 + 14 BINT 1 47 4 + 15 RS-232 Rx ready 48 5 + + default mask is 0x7e3f -- RS232 Rx, RS449 Rx, keyboard, bezel. */ if (m_int_mask != data) diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp index b427c1a16f9..7f28193cbea 100644 --- a/src/mame/drivers/dbox.cpp +++ b/src/mame/drivers/dbox.cpp @@ -548,17 +548,17 @@ READ16_MEMBER (dbox_state::sysflash_r){ } else { - if (m_sf_mode == 4) - { - switch (offset & 0xff) - { - case 0x00: LOGFLASH("- Manufacturer ID\n"); return 01; break; // Manufacturer ID + if (m_sf_mode == 4) + { + switch (offset & 0xff) + { + case 0x00: LOGFLASH("- Manufacturer ID\n"); return 01; break; // Manufacturer ID // case 0x01: LOGFLASH("- Device ID\n"); return 0x22d6; break; // Device ID (Top Boot Block) 29F800TA - case 0x01: LOGFLASH("- Device ID\n"); return 0x2258; break; // Device ID (Bottom Boot Block) 29F800BA - case 0x02: LOGFLASH("- Sector %02x protection: 1 (hardcoded)\n", offset >> 12); return 01; break; - default: LOGFLASH(" - Unhandled Mode:%d State:%08x\n", m_sf_mode, m_sf_state); - } - } + case 0x01: LOGFLASH("- Device ID\n"); return 0x2258; break; // Device ID (Bottom Boot Block) 29F800BA + case 0x02: LOGFLASH("- Sector %02x protection: 1 (hardcoded)\n", offset >> 12); return 01; break; + default: LOGFLASH(" - Unhandled Mode:%d State:%08x\n", m_sf_mode, m_sf_state); + } + } } return 0; } diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index e1fa2eaaf8a..383fdcf314d 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -658,37 +658,37 @@ MACHINE_CONFIG_END sector SA5 (1A000 - 1BFFF) is read-only, contain information written during manufacture or repair, fully generated by software tool (except predefined list of creators) struct factory_sector { - struct factory_record { - // everything 'char' below is decimal numbers in ASCII, unless noted else - char machine_code1; // '0' - Dreamcast, 0xFF - dev.box - char machine_code2; // '0' - Dreamcast, 0xFF - dev.box - char country_code; // 0 - Japan, 1 - America, 2 - Europe - char language; // 0 - Japanese, 1 - English, etc - char broadcast_format; // 0 - NTSC, 1 - PAL, 2 - PAL-M, 3 - PAL-N - char machine_name[32]; // ASCII text 'Dreamcast', trail is 0x20 filled - char tool_number[4]; // software tool # - char tool_version[2]; // software tool version - char tool_type[2]; // software tool type: 0 - for MP(mass production?), 1 - for Repair, 2 - for PP - char year[4]; - char month[2]; - char day[2]; - char hour[2]; - char min[2]; - char serial_number[8]; - char factory_code[4]; - char total_number[16]; - uint8_t sum; // byte sum of above - uint8_t machine_id[8]; // 64bit UID - uint8_t machine_type; // FF - Dreamcast - uint8_t machine_version;// FF - VA0, FE - VA1, FD - VA2, NOTE: present in 1st factory record only, in 2nd always FF - uint8_t unused[0x40] // FF filled - } factory_records[2]; // 2 copies - uint8_t unused_0[0x36]; // FF filled - uint8_t unk_version; // not clear if hardware or bios version, A0 - VA0, 9F - VA1, 9E - VA2 - uint8_t unused_1[9]; // FF filled - char staff_roll[0xca0]; // list of creators - uint8_t unused_2[0x420]; // FF filled - uint8_t random[0xdc0]; // output of RNG {static u32 seed; seed=(seed*0x83d+0x2439)&0x7fff; return (u16)(seed+0xc000);}, where initial seed value is serial_number[7] & 0xf + struct factory_record { + // everything 'char' below is decimal numbers in ASCII, unless noted else + char machine_code1; // '0' - Dreamcast, 0xFF - dev.box + char machine_code2; // '0' - Dreamcast, 0xFF - dev.box + char country_code; // 0 - Japan, 1 - America, 2 - Europe + char language; // 0 - Japanese, 1 - English, etc + char broadcast_format; // 0 - NTSC, 1 - PAL, 2 - PAL-M, 3 - PAL-N + char machine_name[32]; // ASCII text 'Dreamcast', trail is 0x20 filled + char tool_number[4]; // software tool # + char tool_version[2]; // software tool version + char tool_type[2]; // software tool type: 0 - for MP(mass production?), 1 - for Repair, 2 - for PP + char year[4]; + char month[2]; + char day[2]; + char hour[2]; + char min[2]; + char serial_number[8]; + char factory_code[4]; + char total_number[16]; + uint8_t sum; // byte sum of above + uint8_t machine_id[8]; // 64bit UID + uint8_t machine_type; // FF - Dreamcast + uint8_t machine_version;// FF - VA0, FE - VA1, FD - VA2, NOTE: present in 1st factory record only, in 2nd always FF + uint8_t unused[0x40] // FF filled + } factory_records[2]; // 2 copies + uint8_t unused_0[0x36]; // FF filled + uint8_t unk_version; // not clear if hardware or bios version, A0 - VA0, 9F - VA1, 9E - VA2 + uint8_t unused_1[9]; // FF filled + char staff_roll[0xca0]; // list of creators + uint8_t unused_2[0x420]; // FF filled + uint8_t random[0xdc0]; // output of RNG {static u32 seed; seed=(seed*0x83d+0x2439)&0x7fff; return (u16)(seed+0xc000);}, where initial seed value is serial_number[7] & 0xf }; */ diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index d12e8bae2d0..74d714e6bb0 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -512,7 +512,7 @@ static ADDRESS_MAP_START( dragngun_map, AS_PROGRAM, 32, dragngun_state ) AM_RANGE(0x1000000, 0x1000007) AM_READ(unk_video_r) AM_RANGE(0x1000100, 0x1007fff) AM_RAM AM_RANGE(0x10b0000, 0x10b01ff) AM_RAM - AM_RANGE(0x1400000, 0x1ffffff) AM_ROM AM_REGION("dvi", 0x00000) // reads from here during boss battles when the videos should be displayed at the offsets where the DVI headers are // as a result it ends up writing what looks like pointers to the frame data in the ram area above + AM_RANGE(0x1400000, 0x1ffffff) AM_ROM AM_REGION("dvi", 0x00000) // reads from here during boss battles when the videos should be displayed at the offsets where the DVI headers are // as a result it ends up writing what looks like pointers to the frame data in the ram area above ADDRESS_MAP_END static ADDRESS_MAP_START( lockloadu_map, AS_PROGRAM, 32, dragngun_state ) @@ -935,9 +935,9 @@ DECO16IC_BANK_CB_MEMBER( deco32_state::tattass_bank_callback ) // INPUTS //************************************************************************** -READ8_MEMBER( deco32_state::captaven_dsw1_r ) { return ioport("DSW1")->read(); } -READ8_MEMBER( deco32_state::captaven_dsw2_r ) { return ioport("DSW2")->read(); } -READ8_MEMBER( deco32_state::captaven_dsw3_r ) { return ioport("DSW3")->read(); } +READ8_MEMBER( deco32_state::captaven_dsw1_r ) { return ioport("DSW1")->read(); } +READ8_MEMBER( deco32_state::captaven_dsw2_r ) { return ioport("DSW2")->read(); } +READ8_MEMBER( deco32_state::captaven_dsw3_r ) { return ioport("DSW3")->read(); } READ16_MEMBER( deco32_state::fghthist_in0_r ) { return ioport("IN0")->read(); } READ16_MEMBER( deco32_state::fghthist_in1_r ) { return ioport("IN1")->read(); } diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp index f4d7ced069a..6de6733a1f9 100644 --- a/src/mame/drivers/didact.cpp +++ b/src/mame/drivers/didact.cpp @@ -84,14 +84,14 @@ //#define LOG_OUTPUT_FUNC printf #include "logmacro.h" -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) -#define LOGSCAN(...) LOGMASKED(LOG_SCAN, __VA_ARGS__) -#define LOGBANK(...) LOGMASKED(LOG_BANK, __VA_ARGS__) -#define LOGSCREEN(...) LOGMASKED(LOG_SCREEN, __VA_ARGS__) -#define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) -#define LOGCS(...) LOGMASKED(LOG_CS, __VA_ARGS__) -#define LOGPLA(...) LOGMASKED(LOG_PLA, __VA_ARGS__) -#define LOGPROM(...) LOGMASKED(LOG_PROM, __VA_ARGS__) +#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) +#define LOGSCAN(...) LOGMASKED(LOG_SCAN, __VA_ARGS__) +#define LOGBANK(...) LOGMASKED(LOG_BANK, __VA_ARGS__) +#define LOGSCREEN(...) LOGMASKED(LOG_SCREEN, __VA_ARGS__) +#define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) +#define LOGCS(...) LOGMASKED(LOG_CS, __VA_ARGS__) +#define LOGPLA(...) LOGMASKED(LOG_PLA, __VA_ARGS__) +#define LOGPROM(...) LOGMASKED(LOG_PROM, __VA_ARGS__) #ifdef _MSC_VER #define FUNCNAME __func__ @@ -919,7 +919,7 @@ protected: private: enum { PLA_EPROM = 0x80, - PLA_IO1 = 0x40, + PLA_IO1 = 0x40, PLA_RAM2 = 0x20, PLA_RAM1 = 0x10, PLA_RAM0 = 0x08, @@ -954,18 +954,18 @@ void can09t_state::machine_start() LOG("%s()\n", FUNCNAME); /* TBP18S030 32 bytes fuse PROM controls the entire memory map in two parts/map-banks - BANK 0: 6f 6f 69 69 7b 7b ee ee e8 e8 ec bc ea ea 7f 7f + BANK 0: 6f 6f 69 69 7b 7b ee ee e8 e8 ec bc ea ea 7f 7f BANK 1: f1 f1 f5 f5 f3 f3 f7 f7 dc dc ec bc ea ea 7f 7f Connected as follows: A12 -- A0 Y0 -- MPX* - latch for screen RAM - A13 -- A1 Y1 -- RAM14 - A14 -- A2 Y2 -- RAM13 + A13 -- A1 Y1 -- RAM14 + A14 -- A2 Y2 -- RAM13 A15 -- A3 Y3 -- RAM0 SYSPIA PB5 -- BANK -- A4 Y4 -- RAM1 E+Q -- S* Y5 -- RAM2 - Y6 -- IO1 - Y7 -- EPROM + Y6 -- IO1 + Y7 -- EPROM The PAL outputs are used as follows: -------------------------------- @@ -1041,7 +1041,7 @@ READ8_MEMBER( can09t_state::read ) LOGPLA("- RAM2 %04x->%02x\n", offset, byte); } - // IC11 74138 Y6 demultiplexer : A5, A5, A7 + A8:1 + A9:0 maps in the i/o area at some + // IC11 74138 Y6 demultiplexer : A5, A5, A7 + A8:1 + A9:0 maps in the i/o area at some if ( (~pla_data & PLA_IO1) && (~pla_data & PLA_MPX) && (offset & CPU_A8) && (~offset & CPU_A9) ) { switch (offset & 0x00f0) @@ -1065,13 +1065,13 @@ READ8_MEMBER( can09t_state::read ) LOGPLA("-- PTM\n"); byte = m_ptm->read(space, offset & 7); break; - case X4XX: // + case X4XX: // LOGPLA("-- XX4X\n"); break; case X5XX: // J1, J2 LOGPLA("-- XX5X\n"); break; - case X6XX: // + case X6XX: // LOGPLA("-- XX6X\n"); break; case X7XX: // J1, J2 @@ -1125,7 +1125,7 @@ WRITE8_MEMBER( can09t_state::write ) LOGPLA("- RAM2 %04x->%02x\n", offset, data); } - // IC11 74138 Y6 demultiplexer : A5, A5, A7 + A8:1 + A9:0 maps in the i/o area at some + // IC11 74138 Y6 demultiplexer : A5, A5, A7 + A8:1 + A9:0 maps in the i/o area at some if ( (~pla_data & PLA_IO1) && (~pla_data & PLA_MPX) && (offset & CPU_A8) && (~offset & CPU_A9) ) { LOGPLA("- IO1 %04x<-%02x\n", offset, data); @@ -1150,13 +1150,13 @@ WRITE8_MEMBER( can09t_state::write ) LOGPLA("-- PTM\n"); m_ptm->write(space, offset & 7, data); break; - case X4XX: // + case X4XX: // LOGPLA("-- XX4X\n"); break; case X5XX: // J1, J2 LOGPLA("-- XX5X\n"); break; - case X6XX: // + case X6XX: // LOGPLA("-- XX6X\n"); break; case X7XX: // J1, J2 @@ -1223,7 +1223,7 @@ WRITE_LINE_MEMBER (can09t_state::write_acia_clock){ static ADDRESS_MAP_START( can09t_map, AS_PROGRAM, 8, can09t_state ) // Everything is dynamically and asymetrically mapped through the PAL decoded by read/write - AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write) + AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write) ADDRESS_MAP_END static INPUT_PORTS_START( can09t ) diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp index 2bef537ebf5..178ee95fc75 100644 --- a/src/mame/drivers/europc.cpp +++ b/src/mame/drivers/europc.cpp @@ -20,9 +20,9 @@ * * To-Do: * An external 20MB harddisk (Schneider HD20) can be added to the PC and PC II. This is a XT IDE drive. The BIOSs contain their own copy of the WD XT IDE BIOS that can be activated from the BIOS setup menu. * (load debug, then g=f000:a000 to enter formatter routine) -* * emulate internal graphics, but AGA is not quite the correct choice for the standard graphics adapter (it's a Commodore standard), as the Schneiders are only capable of switching between Hercules and CGA modes. -* * The PC 2 and XT have 768K of memory that can be configured from the BIOS setup as 640K, 640K+128K EMS and 512K+256K EMS. The EMS options are not visible in our emulation and loading the EMS driver fails. -* See http://forum.classic-computing.de/index.php?page=Thread&threadID=8380 for screenshots. +* * emulate internal graphics, but AGA is not quite the correct choice for the standard graphics adapter (it's a Commodore standard), as the Schneiders are only capable of switching between Hercules and CGA modes. +* * The PC 2 and XT have 768K of memory that can be configured from the BIOS setup as 640K, 640K+128K EMS and 512K+256K EMS. The EMS options are not visible in our emulation and loading the EMS driver fails. +* See http://forum.classic-computing.de/index.php?page=Thread&threadID=8380 for screenshots. * * use correct AT style keyboard for XT * *****************************************************************************************************/ @@ -592,4 +592,4 @@ ROM_END // YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS COMP( 1988, europc, ibm5150, 0, europc, europc, europc_pc_state, europc, "Schneider Rdf. AG", "EURO PC", MACHINE_NOT_WORKING) COMP( 198?, europc2, ibm5150, 0, europc2, europc, europc_pc_state, europc, "Schneider Rdf. AG", "EURO PC II", MACHINE_NOT_WORKING) -COMP( 198?, euroxt, ibm5150, 0, euroxt, europc, europc_pc_state, europc, "Schneider Rdf. AG", "EURO XT", MACHINE_NOT_WORKING) \ No newline at end of file +COMP( 198?, euroxt, ibm5150, 0, euroxt, europc, europc_pc_state, europc, "Schneider Rdf. AG", "EURO XT", MACHINE_NOT_WORKING) diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp index 465de61e34a..afb531fddf5 100644 --- a/src/mame/drivers/exidyttl.cpp +++ b/src/mame/drivers/exidyttl.cpp @@ -215,20 +215,20 @@ ROM_START( rhunting ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_REGION( 0x0400, "roms", ROMREGION_ERASE00 ) - ROM_LOAD( "6301-1.j11", 0x0000, 0x0100, CRC(d751bd57) SHA1(a6208af40661bf3cd50363d2ece38cd3b9f6a7a0) ) - ROM_LOAD( "93427.j10", 0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) ) - ROM_LOAD( "6301-1.v5", 0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) ) - ROM_LOAD( "6301-1.m11", 0x0000, 0x0100, CRC(2b02444f) SHA1(e1fc01f7271109515438542a223efc0042f794a5) ) - ROM_LOAD( "6301-1.l11", 0x0000, 0x0100, CRC(0bdaf1eb) SHA1(67976e73bfdc4d42a520212d020dd52d51667674) ) - ROM_LOAD( "6301-1.k11", 0x0000, 0x0100, CRC(34763c8f) SHA1(2012ace666e8b82a89a0c15511ee80173d9700bc) ) - - ROM_LOAD( "6331-1.a11", 0x0000, 0x0020, CRC(f304a1fb) SHA1(0f029274bb99723ebcc271d761e1500ca50b2738) ) - ROM_LOAD( "6331-1.c12", 0x0000, 0x0020, CRC(f8dbd779) SHA1(55bdaf9eb1ba6185e20512c4874ebb625861508e) ) - ROM_LOAD( "6331-1.p14", 0x0000, 0x0020, CRC(2e83bf80) SHA1(02fcc1e879c06759a21ef4f004fe7aa790814112) ) - ROM_LOAD( "6331-1.e7", 0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) ) - ROM_LOAD( "6331-1.g7", 0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) ) - ROM_LOAD( "6331-1.r7", 0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) ) - ROM_LOAD( "6331-1.t7", 0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) ) + ROM_LOAD( "6301-1.j11", 0x0000, 0x0100, CRC(d751bd57) SHA1(a6208af40661bf3cd50363d2ece38cd3b9f6a7a0) ) + ROM_LOAD( "93427.j10", 0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) ) + ROM_LOAD( "6301-1.v5", 0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) ) + ROM_LOAD( "6301-1.m11", 0x0000, 0x0100, CRC(2b02444f) SHA1(e1fc01f7271109515438542a223efc0042f794a5) ) + ROM_LOAD( "6301-1.l11", 0x0000, 0x0100, CRC(0bdaf1eb) SHA1(67976e73bfdc4d42a520212d020dd52d51667674) ) + ROM_LOAD( "6301-1.k11", 0x0000, 0x0100, CRC(34763c8f) SHA1(2012ace666e8b82a89a0c15511ee80173d9700bc) ) + + ROM_LOAD( "6331-1.a11", 0x0000, 0x0020, CRC(f304a1fb) SHA1(0f029274bb99723ebcc271d761e1500ca50b2738) ) + ROM_LOAD( "6331-1.c12", 0x0000, 0x0020, CRC(f8dbd779) SHA1(55bdaf9eb1ba6185e20512c4874ebb625861508e) ) + ROM_LOAD( "6331-1.p14", 0x0000, 0x0020, CRC(2e83bf80) SHA1(02fcc1e879c06759a21ef4f004fe7aa790814112) ) + ROM_LOAD( "6331-1.e7", 0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) ) + ROM_LOAD( "6331-1.g7", 0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) ) + ROM_LOAD( "6331-1.r7", 0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) ) + ROM_LOAD( "6331-1.t7", 0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) ) ROM_END diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp index 7a9f269692f..f0552f7569e 100644 --- a/src/mame/drivers/flstory.cpp +++ b/src/mame/drivers/flstory.cpp @@ -40,12 +40,12 @@ static ADDRESS_MAP_START( base_map, AS_PROGRAM, 8, flstory_state ) AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x800) AM_RAM_WRITE(flstory_videoram_w) AM_SHARE("videoram") AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* watchdog */ - AM_RANGE(0xd002, 0xd002) AM_NOP /* unknown read & coin lock out? */ + AM_RANGE(0xd002, 0xd002) AM_NOP /* unknown read & coin lock out? */ AM_RANGE(0xd400, 0xd400) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) AM_RANGE(0xd400, 0xd400) AM_DEVWRITE("soundlatch", generic_latch_8_device, write) AM_RANGE(0xd403, 0xd403) AM_READNOP AM_WRITE(snd_reset_w) // unknown read (set/clr side effect?) - + AM_RANGE(0xd401, 0xd401) AM_READ(snd_flag_r) AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSW0") AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW1") @@ -53,7 +53,7 @@ static ADDRESS_MAP_START( base_map, AS_PROGRAM, 8, flstory_state ) AM_RANGE(0xd803, 0xd803) AM_READ_PORT("SYSTEM") AM_RANGE(0xd804, 0xd804) AM_READ_PORT("P1") AM_RANGE(0xd806, 0xd806) AM_READ_PORT("P2") - + AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_SHARE("spriteram") AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE(flstory_scrlram_w) AM_SHARE("scrlram") @@ -140,10 +140,10 @@ WRITE8_MEMBER(flstory_state::sound_control_1_w) for(int i=0;i<4;i++) m_ta7630->set_channel_volume(m_msm,i+4,m_snd_ctrl1 >> 4); -// m_msm->set_output_gain(4, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ -// m_msm->set_output_gain(5, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ -// m_msm->set_output_gain(6, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ -// m_msm->set_output_gain(7, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(4, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(5, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(6, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(7, m_vol_ctrl[(m_snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ } WRITE8_MEMBER(flstory_state::sound_control_2_w) @@ -708,7 +708,7 @@ void flstory_state::machine_start() MACHINE_RESET_MEMBER(flstory_state,flstory) { -// MACHINE_RESET_CALL_MEMBER(ta7630); +// MACHINE_RESET_CALL_MEMBER(ta7630); /* video */ m_gfxctrl = 0; @@ -746,10 +746,10 @@ static MACHINE_CONFIG_START( flstory ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // derived from ladyfrog.cpp, guess MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_flstory) @@ -815,10 +815,10 @@ static MACHINE_CONFIG_START( onna34ro ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // derived from ladyfrog.cpp, guess MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_flstory) @@ -894,10 +894,10 @@ static MACHINE_CONFIG_START( victnine ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // derived from ladyfrog.cpp, guess MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHzs MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_victnine) @@ -967,10 +967,10 @@ static MACHINE_CONFIG_START( rumba ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // derived from ladyfrog.cpp, guess MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_rumba) diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 892ca94d93c..c5debc4a315 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -4969,10 +4969,10 @@ ROM_END Encrypted graphics 'alla TAB blue PCB. Maybe is the infamous encrypted Impera green PCB. - + From the manual: "With third draw" - ...but I couldn't trigger this feature. - + ...but I couldn't trigger this feature. + */ ROM_START( royaljp ) diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index 88d260867b8..282e042ffba 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -859,15 +859,15 @@ REF: 940411 */ -/* - the byte at 0x1ff in the rom at u44 controls the language / region settings - and even allows for an alt. title of Lizard Hunt +/* + the byte at 0x1ff in the rom at u44 controls the language / region settings + and even allows for an alt. title of Lizard Hunt Bits Usage - --------------------------------------------------------------------------------- - 0000 1000 Title (0x00 = LIZARD HUNT, 0x08 = ALLIGATOR HUNT) - 0000 0100 Language (0x00 = SPANISH, 0x04 = ENGLISH) - 0000 0011 Region warning ( 0x00, 0x02 = USA, 0x01 = NOT USA, 0x03 = NO WARNING) + --------------------------------------------------------------------------------- + 0000 1000 Title (0x00 = LIZARD HUNT, 0x08 = ALLIGATOR HUNT) + 0000 0100 Language (0x00 = SPANISH, 0x04 = ENGLISH) + 0000 0011 Region warning ( 0x00, 0x02 = USA, 0x01 = NOT USA, 0x03 = NO WARNING) */ ROM_START( aligator ) diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp index 10d19428e05..d390a8a7792 100644 --- a/src/mame/drivers/glass.cpp +++ b/src/mame/drivers/glass.cpp @@ -426,7 +426,7 @@ DRIVER_INIT_MEMBER(glass_state, glass) /* ALL versions of Glass contain the 'Break Edition' string (it just seems to be part of the title?) The 2 version 1.0 releases are very similar code, it was thought that one was a break edition and the other wasn't, but this is not the case. - + Version 1.1 releases also show Version 1994 on the title screen. These versions do not have skulls in the playfield (at least not on early stages) The protected version 1.1 also doesn't show any kind of attract gameplay, looks like it was patched out? (should be verified on an untouched original 1.1 using it's original SRAM tho) The unprotected version appears to be a Korean set, is censored, and has different girl pictures. diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp index 7556e59d07b..370364aaf1c 100644 --- a/src/mame/drivers/gstriker.cpp +++ b/src/mame/drivers/gstriker.cpp @@ -30,7 +30,7 @@ TODO: - Tilemap scrolling/rotation/zooming or whatever effect it needs - Priorities are wrong. I suspect they need sprite orthogonality - Missing mixer registers (mainly layer enable/disable) -- Tecmo World Cup '94 has missing protection emulation for draw buy-in +- Tecmo World Cup '94 has missing protection emulation for draw buy-in (as seen by code snippet 0x42ee, referenced in other places as well) It's unknown how the game logic should be at current stage. - Tecmo World Cup '94 also has no name entry whatsoever. @@ -382,7 +382,7 @@ static INPUT_PORTS_START( twcup94 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Pass") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Shoot") PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("DSW1") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) @@ -832,7 +832,7 @@ WRITE8_MEMBER(gstriker_state::twcup94_prot_reg_w) // Command byte is also written to VS9209 port F, which is set for input only. // Does the MCU somehow strobe it out of there? uint8_t mcu_data = m_work_ram[0x00f/2] & 0x00ff; - + if( ((m_prot_reg[1] & 4) == 0) && ((m_prot_reg[0] & 4) == 4) ) { switch( m_gametype ) @@ -901,14 +901,14 @@ WRITE8_MEMBER(gstriker_state::twcup94_prot_reg_w) logerror("Unknown MCU CMD %04x\n",mcu_data); PC(NULL_SUB); break; - + #undef NULL_SUB } break; - + // same as above but with +0x10 displacement offsets case TECMO_WCUP94A_MCU: - + switch (mcu_data) { #define NULL_SUB 0x0000829E @@ -927,12 +927,12 @@ WRITE8_MEMBER(gstriker_state::twcup94_prot_reg_w) case 0x6e: PC(0x00010E38); break; // loop case 0x6b: PC(0x00010EFC); break; // attract even case 0x69: PC(0x0001121A); break; // attract odd - + default: logerror("Unknown MCU CMD %04x\n",mcu_data); PC(NULL_SUB); break; - + #undef NULL_SUB } break; diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp index b6f170ade28..fa292c2fa86 100644 --- a/src/mame/drivers/hp16500.cpp +++ b/src/mame/drivers/hp16500.cpp @@ -60,7 +60,7 @@ #define CRTC_TAG "crtc" #define SCREEN_TAG "screen" #define DUART_TAG "duart" -#define MLC_TAG "mlc" +#define MLC_TAG "mlc" class hp16500_state : public driver_device { diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index bd5f0496689..39ebcab48d4 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -107,9 +107,9 @@ public: /* 8042 interface */ DECLARE_WRITE8_MEMBER(iocpu_port1_w); - DECLARE_WRITE8_MEMBER(iocpu_port2_w); - DECLARE_READ8_MEMBER(iocpu_port1_r); - DECLARE_READ8_MEMBER(iocpu_test0_r); + DECLARE_WRITE8_MEMBER(iocpu_port2_w); + DECLARE_READ8_MEMBER(iocpu_port1_r); + DECLARE_READ8_MEMBER(iocpu_test0_r); DECLARE_WRITE32_MEMBER(led_w) { @@ -117,7 +117,7 @@ public: { return; } - #if 0 +#if 0 printf("LED: %02x (", data&0xff); for (int i = 7; i >= 0; i--) { @@ -131,7 +131,7 @@ public: } } printf(")\n"); - #endif +#endif } private: @@ -345,14 +345,14 @@ WRITE8_MEMBER(hp9k3xx_state::iocpu_port2_w) READ8_MEMBER(hp9k3xx_state::iocpu_port1_r) { - if (m_hil_read) - return m_mlc->read(space, (m_latch_data & 0xc0) >> 6, 0xff); + if (m_hil_read) + return m_mlc->read(space, (m_latch_data & 0xc0) >> 6, 0xff); return 0xff; } READ8_MEMBER(hp9k3xx_state::iocpu_test0_r) { - return !m_mlc->get_int(); + return !m_mlc->get_int(); } static SLOT_INTERFACE_START(dio16_cards) diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index 2c795f6a7f6..bc8b846a581 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -833,7 +833,7 @@ WRITE16_MEMBER(itech8_state::display_page16_w) READ16_MEMBER(itech8_state::rom_constant_r) { -// Ninja Clowns reads this area for program ROM checksum +// Ninja Clowns reads this area for program ROM checksum logerror("Read ROM constant area %04x\n",offset*2+0x40000); return 0xd840; } diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index b12e72217c5..a39e9728918 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -1309,7 +1309,7 @@ static INPUT_PORTS_START( gtmr ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START("P2") /* b0002.w */ + PORT_START("P2") /* b0002.w */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("DSW1",0x0800,NOTEQUALS,0x00) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("DSW1",0x0800,NOTEQUALS,0x00) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("DSW1",0x0800,NOTEQUALS,0x00) @@ -1368,7 +1368,7 @@ static INPUT_PORTS_START( gtmr ) PORT_START("WHEEL0") /* Wheel (270deg) - 100015.b <- ffffe.b */ PORT_BIT ( 0x00ff, 0x0080, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(25) PORT_PLAYER(1) PORT_CONDITION("DSW1",0x1800,EQUALS,0x0000) PORT_BIT ( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW1",0x1800,NOTEQUALS,0x0000) - + PORT_START("WHEEL1") /* Wheel (360deg) */ PORT_BIT ( 0x00ff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(25) PORT_PLAYER(1) PORT_CONDITION("DSW1",0x1800,EQUALS,0x1000) PORT_BIT ( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW1",0x1800,NOTEQUALS,0x1000) diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp index 47c6a583da1..b79d16c0c6a 100644 --- a/src/mame/drivers/ladyfrog.cpp +++ b/src/mame/drivers/ladyfrog.cpp @@ -302,10 +302,10 @@ static MACHINE_CONFIG_START( ladyfrog ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // black borders in ladyfrog gameplay are correct +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // black borders in ladyfrog gameplay are correct MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz MCFG_SCREEN_UPDATE_DRIVER(ladyfrog_state, screen_update_ladyfrog) MCFG_SCREEN_PALETTE("palette") @@ -337,7 +337,7 @@ static MACHINE_CONFIG_START( ladyfrog ) // pin 1 SOLO 8' not mapped // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - + MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index fd9907d3222..18a1e6f5a8d 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -67,7 +67,7 @@ TO DO: - figure out what really should happen during VCU test in Great Guns (patched out at the moment) (btw. Mazer Blazer doesn't test VCU) -- add sound interface to Mazer Blazer - Speech processor is Digitalker chip, sample ROMs are currently +- add sound interface to Mazer Blazer - Speech processor is Digitalker chip, sample ROMs are currently undumped; ============================================================================ @@ -668,13 +668,13 @@ static INPUT_PORTS_START( mazerbla ) PORT_START("STICK0_X") /* Strobe 6: horizontal movement of gun */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_REVERSE PORT_PLAYER(1) - + PORT_START("STICK0_Y") /* Strobe 7: vertical movement of gun */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_PLAYER(1) PORT_START("STICK1_X") /* Strobe 8: horizontal movement of gun */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("STICK1_Y") /* Strobe 9: vertical movement of gun */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -684,7 +684,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( mazerblaa ) PORT_INCLUDE( mazerbla ) - + PORT_MODIFY("DSW0") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "3" ) @@ -705,7 +705,7 @@ static INPUT_PORTS_START( mazerblaa ) PORT_DIPSETTING( 0xc0, "40000" ) PORT_DIPSETTING( 0x80, "50000" ) PORT_DIPSETTING( 0x40, "60000" ) - PORT_DIPSETTING( 0x00, "70000" ) + PORT_DIPSETTING( 0x00, "70000" ) INPUT_PORTS_END // TODO: defaults, not listed in manual @@ -969,7 +969,7 @@ static MACHINE_CONFIG_START( mazerbla ) MCFG_MB_VCU_PALETTE("palette") MCFG_NVRAM_ADD_0FILL("nvram") - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -981,7 +981,7 @@ static MACHINE_CONFIG_START( mazerbla ) MCFG_PALETTE_ADD("palette", 256+1) MCFG_PALETTE_INIT_OWNER(mazerbla_state, mazerbla) - + /* sound hardware */ MACHINE_CONFIG_END @@ -1012,7 +1012,7 @@ static MACHINE_CONFIG_START( greatgun ) MCFG_MB_VCU_PALETTE("palette") MCFG_NVRAM_ADD_0FILL("nvram") - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1155,14 +1155,14 @@ ROM_END DRIVER_INIT_MEMBER(mazerbla_state,mazerbla) { -// m_game_id = MAZERBLA; +// m_game_id = MAZERBLA; } DRIVER_INIT_MEMBER(mazerbla_state,greatgun) { uint8_t *rom = memregion("sub2")->base(); -// m_game_id = GREATGUN; +// m_game_id = GREATGUN; // patch VCU test // VCU test starts at PC=0x56f diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp index 47e38ae87c7..08ed91f4a28 100644 --- a/src/mame/drivers/mephisto_montec.cpp +++ b/src/mame/drivers/mephisto_montec.cpp @@ -2,12 +2,12 @@ // copyright-holders:Sandro Ronco // thanks-to:yoyo_chessboard /************************************************************************************************** - - Mephisto Monte Carlo - Mephisto Mega IV - Mephisto Monte Carlo IV LE - Mephisto Super Mondial - Mephisto Super Mondial II + + Mephisto Monte Carlo + Mephisto Mega IV + Mephisto Monte Carlo IV LE + Mephisto Super Mondial + Mephisto Super Mondial II **************************************************************************************************/ @@ -49,7 +49,7 @@ public: DECLARE_WRITE8_MEMBER(montec_ldc_cs0_w); DECLARE_WRITE8_MEMBER(montec_ldc_cs1_w); DECLARE_WRITE8_MEMBER(montec_lcd_clk_w); - + DECLARE_READ8_MEMBER(megaiv_input_r); DECLARE_WRITE8_MEMBER(megaiv_led_w); @@ -73,10 +73,10 @@ private: struct display_t { - uint8_t pos; - int8_t shift; - uint8_t data; - uint8_t bit; + uint8_t pos; + int8_t shift; + uint8_t data; + uint8_t bit; } m_display; }; @@ -155,8 +155,8 @@ WRITE8_MEMBER(mephisto_montec_state::montec_lcd_clk_w) if (m_display.shift == 8) { - if (m_lcd_mux & 0x01) output().set_digit_value(0 + m_display.pos, BITSWAP8(m_display.data, 0,3,2,7,6,5,4,1)); - if (m_lcd_mux & 0x02) output().set_digit_value(4 + m_display.pos, BITSWAP8(m_display.data, 0,3,2,7,6,5,4,1)); + if (m_lcd_mux & 0x01) output().set_digit_value(0 + m_display.pos, BITSWAP8(m_display.data, 0,3,2,7,6,5,4,1)); + if (m_lcd_mux & 0x02) output().set_digit_value(4 + m_display.pos, BITSWAP8(m_display.data, 0,3,2,7,6,5,4,1)); m_display.shift = 0; m_display.pos = (m_display.pos + 1) & 3; @@ -175,8 +175,8 @@ WRITE8_MEMBER(mephisto_montec_state::montec_mux_w) READ8_MEMBER(mephisto_montec_state::montec_input_r) { - if (m_input_mux & 0x01) return m_keys[1]->read(); - else if (m_input_mux & 0x02) return m_keys[0]->read(); + if (m_input_mux & 0x01) return m_keys[1]->read(); + else if (m_input_mux & 0x02) return m_keys[0]->read(); return m_board->input_r(space, offset) ^ 0xff; } @@ -218,10 +218,10 @@ WRITE8_MEMBER(mephisto_montec_state::megaiv_led_w) READ8_MEMBER(mephisto_montec_state::megaiv_input_r) { - if (m_input_mux & 0x01) return BIT(m_keys[1]->read(), 0 + offset) << 7; - else if (m_input_mux & 0x02) return BIT(m_keys[1]->read(), 4 + offset) << 7; - else if (m_input_mux & 0x04) return BIT(m_keys[0]->read(), 0 + offset) << 7; - else if (m_input_mux & 0x08) return BIT(m_keys[0]->read(), 4 + offset) << 7; + if (m_input_mux & 0x01) return BIT(m_keys[1]->read(), 0 + offset) << 7; + else if (m_input_mux & 0x02) return BIT(m_keys[1]->read(), 4 + offset) << 7; + else if (m_input_mux & 0x04) return BIT(m_keys[0]->read(), 0 + offset) << 7; + else if (m_input_mux & 0x08) return BIT(m_keys[0]->read(), 4 + offset) << 7; return BIT(m_board->input_r(space, offset), offset) << 7; } @@ -274,9 +274,9 @@ WRITE8_MEMBER(mephisto_montec_state::smondial_board_mux_w) for (int i=0; i<8; i++) { - if (m_leds_mux & 0x03) output().set_led_value(100 + i, BIT(m_smondial_board_mux, i) ? 0 : 1); - if (m_leds_mux & 0x0c) output().set_led_value( 8 + i, BIT(m_smondial_board_mux, i) ? 0 : 1); - if (m_leds_mux & 0x30) output().set_led_value( 0 + i, BIT(m_smondial_board_mux, i) ? 0 : 1); + if (m_leds_mux & 0x03) output().set_led_value(100 + i, BIT(m_smondial_board_mux, i) ? 0 : 1); + if (m_leds_mux & 0x0c) output().set_led_value( 8 + i, BIT(m_smondial_board_mux, i) ? 0 : 1); + if (m_leds_mux & 0x30) output().set_led_value( 0 + i, BIT(m_smondial_board_mux, i) ? 0 : 1); } } diff --git a/src/mame/drivers/miniframe.cpp b/src/mame/drivers/miniframe.cpp index 9950a2e5eb6..965cddbcfad 100644 --- a/src/mame/drivers/miniframe.cpp +++ b/src/mame/drivers/miniframe.cpp @@ -96,9 +96,9 @@ READ16_MEMBER( miniframe_state::ram_mmu_r ) if ((mapentry & MMU_STATUS_MASK) == MMU_STATUS_PRESENT_NOT_ACCESSED) { m_mapram[(offset >> 11) & 0x7ff] &= ~MMU_STATUS_MASK; - m_mapram[(offset >> 11) & 0x7ff] |= MMU_STATUS_ACCESSED_NOT_WRITTEN; + m_mapram[(offset >> 11) & 0x7ff] |= MMU_STATUS_ACCESSED_NOT_WRITTEN; } - + return m_ramptr[addr]; } else @@ -129,8 +129,8 @@ WRITE16_MEMBER( miniframe_state::ram_mmu_w ) // indicate page has been written // we know it's OK to just OR this - m_mapram[(offset >> 11) & 0x7ff] |= MMU_STATUS_ACCESSED_WRITTEN; - + m_mapram[(offset >> 11) & 0x7ff] |= MMU_STATUS_ACCESSED_WRITTEN; + COMBINE_DATA(&m_ramptr[addr]); } else @@ -141,7 +141,7 @@ WRITE16_MEMBER( miniframe_state::ram_mmu_w ) WRITE16_MEMBER( miniframe_state::general_ctrl_w ) { - if (data & 0x1000) // ROM mirror at 0 if set + if (data & 0x1000) // ROM mirror at 0 if set { m_ramrombank->set_bank(1); } @@ -191,7 +191,7 @@ static ADDRESS_MAP_START( miniframe_mem, AS_PROGRAM, 16, miniframe_state ) AM_RANGE(0x450000, 0x450001) AM_WRITE(general_ctrl_w) AM_RANGE(0x800000, 0x81ffff) AM_ROM AM_REGION("bootrom", 0) AM_RANGE(0xc00000, 0xc00007) AM_DEVREADWRITE8("pit8253", pit8253_device, read, write, 0x00ff) - AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8("baudgen", pit8253_device, read, write, 0x00ff) + AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8("baudgen", pit8253_device, read, write, 0x00ff) AM_RANGE(0xc90000, 0xc90003) AM_DEVREADWRITE8("pic8259", pic8259_device, read, write, 0x00ff) ADDRESS_MAP_END @@ -235,8 +235,8 @@ static MACHINE_CONFIG_START( miniframe ) // floppy MCFG_DEVICE_ADD("wd2797", WD2797, 1000000) -// MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(miniframe_state, wd2797_intrq_w)) -// MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(miniframe_state, wd2797_drq_w)) +// MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(miniframe_state, wd2797_intrq_w)) +// MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(miniframe_state, wd2797_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd2797:0", miniframe_floppies, "525dd", floppy_image_device::default_floppy_formats) // 8263s @@ -248,7 +248,7 @@ static MACHINE_CONFIG_START( miniframe ) MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk2)) // and ir4 on the PIC MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("pic8259", pic8259_device, ir4_w)) - + MCFG_DEVICE_ADD("baudgen", PIT8253, 0) MCFG_PIT8253_CLK0(1228800) MCFG_PIT8253_CLK1(1228800) diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index ac8e0351211..f08b50838ee 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -2339,7 +2339,7 @@ static ADDRESS_MAP_START( copro_sharc_map, AS_DATA, 32, model2_state ) AM_RANGE(0x0c00000, 0x13fffff) AM_WRITE(copro_sharc_output_fifo_w) AM_RANGE(0x1400000, 0x1bfffff) AM_READWRITE(copro_sharc_buffer_r, copro_sharc_buffer_w) AM_RANGE(0x1c00000, 0x1dfffff) AM_ROM AM_REGION("user5", 0) -// AM_RANGE(0x3c000000, 0x3fffffff) AM_WRITE(copro_sharc_output_fifo_w) // last bronx, cpu core bug? +// AM_RANGE(0x3c000000, 0x3fffffff) AM_WRITE(copro_sharc_output_fifo_w) // last bronx, cpu core bug? ADDRESS_MAP_END #if 0 diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index bf91ac78015..67988cf1498 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -341,7 +341,7 @@ WRITE32_MEMBER(ms32_state::pip_w) WRITE32_MEMBER(ms32_state::coin_counter_w) { // desertwr/p47aces sets 4 here - // f1superb sets 2 + // f1superb sets 2 machine().bookkeeping().coin_counter_w(0, data & 0x10); machine().bookkeeping().coin_counter_w(1, data & 0x20); } @@ -1253,7 +1253,7 @@ static INPUT_PORTS_START( f1superb ) PORT_DIPSETTING( 0x0c, "7" ) PORT_DIPSETTING( 0x0e, "8" ) PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNUSED ) - + INPUT_PORTS_END /********** GFX DECODE **********/ diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index e399b134db0..b787bc0b5b7 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -225,14 +225,14 @@ WRITE8_MEMBER(msisaac_state::sound_control_0_w) // group2 m_ta7630->set_channel_volume(m_msm,i+4, m_snd_ctrl0 >> 4); } -// m_msm->set_output_gain(0, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ -// m_msm->set_output_gain(1, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ -// m_msm->set_output_gain(2, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ -// m_msm->set_output_gain(3, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ -// m_msm->set_output_gain(4, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ -// m_msm->set_output_gain(5, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ -// m_msm->set_output_gain(6, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ -// m_msm->set_output_gain(7, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(0, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ +// m_msm->set_output_gain(1, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ +// m_msm->set_output_gain(2, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ +// m_msm->set_output_gain(3, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */ +// m_msm->set_output_gain(4, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(5, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(6, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ +// m_msm->set_output_gain(7, m_vol_ctrl[(m_snd_ctrl0 >> 4) & 15] / 100.0); /* group2 from msm5232 */ } WRITE8_MEMBER(msisaac_state::sound_control_1_w) { @@ -481,7 +481,7 @@ static MACHINE_CONFIG_START( msisaac ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_TA7630_ADD("ta7630") - + MCFG_SOUND_ADD("ay1", AY8910, 2000000) // port A/B likely to be TA7630 filters MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 935c71da93b..0b1e3264f74 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -2107,7 +2107,7 @@ static MACHINE_CONFIG_START( metlhawk ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ -// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) +// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 5bb5c66bb00..ab50d57df1a 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -41,7 +41,7 @@ * Battery Module *OR* debugger module type A or B (debugger module has an i8255 on it for alto<->notetaker comms,\ and allows alto to halt the cpus [type A and B can debug either the emulator cpu or the iocpu respectively] and dump registers to alto screen, etc) - + * In 1980-1981 an Ethernet card with another 8086 on it was developed, but unclear if this ever fully worked. * Prototypes only, 10 units[2] manufactured 1978-1980 @@ -677,16 +677,16 @@ read from 0x44 (byte wide) to check input fifo status /* WRITE16_MEMBER(notetaker_state::EPConReg_w) { - m_EP_LED1 = m_EP_ParityError; // if parity checking is enabled AND the last access was to the low 4k AND there was a parity error, the parity error latch is latched here. It triggers an interrupt. - m_EP_LED2 = (data&0x40)?1:0; - m_EP_LED3 = (data&0x20)?1:0; - m_EP_LED4 = (data&0x10)?1:0; - m_EP_SelROM_q = (data&0x08)?1:0; // this doesn't appear to be hooked anywhere, and may just drive an LED - // originally, SelROM_q enabled two 2716 EPROMS, later 82s137 PROMS to map code to the FFC00-FFFFF area but this was dropped in the 1979 design revision - m_EP_ProcLock = (data&0x04)?1:0; // bus lock for this processor (hold other processor in wait state) - m_EP_SetParity_q = (data&0x02)?1:0; // enable parity checking on local ram if low - m_EP_DisLMem_q = (data&0x01)?1:0; // if low, the low 4k of local memory is disabled and accesses the shared memory instead. - popmessage("EP LEDS: CR1: %d, CR2: %d, CR3: %d, CR4: %d", (data&0x80)>>2, (data&0x40)>>3, (data&0x20)>>1, (data&0x10)); + m_EP_LED1 = m_EP_ParityError; // if parity checking is enabled AND the last access was to the low 4k AND there was a parity error, the parity error latch is latched here. It triggers an interrupt. + m_EP_LED2 = (data&0x40)?1:0; + m_EP_LED3 = (data&0x20)?1:0; + m_EP_LED4 = (data&0x10)?1:0; + m_EP_SelROM_q = (data&0x08)?1:0; // this doesn't appear to be hooked anywhere, and may just drive an LED + // originally, SelROM_q enabled two 2716 EPROMS, later 82s137 PROMS to map code to the FFC00-FFFFF area but this was dropped in the 1979 design revision + m_EP_ProcLock = (data&0x04)?1:0; // bus lock for this processor (hold other processor in wait state) + m_EP_SetParity_q = (data&0x02)?1:0; // enable parity checking on local ram if low + m_EP_DisLMem_q = (data&0x01)?1:0; // if low, the low 4k of local memory is disabled and accesses the shared memory instead. + popmessage("EP LEDS: CR1: %d, CR2: %d, CR3: %d, CR4: %d", (data&0x80)>>2, (data&0x40)>>3, (data&0x20)>>1, (data&0x10)); } */ diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index 7c2e1a6a11c..4a54583ab07 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -715,7 +715,7 @@ void nycaptor_state::machine_start() void nycaptor_state::machine_reset() { -// MACHINE_RESET_CALL_MEMBER(ta7630); +// MACHINE_RESET_CALL_MEMBER(ta7630); m_generic_control_reg = 0; diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 3fc6b8f59eb..7addb73f540 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -555,7 +555,7 @@ READ8_MEMBER(pacman_state::alibaba_mystery_1_r) /* The return value determines what the mystery item is. Each bit corresponds to a question mark */ return machine().rand() & 0x0f; -// return m_maincpu->state_int(Z80_R) & 0x0f; +// return m_maincpu->state_int(Z80_R) & 0x0f; } diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index 53929bf22bf..b239471adb6 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -282,7 +282,7 @@ Options: 8087 FPU Ericsson PC =========== -Links: https://youtu.be/6uilOdMJc24 +Links: https://youtu.be/6uilOdMJc24 Form Factor: Desktop CPU: 8088 @ 4.77MHz RAM: 256K @@ -319,8 +319,8 @@ RAM: 768K, not sure how to address the area above 640K Bus: 8x ISA: 1) NEC V20 Slot CPU with 786K RAM, TI TACT80181FT chip 2) Z180 CP/M emulation card, needed to run the proprietary Olytext 30 word processor) 3) Monochrome graphics/color graphics card (possibly EGA capable) ICs: Chips P82C441 and P82A442A - 4) MFM hard disk controller HDC-770, ICs: HDC9224, HDC92C26, HDC9223, - 5) Floppy, serial and RTC DIO-770, ICs: 2x UM8250B, UM8272A, OKI M5832 + 4) MFM hard disk controller HDC-770, ICs: HDC9224, HDC92C26, HDC9223, + 5) Floppy, serial and RTC DIO-770, ICs: 2x UM8250B, UM8272A, OKI M5832 Video: MDA/Hercules/CGA, possibly EGA Mass storage: 1x 3.5" 720K, 20MB Miniscribe harddisk On board ports: speaker @@ -991,4 +991,4 @@ COMP( 1989, ssam88s, ibm5150, 0, pccga, pccga, COMP( 1983, eagle1600, ibm5150, 0, eagle1600, pccga, pc_state, 0, "Eagle", "1600" , MACHINE_NOT_WORKING ) COMP( 1988, laser_turbo_xt, ibm5150, 0, laser_turbo_xt, 0, pc_state, 0, "VTech", "Laser Turbo XT", 0 ) COMP( 1989, laser_xt3, ibm5150, 0, laser_xt3, 0, pc_state, 0, "VTech", "Laser XT/3", 0 ) -COMP( 198?, olytext30, ibm5150, 0, olytext30, pccga, pc_state, 0, "AEG Olympia", "Olytext 30", MACHINE_NOT_WORKING ) \ No newline at end of file +COMP( 198?, olytext30, ibm5150, 0, olytext30, pccga, pc_state, 0, "AEG Olympia", "Olytext 30", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/polgar.cpp b/src/mame/drivers/polgar.cpp index 3ba37f4f092..16b9e5e93a7 100644 --- a/src/mame/drivers/polgar.cpp +++ b/src/mame/drivers/polgar.cpp @@ -319,9 +319,9 @@ WRITE8_MEMBER(mephisto_modena_state::modena_led_w) { for(int i=0; i<8; i++) { - if (m_io_ctrl & 0x02) output().set_led_value(100 + i, BIT(data, i) ? 0 : 1); - if (m_io_ctrl & 0x04) output().set_led_value(0 + i, BIT(data, i) ? 0 : 1); - if (m_io_ctrl & 0x08) output().set_led_value(8 + i, BIT(data, i) ? 0 : 1); + if (m_io_ctrl & 0x02) output().set_led_value(100 + i, BIT(data, i) ? 0 : 1); + if (m_io_ctrl & 0x04) output().set_led_value(0 + i, BIT(data, i) ? 0 : 1); + if (m_io_ctrl & 0x08) output().set_led_value(8 + i, BIT(data, i) ? 0 : 1); } } } @@ -528,12 +528,12 @@ static MACHINE_CONFIG_DERIVED( academy, polgar ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( modena, milano ) - MCFG_CPU_MODIFY("maincpu") // W65C02SP + MCFG_CPU_MODIFY("maincpu") // W65C02SP MCFG_CPU_CLOCK(XTAL_4_194304Mhz) MCFG_CPU_PROGRAM_MAP(modena_mem) MCFG_CPU_PERIODIC_INT_REMOVE() MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_on", mephisto_modena_state, nmi_on, attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13))) - MCFG_TIMER_START_DELAY(attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13)) - attotime::from_usec(975)) // active for 975us + MCFG_TIMER_START_DELAY(attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13)) - attotime::from_usec(975)) // active for 975us MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_off", mephisto_modena_state, nmi_off, attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13))) MCFG_DEVICE_REMOVE("display") diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp index b1e07a4c460..5931ba93d59 100644 --- a/src/mame/drivers/psx.cpp +++ b/src/mame/drivers/psx.cpp @@ -438,7 +438,7 @@ WRITE16_MEMBER(psx1_state::parallel_w) m_maincpu->set_state_int(PSXCPU_DELAYR, PSXCPU_DELAYR_PC); m_maincpu->set_state_int(PSXCPU_DELAYV, m_maincpu->state_int(PSXCPU_PC)); - // workround to fix controller in amidog tests that do not initialise the sio registers + // workround to fix controller in amidog tests that do not initialise the sio registers m_maincpu->space(AS_PROGRAM).write_word(0x1f80104e, 0x0088); m_maincpu->space(AS_PROGRAM).write_word(0x1f801048, 0x000d); diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index 7fce643720a..68e2598cbd3 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -256,7 +256,7 @@ TIMER_CALLBACK_MEMBER(superqix_state::mcu_port2_w_cb) m_port2_raw = param; // bit 0 = inverted CLK for 74ls174 @1J; normally active on rising edge, this is inverted first, hence active on the falling edge if (BIT(changed_m_port2, 0) && !BIT(m_port2_raw, 0)) - { + { // bit 1 = 74ls174@1J.d0 = coin cointer 1 machine().bookkeeping().coin_counter_w(0, BIT(m_port2_raw, 1)); diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp index ebab630a243..d2070fee7c9 100644 --- a/src/mame/drivers/taitottl.cpp +++ b/src/mame/drivers/taitottl.cpp @@ -164,14 +164,14 @@ MACHINE_CONFIG_END /* Fisco 400 - + label loc. Part # ========================================================== TOP PCB : [FS070001 FSN00001A] CR11 L9 MMI 6301 - FS01 J10 Texas Instruments 74S288 (read as AMD 74S288) + FS01 J10 Texas Instruments 74S288 (read as AMD 74S288) FS02 D10 MMI 6301 - FS03 E10 MMI 6301 + FS03 E10 MMI 6301 FS04 A7 Intersil IM5624 FS05 B7 Intersil IM5624 FS06 C7 Intersil IM5624 @@ -180,7 +180,7 @@ MACHINE_CONFIG_END FS09 A6 Intersil IM5624 FS10 B6 Intersil IM5624 FS11 C6 Intersil IM5624 - FS12 D6 Intersil IM5624 + FS12 D6 Intersil IM5624 Bottom PCB : [FS070002A FSN00002A] FS13 H8 Texas Inst. 74S287 (read as national 74S287) diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index 5c20bfb9417..3d3f5804049 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -2319,10 +2319,10 @@ Taito: K1100416A J1100332A Notes: 6264: 8K x8 SRAM 6116: 2K x8 SRAM - Graphics ROMs are 23C1000/TC531000 MASK ROMs + Graphics ROMs are 23C1000/TC531000 MASK ROMs -Chuka Taisen 'later' version: +Chuka Taisen 'later' version: Seta: PO-025-A Taito: K1100241A J1100107A Sticker: K1100364A CHUKA TAISEN @@ -2353,7 +2353,7 @@ PROMs are AM27S29 ROM Board --------- -K9100189A J9100141A ROM7PCB +K9100189A J9100141A ROM7PCB Sticker: K9100189A CHUUKA TAISEN All EPROMs are Toshiba TC571000D-20 diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp index e871cc136c8..cc0654b4cce 100644 --- a/src/mame/drivers/ts816.cpp +++ b/src/mame/drivers/ts816.cpp @@ -100,7 +100,7 @@ ADDRESS_MAP_END /* Input ports */ static INPUT_PORTS_START( ts816 ) - PORT_START("DSW") // + PORT_START("DSW") // PORT_DIPNAME( 0x07, 0x01, "System Terminal") // read at @0368 PORT_DIPSETTING( 0x00, "19200 baud") PORT_DIPSETTING( 0x01, "9600 baud") @@ -223,7 +223,7 @@ static const z80_daisy_config daisy_chain[] = { "pio" }, { "ctc1" }, { "ctc2" }, -// { "sio0" }, +// { "sio0" }, { "sio1" }, { "sio2" }, { "sio3" }, diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index ab1a24e2b64..fa493668e3b 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -1102,7 +1102,7 @@ WRITE8_MEMBER(vicdual_state::carnival_io_w) WRITE8_MEMBER(vicdual_state::brdrline_io_w) { if (offset & 0x01) brdrline_audio_w(space, 0, data); - if (offset & 0x02) + if (offset & 0x02) { palette_bank_w(space, 0, data); brdrline_audio_aux_w(space,0, data); @@ -2068,7 +2068,7 @@ static MACHINE_CONFIG_DERIVED( brdrline, vicdual_dualgame_root ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(brdrline_io_map) - + /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_FRAGMENT_ADD(brdrline_audio) diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index ad1598fb56f..99576cc3165 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -392,17 +392,17 @@ static INPUT_PORTS_START( unkitpkr ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_START("DSW") /* b600 */ - PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2") // ok + PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2") // ok PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x03, "1 Coin/10 Credits" ) - PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:3,4") // ok + PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:3,4") // ok PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x0c, "1 Coin/10 Credits" ) - PORT_DIPNAME( 0x30, 0x00, "Coin C" ) PORT_DIPLOCATION("SW2:5,6") // ok + PORT_DIPNAME( 0x30, 0x00, "Coin C" ) PORT_DIPLOCATION("SW2:5,6") // ok PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 1C_5C ) ) @@ -669,7 +669,7 @@ DRIVER_INIT_MEMBER(wallc_state, sidam) /* Unknown Italian Poker Seems a brute hack of an unknown game. - + The "conforme alla legge n." string is overwritting the hands table: "CONFORME" = Royal Flush @@ -689,7 +689,7 @@ DRIVER_INIT_MEMBER(wallc_state, sidam) 00cd: nop 00ce: nop 00cf: nop - + 00d2: ld a,(hl) 00d3: cp c 00d4: nop diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index f832c394be6..d1ce530b94b 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -120,11 +120,11 @@ static MACHINE_CONFIG_START( wswan ) MCFG_WSWAN_VIDEO_DMASND_CB(wswan_state, dma_sound_cb) MCFG_SCREEN_ADD("screen", LCD) -// MCFG_SCREEN_REFRESH_RATE(75) -// MCFG_SCREEN_VBLANK_TIME(0) +// MCFG_SCREEN_REFRESH_RATE(75) +// MCFG_SCREEN_VBLANK_TIME(0) MCFG_SCREEN_UPDATE_DEVICE("vdp", wswan_video_device, screen_update) -// MCFG_SCREEN_SIZE(WSWAN_X_PIXELS, WSWAN_Y_PIXELS) -// MCFG_SCREEN_VISIBLE_AREA(0*8, WSWAN_X_PIXELS - 1, 0, WSWAN_Y_PIXELS - 1) +// MCFG_SCREEN_SIZE(WSWAN_X_PIXELS, WSWAN_Y_PIXELS) +// MCFG_SCREEN_VISIBLE_AREA(0*8, WSWAN_X_PIXELS - 1, 0, WSWAN_Y_PIXELS - 1) MCFG_SCREEN_RAW_PARAMS(XTAL_3_072MHz,256,0,WSWAN_X_PIXELS,159,0,WSWAN_Y_PIXELS) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index d9287f36580..9009fc8642c 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -697,7 +697,7 @@ static MACHINE_CONFIG_START( wyvernf0 ) // pin 1 SOLO 8' not mapped // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - + MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index b3a9a9d087b..84a87fb8a85 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -96,6 +96,6 @@ private: int m_sky_on; int m_sprite_color_base; int m_bg_scrollx; - bool m_sound_irq_enable; + bool m_sound_irq_enable; uint8_t m_sprite_lookup[0x2000]; }; diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index bca46afe77a..72d0b0bb7d4 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -63,7 +63,7 @@ public: required_shared_ptr m_textureram1; required_shared_ptr m_lumaram; required_shared_ptr m_fbvram1; - required_shared_ptr m_fbvram2; + required_shared_ptr m_fbvram2; optional_shared_ptr m_soundram; optional_shared_ptr m_tgp_program; optional_shared_ptr m_tgpx4_program; diff --git a/src/mame/layout/kdt6.lay b/src/mame/layout/kdt6.lay index 15cce723e13..12d09e39684 100644 --- a/src/mame/layout/kdt6.lay +++ b/src/mame/layout/kdt6.lay @@ -19,7 +19,7 @@ - + @@ -36,6 +36,6 @@ - + - \ No newline at end of file + diff --git a/src/mame/layout/mephisto_academy.lay b/src/mame/layout/mephisto_academy.lay index b29cb6289c4..565f670185b 100644 --- a/src/mame/layout/mephisto_academy.lay +++ b/src/mame/layout/mephisto_academy.lay @@ -76,44 +76,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -337,7 +337,7 @@ - + diff --git a/src/mame/layout/mephisto_lcd.lay b/src/mame/layout/mephisto_lcd.lay index 3652fdaac6b..b8e2a0ec110 100644 --- a/src/mame/layout/mephisto_lcd.lay +++ b/src/mame/layout/mephisto_lcd.lay @@ -69,39 +69,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/mephisto_megaiv.lay b/src/mame/layout/mephisto_megaiv.lay index 29fe5e2b1c4..de70b364aee 100644 --- a/src/mame/layout/mephisto_megaiv.lay +++ b/src/mame/layout/mephisto_megaiv.lay @@ -84,68 +84,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -313,7 +313,7 @@ - + diff --git a/src/mame/layout/mephisto_milano.lay b/src/mame/layout/mephisto_milano.lay index da24ec3f20e..2f1f14c3bd6 100644 --- a/src/mame/layout/mephisto_milano.lay +++ b/src/mame/layout/mephisto_milano.lay @@ -71,37 +71,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/mephisto_modena.lay b/src/mame/layout/mephisto_modena.lay index bceba757d25..6087b3ca05a 100644 --- a/src/mame/layout/mephisto_modena.lay +++ b/src/mame/layout/mephisto_modena.lay @@ -73,43 +73,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/mephisto_montec.lay b/src/mame/layout/mephisto_montec.lay index 5c557f7f471..f2afb906c98 100644 --- a/src/mame/layout/mephisto_montec.lay +++ b/src/mame/layout/mephisto_montec.lay @@ -84,68 +84,68 @@ - + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -367,7 +367,7 @@ - + diff --git a/src/mame/layout/mephisto_smondial2.lay b/src/mame/layout/mephisto_smondial2.lay index 8a21f678c6b..025cd47614a 100644 --- a/src/mame/layout/mephisto_smondial2.lay +++ b/src/mame/layout/mephisto_smondial2.lay @@ -87,68 +87,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -316,7 +316,7 @@ - + diff --git a/src/mame/machine/deco_irq.cpp b/src/mame/machine/deco_irq.cpp index b9d04aa2797..93bca79922f 100644 --- a/src/mame/machine/deco_irq.cpp +++ b/src/mame/machine/deco_irq.cpp @@ -207,7 +207,7 @@ READ8_MEMBER( deco_irq_device::status_r ) data |= 0 << 3; data |= 0 << 2; data |= m_screen->vblank() << 1; -// data |= (m_screen->hblank() & m_screen->vblank()) << 0; +// data |= (m_screen->hblank() & m_screen->vblank()) << 0; data |= m_screen->hblank() << 0; return data; diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 1de747e9862..29383fae809 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -186,7 +186,7 @@ void iteagle_fpga_device::device_timer(emu_timer &timer, device_timer_id tid, in //const rectangle &visarea = m_screen->visible_area(); //beamy++; //if (beamy <= m_screen->visible_area().max_y && beamy <= m_gun_y + BEAM_DY) { - // m_timer->adjust(m_screen->time_until_pos(beamy, std::max(0, m_gun_x - BEAM_DX))); + // m_timer->adjust(m_screen->time_until_pos(beamy, std::max(0, m_gun_x - BEAM_DX))); //} //m_fpga_regs[0x04/4] |= 0x02080000; m_fpga_regs[0x04 / 4] |= 0x00080000; diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 1ac84e7ba2f..44746349fbe 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -442,14 +442,14 @@ void pce_cd_device::nec_set_audio_start_position() m_cdda_status = PCE_CD_CDDA_PAUSED; // old code for reference, seems unlikely that this puts status in standby (and breaks Snatcher at the title screen) -// if (m_cdda_status == PCE_CD_CDDA_PAUSED) -// { -// m_cdda_status = PCE_CD_CDDA_OFF; -// m_cdda->stop_audio(); -// m_end_frame = m_last_frame; -// m_end_mark = 0; -// } -// else +// if (m_cdda_status == PCE_CD_CDDA_PAUSED) +// { +// m_cdda_status = PCE_CD_CDDA_OFF; +// m_cdda->stop_audio(); +// m_end_frame = m_last_frame; +// m_end_mark = 0; +// } +// else { if (m_command_buffer[1] & 0x03) { diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 69894096307..37ae895bf62 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -1075,7 +1075,7 @@ asma2k // asmapro // @source:alphatro.cpp -alphatp3 // 1982 Triumph-Adler +alphatp3 // 1982 Triumph-Adler alphatro // @source:altair.cpp @@ -12116,7 +12116,7 @@ ironfort // (c) 1998 Eolith ironfortj // (c) 1998 Eolith landbrk // (c) 1999 Eolith landbrka // (c) 1999 Eolith -landbrkb // (c) 1999 Eolith +landbrkb // (c) 1999 Eolith linkypip // (c) 1998 Eolith nhidctch // (c) 1999 Eolith penfan // (c) 1999 Eolith @@ -12253,8 +12253,8 @@ waveterm // @source:europc.cpp europc // 1988 Schneider Euro PC (CGA or Hercules) -europc2 // 1989 Schneider Euro PC II -euroxt // Schneider Euro XT +europc2 // 1989 Schneider Euro PC II +euroxt // Schneider Euro XT @source:eva.cpp eva11 // @@ -30215,7 +30215,7 @@ zdsupers // ncrpc4i // NCR PC4i laser_turbo_xt // 1988 VTech Laser Turbo XT laser_xt3 // 1989 VTech Laser XT/3 -olytext30 // AEG Olympia Olytext 30 +olytext30 // AEG Olympia Olytext 30 @source:pc100.cpp pc100 // diff --git a/src/mame/video/gstriker.cpp b/src/mame/video/gstriker.cpp index c1919f10727..29b481fccde 100644 --- a/src/mame/video/gstriker.cpp +++ b/src/mame/video/gstriker.cpp @@ -14,7 +14,7 @@ void gstriker_state::video_start() // Initialize the chip for the screen plane m_bg->set_transparent_pen(0xf); - + m_buffered_spriteram = std::make_unique(0x2000); m_buffered_spriteram2 = std::make_unique(0x2000); save_pointer(NAME(m_buffered_spriteram.get()), 0x2000); @@ -26,7 +26,7 @@ WRITE_LINE_MEMBER(gstriker_state::screen_vblank) // sprites are two frames ahead // TODO: probably all Video System games are (Aero Fighters definitely desyncs wrt background) if(state) - { + { memcpy(m_buffered_spriteram.get(), m_CG10103_m_vram, 0x2000); memcpy(m_buffered_spriteram2.get(), m_buffered_spriteram.get(), 0x2000); } @@ -36,13 +36,13 @@ WRITE_LINE_MEMBER(gstriker_state::screen_vblank) uint32_t gstriker_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bitmap.fill(m_mixerregs[8]&0x07ff, cliprect); // complete guess, causes green behind test grid in twc94 and blue behind title screen on gstriker - + /* [4] AAAA BBBB ---- ---- sprite priority number A/B? [5] xxxx ---- ---- ---- background layer priority number? [6] xxxx ---- ---- ---- foreground layer priority number? */ -// popmessage("%04x %04x %04x %04x %04x %04x %04x %04x | %04x %04x %04x %04x %04x %04x %04x %04x", m_mixerregs[0],m_mixerregs[1],m_mixerregs[2],m_mixerregs[3],m_mixerregs[4],m_mixerregs[5],m_mixerregs[6],m_mixerregs[7], m_mixerregs[8],m_mixerregs[9],m_mixerregs[10],m_mixerregs[11],m_mixerregs[12],m_mixerregs[13],m_mixerregs[14],m_mixerregs[15] ); +// popmessage("%04x %04x %04x %04x %04x %04x %04x %04x | %04x %04x %04x %04x %04x %04x %04x %04x", m_mixerregs[0],m_mixerregs[1],m_mixerregs[2],m_mixerregs[3],m_mixerregs[4],m_mixerregs[5],m_mixerregs[6],m_mixerregs[7], m_mixerregs[8],m_mixerregs[9],m_mixerregs[10],m_mixerregs[11],m_mixerregs[12],m_mixerregs[13],m_mixerregs[14],m_mixerregs[15] ); m_spr->set_pal_base( (m_mixerregs[0]&0xf000)>>8 ); m_bg->set_pal_base( (m_mixerregs[1]&0xf000)>>8 ); diff --git a/src/mame/video/mb60553.cpp b/src/mame/video/mb60553.cpp index f24c8de2864..63888c8601c 100644 --- a/src/mame/video/mb60553.cpp +++ b/src/mame/video/mb60553.cpp @@ -5,12 +5,12 @@ the actual line scroll / zoom is not properly understood interestingly the chip seems to require doubled up ROMs (2 copies of each ROM) to draw just the single layer. - + */ /* - Tecmo World Cup '94 "service mode" has an item for testing zooming, this is: - 0xffdf12 target zoom code - 0xffdf16 current zoom code + Tecmo World Cup '94 "service mode" has an item for testing zooming, this is: + 0xffdf12 target zoom code + 0xffdf16 current zoom code */ #include "emu.h" @@ -262,7 +262,7 @@ void mb60553_zooming_tilemap_device::draw( screen_device &screen, bitmap_ind16& { int line; rectangle clip; - + clip.min_x = screen.visible_area().min_x; clip.max_x = screen.visible_area().max_x; @@ -274,7 +274,7 @@ void mb60553_zooming_tilemap_device::draw( screen_device &screen, bitmap_ind16& int32_t incxx,incyy; int32_t incxy,incyx; float xoffset; - + // confirmed on how ROZ is used incyy = ((int16_t)m_lineram[(line)*8+0])<<4; incxx = ((int16_t)m_lineram[(line)*8+3])<<4; @@ -291,7 +291,7 @@ void mb60553_zooming_tilemap_device::draw( screen_device &screen, bitmap_ind16& incyx = ((int16_t)m_lineram[(line)*8+7])<<4; // V Goal Soccer rotation incxy = ((int16_t)m_lineram[(line)*8+4])<<4; - + clip.min_y = clip.max_y = line; draw_roz_core(screen, bitmap, clip, startx<<12,starty<<12, diff --git a/src/mame/video/model2rd.hxx b/src/mame/video/model2rd.hxx index 22d9107fc56..0bf39a8900e 100644 --- a/src/mame/video/model2rd.hxx +++ b/src/mame/video/model2rd.hxx @@ -84,7 +84,7 @@ void MODEL2_FUNC_NAME(int32_t scanline, const extent_t& extent, const m2_poly_ex // fix luma overflow if(luma > 0x3f) luma = 0x3f; - + color = state->m_palram[BYTE_XOR_LE(color + 0x1000)] & 0x7fff; colortable_r += ((color >> 0) & 0x1f) << 8; @@ -182,7 +182,7 @@ void MODEL2_FUNC_NAME(int32_t scanline, const extent_t& extent, const m2_poly_ex continue; #endif luma = lumaram[BYTE_XOR_LE(lumabase + (t << 3))]; - + // Virtua Striker sets up a luma of 0x40 for flags, fix here. if(luma > 0x3f) luma = 0x3f; -- cgit v1.2.3