Previous 199869 Revisions Next

r45157 Tuesday 23rd February, 2016 at 06:57:56 UTC by Miodrag Milanović
Merge pull request #637 from AntoPISA/patch-1

Update strings.po
[hash]m5_cart.xml
[src/mame]arcade.lst
[src/mame/drivers]fidelz80.cpp konamigv.cpp kurukuru.cpp viper.cpp vt100.cpp
[src/mame/machine]trs80.cpp
[src/osd/modules/render/bgfx]uniform.cpp

trunk/hash/m5_cart.xml
r253668r253669
1<?xml version="1.0"?>
1<?xml version="1.0"?>
22<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
33
44<!--
trunk/src/mame/arcade.lst
r253668r253669
41274127gticlub2        // 2001
41284128gticlub2ea      // 2001
41294129jpark3          // 2001
4130jpark3u         // 2001
41304131mocapglf        // 2001
41314132mocapb          // 2001
41324133mocapbj         // 2001
trunk/src/mame/drivers/fidelz80.cpp
r253668r253669
10251025   ADDRESS_MAP_UNMAP_HIGH
10261026   ADDRESS_MAP_GLOBAL_MASK(0x3fff)
10271027   AM_RANGE(0x0000, 0x0fff) AM_ROM
1028   AM_RANGE(0x3000, 0x31ff) AM_MIRROR(0x0e00) AM_RAM
1028   AM_RANGE(0x1000, 0x10ff) AM_MIRROR(0x0f00) AM_RAM
1029   AM_RANGE(0x3000, 0x30ff) AM_MIRROR(0x0f00) AM_RAM
10291030ADDRESS_MAP_END
10301031
10311032static ADDRESS_MAP_START( vcc_map, AS_PROGRAM, 8, fidelz80_state )
r253668r253669
11461147
11471148   PORT_START("IN.3")
11481149   PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("EN") PORT_CODE(KEYCODE_ENTER)
1149   PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("PV") PORT_CODE(KEYCODE_O)
1150   PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("PV") PORT_CODE(KEYCODE_V)
11501151   PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("D4") PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_CODE(KEYCODE_D)
11511152   PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("H8") PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_CODE(KEYCODE_H)
11521153
r253668r253669
12151216static INPUT_PORTS_START( bcc )
12161217   PORT_START("IN.0")
12171218   PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("EN") PORT_CODE(KEYCODE_ENTER)
1218   PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("PV") PORT_CODE(KEYCODE_O)
1219   PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("PV") PORT_CODE(KEYCODE_V)
12191220   PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("d4") PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_CODE(KEYCODE_D)
12201221   PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("H8") PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_CODE(KEYCODE_H)
12211222
trunk/src/mame/drivers/konamigv.cpp
r253668r253669
670670
671671INPUT_PORTS_END
672672
673/* Wedding Rhapsody */
674
675static INPUT_PORTS_START( weddingr )
676   PORT_INCLUDE( konamigv )
677
678   PORT_MODIFY("P1")
679   PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("Answer 3/Zoom In")
680   PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("Answer 4/Zoom Out")
681   PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Answer 1/Pan Left")
682   PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Answer 2/Pan Right")
683   PORT_BIT( 0x00000070, IP_ACTIVE_LOW, IPT_UNKNOWN )
684
685   PORT_MODIFY("P2")
686   PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("Answer 3/Zoom In")
687   PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("Answer 4/Zoom Out")
688   PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("Answer 1/Pan Left")
689   PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("Answer 2/Pan Right")
690   PORT_BIT( 0x00000070, IP_ACTIVE_LOW, IPT_UNKNOWN )
691
692   PORT_MODIFY("P3_P4")
693   PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
694
695INPUT_PORTS_END
696
673697#define GV_BIOS \
674698   ROM_REGION32_LE( 0x080000, "maincpu:rom", 0 ) \
675699   ROM_LOAD( "999a01.7e",   0x0000000, 0x080000, CRC(ad498d2d) SHA1(02a82a2fe1fba0404517c3602324bfa64e23e478) )
r253668r253669
829853GAME( 1996, susume,   lacrazyc, konamigv, konamigv, driver_device,  0,        ROT0, "Konami", "Susume! Taisen Puzzle-Dama (GV027 Japan 1.20)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
830854GAME( 1996, btchamp,  konamigv, btchamp,  btchamp,  driver_device,  0,        ROT0, "Konami", "Beat the Champ (GV053 UAA01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
831855GAME( 1996, kdeadeye, konamigv, kdeadeye, kdeadeye, driver_device,  0,        ROT0, "Konami", "Dead Eye (GV054 UAA01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
832GAME( 1997, weddingr, konamigv, konamigv, konamigv, driver_device,  0,        ROT0, "Konami", "Wedding Rhapsody (GX624 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
856GAME( 1997, weddingr, konamigv, konamigv, weddingr, driver_device,  0,        ROT0, "Konami", "Wedding Rhapsody (GX624 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
833857GAME( 1997, tmosh,    konamigv, tmosh,    konamigv, driver_device,  0,        ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart (GQ673 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
834858GAME( 1997, tmoshs,   konamigv, tmosh,    konamigv, driver_device,  0,        ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version (GE755 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
835859GAME( 1997, tmoshsp,  konamigv, tmosh,    konamigv, driver_device,  0,        ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version Plus (GE756 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
trunk/src/mame/drivers/kurukuru.cpp
r253668r253669
121121
122122  1) Pyon Pyon (a marathon game with froggy characters).
123123  2) Kuru Kuru Pyon Pyon (a kind of slots game with the same froggy characters).
124  3) Pyon Pyon Jyanpu (a contents where the same characters try to cross the river jumping on pads).
124  3) Pyon Pyon Jump (a contents where the same characters try to cross the river jumping on pads).
125125  4) Sui Sui Pyon Pyon (a swimming competition where the same characters swim with different styles, even walking).
126126
127127  Coin 1 (key 5) could be set either as Coin 1 or as Payout button, through
r253668r253669
179179
180180  ----------------------------------------------------------------------------------
181181
182  * Pyon Pyon Jyanpu:
182  * Pyon Pyon Jump:
183183
184184  The game name could be translated as "Hop Hop Jump"
185  Pyon is the sound of jumps. Jyanpu means jump.
185  Pyon Pyon is an onomatopoeia for hopping or jumping lightly.
186186
187187  How to play...
188188
r253668r253669
620620
621621static INPUT_PORTS_START( ppj )
622622   PORT_START("IN0")
623   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_Z) PORT_NAME("1st (Boketa)")
624   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_X) PORT_NAME("2nd (Kunio)")
625   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_C) PORT_NAME("3rd (Pyon-Pyon)")
626   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_CODE(KEYCODE_V) PORT_NAME("4th (Pyokorin)")
627   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_B) PORT_NAME("5th (Botechin)")
623   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("1st (Boketa)")
624   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("2nd (Kunio)")
625   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("3rd (Pyon-Pyon)")
626   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("4th (Pyokorin)")
627   PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("5th (Botechin)")
628628   PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER )   PORT_CODE(KEYCODE_S) PORT_NAME("Unknown 70h - bit5")
629629   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )   PORT_CODE(KEYCODE_D) PORT_NAME("Unknown 70h - bit6")
630630   PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
631631
632632   PORT_START("IN1")
633   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_9) PORT_NAME("Bookkeeping")
633   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )
634634   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 )   PORT_NAME("Medal In")
635635   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_0) PORT_NAME("Reset Button")
636636   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 )
r253668r253669
808808   ROM_LOAD( "7908b-4.ic32", 0x0600, 0x0034, CRC(bddf925e) SHA1(861cf5966444d0c0392241e5cfa08db475fb439a) )
809809ROM_END
810810
811/*  Pyon Pyon Jyanpu.
811/*  Pyon Pyon Jump.
812812    Ver 1.40.
813813   199?, Success / Taiyo Jidoki.
814814*/
r253668r253669
839839
840840/*    YEAR  NAME      PARENT  MACHINE   INPUT     STATE          INIT  ROT    COMPANY                   FULLNAME                          FLAGS  */
841841GAME( 1990, kurukuru, 0,      kurukuru, kurukuru, driver_device, 0,    ROT0, "Success / Taiyo Jidoki", "Kuru Kuru Pyon Pyon (Japan)",     0 )
842GAME( 199?, ppj,      0,      ppj,      ppj,      driver_device, 0,    ROT0, "Success / Taiyo Jidoki", "Pyon Pyon Jyanpu (V1.40, Japan)", 0 )
842GAME( 199?, ppj,      0,      ppj,      ppj,      driver_device, 0,    ROT0, "Success / Taiyo Jidoki", "Pyon Pyon Jump (V1.40, Japan)", 0 )
843843
844844// unemulated....
845845
trunk/src/mame/drivers/viper.cpp
r253668r253669
23342334   DISK_IMAGE( "941a02", 0,  NO_DUMP )
23352335ROM_END
23362336
2337/* This CF card has sticker B41C02 */
23372338ROM_START(jpark3) //*
23382339   VIPER_BIOS
23392340
r253668r253669
23472348   DISK_IMAGE( "b41c02", 0, SHA1(fb6b0b43a6f818041d644bcd711f6a727348d3aa) )
23482349ROM_END
23492350
2351/* This CF card has sticker B41C02 */
2352ROM_START(jpark3u) //*
2353   VIPER_BIOS
2354
2355   ROM_REGION(0x28, "ds2430", ROMREGION_ERASE00)       /* DS2430 */
2356   ROM_LOAD("ds2430.u3", 0x00, 0x28, CRC(f1511505) SHA1(ed7cd9b2763b3e377df9663943160f9871f65105))
2357
2358   ROM_REGION(0x2000, "m48t58", ROMREGION_ERASE00)     /* M48T58 Timekeeper NVRAM */
2359   ROM_LOAD("b41 ua rtc.u39", 0x00000, 0x1ff8, CRC(75fdda39) SHA1(6292ce0d32afdf6bde33ac7f1f07655fa17282f6))
2360
2361   DISK_REGION( "ata:0:hdd:image" )
2362   DISK_IMAGE( "b41c02", 0, SHA1(fb6b0b43a6f818041d644bcd711f6a727348d3aa) )
2363ROM_END
2364
23502365/* This CF card has sticker B33A02 */
23512366ROM_START(mocapglf) //*
23522367   VIPER_BIOS
r253668r253669
28032818GAME(2001, gticlub2,  kviper,    viper, viper, viper_state, vipercf,  ROT0,  "Konami", "GTI Club 2 (ver JAB)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
28042819GAME(2001, gticlub2ea,gticlub2,  viper, viper, viper_state, vipercf,  ROT0,  "Konami", "GTI Club 2 (ver EAA)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
28052820GAME(2001, jpark3,    kviper,    viper, viper, viper_state, vipercf,  ROT0,  "Konami", "Jurassic Park 3 (ver EBC)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
2821GAME(2001, jpark3u,   jpark3,    viper, viper, viper_state, vipercf,  ROT0,  "Konami", "Jurassic Park 3 (ver UA)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
28062822GAME(2001, mocapglf,  kviper,    viper, viper, viper_state, vipercf,  ROT0,  "Konami", "Mocap Golf (ver UAA)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
28072823GAME(2001, mocapb,    kviper,    viper, viper, viper_state, vipercf,  ROT90,  "Konami", "Mocap Boxing (ver AAA)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
28082824GAME(2001, mocapbj,   mocapb,    viper, viper, viper_state, vipercf,  ROT90,  "Konami", "Mocap Boxing (ver JAA)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
trunk/src/mame/drivers/vt100.cpp
r253668r253669
424424   MCFG_VT_VIDEO_RAM_CALLBACK(READ8(vt100_state, vt100_read_video_ram_r))
425425   MCFG_VT_VIDEO_CLEAR_VIDEO_INTERRUPT_CALLBACK(WRITELINE(vt100_state, vt100_clear_video_interrupt))
426426
427   MCFG_DEVICE_ADD("i8251", I8251, 0)
427   MCFG_DEVICE_ADD("i8251", I8251, 0) // 2.7648Mhz phi-clock (not used for tx clock or rx clock?)
428428   MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
429429   MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
430430   MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
r253668r253669
433433   MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
434434   MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_dsr))
435435
436   MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL_5_0688MHz)
436   MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL_5_0688MHz/*XTAL_24_8832MHz / 9*/) // COM5016T-013, 2.7648Mhz Clock, currently hacked wrongly
437437   MCFG_COM8116_FR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
438438   MCFG_COM8116_FT_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
439439
trunk/src/mame/machine/trs80.cpp
r253668r253669
420420    CCh    4800
421421    DDh    7200
422422    EEh    9600
423    FFh    19200 */
423    FFh    19200
424Note: this may be a COM5016 dual baud rate generator, or may be an equivalent circuit embedded in the gate array ASIC on the trs80 model 4
425   */
424426
425427   static const int baud_clock[]={ 800, 1200, 1760, 2152, 2400, 4800, 9600, 19200, 28800, 32000, 38400, 57600, 76800, 115200, 153600, 307200 };
426428   m_ay31015->set_receiver_clock(baud_clock[data & 0x0f]);
trunk/src/osd/modules/render/bgfx/uniform.cpp
r253668r253669
2929
3030void bgfx_uniform::upload()
3131{
32    bgfx::setUniform(m_handle, m_data);
32   if (m_type != bgfx::UniformType::Int1) // Avoid samplers; set separately!
33       bgfx::setUniform(m_handle, m_data);
3334}
3435
3536bgfx_uniform* bgfx_uniform::set(float* value)

https://github.com/mamedev/mame/commit/f24e935fdc3f8d2a7de499ac4b446259bcfa5849

Previous 199869 Revisions Next

© 1997-2024 The MAME Team