Previous 199869 Revisions Next

r34660 Tuesday 27th January, 2015 at 15:28:19 UTC by Olivier Galibert
Merge pull request #119 from p1pkin/naomi#0

Naomi#0
[hash]pasogo.xml
[src/mame/drivers]aliens.c namcos21.c
[src/mame/includes]namcos21.h
[src/osd/sdl]video.c

trunk/hash/pasogo.xml
r243171r243172
11<?xml version="1.0"?>
22<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
33<softwarelist name="pasogo" description="Koei PasoGo cartridges">
4   <!-- KS-1010. Contians 8M SOP44 ROM, 62256 SOP32 RAM, Microchip 1081N (reset IC?watchdog?battery-power-switcher?) and 3V battery. -->
4
5<!--
6  Koei PasoGo (パソ碁) undumped games
7
8  Taikyoku-kun I ~ 対局くん I [KS-1001]
9  Tanoshii Tsumego Dai-1-kan ~ 楽しい詰碁・第1巻 [KS-1002]
10  Tanoshii Tsumego Dai-2-kan ~ 楽しい詰碁・第2巻 [KS-1003]
11
12-->
13
14   <!-- Contians 8M SOP44 ROM, 62256 SOP32 RAM, Microchip 1081N (reset IC?watchdog?battery-power-switcher?) and 3V battery. -->
515   <software name="dgoban">
616      <description>Denshi Goban</description>
717      <year>1996</year>
818      <publisher>Koei</publisher>
19      <info name="serial" value="KS-1009"/>
20      <info name="alt_title" value="電子碁盤"/>
921      <part name="cart" interface="pasogo_cart">
1022         <dataarea name="rom" width="16" endianness="little" size="1048576">
1123            <rom name="ks-1010.ic4" size="1048576" crc="b6a3f97c" sha1="2de63b05ec93a4ba3ea55ba131c0706927a5bf39" offset="00000000" />
r243171r243172
1325      </part>
1426   </software>
1527
16   <!-- KS-1004. Contains 4M SOP40 ROM only. -->
28
29   <!-- Contains 4M SOP40 ROM only. -->
1730   <software name="igmks1">
18      <description>Igo Meikyokushuu - Dai Ikkan</description>
31      <description>Igo Meikyokushuu - Dai-1-kan</description>
1932      <year>1996</year>
2033      <publisher>Koei</publisher>
34      <info name="serial" value="KS-1004"/>
35      <info name="alt_title" value="囲碁名局集 第1巻"/>
2136      <part name="cart" interface="pasogo_cart">
2237         <dataarea name="rom" width="16" endianness="little" size="524288">
2338            <rom name="yrm0442m-184s" size="524288" crc="32f9c38a" sha1="1be82afcdf5e2d1a0e873fda4161e663d7a53a85" offset="00000000" />
r243171r243172
2540      </part>
2641   </software>
2742
28   <!-- KS-1009. Contains 4M SOP40 ROM only. -->
43   <!-- Contains 4M SOP40 ROM only. -->
2944   <software name="tnt1">
30      <description>Tsuyoku Naru Tesuji - Dai Ikkan</description>
45      <description>Tsuyoku Naru Tesuji - Dai-1-kan</description>
3146      <year>1996</year>
3247      <publisher>Koei</publisher>
48      <info name="serial" value="KS-1010"/>
49      <info name="alt_title" value="強くなる手筋・第1巻"/>
3350      <part name="cart" interface="pasogo_cart">
3451         <dataarea name="rom" width="16" endianness="little" size="524288">
3552            <rom name="ks-1009.ic4" size="524288" crc="3e70fca6" sha1="c46cdc9e01f2f5c66b2523e1d30355e51c839f27" offset="00000000" />
trunk/src/mame/drivers/aliens.c
r243171r243172
455455   /* second half empty */
456456
457457   ROM_REGION( 0x200000, "k051960", 0 )    /* sprites */
458   ROM_LOAD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
459   ROM_LOAD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
460   ROM_LOAD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
458   ROM_LOAD32_WORD( "875b10.k08", 0x000000, 0x80000, CRC(0b1035b1) SHA1(db04020761386e79249762cd1540208375c38c7f) )
459   ROM_LOAD32_WORD( "875b09.k02", 0x000002, 0x80000, CRC(e76b3c19) SHA1(6838e07460b3eaaeb129208ad0696c8019bd63d9) )
460   ROM_LOAD32_WORD( "875b06.j08", 0x100000, 0x40000, CRC(081a0566) SHA1(3a4aa14178fe76a030224743c9e9cd974e08bd79) )
461461   /* second half empty */
462   ROM_LOAD( "875b05.j02", 0x100002, 0x40000, CRC(19a261f2) SHA1(b0518fad833b3e613e0201d5d9cab73dc5e78e1d) )
462   ROM_LOAD32_WORD( "875b05.j02", 0x100002, 0x40000, CRC(19a261f2) SHA1(b0518fad833b3e613e0201d5d9cab73dc5e78e1d) )
463463   /* second half empty */
464464
465465   ROM_REGION( 0x0100, "proms", 0 )
trunk/src/mame/drivers/namcos21.c
r243171r243172
311311
312312INT32 namcos21_state::read_pointrom_data(unsigned offset)
313313{
314   const INT32 *pPointData = (INT32 *)memregion( "point" )->base();
315   INT32 result = pPointData[offset];
316   return result;
314   return m_ptrom24[offset];
317315}
318316
319317READ16_MEMBER(namcos21_state::namcos21_video_enable_r)
r243171r243172
11681166
11691167READ16_MEMBER(namcos21_state::winrun_dsp_pointrom_data_r)
11701168{
1171   UINT16 *ptrom = (UINT16 *)memregion("point")->base();
1172   return ptrom[m_winrun_pointrom_addr++];
1169   return m_ptrom16[m_winrun_pointrom_addr++];
11731170}
11741171
11751172WRITE16_MEMBER(namcos21_state::winrun_dsp_complete_w)
r243171r243172
16451642   ROM_LOAD16_BYTE( "ac1-edata1-u.3c", 0x000000, 0x80000, CRC(a9547509) SHA1(1bc663cec03b60ad968896bbc2546f02efda135e) )
16461643   ROM_LOAD16_BYTE( "ac1-edata1-l.1c", 0x000001, 0x80000, CRC(a87087dd) SHA1(cd9b83a8f07886ab44e4ded68002b44338777e8c) )
16471644
1648   ROM_REGION32_BE( 0x400000, "point", ROMREGION_ERASE00)       /* 24bit signed point data */
1645   ROM_REGION32_BE( 0x400000, "point24", ROMREGION_ERASE00)       /* 24bit signed point data */
16491646   ROM_LOAD32_BYTE( "ac1-poi-h.2f",  0x000001, 0x80000, CRC(573bbc3b) SHA1(371be12b915db6872049f18980c1b55544cfc445) ) /* most significant */
16501647   ROM_LOAD32_BYTE( "ac1-poi-lu.2k", 0x000002, 0x80000, CRC(d99084b9) SHA1(c604d60a2162af7610e5ff7c1aa4195f7df82efe) )
16511648   ROM_LOAD32_BYTE( "ac1-poi-ll.2n", 0x000003, 0x80000, CRC(abb32307) SHA1(8e936ba99479215dd33a951d81ec2b04020dfd62) ) /* least significant */
r243171r243172
17061703   ROM_LOAD16_BYTE( "ac1-edata1-u.3c", 0x000000, 0x80000, CRC(a9547509) SHA1(1bc663cec03b60ad968896bbc2546f02efda135e) )
17071704   ROM_LOAD16_BYTE( "ac1-edata1-l.1c", 0x000001, 0x80000, CRC(a87087dd) SHA1(cd9b83a8f07886ab44e4ded68002b44338777e8c) )
17081705
1709   ROM_REGION32_BE( 0x400000, "point", ROMREGION_ERASE00)       /* 24bit signed point data */
1706   ROM_REGION32_BE( 0x400000, "point24", ROMREGION_ERASE00)       /* 24bit signed point data */
17101707   ROM_LOAD32_BYTE( "ac1-poi-h.2f",  0x000001, 0x80000, CRC(573bbc3b) SHA1(371be12b915db6872049f18980c1b55544cfc445) ) /* most significant */
17111708   ROM_LOAD32_BYTE( "ac1-poi-lu.2k", 0x000002, 0x80000, CRC(d99084b9) SHA1(c604d60a2162af7610e5ff7c1aa4195f7df82efe) )
17121709   ROM_LOAD32_BYTE( "ac1-poi-ll.2n", 0x000003, 0x80000, CRC(abb32307) SHA1(8e936ba99479215dd33a951d81ec2b04020dfd62) ) /* least significant */
r243171r243172
17671764   ROM_LOAD16_BYTE( "cy1-edata0-u.3b", 0x000000, 0x80000, CRC(77452533) SHA1(48fc199bcc1beb23c714eebd9b09b153c980170b) )
17681765   ROM_LOAD16_BYTE( "cy1-edata0-l.1b", 0x000001, 0x80000, CRC(e812e290) SHA1(719e0a026ae8ef63d0d0269b67669ea9b4d950dd) )
17691766
1770   ROM_REGION32_BE( 0x400000, "point", ROMREGION_ERASE00)       /* 24bit signed point data */
1767   ROM_REGION32_BE( 0x400000, "point24", ROMREGION_ERASE00)       /* 24bit signed point data */
17711768   ROM_LOAD32_BYTE( "cy1-poi-h1.2f",  0x000001, 0x80000, CRC(eaf8bac3) SHA1(7a2caf6672af158b4a23ce4626342d1f17d1a4e4) )    /* most significant */
17721769   ROM_LOAD32_BYTE( "cy1-poi-lu1.2k", 0x000002, 0x80000, CRC(c544a8dc) SHA1(4cce5f2ab3519b4aa7edbdd15b2d79a7fdcade3c) )
17731770   ROM_LOAD32_BYTE( "cy1-poi-ll1.2n", 0x000003, 0x80000, CRC(30acb99b) SHA1(a28dcb3e5405f166644f6353a903c1143ee268f1) )    /* least significant */
r243171r243172
18261823   ROM_LOAD16_BYTE( "cy1-edata0-u.3b", 0x000000, 0x80000, CRC(77452533) SHA1(48fc199bcc1beb23c714eebd9b09b153c980170b) )
18271824   ROM_LOAD16_BYTE( "cy1-edata0-l.1b", 0x000001, 0x80000, CRC(e812e290) SHA1(719e0a026ae8ef63d0d0269b67669ea9b4d950dd) )
18281825
1829   ROM_REGION32_BE( 0x400000, "point", ROMREGION_ERASE00)       /* 24bit signed point data */
1826   ROM_REGION32_BE( 0x400000, "point24", ROMREGION_ERASE00)       /* 24bit signed point data */
18301827   ROM_LOAD32_BYTE( "cy1-poi-h1.2f",  0x000001, 0x80000, CRC(eaf8bac3) SHA1(7a2caf6672af158b4a23ce4626342d1f17d1a4e4) )    /* most significant */
18311828   ROM_LOAD32_BYTE( "cy1-poi-lu1.2k", 0x000002, 0x80000, CRC(c544a8dc) SHA1(4cce5f2ab3519b4aa7edbdd15b2d79a7fdcade3c) )
18321829   ROM_LOAD32_BYTE( "cy1-poi-ll1.2n", 0x000003, 0x80000, CRC(30acb99b) SHA1(a28dcb3e5405f166644f6353a903c1143ee268f1) )    /* least significant */
r243171r243172
18871884   ROM_LOAD16_BYTE( "de1-data-u.3a",  0x00000, 0x80000, CRC(fe65d2ab) SHA1(dbe962dda7efa60357fa3a684a265aaad49df5b5) )
18881885   ROM_LOAD16_BYTE( "de1-data-l.1a",  0x00001, 0x80000, CRC(9bb37aca) SHA1(7f5dffc95cadcf12f53ff7944920afc25ed3cf68) )
18891886
1890   ROM_REGION16_BE( 0xc0000, "point", 0 ) /* 3d objects */
1887   ROM_REGION16_BE( 0xc0000, "point16", 0 ) /* 3d objects */
18911888   ROM_LOAD16_BYTE( "de1-pt0-ub.8j", 0x00000, 0x20000, CRC(3b6b746d) SHA1(40c992ef4cf5187b30aba42c5fe7ce0f8f02bee0) )
18921889   ROM_LOAD16_BYTE( "de1-pt0-lb.8d", 0x00001, 0x20000, CRC(9c5c477e) SHA1(c8ae8a663227d636d35bd5f432d23f05d6695942) )
18931890   ROM_LOAD16_BYTE( "de1-pt1-u.8l",  0x40000, 0x20000, CRC(23bc72a1) SHA1(083e2955ae2f88d1ad461517b47054d64375b46e) )
r243171r243172
19371934
19381935   ROM_REGION16_BE( 0x100000, "edata", ROMREGION_ERASEFF )
19391936
1940   ROM_REGION32_BE( 0x400000, "point", ROMREGION_ERASE00) /* 24bit signed point data */
1937   ROM_REGION32_BE( 0x400000, "point24", ROMREGION_ERASE00) /* 24bit signed point data */
19411938   ROM_LOAD32_BYTE( "st1-pt0-h.bin", 0x000001, 0x80000, CRC(84eb355f) SHA1(89a248b8be2e0afcee29ba4c4c9cca65d5fb246a) )
19421939   ROM_LOAD32_BYTE( "st1-pt0-u.bin", 0x000002, 0x80000, CRC(1956cd0a) SHA1(7d21b3a59f742694de472c545a1f30c3d92e3390) )
19431940   ROM_LOAD32_BYTE( "st1-pt0-l.bin", 0x000003, 0x80000, CRC(ff577049) SHA1(1e1595174094e88d5788753d05ce296c1f7eca75) )
r243171r243172
19901987
19911988   ROM_REGION16_BE( 0x100000, "edata", ROMREGION_ERASEFF )
19921989
1993   ROM_REGION32_BE( 0x400000, "point", ROMREGION_ERASE00) /* 24bit signed point data */
1990   ROM_REGION32_BE( 0x400000, "point24", ROMREGION_ERASE00) /* 24bit signed point data */
19941991   ROM_LOAD32_BYTE( "st1-pt0-h.bin", 0x000001, 0x80000, CRC(84eb355f) SHA1(89a248b8be2e0afcee29ba4c4c9cca65d5fb246a) )
19951992   ROM_LOAD32_BYTE( "st1-pt0-u.bin", 0x000002, 0x80000, CRC(1956cd0a) SHA1(7d21b3a59f742694de472c545a1f30c3d92e3390) )
19961993   ROM_LOAD32_BYTE( "st1-pt0-l.bin", 0x000003, 0x80000, CRC(ff577049) SHA1(1e1595174094e88d5788753d05ce296c1f7eca75) )
r243171r243172
20472044
20482045   ROM_REGION16_BE( 0x100000, "edata", ROMREGION_ERASEFF )
20492046
2050   ROM_REGION32_BE( 0x400000, "point", ROMREGION_ERASE00)       /* 24bit signed point data */
2047   ROM_REGION32_BE( 0x400000, "point24", ROMREGION_ERASE00)       /* 24bit signed point data */
20512048   ROM_LOAD32_BYTE( "sv1-pt0-h.bin", 0x000001, 0x80000, CRC(3be21115) SHA1(c9f30353c1216f64199f87cd34e787efd728e739) ) /* most significant */
20522049   ROM_LOAD32_BYTE( "sv1-pt0-u.bin", 0x000002, 0x80000, CRC(4aacfc42) SHA1(f0e179e057183b41744ca429764f44306f0ce9bf) )
20532050   ROM_LOAD32_BYTE( "sv1-pt0-l.bin", 0x000003, 0x80000, CRC(6a4dddff) SHA1(9ed182d21d328c6a684ee6658a9dfcf3f3dd8646) ) /* least significant */
r243171r243172
20952092   ROM_LOAD16_BYTE( "wr1-gd0u-2.1p",  0x00000, 0x40000, CRC(9752eef5) SHA1(d6df0faf9c2696247bdf463f53c1e474ec595dd0) )
20962093   ROM_LOAD16_BYTE( "wr1-gd0l-2.3p",  0x00001, 0x40000, CRC(349c95cc) SHA1(8898eecf5918485ec683900520f123483077df28) )
20972094
2098   ROM_REGION16_BE( 0x80000, "point", 0 ) /* 3d objects */
2095   ROM_REGION16_BE( 0x80000, "point16", 0 ) /* 3d objects */
20992096   ROM_LOAD16_BYTE( "wr1-pt0u.8j", 0x00000, 0x20000, CRC(7ec4cf6b) SHA1(92ec92567b9f7321efb4a3724cbcdba216eb22f9) )
21002097   ROM_LOAD16_BYTE( "wr1-pt0l.8d", 0x00001, 0x20000, CRC(58c14b73) SHA1(e34a26866cd870743e166669f7fa5915a82104e9) )
21012098
r243171r243172
21632160   ROM_LOAD16_BYTE( "sg1-gd1-u.1s", 0x80000, 0x40000, CRC(271db29b) SHA1(8b35fcf273b9aec28d4c606c41c0626dded697e1) )
21642161   ROM_LOAD16_BYTE( "sg1-gd1-l.3s", 0x80001, 0x40000, CRC(a6c4da96) SHA1(377dbf21a1bede01de16708c96c112abab4417ce) )
21652162
2166   ROM_REGION16_BE( 0x80000, "point", 0 ) /* 3d objects */
2163   ROM_REGION16_BE( 0x80000, "point16", 0 ) /* 3d objects */
21672164   ROM_LOAD16_BYTE( "sg1-pt0-u.8j", 0x00000, 0x20000, CRC(160c3634) SHA1(485d20d6cc459f17d77682201dee07bdf76bf343) )
21682165   ROM_LOAD16_BYTE( "sg1-pt0-l.8d", 0x00001, 0x20000, CRC(b5a665bf) SHA1(5af6ec492f31395c0492e14590b025b120067b8d) )
21692166   ROM_LOAD16_BYTE( "sg1-pt1-u.8l", 0x40000, 0x20000, CRC(b63d3006) SHA1(78e78619766b0fd91b1e830cfb066495d6773981) )
r243171r243172
22122209   ROM_LOAD16_BYTE( "r911-gd1u.1s", 0x80000, 0x40000, CRC(17e5a61c) SHA1(272ebd7daa56847f1887809535362331b5465dec) )
22132210   ROM_LOAD16_BYTE( "r911-gd1l.3s", 0x80001, 0x40000, CRC(64df59a2) SHA1(1e9d0945b94780bb0be16803e767466d2cda07e8) )
22142211
2215   ROM_REGION16_BE( 0x80000, "point", 0 ) /* winrun91 - 3d objects */
2212   ROM_REGION16_BE( 0x80000, "point16", 0 ) /* winrun91 - 3d objects */
22162213   ROM_LOAD16_BYTE( "r911-pt0u.8j", 0x00000, 0x20000, CRC(abf512a6) SHA1(e86288039d6c4dedfa95b11cb7e4b87637f90c09) ) /* Version on SYSTEM21B CPU only has R911 PTU @ 8W */
22172214   ROM_LOAD16_BYTE( "r911-pt0l.8d", 0x00001, 0x20000, CRC(ac8d468c) SHA1(d1b457a19a5d3259d0caf933f42b3a02b485867b) ) /* and R911 PTL @ 12W with rom type 27C020 */
22182215   ROM_LOAD16_BYTE( "r911-pt1u.8l", 0x40000, 0x20000, CRC(7e5dab74) SHA1(5bde219d5b4305d38d17b494b2e759f05d05329f) )
trunk/src/mame/includes/namcos21.h
r243171r243172
4949      m_dspram16(*this,"dspram16"),
5050      m_mpDualPortRAM(*this,"mpdualportram"),
5151      m_master_dsp_code(*this,"master_dsp_code"),
52      m_ptrom24(*this,"point24"),
53      m_ptrom16(*this,"point16"),
5254      m_dsp(*this, "dsp") { }
5355
5456   optional_shared_ptr<UINT16> m_winrun_dspbios;
r243171r243172
5860   required_shared_ptr<UINT8> m_mpDualPortRAM;
5961   optional_shared_ptr<UINT16> m_master_dsp_code;
6062
63   optional_region_ptr<INT32> m_ptrom24;
64   optional_region_ptr<UINT16> m_ptrom16;
65
6166   optional_device<cpu_device> m_dsp;
6267
6368   UINT8 *m_videoram;
trunk/src/osd/sdl/video.c
r243171r243172
648648   stemp = options().video();
649649   if (strcmp(stemp, "auto") == 0)
650650   {
651#ifdef SDLMAME_MACOSX
651#if (defined SDLMAME_MACOSX || defined SDLMAME_WIN32)
652652      stemp = "opengl";
653653#else
654654      stemp = "soft";

https://github.com/mamedev/mame/commit/8fd2f65f0b976dc48f482050e525e4b892f03739

Previous 199869 Revisions Next

© 1997-2024 The MAME Team