Previous 199869 Revisions Next

r36646 Wednesday 25th March, 2015 at 21:10:38 UTC by Angelo Salese
Merge branch 'master' of https://github.com/mamedev/mame
[docs]hlsl.txt
[src/emu/sound]aica.c
[src/mame]mame.lst
[src/mame/drivers]namcops2.c
[src/mess/drivers]hh_tms1k.c
[src/mess/layout]ssimon.lay

trunk/docs/hlsl.txt
r245157r245158
1111hlsl_prescale_x         [horizontal]    HLSL pre-scale override factor for X.  (0 for auto)
1212hlsl_prescale_y         [vertical]      HLSL pre-scale override factor for Y.  (0 for auto)
1313hlsl_preset             -1 through 3    HLSL preset to use.  (default: -1)
14hlsl_write              0/1      Enable HLSL AVI writing.  (huge disk bandwidth suggested)
14hlsl_write              [filename]      Enable HLSL AVI writing.   (huge disk bandwidth suggested)
1515hlsl_snap_width         [width]         HLSL upscaled-snapshot width.  (default: 2048)
1616hlsl_snap_height       [height]        HLSL upscaled-snapshot height.  (default: 1536)
1717
trunk/src/emu/sound/aica.c
r245157r245158
10791079   UINT32 addr1,addr2,addr_select;                                   // current and next sample addresses
10801080   UINT32 *addr[2]      = {&addr1, &addr2};                          // used for linear interpolation
10811081   UINT32 *slot_addr[2] = {&(slot->cur_addr), &(slot->nxt_addr)};    //
1082   UINT32 chanlea = LEA(slot);
10821083
10831084   if(SSCTL(slot)!=0)  //no FM or noise yet
10841085      return 0;
10851086
1087   if(PCMS(slot) == 3) // Red Dog music relies on this
1088      chanlea = (chanlea + 3) & ~3;
1089
10861090   if(PLFOS(slot)!=0)
10871091   {
10881092      step=step*AICAPLFO_Step(&(slot->PLFO));
r245157r245158
11301134      int cur_sample;       //current ADPCM sample
11311135      int nxt_sample;       //next ADPCM sample
11321136      INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
1133      UINT32 steps_to_go = addr2, curstep = slot->curstep;
1137      UINT32 steps_to_go = addr1 > addr2 ? chanlea : addr2, curstep = slot->curstep;
11341138
11351139      if (slot->adbase)
11361140      {
r245157r245158
11861190      switch(LPCTL(slot))
11871191      {
11881192      case 0: //no loop
1189         if(*addr[addr_select]>=LSA(slot) && *addr[addr_select]>=LEA(slot))
1193         if(*addr[addr_select]>=LSA(slot) && *addr[addr_select]>=chanlea)
11901194         {
11911195            StopSlot(slot,0);
11921196         }
11931197         break;
11941198      case 1: //normal loop
1195         if(*addr[addr_select]>=LEA(slot))
1199         if(*addr[addr_select]>=chanlea)
11961200         {
11971201            slot->lpend = 1;
1198            rem_addr = *slot_addr[addr_select] - (LEA(slot)<<SHIFT);
1202            rem_addr = *slot_addr[addr_select] - (chanlea<<SHIFT);
11991203            *slot_addr[addr_select]=(LSA(slot)<<SHIFT) + rem_addr;
12001204
1201            if(PCMS(slot)>=2)
1205            if(PCMS(slot)>=2 && addr_select == 0)
12021206            {
12031207               // restore the state @ LSA - the sampler will naturally walk to (LSA + remainder)
12041208               slot->adbase = &m_AICARAM[SA(slot)+(LSA(slot)/2)];
trunk/src/mame/drivers/namcops2.c
r245157r245158
310310   DISK_IMAGE_READONLY( "hm-in2", 0, SHA1(4e2d95798a2bcc6f93bc82c364379a3936d68986) )
311311ROM_END
312312
313ROM_START( taiko7 )
314   ROM_REGION(0x200000, "bios", 0)
315   SYSTEM246_BIOS
316
317   ROM_REGION(0x840000, "key", ROMREGION_ERASE00)
318   ROM_LOAD( "tk71.ic002",   0x000000, 0x800000, CRC(0560e525) SHA1(3ae378de908ec2f6472867d4d0c3c19eb51cf8bc) )
319   ROM_LOAD( "tk71_spr.ic002", 0x800000, 0x040000, CRC(245233a5) SHA1(a5dd1eb0350d454396984241c1178ec708a7de55) )
320
321   DISK_REGION("dvd")
322   DISK_IMAGE_READONLY( "tk71dvd0", 0, SHA1(622ffc8f71f50e93069a8e91b56a7e63cf98b5ae) )
323ROM_END
324
325ROM_START( taiko8 )
326   ROM_REGION(0x200000, "bios", 0)
327   SYSTEM246_BIOS
328
329   ROM_REGION(0x840000, "key", ROMREGION_ERASE00)
330   ROM_LOAD( "tk81001-na-a.ic002", 0x000000, 0x800000, CRC(205410cf) SHA1(8379771d82c9d8b09ad593e28872107ecc0100ad) )
331   ROM_LOAD( "tk81001-na-a_spr.ic002", 0x800000, 0x040000, CRC(590c8d80) SHA1(30622142428e37b8c3b91dee7fdd147d593b4d6f) )
332
333   DISK_REGION("dvd")
334   DISK_IMAGE_READONLY( "tk8100-1-na-dvd0-a", 0, SHA1(81a2a9d7164495af825ad038fbf6f696e755ab9c) )
335ROM_END
336
337ROM_START( zoidsinf )
338   ROM_REGION(0x200000, "bios", 0)
339   SYSTEM246_BIOS
340
341   ROM_REGION(0x840000, "key", ROMREGION_ERASE00)
342   ROM_LOAD( "b3900076a.ic002", 0x000000, 0x800000, CRC(4cdc2e4f) SHA1(7c53e519683903e5ae53823b7d0644323be23680) )
343   ROM_LOAD( "b3900076a_spr.ic002", 0x800000, 0x040000, CRC(7a7bf195) SHA1(0970251ba203720b2b769d6195bff06b41931b17) )
344
345   DISK_REGION("dvd")
346   DISK_IMAGE_READONLY( "zoidsinf", 0, SHA1(aca35eb554bf906898b3ebc27e65f652a72d63f8) )
347ROM_END
348
349ROM_START( zoidiexp )
350   ROM_REGION(0x200000, "bios", 0)
351   SYSTEM246_BIOS
352
353   ROM_REGION(0x840000, "key", ROMREGION_ERASE00)
354   ROM_LOAD( "b3900107a.ic002", 0x000000, 0x800000, CRC(1729af4a) SHA1(df5fb0841f4a81aae68382f731b96437572cdffd) )
355   ROM_LOAD( "b3900107a_spr.ic002", 0x800000, 0x040000, CRC(b3d56cd4) SHA1(1e0afeba4881892682d1f91be8e0b880ee7a7fcb) )
356
357   DISK_REGION("dvd")
358   DISK_IMAGE_READONLY( "zoidsinf-ex-plus-ver2-10", 0, SHA1(6671afc45c8b506a15e5b4b09645b956ab4cfe99) )
359ROM_END
360
313361ROM_START( taiko9 )
314362   ROM_REGION(0x200000, "bios", 0)
315363   SYSTEM256_BIOS
r245157r245158
693741GAME(2004, fghtjam,    sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Namco", "Capcom Fighting Jam (JAM1 Ver. A)", GAME_IS_SKELETON)
694742GAME(2004, sukuinuf,   sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Quiz and Variety Suku Suku Inufuku 2 (IN2 Ver. A)", GAME_IS_SKELETON)
695743GAME(2004, zgundmdx,   sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Banpresto", "Mobile Suit Z-Gundam: A.E.U.G. vs Titans DX (ZDX1 Ver. A)", GAME_IS_SKELETON)
744GAME(2004, zoidsinf,   sys246, system246, system246, driver_device, 0, ROT0, "Tomy / Taito", "Zoids Infinity", GAME_IS_SKELETON)
696745GAME(2005, gundzaft,   sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Banpresto", "Gundam Seed: Federation vs. Z.A.F.T. (SED1 Ver. A)", GAME_IS_SKELETON)
697746GAME(2005, soulclb3,   sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur III (SC31001-NA-A)", GAME_IS_SKELETON)
698747GAME(2005, soulclb3a,soulclb3, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur III (SC31002-NA-A)", GAME_IS_SKELETON)
748GAME(2005, taiko7,     sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 7 (TK71-NA-A)", GAME_IS_SKELETON)
749GAME(2006, taiko8,     sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 8 (TK8100-1-NA-A)", GAME_IS_SKELETON)
699750GAME(2006, qgundam,    sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Quiz Mobile Suit Gundam: Monsenshi (QG1 Ver. A)", GAME_IS_SKELETON)
700751GAME(2008, fateulc,    sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Namco", "Fate: Unlimited Codes (FUD1 ver. A)", GAME_IS_SKELETON)
701752GAME(2008, fateulcb,  fateulc, system246, system246, driver_device, 0, ROT0, "bootleg", "Fate: Unlimited Codes (bootleg)", GAME_IS_SKELETON)
r245157r245158
709760GAME(2006, kinniku,    sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Kinnikuman Muscle Grand Prix (KN1 Ver. A)", GAME_IS_SKELETON)
710761GAME(2006, taiko9,     sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 9 (TK91001-NA-A)", GAME_IS_SKELETON)
711762GAME(2006, yuyuhaku,   sys256, system256, system246, driver_device, 0, ROT0, "Banpresto", "The Battle of Yu Yu Hakusho: Shitou! Ankoku Bujutsukai!", GAME_IS_SKELETON)
763GAME(2006, zoidiexp,   sys246, system246, system246, driver_device, 0, ROT0, "Tomy / Taito", "Zoids Infinity EX Plus (ver. 2.10)", GAME_IS_SKELETON)
712764GAME(2007, kinniku2,   sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Kinnikuman Muscle Grand Prix 2 (KN2 Ver. A)", GAME_IS_SKELETON)
713765GAME(2007, taiko10,    sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 10 (T101001-NA-A)", GAME_IS_SKELETON)
714766GAME(2008, gdvsgd,     sys256, system256, system246, driver_device, 0, ROT0, "Capcom / Bandai", "Gundam vs. Gundam (GVS1 Ver. A)", GAME_IS_SKELETON)
trunk/src/mame/mame.lst
r245157r245158
11221122fghtjam
11231123sukuinuf
11241124zgundmdx
1125zoidsinf
11251126gundzaft
11261127soulclb3
11271128soulclb3a
1129taiko7
1130taiko8
11281131qgundam
11291132fateulc
11301133fateulcb
r245157r245158
11391142kinniku2
11401143taiko9
11411144yuyuhaku
1145zoidiexp
11421146taiko10
11431147gdvsgd
11441148gdvsgdnx
trunk/src/mess/drivers/hh_tms1k.c
r245157r245158
14211421   // R7 -> 75494 IN2 -> blue lamp
14221422   display_matrix(4, 1, data >> 4, 1);
14231423
1424   // R8 -> 75494 IN0 -> speaker
1424   // R8 -> 75494 IN0 -> speaker out
14251425   m_speaker->level_w(data >> 8 & 1);
14261426
1427   // R0,R1,R2,R9: input mux
1427   // R0-R2,R9: input mux
14281428   // R3: GND
14291429   // other bits: N/C
14301430   m_inp_mux = (data & 7) | (data >> 6 & 8);
r245157r245158
14501450   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
14511451
14521452   PORT_START("IN.1") // R1
1453   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Green Button")
1454   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Red Button")
1455   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Yellow Button")
1456   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Blue Button")
1453   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Green Button")
1454   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Red Button")
1455   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Yellow Button")
1456   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Blue Button")
14571457
14581458   PORT_START("IN.2") // R2
14591459   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Start")
1460   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Last")
1461   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Longest")
1460   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Last")
1461   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Longest")
14621462   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
14631463
14641464   PORT_START("IN.3") // R9
1465   PORT_CONFNAME( 0x0f, 0x01, "Skill Level")
1465   PORT_CONFNAME( 0x0f, 0x02, "Skill Level")
14661466   PORT_CONFSETTING(    0x02, "1" )
14671467   PORT_CONFSETTING(    0x04, "2" )
14681468   PORT_CONFSETTING(    0x08, "3" )
r245157r245158
15041504
15051505WRITE16_MEMBER(hh_tms1k_state::ssimon_write_r)
15061506{
1507   // R0-R3,R9,R10: input mux
1508   m_inp_mux = (data & 0xf) | (data >> 5 & 0x30);
1509   
1510   // R4: yellow lamps
1511   // R5: green lamps
1512   // R6: blue lamps
1513   // R7: red lamps
1514   display_matrix(4, 1, data >> 4, 1);
1515   
1516   // R8: speaker out
1517   m_speaker->level_w(data >> 8 & 1);
15071518}
15081519
15091520WRITE16_MEMBER(hh_tms1k_state::ssimon_write_o)
r245157r245158
15131524
15141525READ8_MEMBER(hh_tms1k_state::ssimon_read_k)
15151526{
1516   return 0;
1527   return read_inputs(6);
15171528}
15181529
15191530
15201531static INPUT_PORTS_START( ssimon )
1532   PORT_START("IN.0") // R0
1533   PORT_CONFNAME( 0x0f, 0x01, "Game Select")
1534   PORT_CONFSETTING(    0x01, "1" )
1535   PORT_CONFSETTING(    0x02, "2" )
1536   PORT_CONFSETTING(    0x04, "3" )
1537   PORT_CONFSETTING(    0x08, "4" )
1538   PORT_CONFSETTING(    0x00, "5" )
1539
1540   PORT_START("IN.1") // R1
1541   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 Yellow Button")
1542   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Green Button")
1543   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Blue Button")
1544   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Red Button")
1545
1546   PORT_START("IN.2") // R2
1547   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Start")
1548   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Last")
1549   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Longest")
1550   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Decision")
1551
1552   PORT_START("IN.3") // R3
1553   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 Yellow Button")
1554   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Green Button")
1555   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Blue Button")
1556   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Red Button")
1557
1558   PORT_START("IN.4") // R9
1559   PORT_CONFNAME( 0x0f, 0x02, "Skill Level")
1560   PORT_CONFSETTING(    0x00, "Head-to-Head" ) // this sets R10 K2, see below
1561   PORT_CONFSETTING(    0x02, "1" )
1562   PORT_CONFSETTING(    0x04, "2" )
1563   PORT_CONFSETTING(    0x08, "3" )
1564   PORT_CONFSETTING(    0x01, "4" )
1565
1566   PORT_START("IN.5") // R10
1567   PORT_BIT( 0x02, 0x02, IPT_SPECIAL ) PORT_CONDITION("IN.4", 0x0f, EQUALS, 0x00)
1568   PORT_BIT( 0x02, 0x00, IPT_SPECIAL ) PORT_CONDITION("IN.4", 0x0f, NOTEQUALS, 0x00)
1569   PORT_BIT( 0x0d, IP_ACTIVE_HIGH, IPT_UNUSED )
1570
1571   PORT_START("IN.6") // fake
1572   PORT_CONFNAME( 0x03, 0x00, "Speed" ) //PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, ssimon_speed_switch, NULL)
1573   PORT_CONFSETTING(    0x00, "Simple" )
1574   PORT_CONFSETTING(    0x01, "Normal" )
1575   PORT_CONFSETTING(    0x02, "Super" )
15211576INPUT_PORTS_END
15221577
15231578
15241579static MACHINE_CONFIG_START( ssimon, hh_tms1k_state )
15251580
15261581   /* basic machine hardware */
1527   MCFG_CPU_ADD("maincpu", TMS1000, 350000) // x
1582   MCFG_CPU_ADD("maincpu", TMS1100, 350000) // x
15281583   MCFG_TMS1XXX_READ_K_CB(READ8(hh_tms1k_state, ssimon_read_k))
15291584   MCFG_TMS1XXX_WRITE_R_CB(WRITE16(hh_tms1k_state, ssimon_write_r))
15301585   MCFG_TMS1XXX_WRITE_O_CB(WRITE16(hh_tms1k_state, ssimon_write_o))
trunk/src/mess/layout/ssimon.lay
r245157r245158
55
66   <element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
77
8   <element name="lamp_r" defstate="0">
9      <rect state="0"><color red="0.5" green="0.15" blue="0.1" /></rect>
10      <rect state="1"><color red="1.0" green="0.4" blue="0.28" /></rect>
11   </element>
12   <element name="lamp_b" defstate="0">
13      <rect state="0"><color red="0.1" green="0.15" blue="0.5" /></rect>
14      <rect state="1"><color red="0.3" green="0.42" blue="1.0" /></rect>
15   </element>
16   <element name="lamp_g" defstate="0">
17      <rect state="0"><color red="0.15" green="0.5" blue="0.1" /></rect>
18      <rect state="1"><color red="0.52" green="1.0" blue="0.4" /></rect>
19   </element>
20   <element name="lamp_y" defstate="0">
21      <rect state="0"><color red="0.5" green="0.45" blue="0.1" /></rect>
22      <rect state="1"><color red="1.0" green="0.93" blue="0.4" /></rect>
23   </element>
824
25
26
927<!-- build screen -->
1028
1129   <view name="Internal Layout">
r245157r245158
1331      <bezel element="static_black">
1432         <bounds left="0" right="64" top="0" bottom="64" />
1533      </bezel>
34     
35      <bezel name="lamp3" element="lamp_r"><bounds x="0" y="0" width="10" height="10" /></bezel>
36      <bezel name="lamp2" element="lamp_b"><bounds x="10" y="0" width="10" height="10" /></bezel>
37      <bezel name="lamp1" element="lamp_g"><bounds x="20" y="0" width="10" height="10" /></bezel>
38      <bezel name="lamp0" element="lamp_y"><bounds x="30" y="0" width="10" height="10" /></bezel>
1639
1740
1841   </view>

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

Previous 199869 Revisions Next

© 1997-2024 The MAME Team