Previous

199869 Revisions

Next

r29317 Saturday 5th April, 2014 at 14:17:46 UTC by Nathan Woods
Merge branch 'master' of ssh://mess.org/mame into new_menus Conflicts:   src/emu/diimage.c

[/branches/new_menus/hash]	gameboy.xml gba.xml gbcolor.xml megadriv.xml pico.xml
[/branches/new_menus/src/emu]	diimage.c diimage.h emu.mak
[/branches/new_menus/src/emu/imagedev]	floppy.h
[/branches/new_menus/src/emu/ui]	imgcntrl.c* imgcntrl.h*
[/branches/new_menus/src/mess/drivers]	tandy2k.c
[/branches/new_menus/src/mess/includes]	tandy2k.h

branches/new_menus/hash/gba.xml

r29316	r29317
9674	9674	</part>
9675	9675	</software>
9676	9676
	9677	<software name="contradvp" cloneof="contradv">
	9678	<description>Contra Advance (Prototype)</description>
	9679	<year>2003</year>
	9680	<publisher>Konami</publisher>
	9681	<part name="cart" interface="gba_cart">
	9682	<dataarea name="rom" size="33554432">
	9683	<rom name="contra advance (proto).bin" size="33554432" crc="dd1499a0" sha1="86f25c0f0b0814b99a12c44c43855e380722c9e9" offset="000000" />
	9684	</dataarea>
	9685	</part>
	9686	</software>
	9687
9677	9688	<software name="corvette">
9678	9689	<description>Corvette (USA)</description>
9679	9690	<year>2003</year>
r29316	r29317
9809	9820	</software>
9810	9821
9811	9822	<software name="crashfsnu" cloneof="crashfsn">
	9823	<description>Crash Bandicoot Purple - Ripto's Rampage (USA, Rev. A)</description>
	9824	<year>2004</year>
	9825	<publisher>Vivendi Universal</publisher>
	9826	<info name="serial" value="AGB-BD4E-USA"/>
	9827	<part name="cart" interface="gba_cart">
	9828	<feature name="slot" value="gba_eeprom_4k" />
	9829	<feature name="pcb_type" value="GBA-EEPROM-4K" />
	9830	<dataarea name="rom" size="16777216">
	9831	<rom name="crash bandicoot purple - ripto's rampage (u) (v1.1).bin" size="16777216" crc="3ddf07a1" sha1="b14da39b82d9c69f60deda179c073a14d07d5ce7" offset="000000" />
	9832	</dataarea>
	9833	</part>
	9834	</software>
	9835
	9836	<software name="crashfsnua" cloneof="crashfsn">
9812	9837	<description>Crash Bandicoot Purple - Ripto's Rampage (USA)</description>
9813	9838	<year>2004</year>
9814	9839	<publisher>Vivendi Universal</publisher>
r29316	r29317
15409	15434	</part>
15410	15435	</software>
15411	15436
15412		<software name="franklin1" cloneof="franklin">
	15437	<software name="franklina" cloneof="franklin">
	15438	<description>Franklin the Turtle (Euro, Rev. 1)</description>
	15439	<year>2006</year>
	15440	<publisher>The Game Factory</publisher>
	15441	<info name="serial" value="AGB-BFKP-EUR"/>
	15442	<part name="cart" interface="gba_cart">
	15443	<feature name="slot" value="gba_eeprom_4k" />
	15444	<feature name="pcb_type" value="GBA-EEPROM-4K" />
	15445	<dataarea name="rom" size="4194304">
	15446	<rom name="franklin the turtle (europe) (rev 1).bin" size="4194304" crc="1a2f7ee6" sha1="5211fb864a60461f7ae20c42e2bf60e08a9f96ba" offset="000000" />
	15447	</dataarea>
	15448	</part>
	15449	</software>
	15450
	15451	<software name="franklinb" cloneof="franklin">
15413	15452	<description>Franklin the Turtle (Euro)</description>
15414	15453	<year>2006</year>
15415	15454	<publisher>The Game Factory</publisher>
r29316	r29317
16468	16507	</software>
16469	16508
16470	16509	<software name="garfldsp">
	16510	<description>Garfield - The Search for Pooky (Euro, Rev. 2)</description>
	16511	<year>2004</year>
	16512	<publisher>The Game Factory</publisher>
	16513	<info name="serial" value="AGB-BGOP-EUR"/>
	16514	<part name="cart" interface="gba_cart">
	16515	<dataarea name="rom" size="16777216">
	16516	<!-- 2nd half (8MB) filled with 0xff, verified on the real cart -->
	16517	<rom name="garfieldtsfp.bgop.bin" size="16777216" crc="f7cd830c" sha1="c3ab25e65f59c5d80d45b605a2c55ba666362be5" offset="000000" />
	16518	</dataarea>
	16519	</part>
	16520	</software>
	16521
	16522	<software name="garfldspa" cloneof="garfldsp">
16471	16523	<description>Garfield - The Search for Pooky (Euro)</description>
16472	16524	<year>2004</year>
16473	16525	<publisher>The Game Factory</publisher>
r29316	r29317
25254	25306	</software>
25255	25307
25256	25308	<software name="tetrisad" supported="partial">
	25309	<description>Minna no Soft Series - Tetris Advance (Jpn, Rev. 1)</description>
	25310	<year>2003</year>
	25311	<publisher>Success</publisher>
	25312	<info name="serial" value="AGB-BTTJ-JPN"/>
	25313	<info name="release" value="20031128"/>
	25314	<info name="alt_title" value="みんなのソフトシリーズ テトリス アドバンス"/>
	25315	<part name="cart" interface="gba_cart">
	25316	<feature name="slot" value="gba_eeprom_4k" />
	25317	<feature name="pcb_type" value="GBA-EEPROM-4K" />
	25318	<dataarea name="rom" size="4194304">
	25319	<rom name="minna no soft series - tetris advance (japan) (rev 1).bin" size="4194304" crc="524d0749" sha1="379f524b1772ad41355b68884df1f8be75e388e7" offset="000000" />
	25320	</dataarea>
	25321	</part>
	25322	</software>
	25323
	25324	<software name="tetrisada" cloneof="tetrisad" supported="partial">
25257	25325	<description>Minna no Soft Series - Tetris Advance (Jpn)</description>
25258	25326	<year>2003</year>
25259	25327	<publisher>Success</publisher>
r29316	r29317
26610	26678	</software>
26611	26679
26612	26680	<software name="narutoncj" cloneof="narutonc">
	26681	<description>Naruto - Ninjutsu Zenkai! Saikyou Ninja Daikesshuu (Jpn, Rev. 1)</description>
	26682	<year>2003</year>
	26683	<publisher>Tomy</publisher>
	26684	<info name="serial" value="AGB-A7AJ-JPN"/>
	26685	<info name="release" value="20030501"/>
	26686	<info name="alt_title" value="NARUTO-ナルト- 忍術全開!最強忍者 大結集"/>
	26687	<part name="cart" interface="gba_cart">
	26688	<feature name="slot" value="gba_sram" />
	26689	<feature name="pcb_type" value="GBA-SRAM" />
	26690	<dataarea name="rom" size="8388608">
	26691	<rom name="naruto - ninjutsu zenkai! saikyou ninja daikesshuu (japan) (rev 1).bin" size="8388608" crc="f5f8ecb4" sha1="7fca2cff63cf5aa2f2ad301ca254f979f723b072" offset="000000" />
	26692	</dataarea>
	26693	</part>
	26694	</software>
	26695
	26696	<software name="narutoncja" cloneof="narutonc">
26613	26697	<description>Naruto - Ninjutsu Zenkai! Saikyou Ninja Daikesshuu (Jpn)</description>
26614	26698	<year>2003</year>
26615	26699	<publisher>Tomy</publisher>
r29316	r29317
34692	34776	</software>
34693	34777
34694	34778	<software name="spyrorng" cloneof="spyrofsn">
	34779	<description>Spyro Orange - The Cortex Conspiracy (USA, Rev. A)</description>
	34780	<year>2004</year>
	34781	<publisher>Vivendi Universal</publisher>
	34782	<info name="serial" value="AGB-BSTE-USA"/>
	34783	<part name="cart" interface="gba_cart">
	34784	<feature name="slot" value="gba_eeprom_4k" />
	34785	<feature name="pcb_type" value="GBA-EEPROM-4K" />
	34786	<dataarea name="rom" size="16777216">
	34787	<rom name="spyro orange - the cortex conspiracy (u) (v1.1).bin" size="16777216" crc="bbf2549d" sha1="eed93ebe63a99de8490d05ae1bc122dbfe5f8596" offset="000000" />
	34788	</dataarea>
	34789	</part>
	34790	</software>
	34791
	34792	<software name="spyrornga" cloneof="spyrofsn">
34695	34793	<description>Spyro Orange - The Cortex Conspiracy (USA)</description>
34696	34794	<year>2004</year>
34697	34795	<publisher>Vivendi Universal</publisher>
r29316	r29317
36874	36972	</software>
36875	36973
36876	36974	<software name="tetrswldj" cloneof="tetrswld">
	36975	<description>Tetris Worlds (Jpn, Rev. 1)</description>
	36976	<year>2002</year>
	36977	<publisher>Success</publisher>
	36978	<info name="serial" value="AGB-ATWJ-JPN"/>
	36979	<info name="release" value="20020426"/>
	36980	<info name="alt_title" value="テトリスワールド"/>
	36981	<part name="cart" interface="gba_cart">
	36982	<dataarea name="rom" size="4194304">
	36983	<rom name="tetris worlds (japan) (rev 1).bin" size="4194304" crc="fcf2d471" sha1="be44036e39f95fb9feb93630720d46570ba1a42f" offset="000000" />
	36984	</dataarea>
	36985	</part>
	36986	</software>
	36987
	36988	<software name="tetrswldja" cloneof="tetrswld">
36877	36989	<description>Tetris Worlds (Jpn)</description>
36878	36990	<year>2002</year>
36879	36991	<publisher>Success</publisher>
r29316	r29317
36975	37087	</software>
36976	37088
36977	37089	<software name="3table6">
	37090	<description>Three-in-One Pack - Risk + Battleship + Clue (USA, Rev. A)</description>
	37091	<year>2005</year>
	37092	<publisher>DSI Games</publisher>
	37093	<info name="serial" value="AGB-B66E-USA"/>
	37094	<part name="cart" interface="gba_cart">
	37095	<dataarea name="rom" size="4194304">
	37096	<rom name="three-in-one pack - risk + battleship + clue (u) (v1.1).bin" size="4194304" crc="15c24091" sha1="06f95762bc56e11c984af71e197d146f95ea4f70" offset="000000" />
	37097	</dataarea>
	37098	</part>
	37099	</software>
	37100
	37101	<software name="3table6a" cloneof="3table6">
36978	37102	<description>Three-in-One Pack - Risk + Battleship + Clue (USA)</description>
36979	37103	<year>2005</year>
36980	37104	<publisher>DSI Games</publisher>

branches/new_menus/hash/megadriv.xml

r29316	r29317
13809	13809	</part>
13810	13810	</software>
13811	13811
	13812	<software name="f15se2upa" cloneof="f15se2">
	13813	<description>F-15 Strike Eagle II (USA, Prototype, Alt)</description>
	13814	<year>1993</year>
	13815	<publisher>Microprose</publisher>
	13816	<part name="cart" interface="megadriv_cart">
	13817	<dataarea name="rom" size="2097152">
	13818	<rom name="f-15strikeeagleii.0f82.bin" size="2097152" crc="dc5f07ba" sha1="6900219ec9057ce2ef5bd1304c2c26aa678a1daa" offset="0x000000" loadflag="load16_word_swap"/>
	13819	</dataarea>
	13820	</part>
	13821	</software>
	13822
13812	13823	<software name="f22">
13813	13824	<description>F-22 Interceptor (Euro, USA, 199206)</description>
13814	13825	<year>1991</year>
r29316	r29317
16565	16576	</part>
16566	16577	</software>
16567	16578
	16579	<software name="lethalenup" cloneof="lethalen">
	16580	<description>Lethal Enforcers (USA, Prototype)</description>
	16581	<year>1993</year>
	16582	<publisher>Konami</publisher>
	16583	<part name="cart" interface="megadriv_cart">
	16584	<dataarea name="rom" size="2097152">
	16585	<rom name="lethalenforcers00.eadd.bin" size="2097152" crc="f4010503" sha1="01a445cf8ed57db1be4bd2aef1107d9e2fbcdb77" offset="0x000000" loadflag="load16_word_swap"/>
	16586	</dataarea>
	16587	</part>
	16588	</software>
	16589
16568	16590	<software name="le2">
16569	16591	<description>Lethal Enforcers II - Gun Fighters (Euro)</description>
16570	16592	<year>1994</year>
r29316	r29317
16771	16793	</part>
16772	16794	</software>
16773	16795
	16796	<!-- These were recovered from a preview floppy disk. The composite ROM has CRC 2b4c3ec1 -->
	16797	<software name="lufia">
	16798	<description>Lufia &amp; The Fortress of Doom (USA, Early Prototype)</description>
	16799	<year>1993</year>
	16800	<publisher>Taito</publisher>
	16801	<part name="cart" interface="megadriv_cart">
	16802	<dataarea name="rom" size="1048576">
	16803	<rom name="lufia01.bin" size="262144" crc="0193c049" sha1="d9effc085e8f9a6ed09769774e4d7179d5a73369" offset="0x000000" loadflag="load16_byte"/>
	16804	<rom name="lufia02.bin" size="262144" crc="6908532d" sha1="b0ab16d0ad1fb679b1c85b0c5d9d8fb55b42a589" offset="0x000001" loadflag="load16_byte"/>
	16805	<!-- second half contains no data, it was like this in the original backup -->
	16806	<rom name="lufia03.bin" size="262144" crc="b7094978" sha1="1e4903cd5f594c13dad2fd74666ba35c62550044" offset="0x080000" loadflag="load16_byte"/>
	16807	<rom name="lufia04.bin" size="262144" crc="b7094978" sha1="1e4903cd5f594c13dad2fd74666ba35c62550044" offset="0x080001" loadflag="load16_byte"/>
	16808	</dataarea>
	16809	</part>
	16810	</software>
	16811
16774	16812	<software name="maqiao">
16775	16813	<description>Ma Qiao E Mo Ta - Devilish Mahjong Tower (Chi)</description>
16776	16814	<year>1994</year>
r29316	r29317
20168	20206	<year>1994</year>
20169	20207	<publisher>Codemasters</publisher>
20170	20208	<part name="cart" interface="megadriv_cart">
	20209	<feature name="slot" value="rom_jcart"/>
20171	20210	<dataarea name="rom" size="1048576">
20172	20211	<rom name="mdstee_13.bin" size="1048576" crc="aa8b19bc" sha1="3f73dcabcdf0d781834fcc673533301b82f0e91b" offset="0x000000" loadflag="load16_word_swap"/>
20173	20212	</dataarea>
r29316	r29317
20179	20218	<year>1994</year>
20180	20219	<publisher>Codemasters</publisher>
20181	20220	<part name="cart" interface="megadriv_cart">
	20221	<feature name="slot" value="rom_jcart"/>
20182	20222	<dataarea name="rom" size="1048576">
20183	20223	<rom name="pete sampras tennis (euro, usa) (j-cart).bin" size="1048576" crc="9ef5bbd1" sha1="222a66cdb8865a7f89e5a72418413888bb400176" offset="0x000000" loadflag="load16_word_swap"/>
20184	20224	</dataarea>
r29316	r29317
22199	22239	<year>1995</year>
22200	22240	<publisher>Codemasters</publisher>
22201	22241	<part name="cart" interface="megadriv_cart">
	22242	<feature name="slot" value="rom_jcart"/>
22202	22243	<dataarea name="rom" size="2097152">
22203	22244	<rom name="sampras tennis 96 (euro) (j-cart).bin" size="2097152" crc="14e3fb7b" sha1="139b9cea418c7c932033ddff87bf10466828cbfa" offset="0x000000" loadflag="load16_word_swap"/>
22204	22245	</dataarea>

branches/new_menus/hash/gbcolor.xml

r29316	r29317
7	7	- Shanghai Pocket by Sunsoft: are serial and release date correct or do they refer to the GB version?
8	8
9	9	Undumped:
10		- Mary-Kate and Ashley - Crush Course CGB-BCVP-UKV
11		- Mary-Kate and Ashley - Pocket Planner DMG-BMAP-EUR
12	10	- San Francisco Rush 2049 (Euro, fr/de/nl) [small pic]
13	11
14		nointro guys also list the following
15		- The New Adventures of Mary-Kate & Ashley (Euro)
16
17	12	Undumped GBC protos:
18	13	- Jet Force Gemini
19	14
r29316	r29317
9029	9024	<feature name="slot" value="rom_mbc5" />
9030	9025	<!-- cartridge ram -->
9031	9026	<dataarea name="rom" size="1048576">
9032		<rom name="game boy wars 2 (japan).bin" size="1048576" crc="e3b0319e" sha1="5da1bf00291dee9b478b739b73855bf4b49d63c7" offset="000000" />
	9027	<!-- 2nd half is filled with 0xff, confirmed with the real cart -->
	9028	<rom name="game boy wars 2 (japan).bin" size="1048576" crc="c69dc37b" sha1="db511650fdc9a6c130add7eada9562b6443b565d" offset="000000" />
9033	9029	</dataarea>
9034	9030	<dataarea name="nvram" size="32768">
9035	9031	</dataarea>
r29316	r29317
13623	13619
13624	13620	<software name="mnacrush">
13625	13621	<!-- Notes: GBC only -->
13626		<description>Mary-Kate and Ashley - Crush Course (USA)</description>
	13622	<description>Mary-Kate and Ashley - Crush Course (Euro, USA)</description>
13627	13623	<year>2001</year>
13628	13624	<publisher>Acclaim Entertainment</publisher>
13629		<info name="serial" value="CGB-BCVE-USA"/>
	13625	<info name="serial" value="CGB-BCVE-USA, CGB-BCVP-UKV"/>
13630	13626	<part name="cart" interface="gameboy_cart">
13631	13627	<feature name="slot" value="rom_mbc5" />
13632	13628	<dataarea name="rom" size="1048576">
r29316	r29317
13636	13632	</software>
13637	13633
13638	13634	<software name="mnaplann">
13639		<description>Mary-Kate and Ashley - Pocket Planner (USA)</description>
	13635	<description>Mary-Kate and Ashley - Pocket Planner (Euro, USA)</description>
13640	13636	<year>2000</year>
13641	13637	<publisher>Acclaim Entertainment</publisher>
13642		<info name="serial" value="DMG-BMAE-USA"/>
	13638	<info name="serial" value="DMG-BMAE-USA, DMG-BMAP-EUR"/>
13643	13639	<part name="cart" interface="gameboy_cart">
13644	13640	<feature name="slot" value="rom_mbc3" />
13645	13641	<feature name="rtc" value="yes" />
r29316	r29317
15435	15431	</software>
15436	15432
15437	15433	<software name="newmna">
15438		<description>The New Adventures of Mary-Kate &amp; Ashley (USA)</description>
	15434	<description>The New Adventures of Mary-Kate &amp; Ashley (Euro, USA)</description>
15439	15435	<year>1999</year>
15440	15436	<publisher>Acclaim Entertainment</publisher>
15441		<info name="serial" value="DMG-AXFE-USA"/>
	15437	<info name="serial" value="DMG-AXFE-USA, DMG-AXFP-EUR"/>
15442	15438	<part name="cart" interface="gameboy_cart">
15443	15439	<feature name="slot" value="rom_mbc5" />
15444	15440	<dataarea name="rom" size="1048576">

branches/new_menus/hash/gameboy.xml

r29316	r29317
184	184	</software>
185	185
186	186	<software name="advpinoc">
187		<description>The Adventures of Pinocchio (USA, Prototype)</description>
	187	<description>The Adventures of Pinocchio (Prototype)</description>
188	188	<year>1993</year>
189	189	<publisher>Nintendo</publisher>
190	190	<part name="cart" interface="gameboy_cart">
r29316	r29317
3861	3861	<!-- This dump has been verified from an European cart by NoIntro guys, the duffy set is still unverified (maybe a Rev.1?) -->
3862	3862	<software name="daffya" cloneof="daffy">
3863	3863	<!-- Notes: SGB enhanced -->
3864		<description>Daffy Duck - The Marvin Missions (Euro, USA, Alt)</description>
	3864	<description>Daffy Duck - The Marvin Missions (Euro, Alt)</description>
3865	3865	<year>1995</year>
3866	3866	<publisher>Sunsoft</publisher>
3867		<info name="serial" value="DMG-YS-USA, DMG-YS-NOE"/>
	3867	<info name="serial" value="DMG-YS-NOE"/>
3868	3868	<part name="cart" interface="gameboy_cart">
3869	3869	<feature name="slot" value="rom_mbc1" />
3870	3870	<dataarea name="rom" size="131072">
r29316	r29317
15926	15926	</software>
15927	15927
15928	15928	<software name="powrace">
15929		<description>Power Racer (Euro, USA)</description>
	15929	<description>Power Racer (Euro)</description>
15930	15930	<year>1990</year>
15931	15931	<publisher>Tecmo</publisher>
15932		<info name="serial" value="DMG-PQ-USA, DMG-PQ-NOE"/>
	15932	<info name="serial" value="DMG-PQ-NOE"/>
15933	15933	<part name="cart" interface="gameboy_cart">
15934	15934	<feature name="slot" value="rom_mbc1" />
15935	15935	<dataarea name="rom" size="65536">
r29316	r29317
15938	15938	</part>
15939	15939	</software>
15940	15940
	15941	<software name="powraceu" cloneof="powrace">
	15942	<description>Power Racer (USA)</description>
	15943	<year>1990</year>
	15944	<publisher>Tecmo</publisher>
	15945	<info name="serial" value="DMG-PQ-USA"/>
	15946	<part name="cart" interface="gameboy_cart">
	15947	<feature name="slot" value="rom_mbc1" />
	15948	<dataarea name="rom" size="65536">
	15949	<rom name="power racer (usa, europe).bin" size="65536" crc="afc6a949" sha1="c0c8f28a9b66b6c08a0ed4d31a186c3382160c3d" offset="000000" />
	15950	</dataarea>
	15951	</part>
	15952	</software>
	15953
15941	15954	<software name="pman">
15942	15955	<description>Prehistorik Man (Euro, USA)</description>
15943	15956	<year>1996</year>
r29316	r29317
19014	19027	<part name="cart" interface="gameboy_cart">
19015	19028	<feature name="slot" value="rom_mbc1" />
19016	19029	<dataarea name="rom" size="131072">
19017		<rom name="spot - the cool adventure (usa).bin" size="131072" crc="0e08f59b" sha1="7e80ddc835ecde69ea11c4702a6cfb93575e917a" offset="000000" />
	19030	<rom name="spot - the cool adventure (usa).bin" size="131072" crc="76f67428" sha1="bcc923e6e73efe7e865625bb6ecf2ef08e380826" offset="000000" />
19018	19031	</dataarea>
19019	19032	</part>
19020	19033	</software>
r29316	r29317
23040	23053	</software>
23041	23054
23042	23055	<software name="yuyu3">
23043		<description>Yu Yu Hakusho Dai-3-dan - Makai no Tobira (Jpn)</description>
	23056	<description>Yu Yu Hakusho Dai-3-dan - Makai no Tobira Hen (Jpn)</description>
23044	23057	<year>1994</year>
23045	23058	<publisher>Tomy</publisher>
23046	23059	<info name="serial" value="DMG-UGJ"/>

branches/new_menus/hash/pico.xml

r29316	r29317
18	18	* 魔法騎士 レイアース マジックナイトたんじょう - Magic Knight Rayearth: Magic Knight Tanjou (Sega - 1995xxxx - HPC-6022)
19	19	* NHKおかあさんといっしょ げんきなこあつまれ! - NHK Okaasan to Issho Genki na Koatsumare! (Sega - 19951125 - HPC-6025)
20	20	* ぺたぺたちょっきん あそべるずかん <どうぶつ> - Petapeta Chokkinna Soberuzukan ~Doubutsu~ (Sega - 199511xx - HPC-6028)
21		* サンリオカーニバル たのしいカードづくり - Sanrio Carnival Tanoshii Card Dukuri (Sega - 19951130 - HPC-6031)
22	21	* 怪盗セイント･テール セイントテールとワン･ツー･スリー! - Kaitou Saint Tail - Saint Tail to One, Two, Three! (Sega - ???? - HPC-6035)
23	22	* バーバパパのうちゅうりょこう - Barbapapa no Uchuu Ryokou (Sega - 1996xxxx - HPC-6036)
24		* みんなでおどろう オズのまほうつかい  - Minna de Odorou - Ozu no Mahou Tsukai (Sega - ???? - HPC-6037)
25	23	* 超光戦士 シャンゼリオン  - Chou Hikari Senshi Shanzerion (Sega - 1996xxxx - HPC-6038)
26	24	* パケット2 ゆかいな仲間とゲームで数遊び  - Paketto 2 Yukai na Nakama to Game de Kazu Asobi (Sega - ???? - HPC-6048)
27	25	* キーボードピコ2 セット さわってみよう! よいこのはじめてキーボード <同梱> - Keyboard Pico 2 Set with Sawatte Miyou! Yoiko no Hajimete Keyboard (Sega - 199712xx - HPC-6052)
r29316	r29317
40	38	* スージーちゃんとマービー おてつだい だ～いすき! - Susie-chan to Mabi - Otetsudai Daisuki! (Sega Toys - 200010xx - HPC-6089)
41	39	* それいけ!アンパンマン アンパンマンとすうじあそび - Soreike! Anpanman - Anpanman to Suuji Asobi (Sega Toys - ???? - HPC-6091)
42	40	* コンビニでおかいもの! - Conveni de Okaimono! (Sega Toys - ???? - HPC-6094)
43		* やさしくおてあて ピコクリニック! かんごふさんピコ - Yasashiku Oteate Pico Clinic! Kangofusan Pico (Sega Toys - 2001xxxx - HPC-6095)
44	41	* パソコン接続キット ピコタウンにでかけよう! - Pasokon Setsuzoku Kit PicoTown ni Dekakeyou! (Sega Toys - 20010601 - HPC-6097)
45	42	* アンパンマンのはじめてマウスピコ アンパンマンとパソコンれんしゅう! <同梱> - Anpanman no Hajimete Mouse Pico with Anpanman to Pasokon renshuu! (Sega Toys - 20020124 - HPC-6102)
46	43	* ECCジュニアの はじめてえいご Vol.3 - Happy Birthday, Patty! パティちゃんのお誕生日 - ECC Junior no Hajimete Eigo Vol. 3 - Happy Birthday, Patty! - Patty-chan no Otanjoubi (Sega Toys - 20020307 - HPC-6105)
r29316	r29317
48	45	* ECCジュニアの はじめてえいご Vol.5 - Merry Christmas, Patty! メリークリスマス、パティちゃん - ECC Junior no Hajimete Eigo Vol. 5 - Merry Christmas, Patty! - Merry Christmas, Patty-chan (Sega Toys - 200207xx - HPC-6107)
49	46	* ECCジュニアの はじめてえいご Vol.6 - Patty Goes to the Amusement Park パティちゃん遊園地に行く - ECC Junior no Hajimete Eigo Vol. 6 - Patty Goes to the Amusement Park - Patty-chan Yuuenchi ni Iku (Sega Toys - 200207xx - HPC-6108)
50	47	* おせわしましょ! あかちゃんピコ - Osewashimasho! Akachan Pico (Sega Toys - 20020701 - HPC-6109)
51		* コスメピコ もっとかわいくなりたいな - Kosume Pico Motto Kawai Kunaritaina! (Sega Toys - 20020604 - HPC-6112)
52	48	* トミカ・ピコ レスキューパーキング きんきゅうしゅつどう! はたらくのりもの <初回･トミカ付属> - Tomica Pico Rescue Parking Kinkyuushutsudou! Hataraku Norimono ~Shokai-Tomica Fuzoku~ (Sega Toys - 200207xx - HPC-6114)
53	49	* ハローキティのたのしいおみせやさん - Hello Kitty no Tanoshii Omiseyasan (Sega Toys - 200211xx - HPC-6117)
54	50	* 学研 ピコで学習 1年生 - Gakken Pico de Gakushuu 1-nensei (Sega Toys - ???? - HPC-????)
r29316	r29317
88	84	* それいけ!アンパンマンのみんなできょうそうアンパンマン! - Soreike! Anpanman no Minna de Kyousou Anpanman! (Bandai - 1996xxxx - T-133250)
89	85	* 夢のクレヨン王国 - Yume no Crayon Oukoku (Bandai - 1998xxxx - T-133270)
90	86	* 新ウルトラヒーロー - Shin Ultrahero (Bandai - 1998xxxx - T-133280)
91		* おえかきロボコン!! - Oekaki Robokon!! (Bandai - 1999xxxx - T-133290)
92	87	* うんてんトーマス デラックスセット - Unten Thomas Track Set (Bandai - 200004xx - T-133???)
93	88	* ウルトラマンピコ ウルトラファイティングベース - Ultraman Pico Ultraman Fighting Best (Bandai - 200009xx - T-133???)
94	89	* アンパンマンピコ わくわくパン工場 - Anpanman Pico Wakuwaku Pan Koujou (Bandai - 200106xx - T-133350)
r29316	r29317
104	99	* はじめまシリーズ4 学研のおべんきょうソフト たしざん ひきざん - Hajimema Series 4 - Gakken no Obenkyou Soft - Tashizan Hikizan (Gakken - 1998xxxx - T-169070)
105	100	* 平成天才バカボン みんなでファミリーレストランにいくのだ! - Heisei Tensai Bakabon Minna de Family Resturant ni Ikunoda! (GE - ???? - T-170010)
106	101	* ドラえもん えんそく･いもほり･うんどうかい <10th Anniversary> - Doraemon Ensoku-Imohori-Undoukai ~10th Anniversary Edition~ (Shogakukan - 200309xx - T-226090)
107		* ドラえもん ようちえんはたのしいな<Best Selection> - Doraemon Youchien Hata no Shiina ~Best Selection~ (Shogakukan - 20040213 - T-226110)
108	102	* 里中満智子のたのしいおりがみ - Satonaka Machiko no Tanoshii Origami (Nayuta - 199511xx - T-227010)
109	103	* くもんの すくすくれっすん 1から30までのすうじ - Kumon no Sukusuku Ressun 1-Kara 30-made no Suuji (Kumon - 2001xxxx - T-300010)
110	104	* くもんの すくすくれっすん はじめてのひらがな - Kumon no Sukusuku Ressun Hajimete no Hiragana (Kumon - 20020124 - T-300020)
111		* 右脳開発シリーズ11 平成教育委員会Jr. - Unou Kaihatsu Series 11 Heisei Kyouikuiinkai Jr. (Imagineer - 19960102 - T-150130)
112		* 右脳開発シリーズ5 ハローキティのすてきなたからもの - Unou Kaihatsu Series 5 Hello Kitty no Suteki na Takaramono (Imagineer - 19951104 - T-150???)
113		* 右脳開発シリーズ10 ノンタンといっしょ わいわいにっぽん - Unou Kaihatsu Series 10 Nontan to Issho Waiwai Nihon (Imagineer - 19960102 - T-150???)
114	105	* 左脳開発シリーズ2 数量・計算 - Sanou Kaihatsu Series 2 Suuryou - Keisan (Imagineer - 19951002 - T-150230)
115	106	* 左脳開発シリーズ5 迷路・記憶 (CD付き) - Sanou Kaihatsu Series 5 Meiro - Kioku (CD Tsuki) (Imagineer - 19951208 - T-150240)
116	107	* 平成教育委員会Jr. めざせ優等生 - Heisei Kyouikuiinkai Jr. Mezase Yuutousei (Imagineer - 19951201 - T-150270)
r29316	r29317
280	271	</part>
281	272	</software>
282	273
	274	<software name="poohcorni" cloneof="poohcorn" supported="no">
	275	<description>Un Anno con Winny Puh (Ita)</description>
	276	<year>199?</year>
	277	<publisher>Sega</publisher>
	278	<info name="serial" value="49021-13"/>
	279	<part name="cart" interface="pico_cart">
	280	<feature name="pcb" value="171-6882A" />
	281	<feature name="ic1" value="MPR-17791-T" />
	282	<dataarea name="rom" size="524288">
	283	<rom name="mpr-17791-t.ic1" size="524288" crc="b9594101" sha1="f03ed21a23a7777dbcd9d816712542730b6968cf" offset="000000" loadflag="load16_word_swap" />
	284	</dataarea>
	285	</part>
	286	</software>
	287
283	288	<software name="poohcornj" cloneof="poohcorn">
284	289	<description>Pooh-san no Ichi Nichi (Jpn, Rev. 1)</description>
285	290	<year>1995</year>
r29316	r29317
342	347	<publisher>Imagineer</publisher>
343	348	<info name="serial" value="T-150110"/>
344	349	<info name="release" value="19951104"/>
345		<info name="alt_title" value="右脳開発シリーズ6 アヒルのペックルのかぞえてみよう"/>
	350	<info name="alt_title" value="右脳開発シリーズ6 (Unou Kaihatsu Series 6) アヒルのペックルのかぞえてみよう"/>
346	351	<part name="cart" interface="pico_cart">
347	352	<feature name="pcb" value="171-6883A" />
348	353	<feature name="ic1" value="MPR-18196 J22" />
r29316	r29317
617	622	<publisher>Imagineer</publisher>
618	623	<info name="serial" value="T-150030"/>
619	624	<info name="release" value="19951205"/>
620		<info name="alt_title" value="右脳開発シリーズ8 ドラッキーのおえかきハウス"/>
	625	<info name="alt_title" value="右脳開発シリーズ8 (Unou Kaihatsu Series 8) ドラッキーのおえかきハウス"/>
621	626	<part name="cart" interface="pico_cart">
622	627	<feature name="pcb" value="171-6882A" />
623	628	<feature name="ic1" value="MPR-17804-H" />
r29316	r29317
821	826	</part>
822	827	</software>
823	828
	829	<!-- The 'Best Selection' release has been confirmed to contain the exact same data as the original  -->
824	830	<software name="dorayuta">
825	831	<description>Doraemon - Youchien wa Tanoshii na (Jpn)</description>
826	832	<year>199?</year>
827	833	<publisher>Shogakukan</publisher>
828		<info name="serial" value="T-226020"/>
	834	<info name="serial" value="T-226020, T-226110 (Best Selection)"/>
	835	<info name="release" value="20040213 (Best Selection)"/>
829	836	<info name="alt_title" value="ドラえもん ようちえんはたのしいな"/>
830	837	<part name="cart" interface="pico_cart">
831	838	<feature name="pcb" value="171-6883A" />
r29316	r29317
978	985	<publisher>Imagineer</publisher>
979	986	<info name="serial" value="T-150060"/>
980	987	<info name="release" value="19951031"/>
981		<info name="alt_title" value="右脳開発シリーズ2 ECCO Jr"/>
	988	<info name="alt_title" value="右脳開発シリーズ (Unou Kaihatsu Series 2) ECCO Jr"/>
982	989	<part name="cart" interface="pico_cart">
983	990	<feature name="pcb" value="171-6882A" />
984	991	<feature name="ic1" value="MPR-17853-H" />
r29316	r29317
1351	1358	</part>
1352	1359	</software>
1353	1360
	1361	<software name="hkiinkai">
	1362	<description>Heisei Kyouiku Iinkai Jr. (Jpn)</description>
	1363	<year>1996</year>
	1364	<publisher>Imagineer</publisher>
	1365	<info name="serial" value="T-150130"/>
	1366	<info name="release" value="19960102"/>
	1367	<info name="alt_title" value="右脳開発シリーズ11 (Unou Kaihatsu Series 11) 平成教育委員会Jr."/>
	1368	<part name="cart" interface="pico_cart">
	1369	<feature name="pcb" value="171-6883A" />
	1370	<feature name="ic1" value="MPR-17860 J21" />
	1371	<dataarea name="rom" size="1048576">
	1372	<rom name="mpr-17860 j21.ic1" size="1048576" crc="cb3f7654" sha1="9ba109e6eda70e0a5d0885f746e22574c33b81f1" offset="000000" loadflag="load16_word_swap" />
	1373	</dataarea>
	1374	</part>
	1375	</software>
	1376
	1377	<software name="hellokcs">
	1378	<description>Hello Kitty no Castelo (Bra)</description>
	1379	<year>19??</year>
	1380	<publisher>Tec Toy</publisher>
	1381	<info name="serial" value="MPR-18316?"/>
	1382	<part name="cart" interface="pico_cart">
	1383	<feature name="pcb" value="171-6882A" />
	1384	<feature name="ic1" value="MPR-18316-T" />
	1385	<dataarea name="rom" size="524288">
	1386	<rom name="mpr-18316-t.ic1" size="524288" crc="788de189" sha1="c58a8b64d6372e85199b03c379aae2cfb0308a62" offset="000000" loadflag="load16_word_swap" />
	1387	</dataarea>
	1388	</part>
	1389	</software>
	1390
	1391	<software name="hellokmo">
	1392	<description>Hello Kitty no Machi he Odekake (Jpn)</description>
	1393	<year>1995</year>
	1394	<publisher>Imagineer</publisher>
	1395	<info name="serial" value="T-150080"/>
	1396	<info name="release" value="19951031"/>
	1397	<info name="alt_title" value="右脳開発シリーズ3 (Unou Kaihatsu Series 3) ハローキティのまちへおでかけ"/>
	1398	<part name="cart" interface="pico_cart">
	1399	<feature name="pcb" value="171-6883A" />
	1400	<feature name="ic1" value="MPR-17859 J19" />
	1401	<dataarea name="rom" size="1048576">
	1402	<rom name="mpr-17859 j19.ic1" size="1048576" crc="3f336747" sha1="28e866688fed6e7c0a82c3f1e91f205600afcf68" offset="000000" loadflag="load16_word_swap" />
	1403	</dataarea>
	1404	</part>
	1405	</software>
	1406
	1407	<software name="hellokso">
	1408	<description>Hello Kitty no Suteki na Outanjoubi (Jpn)</description>
	1409	<year>1997</year>
	1410	<publisher>Sega</publisher>
	1411	<info name="serial" value="HPC-6040"/>
	1412	<info name="alt_title" value="ハローキティのすてきなおたんじょうび"/>
	1413	<part name="cart" interface="pico_cart">
	1414	<feature name="pcb" value="171-6883A" />
	1415	<feature name="ic1" value="MPR-19639 J34" />
	1416	<dataarea name="rom" size="1048576">
	1417	<rom name="mpr-19639 j34.ic1" size="1048576" crc="45ded176" sha1="a451d2674a3d7aa88b8a0befb96f48b55ff77bc1" offset="000000" loadflag="load16_word_swap" />
	1418	</dataarea>
	1419	</part>
	1420	</software>
	1421
	1422	<software name="hellokst">
	1423	<description>Hello Kitty no Suteki na Takaramono (Jpn)</description>
	1424	<year>1995</year>
	1425	<publisher>Imagineer</publisher>
	1426	<info name="serial" value="T-150090"/>
	1427	<info name="release" value="19951104"/>
	1428	<info name="alt_title" value="右脳開発シリーズ5 (Unou Kaihatsu Series 5) ハローキティのすてきなたからもの"/>
	1429	<part name="cart" interface="pico_cart">
	1430	<feature name="pcb" value="171-6883A" />
	1431	<feature name="ic1" value="MPR-18178 J14" />
	1432	<dataarea name="rom" size="1048576">
	1433	<rom name="mpr-18178 j14.ic1" size="1048576" crc="6262f11d" sha1="9a6293f12a47d403b950b96e0fb9d2b9ed769804" offset="000000" loadflag="load16_word_swap" />
	1434	</dataarea>
	1435	</part>
	1436	</software>
	1437
	1438	<software name="helloktb" cloneof="hellokcs">
	1439	<description>Hello Kitty no Tanoshii Butoukai (Jpn)</description>
	1440	<year>1993</year>
	1441	<publisher>Sega</publisher>
	1442	<info name="serial" value="HPC-6002"/>
	1443	<info name="release" value="19930326"/>
	1444	<info name="alt_title" value="ハローキティのたのしいぶとうかい"/>
	1445	<part name="cart" interface="pico_cart">
	1446	<feature name="pcb" value="171-6434C" />
	1447	<feature name="ic1" value="MPR-15645-H" />
	1448	<dataarea name="rom" size="524288">
	1449	<rom name="mpr-15645-h.ic1" size="524288" crc="18256466" sha1="1dffea9f1087cdf4c92c1091f9033bd97f2e28e3" offset="000000" loadflag="load16_word_swap" />
	1450	</dataarea>
	1451	</part>
	1452	</software>
	1453
	1454	<software name="hellokmc">
	1455	<description>Hello Kitty to McDonald de Asobo! (Jpn)</description>
	1456	<year>2001</year>
	1457	<publisher>Sega Toys</publisher>
	1458	<info name="serial" value="HPC-6100"/>
	1459	<info name="release" value="20011001"/>
	1460	<info name="alt_title" value="ハローキティとマクドナルドであそぼ!"/>
	1461	<part name="cart" interface="pico_cart">
	1462	<feature name="pcb" value="171-7090A" />
	1463	<feature name="ic1" value="9K0-0044-MK" />
	1464	<dataarea name="rom" size="2097152">
	1465	<rom name="9k0-0044-mk.ic1" size="2097152" crc="829a4ec5" sha1="22b8a709f88cd9a7d22c5538fd39d253af3f98c1" offset="000000" loadflag="load16_word_swap" />
	1466	</dataarea>
	1467	</part>
	1468	</software>
	1469
	1470	<software name="hiraponk">
	1471	<description>Hirake! Ponkikki Party wo Hirakou! (Jpn)</description>
	1472	<year>1993</year>
	1473	<publisher>Sega</publisher>
	1474	<info name="serial" value="HPC-6003"/>
	1475	<info name="release" value="199307xx"/>
	1476	<info name="alt_title" value="ひらけ!ポンキッキ パーティをひらこう!"/>
	1477	<part name="cart" interface="pico_cart">
	1478	<feature name="pcb" value="171-6434B" />
	1479	<feature name="ic1" value="MPR-15646-H" />
	1480	<dataarea name="rom" size="524288">
	1481	<rom name="mpr-15646-h.bin" size="524288" crc="369d5e12" sha1="13d3c6d97cd703a7450272b44ad37e38c5339dee" offset="000000" loadflag="load16_word_swap" />
	1482	</dataarea>
	1483	</part>
	1484	</software>
	1485
1354	1486	<software name="hucklowl">
1355	1487	<description>Richard Scarry's - Huckle and Lowly's Busiest Day Ever (Euro)</description>
1356	1488	<year>1994</year>
r29316	r29317
1413	1545	<publisher>Imagineer</publisher>
1414	1546	<info name="serial" value="T-150070"/>
1415	1547	<info name="release" value="19951031"/>
1416		<info name="alt_title" value="右脳開発シリーズ1 Richard Scarry's ハックルとローリー"/>
	1548	<info name="alt_title" value="右脳開発シリーズ1 (Unou Kaihatsu Series 1) Richard Scarry's ハックルとローリー"/>
1417	1549	<part name="cart" interface="pico_cart">
1418	1550	<feature name="pcb" value="171-6883A" />
1419	1551	<feature name="ic1" value="MPR-17858 J02" />
r29316	r29317
1453	1585	</part>
1454	1586	</software>
1455	1587
1456
1457		<software name="hellokmo">
1458		<description>Hello Kitty no Machi he Odekake (Jpn)</description>
1459		<year>1995</year>
1460		<publisher>Imagineer</publisher>
1461		<info name="serial" value="T-150080"/>
1462		<info name="release" value="19951031"/>
1463		<info name="alt_title" value="右脳開発シリーズ3 ハローキティのまちへおでかけ"/>
1464		<part name="cart" interface="pico_cart">
1465		<feature name="pcb" value="171-6883A" />
1466		<feature name="ic1" value="MPR-17859 J19" />
1467		<dataarea name="rom" size="1048576">
1468		<rom name="mpr-17859 j19.ic1" size="1048576" crc="3f336747" sha1="28e866688fed6e7c0a82c3f1e91f205600afcf68" offset="000000" loadflag="load16_word_swap" />
1469		</dataarea>
1470		</part>
1471		</software>
1472
1473		<software name="hellokso">
1474		<description>Hello Kitty no Suteki na Outanjoubi (Jpn)</description>
1475		<year>1997</year>
1476		<publisher>Sega</publisher>
1477		<info name="serial" value="HPC-6040"/>
1478		<info name="alt_title" value="ハローキティのすてきなおたんじょうび"/>
1479		<part name="cart" interface="pico_cart">
1480		<feature name="pcb" value="171-6883A" />
1481		<feature name="ic1" value="MPR-19639 J34" />
1482		<dataarea name="rom" size="1048576">
1483		<rom name="mpr-19639 j34.ic1" size="1048576" crc="45ded176" sha1="a451d2674a3d7aa88b8a0befb96f48b55ff77bc1" offset="000000" loadflag="load16_word_swap" />
1484		</dataarea>
1485		</part>
1486		</software>
1487
1488		<software name="helloktb">
1489		<description>Hello Kitty no Tanoshii Butoukai (Jpn)</description>
1490		<year>1993</year>
1491		<publisher>Sega</publisher>
1492		<info name="serial" value="HPC-6002"/>
1493		<info name="release" value="19930326"/>
1494		<info name="alt_title" value="ハローキティのたのしいぶとうかい"/>
1495		<part name="cart" interface="pico_cart">
1496		<feature name="pcb" value="171-6434C" />
1497		<feature name="ic1" value="MPR-15645-H" />
1498		<dataarea name="rom" size="524288">
1499		<rom name="mpr-15645-h.ic1" size="524288" crc="18256466" sha1="1dffea9f1087cdf4c92c1091f9033bd97f2e28e3" offset="000000" loadflag="load16_word_swap" />
1500		</dataarea>
1501		</part>
1502		</software>
1503
1504		<software name="hellokmc">
1505		<description>Hello Kitty to McDonald de Asobo! (Jpn)</description>
1506		<year>2001</year>
1507		<publisher>Sega Toys</publisher>
1508		<info name="serial" value="HPC-6100"/>
1509		<info name="release" value="20011001"/>
1510		<info name="alt_title" value="ハローキティとマクドナルドであそぼ!"/>
1511		<part name="cart" interface="pico_cart">
1512		<feature name="pcb" value="171-7090A" />
1513		<feature name="ic1" value="9K0-0044-MK" />
1514		<dataarea name="rom" size="2097152">
1515		<rom name="9k0-0044-mk.ic1" size="2097152" crc="829a4ec5" sha1="22b8a709f88cd9a7d22c5538fd39d253af3f98c1" offset="000000" loadflag="load16_word_swap" />
1516		</dataarea>
1517		</part>
1518		</software>
1519
1520		<software name="hiraponk">
1521		<description>Hirake! Ponkikki Party wo Hirakou! (Jpn)</description>
1522		<year>1993</year>
1523		<publisher>Sega</publisher>
1524		<info name="serial" value="HPC-6003"/>
1525		<info name="release" value="199307xx"/>
1526		<info name="alt_title" value="ひらけ!ポンキッキ パーティをひらこう!"/>
1527		<part name="cart" interface="pico_cart">
1528		<feature name="pcb" value="171-6434B" />
1529		<feature name="ic1" value="MPR-15646-H" />
1530		<dataarea name="rom" size="524288">
1531		<rom name="mpr-15646-h.bin" size="524288" crc="369d5e12" sha1="13d3c6d97cd703a7450272b44ad37e38c5339dee" offset="000000" loadflag="load16_word_swap" />
1532		</dataarea>
1533		</part>
1534		</software>
1535
1536	1588	<software name="itsudemo">
1537	1589	<description>Itsudemo Issho Doraemon Set (Jpn)</description>
1538	1590	<year>199?</year>
r29316	r29317
1633	1685	<publisher>Imagineer</publisher>
1634	1686	<info name="serial" value="T-150100"/>
1635	1687	<info name="release" value="19951104"/>
1636		<info name="alt_title" value="右脳開発シリーズ4 けろけろけろっぴのいろかたち"/>
	1688	<info name="alt_title" value="右脳開発シリーズ4 (Unou Kaihatsu Series 4) けろけろけろっぴのいろかたち"/>
1637	1689	<part name="cart" interface="pico_cart">
1638	1690	<feature name="pcb" value="171-6883A" />
1639	1691	<feature name="ic1" value="MPR-18013 J11" />
r29316	r29317
1690	1742	</part>
1691	1743	</software>
1692	1744
	1745	<software name="kosumemk">
	1746	<description>Kosume Pico Motto Kawaiku Naritai na (Jpn)</description>
	1747	<year>2002</year>
	1748	<publisher>Sega Toys</publisher>
	1749	<info name="serial" value="HPC-6112"/>
	1750	<info name="release" value="20020604"/>
	1751	<info name="alt_title" value="コスメピコ もっとかわいくなりたいな"/>
	1752	<part name="cart" interface="pico_cart">
	1753	<feature name="pcb" value="171-7090A" />
	1754	<feature name="ic1" value="EPOXY BLOCK U1" />
	1755	<dataarea name="rom" size="2097152">
	1756	<rom name="epoxy block u1.ic1" size="2097152" crc="bfc8fa4b" sha1="07c4ee9f8cd73ff64ea9c18fc8573e1bf57a4d5f" offset="000000" loadflag="load16_word_swap" />
	1757	</dataarea>
	1758	</part>
	1759	</software>
	1760
1693	1761	<software name="poohcrs">
1694	1762	<description>Kuma no Pooh-san - Christopher Robin wo Sagase (Jpn)</description>
1695	1763	<year>1998</year>
r29316	r29317
2176	2244	</part>
2177	2245	</software>
2178	2246
	2247	<software name="oz">
	2248	<description>Minna de Odorou - Oz no Mahoutsukai (Jpn)</description>
	2249	<year>1996</year>
	2250	<publisher>Sega</publisher>
	2251	<info name="serial" value="HPC-6037"/>
	2252	<info name="alt_title" value="みんなでおどろう オズのまほうつかい"/>
	2253	<part name="cart" interface="pico_cart">
	2254	<feature name="pcb" value="171-7090A" />
	2255	<feature name="ic1" value="MPR-18878 E11" />
	2256	<dataarea name="rom" size="2097152">
	2257	<rom name="mpr-18878 e11.ic1" size="2097152" crc="b2c17f1b" sha1="0c60d4ff8cef472bb9ec01af21d503a5bf8cfaa6" offset="000000" loadflag="load16_word_swap" />
	2258	</dataarea>
	2259	</part>
	2260	</software>
	2261
2179	2262	<software name="moshimos">
2180	2263	<description>Moshimoshi Pico Set with Dare ga Deru kana? Moshimoshi Pico de TV to Oshaberi! (Jpn)</description>
2181	2264	<year>1997</year>
r29316	r29317
2217	2300	<publisher>Imagineer</publisher>
2218	2301	<info name="serial" value="T-150040"/>
2219	2302	<info name="release" value="19951205"/>
2220		<info name="alt_title" value="右脳開発シリーズ9 日本昔ばなし"/>
	2303	<info name="alt_title" value="右脳開発シリーズ9 (Unou Kaihatsu Series 9) 日本昔ばなし"/>
2221	2304	<part name="cart" interface="pico_cart">
2222	2305	<feature name="pcb" value="171-6882A" />
2223	2306	<feature name="ic1" value="MPR-17803-H" />
r29316	r29317
2301	2384	</part>
2302	2385	</software>
2303	2386
	2387	<software name="nontanis">
	2388	<description>Nontan to Issho Waiwai Nihon (Jpn)</description>
	2389	<year>1996</year>
	2390	<publisher>Imagineer</publisher>
	2391	<info name="serial" value="T-150120"/>
	2392	<info name="release" value="19960102"/>
	2393	<info name="alt_title" value="右脳開発シリーズ10 (Unou Kaihatsu Series 10) ノンタンといっしょ わいわいにっぽん"/>
	2394	<part name="cart" interface="pico_cart">
	2395	<feature name="pcb" value="171-6883A" />
	2396	<feature name="ic1" value="MPR-18107 J12" />
	2397	<dataarea name="rom" size="1048576">
	2398	<rom name="mpr-18107 j12.ic1" size="1048576" crc="c41e801f" sha1="dc13f49af69fc3137fba2e535fdfe09aca495b49" offset="000000" loadflag="load16_word_swap" />
	2399	</dataarea>
	2400	</part>
	2401	</software>
	2402
2304	2403	<software name="gogonori">
2305	2404	<description>Norimono Studio - Go Go! Noristar Asobi Maccho (Jpn)</description>
2306	2405	<year>1994</year>
r29316	r29317
2317	2416	</part>
2318	2417	</software>
2319	2418
	2419	<software name="oekarobo">
	2420	<description>Oekaki Robokon!! (Jpn)</description>
	2421	<year>1999</year>
	2422	<publisher>Bandai</publisher>
	2423	<info name="serial" value="T-133290"/>
	2424	<info name="alt_title" value="おえかきロボコン!!"/>
	2425	<part name="cart" interface="pico_cart">
	2426	<feature name="pcb" value="171-6882A" />
	2427	<feature name="ic1" value="MPR-21840-S" />
	2428	<dataarea name="rom" size="524288">
	2429	<rom name="mpr-21840-s.ic1" size="524288" crc="e4116dc0" sha1="78b17719d1d3dc81394509ac6f988c05d50b638a" offset="000000" loadflag="load16_word_swap" />
	2430	</dataarea>
	2431	</part>
	2432	</software>
	2433
2320	2434	<software name="ojadrm">
2321	2435	<description>Ojamajo Doremi# (Jpn)</description>
2322	2436	<year>2000</year>
r29316	r29317
2797	2911	</part>
2798	2912	</software>
2799	2913
	2914	<software name="sanrioct">
	2915	<description>Sanrio Carnival Tanoshii Card Dukuri (Jpn)</description>
	2916	<year>1995</year>
	2917	<publisher>Sega</publisher>
	2918	<info name="serial" value="HPC-6031"/>
	2919	<info name="release" value="19951130"/>
	2920	<info name="alt_title" value="サンリオカーニバル たのしいカードづくり"/>
	2921	<part name="cart" interface="pico_cart">
	2922	<feature name="pcb" value="171-6882A" />
	2923	<feature name="ic1" value="MPR-18573-T" />
	2924	<dataarea name="rom" size="524288">
	2925	<rom name="mpr-18573-t.ic1" size="524288" crc="732373f6" sha1="7dad2ad9f60e508d264efd048686788cfdd2f73f" offset="000000" loadflag="load16_word_swap" />
	2926	</dataarea>
	2927	</part>
	2928	</software>
	2929
2800	2930	<software name="sanriodc">
2801	2931	<description>Sanrio Puroland de Dance Carnival - Minna de Oryouri Osaihou (Jpn)</description>
2802	2932	<year>1995</year>
r29316	r29317
3112	3242	</part>
3113	3243	</software>
3114	3244
	3245	<software name="tailsmmb" cloneof="tailsmm">
	3246	<description>Tails no Mundo da Música (Bra)</description>
	3247	<year>19??</year>
	3248	<publisher>Tec Toy</publisher>
	3249	<info name="serial" value="MPR-18317?"/>
	3250	<part name="cart" interface="pico_cart">
	3251	<feature name="pcb" value="171-6882A" />
	3252	<feature name="ic1" value="MPR-18317-U" />
	3253	<dataarea name="rom" size="524288">
	3254	<rom name="mpr-18317-u.ic1" size="524288" crc="2bc80b15" sha1="4206d0264edc636d8a4d435baa87070fb8cbee5a" offset="000000" loadflag="load16_word_swap" />
	3255	</dataarea>
	3256	</part>
	3257	</software>
	3258
3115	3259	<software name="tailsmmg" cloneof="tailsmm">
3116	3260	<description>Tails und der Musikant (Ger)</description>
3117	3261	<year>1994</year>
r29316	r29317
3160	3304	<publisher>Imagineer</publisher>
3161	3305	<info name="serial" value="T-150050"/>
3162	3306	<info name="release" value="19951205"/>
3163		<info name="alt_title" value="右脳開発シリーズ7 Tails and the Music Maker"/>
	3307	<info name="alt_title" value="右脳開発シリーズ7 (Unou Kaihatsu Series 7) Tails and the Music Maker"/>
3164	3308	<part name="cart" interface="pico_cart">
3165	3309	<feature name="pcb" value="171-6882A" />
3166	3310	<feature name="ic1" value="MPR-17852-H" />
r29316	r29317
3382	3526	</part>
3383	3527	</software>
3384	3528
	3529	<software name="yasaclin">
	3530	<description>Yasashiku Oteate Pico Clinic! Kangofu-san Pico (Jpn)</description>
	3531	<year>2001</year>
	3532	<publisher>Sega Toys</publisher>
	3533	<info name="serial" value="HPC-6095"/>
	3534	<info name="alt_title" value="やさしくおてあて ピコクリニック! かんごふさんピコ"/>
	3535	<part name="cart" interface="pico_cart">
	3536	<feature name="pcb" value="171-7967" />     <!-- The PCB was not 100% readable here -->
	3537	<feature name="ic1" value="9K0-0042-RV" />
	3538	<feature name="ic2" value="HC32" />
	3539	<feature name="ic3" value="HC74" />
	3540	<feature name="ic4" value="HC125" />
	3541	<dataarea name="rom" size="2097152">
	3542	<rom name="9k0-0042-rv.ic1" size="2097152" crc="8eb4bb04" sha1="665dcb0b332d5bd9fcc1f7de3dae4cfd8bdde899" offset="000000" loadflag="load16_word_swap" />
	3543	</dataarea>
	3544	</part>
	3545	</software>
	3546
3385	3547	<software name="yobedora">
3386	3548	<description>Yobeba Kotaeru Doraemon - Nobita to Himitsu Dougu wo Mitsukeyou! (Jpn)</description>
3387	3549	<year>1995?</year>

branches/new_menus/src/emu/imagedev/floppy.h

r29316	r29317
15	15	#include "formats/ipf_dsk.h"
16	16	#include "formats/mfi_dsk.h"
17	17	#include "formats/td0_dsk.h"
	18	#include "ui/imgcntrl.h"
18	19
19	20	#define MCFG_FLOPPY_DRIVE_ADD(_tag, _slot_intf, _def_slot, _formats)  \
20	21	MCFG_DEVICE_ADD(_tag, FLOPPY_CONNECTOR, 0) \

branches/new_menus/src/emu/ui/imgcntrl.h

r0	r29317
	1	/***************************************************************************
	2
	3	ui/imgcntrl.h
	4
	5	MESS's clunky built-in file manager
	6
	7	Copyright Nicola Salmoria and the MAME Team.
	8	Visit http://mamedev.org for licensing and usage restrictions.
	9
	10	***************************************************************************/
	11
	12	#pragma once
	13
	14	#ifndef __UI_IMGCNTRL_H__
	15	#define __UI_IMGCNTRL_H__
	16
	17	// ======================> ui_menu_control_device_image
	18
	19	class ui_menu_control_device_image : public ui_menu {
	20	public:
	21	ui_menu_control_device_image(running_machine &machine, render_container *container, device_image_interface *image);
	22	virtual ~ui_menu_control_device_image();
	23	virtual void populate();
	24	virtual void handle();
	25
	26	protected:
	27	enum {
	28	START_FILE, START_OTHER_PART, START_SOFTLIST, SELECT_PARTLIST, SELECT_ONE_PART, SELECT_OTHER_PART, SELECT_FILE, CREATE_FILE, CREATE_CONFIRM, DO_CREATE, SELECT_SOFTLIST,
	29	LAST_ID
	30	};
	31
	32	// protected instance variables
	33	int state;
	34	device_image_interface *image;
	35	int submenu_result;
	36	astring current_directory;
	37	astring current_file;
	38
	39	// methods
	40	virtual void hook_load(astring filename, bool softlist);
	41
	42	private:
	43	// instance variables
	44	bool create_confirmed;
	45	bool softlist_done;
	46	const software_info *swi;
	47	const software_part *swp;
	48	class software_list_device *sld;
	49	astring software_info_name;
	50
	51	// methods
	52	void test_create(bool &can_create, bool &need_confirm);
	53	void load_software_part();
	54	};
	55
	56
	57	#endif /* __UI_IMGCNTRL_H__ */

Property changes on: branches/new_menus/src/emu/ui/imgcntrl.h

Added: svn:eol-style    + native Added: svn:mime-type    + text/plain

branches/new_menus/src/emu/ui/imgcntrl.c

r0	r29317
	1	/***************************************************************************
	2
	3	ui/imgcntrl.c
	4
	5	MESS's clunky built-in file manager
	6
	7	Copyright Nicola Salmoria and the MAME Team.
	8	Visit http://mamedev.org for licensing and usage restrictions.
	9
	10	***************************************************************************/
	11
	12	#include "emu.h"
	13	#include "ui/ui.h"
	14	#include "ui/menu.h"
	15	#include "ui/imgcntrl.h"
	16	#include "ui/filesel.h"
	17	#include "ui/swlist.h"
	18	#include "zippath.h"
	19
	20
	21	/***************************************************************************
	22	IMPLEMENTATION
	23	***************************************************************************/
	24
	25	//-------------------------------------------------
	26	//  ctor
	27	//-------------------------------------------------
	28
	29	ui_menu_control_device_image::ui_menu_control_device_image(running_machine &machine, render_container *container, device_image_interface *_image)
	30	: ui_menu(machine, container)
	31	{
	32	image = _image;
	33
	34	sld = 0;
	35	if (image->software_list_name()) {
	36	software_list_device_iterator iter(machine.config().root_device());
	37	for (software_list_device *swlist = iter.first(); swlist != NULL; swlist = iter.next())
	38	{
	39	if (strcmp(swlist->list_name(),image->software_list_name())==0) sld = swlist;
	40	}
	41	}
	42	swi = image->software_entry();
	43	swp = image->part_entry();
	44
	45	if(swi)
	46	{
	47	state = START_OTHER_PART;
	48	current_directory.cpy(image->working_directory());
	49	}
	50	else
	51	{
	52	state = START_FILE;
	53
	54	/* if the image exists, set the working directory to the parent directory */
	55	if (image->exists())
	56	{
	57	current_file.cpy(image->filename());
	58	zippath_parent(current_directory, current_file);
	59	} else
	60	current_directory.cpy(image->working_directory());
	61
	62	/* check to see if the path exists; if not clear it */
	63	if (zippath_opendir(current_directory, NULL) != FILERR_NONE)
	64	current_directory.reset();
	65	}
	66	}
	67
	68
	69	//-------------------------------------------------
	70	//  dtor
	71	//-------------------------------------------------
	72
	73	ui_menu_control_device_image::~ui_menu_control_device_image()
	74	{
	75	}
	76
	77
	78	//-------------------------------------------------
	79	//  test_create - creates a new disk image
	80	//-------------------------------------------------
	81
	82	void ui_menu_control_device_image::test_create(bool &can_create, bool &need_confirm)
	83	{
	84	astring path;
	85	osd_directory_entry *entry;
	86	osd_dir_entry_type file_type;
	87
	88	/* assemble the full path */
	89	zippath_combine(path, current_directory, current_file);
	90
	91	/* does a file or a directory exist at the path */
	92	entry = osd_stat(path);
	93	file_type = (entry != NULL) ? entry->type : ENTTYPE_NONE;
	94
	95	switch(file_type)
	96	{
	97	case ENTTYPE_NONE:
	98	/* no file/dir here - always create */
	99	can_create = true;
	100	need_confirm = false;
	101	break;
	102
	103	case ENTTYPE_FILE:
	104	/* a file exists here - ask for permission from the user */
	105	can_create = true;
	106	need_confirm = true;
	107	break;
	108
	109	case ENTTYPE_DIR:
	110	/* a directory exists here - we can't save over it */
	111	machine().ui().popup_time(5, "Cannot save over directory");
	112	can_create = false;
	113	need_confirm = false;
	114	break;
	115
	116	default:
	117	fatalerror("Unexpected\n");
	118	can_create = false;
	119	need_confirm = false;
	120	break;
	121	}
	122
	123	if (entry != NULL)
	124	osd_free(entry);
	125	}
	126
	127
	128	//-------------------------------------------------
	129	//  load_software_part
	130	//-------------------------------------------------
	131
	132	void ui_menu_control_device_image::load_software_part()
	133	{
	134	astring temp_name(sld->list_name(), ":", swi->shortname(), ":", swp->name());
	135	hook_load(temp_name, true);
	136	}
	137
	138
	139	//-------------------------------------------------
	140	//  hook_load
	141	//-------------------------------------------------
	142
	143	void ui_menu_control_device_image::hook_load(astring name, bool softlist)
	144	{
	145	image->load(name);
	146	ui_menu::stack_pop(machine());
	147	}
	148
	149
	150	//-------------------------------------------------
	151	//  populate
	152	//-------------------------------------------------
	153
	154	void ui_menu_control_device_image::populate()
	155	{
	156	}
	157
	158
	159	//-------------------------------------------------
	160	//  handle
	161	//-------------------------------------------------
	162
	163	void ui_menu_control_device_image::handle()
	164	{
	165	switch(state) {
	166	case START_FILE: {
	167	bool can_create = false;
	168	if(image->is_creatable()) {
	169	zippath_directory *directory = NULL;
	170	file_error err = zippath_opendir(current_directory, &directory);
	171	can_create = err == FILERR_NONE && !zippath_is_zip(directory);
	172	if(directory)
	173	zippath_closedir(directory);
	174	}
	175	submenu_result = -1;
	176	ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_file_selector(machine(), container, image, current_directory, current_file, true, image->image_interface()!=NULL, can_create, &submenu_result)));
	177	state = SELECT_FILE;
	178	break;
	179	}
	180
	181	case START_SOFTLIST:
	182	sld = 0;
	183	ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software(machine(), container, image->image_interface(), &sld)));
	184	state = SELECT_SOFTLIST;
	185	break;
	186
	187	case START_OTHER_PART: {
	188	submenu_result = -1;
	189	ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_parts(machine(), container, swi, swp->interface(), &swp, true, &submenu_result)));
	190	state = SELECT_OTHER_PART;
	191	break;
	192	}
	193
	194	case SELECT_SOFTLIST:
	195	if(!sld) {
	196	ui_menu::stack_pop(machine());
	197	break;
	198	}
	199	software_info_name = "";
	200	ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_list(machine(), container, sld, image->image_interface(), software_info_name)));
	201	state = SELECT_PARTLIST;
	202	break;
	203
	204	case SELECT_PARTLIST:
	205	swi = sld->find(software_info_name);
	206	if(swi->has_multiple_parts(image->image_interface())) {
	207	submenu_result = -1;
	208	swp = 0;
	209	ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_parts(machine(), container, swi, image->image_interface(), &swp, false, &submenu_result)));
	210	state = SELECT_ONE_PART;
	211	} else {
	212	swp = swi->first_part();
	213	load_software_part();
	214	ui_menu::stack_pop(machine());
	215	}
	216	break;
	217
	218	case SELECT_ONE_PART:
	219	switch(submenu_result) {
	220	case ui_menu_software_parts::T_ENTRY: {
	221	load_software_part();
	222	ui_menu::stack_pop(machine());
	223	break;
	224	}
	225
	226	case -1: // return to list
	227	state = SELECT_SOFTLIST;
	228	break;
	229
	230	}
	231	break;
	232
	233	case SELECT_OTHER_PART:
	234	switch(submenu_result) {
	235	case ui_menu_software_parts::T_ENTRY: {
	236	load_software_part();
	237	break;
	238	}
	239
	240	case ui_menu_software_parts::T_FMGR:
	241	state = START_FILE;
	242	handle();
	243	break;
	244
	245	case -1: // return to system
	246	ui_menu::stack_pop(machine());
	247	break;
	248
	249	}
	250	break;
	251
	252	case SELECT_FILE:
	253	switch(submenu_result) {
	254	case ui_menu_file_selector::R_EMPTY:
	255	image->unload();
	256	ui_menu::stack_pop(machine());
	257	break;
	258
	259	case ui_menu_file_selector::R_FILE:
	260	hook_load(current_file, false);
	261	break;
	262
	263	case ui_menu_file_selector::R_CREATE:
	264	ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_file_create(machine(), container, image, current_directory, current_file)));
	265	state = CREATE_FILE;
	266	break;
	267
	268	case ui_menu_file_selector::R_SOFTLIST:
	269	state = START_SOFTLIST;
	270	handle();
	271	break;
	272
	273	case -1: // return to system
	274	ui_menu::stack_pop(machine());
	275	break;
	276	}
	277	break;
	278
	279	case CREATE_FILE: {
	280	bool can_create, need_confirm;
	281	test_create(can_create, need_confirm);
	282	if(can_create) {
	283	if(need_confirm) {
	284	ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_confirm_save_as(machine(), container, &create_confirmed)));
	285	state = CREATE_CONFIRM;
	286	} else {
	287	state = DO_CREATE;
	288	handle();
	289	}
	290	} else {
	291	state = START_FILE;
	292	handle();
	293	}
	294	break;
	295	}
	296
	297	case CREATE_CONFIRM: {
	298	state = create_confirmed ? DO_CREATE : START_FILE;
	299	handle();
	300	break;
	301	}
	302
	303	case DO_CREATE: {
	304	astring path;
	305	zippath_combine(path, current_directory, current_file);
	306	int err = image->create(path, 0, NULL);
	307	if (err != 0)
	308	popmessage("Error: %s", image->error());
	309	ui_menu::stack_pop(machine());
	310	break;
	311	}
	312	}
	313	}

Property changes on: branches/new_menus/src/emu/ui/imgcntrl.c

Added: svn:mime-type    + text/plain Added: svn:eol-style    + native

branches/new_menus/src/emu/diimage.c

r29316	r29317
15	15	#include "zippath.h"
16	16	#include "ui/filesel.h"
17	17	#include "ui/swlist.h"
	18	#include "ui/imgcntrl.h"
18	19
19	20	//**************************************************************************
20	21	//  DEVICE CONFIG IMAGE INTERFACE
r29316	r29317
1327	1328	{
1328	1329	return auto_alloc_clear(machine, ui_menu_control_device_image(machine, container, this));
1329	1330	}
1330
1331		ui_menu_control_device_image::ui_menu_control_device_image(running_machine &machine, render_container *container, device_image_interface *_image) : ui_menu(machine, container)
1332		{
1333		image = _image;
1334
1335		sld = 0;
1336		if (image->software_list_name()) {
1337		software_list_device_iterator iter(machine.config().root_device());
1338		for (software_list_device *swlist = iter.first(); swlist != NULL; swlist = iter.next())
1339		{
1340		if (strcmp(swlist->list_name(),image->software_list_name())==0) sld = swlist;
1341		}
1342		}
1343		swi = image->software_entry();
1344		swp = image->part_entry();
1345
1346		if(swi)
1347		{
1348		state = START_OTHER_PART;
1349		current_directory.cpy(image->working_directory());
1350		}
1351		else
1352		{
1353		state = START_FILE;
1354
1355		/* if the image exists, set the working directory to the parent directory */
1356		if (image->exists())
1357		{
1358		current_file.cpy(image->filename());
1359		zippath_parent(current_directory, current_file);
1360		} else
1361		current_directory.cpy(image->working_directory());
1362
1363		/* check to see if the path exists; if not clear it */
1364		if (zippath_opendir(current_directory, NULL) != FILERR_NONE)
1365		current_directory.reset();
1366		}
1367		}
1368
1369		ui_menu_control_device_image::~ui_menu_control_device_image()
1370		{
1371		}
1372
1373
1374
1375
1376		/*-------------------------------------------------
1377		create_new_image - creates a new disk image
1378		-------------------------------------------------*/
1379
1380		void ui_menu_control_device_image::test_create(bool &can_create, bool &need_confirm)
1381		{
1382		astring path;
1383		osd_directory_entry *entry;
1384		osd_dir_entry_type file_type;
1385
1386		/* assemble the full path */
1387		zippath_combine(path, current_directory, current_file);
1388
1389		/* does a file or a directory exist at the path */
1390		entry = osd_stat(path);
1391		file_type = (entry != NULL) ? entry->type : ENTTYPE_NONE;
1392
1393		switch(file_type)
1394		{
1395		case ENTTYPE_NONE:
1396		/* no file/dir here - always create */
1397		can_create = true;
1398		need_confirm = false;
1399		break;
1400
1401		case ENTTYPE_FILE:
1402		/* a file exists here - ask for permission from the user */
1403		can_create = true;
1404		need_confirm = true;
1405		break;
1406
1407		case ENTTYPE_DIR:
1408		/* a directory exists here - we can't save over it */
1409		machine().ui().popup_time(5, "Cannot save over directory");
1410		can_create = false;
1411		need_confirm = false;
1412		break;
1413
1414		default:
1415		fatalerror("Unexpected\n");
1416		can_create = false;
1417		need_confirm = false;
1418		break;
1419		}
1420
1421		if (entry != NULL)
1422		osd_free(entry);
1423		}
1424
1425		void ui_menu_control_device_image::load_software_part()
1426		{
1427		astring temp_name(sld->list_name(), ":", swi->shortname(), ":", swp->name());
1428		hook_load(temp_name, true);
1429		}
1430
1431		void ui_menu_control_device_image::hook_load(astring name, bool softlist)
1432		{
1433		image->load(name);
1434		ui_menu::stack_pop(machine());
1435		}
1436
1437		void ui_menu_control_device_image::populate()
1438		{
1439		}
1440
1441		void ui_menu_control_device_image::handle()
1442		{
1443		switch(state) {
1444		case START_FILE: {
1445		bool can_create = false;
1446		if(image->is_creatable()) {
1447		zippath_directory *directory = NULL;
1448		file_error err = zippath_opendir(current_directory, &directory);
1449		can_create = err == FILERR_NONE && !zippath_is_zip(directory);
1450		if(directory)
1451		zippath_closedir(directory);
1452		}
1453		submenu_result = -1;
1454		ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_file_selector(machine(), container, image, current_directory, current_file, true, can_create, &submenu_result)));
1455		state = SELECT_FILE;
1456		break;
1457		}
1458
1459		case SELECT_ONE_PART:
1460		switch(submenu_result) {
1461		case ui_menu_software_parts::T_ENTRY: {
1462		load_software_part();
1463		ui_menu::stack_pop(machine());
1464		break;
1465		}
1466
1467		case -1: // return to list
1468		state = SELECT_SOFTLIST;
1469		break;
1470
1471		}
1472		break;
1473
1474		case SELECT_OTHER_PART:
1475		switch(submenu_result) {
1476		case ui_menu_software_parts::T_ENTRY: {
1477		load_software_part();
1478		break;
1479		}
1480
1481		case ui_menu_software_parts::T_FMGR:
1482		state = START_FILE;
1483		handle();
1484		break;
1485
1486		case -1: // return to system
1487		ui_menu::stack_pop(machine());
1488		break;
1489
1490		}
1491		break;
1492
1493		case SELECT_FILE:
1494		switch(submenu_result) {
1495		case ui_menu_file_selector::R_EMPTY:
1496		image->unload();
1497		ui_menu::stack_pop(machine());
1498		break;
1499
1500		case ui_menu_file_selector::R_FILE:
1501		hook_load(current_file, false);
1502		break;
1503
1504		case ui_menu_file_selector::R_CREATE:
1505		ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_file_create(machine(), container, image, current_directory, current_file)));
1506		state = CREATE_FILE;
1507		break;
1508
1509		case -1: // return to system
1510		ui_menu::stack_pop(machine());
1511		break;
1512		}
1513		break;
1514
1515		case CREATE_FILE: {
1516		bool can_create, need_confirm;
1517		test_create(can_create, need_confirm);
1518		if(can_create) {
1519		if(need_confirm) {
1520		ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_confirm_save_as(machine(), container, &create_confirmed)));
1521		state = CREATE_CONFIRM;
1522		} else {
1523		state = DO_CREATE;
1524		handle();
1525		}
1526		} else {
1527		state = START_FILE;
1528		handle();
1529		}
1530		break;
1531		}
1532
1533		case CREATE_CONFIRM: {
1534		state = create_confirmed ? DO_CREATE : START_FILE;
1535		handle();
1536		break;
1537		}
1538
1539		case DO_CREATE: {
1540		astring path;
1541		zippath_combine(path, current_directory, current_file);
1542		int err = image->create(path, 0, NULL);
1543		if (err != 0)
1544		popmessage("Error: %s", image->error());
1545		ui_menu::stack_pop(machine());
1546		break;
1547		}
1548		}
1549		}

branches/new_menus/src/emu/diimage.h

r29316	r29317
322	322	// iterator
323	323	typedef device_interface_iterator<device_image_interface> image_interface_iterator;
324	324
325		class ui_menu_control_device_image : public ui_menu {
326		public:
327		ui_menu_control_device_image(running_machine &machine, render_container *container, device_image_interface *image);
328		virtual ~ui_menu_control_device_image();
329		virtual void populate();
330		virtual void handle();
331
332		protected:
333		enum {
334		START_FILE, START_OTHER_PART, START_SOFTLIST, SELECT_PARTLIST, SELECT_ONE_PART, SELECT_OTHER_PART, SELECT_FILE, CREATE_FILE, CREATE_CONFIRM, DO_CREATE, SELECT_SOFTLIST,
335		LAST_ID
336		};
337		int state;
338
339		device_image_interface *image;
340		astring current_directory;
341		astring current_file;
342		int submenu_result;
343		bool create_confirmed;
344		bool softlist_done;
345		const software_info *swi;
346		const software_part *swp;
347		class software_list_device *sld;
348		astring software_info_name;
349
350		void test_create(bool &can_create, bool &need_confirm);
351		void load_software_part();
352		virtual void hook_load(astring filename, bool softlist);
353		};
354
355	325	#endif  /* __DIIMAGE_H__ */

branches/new_menus/src/emu/emu.mak

r29316	r29317
121	121	$(EMUOBJ)/ui/miscmenu.o \
122	122	$(EMUOBJ)/ui/selgame.o \
123	123	$(EMUOBJ)/ui/filesel.o \
	124	$(EMUOBJ)/ui/imgcntrl.o \
124	125	$(EMUOBJ)/ui/imginfo.o \
125	126	$(EMUOBJ)/ui/bbcontrl.o \
126	127	$(EMUOBJ)/ui/barcode.o \

branches/new_menus/src/mess/drivers/tandy2k.c

r29316	r29317
12	12
13	13	TODO:
14	14
15		- video
	15	- video (video RAM is at memory top - 0x1400, i.e. 0x1ec00)
	16	- DMA
	17	- floppy
16	18	- keyboard ROM
17	19	- hires graphics board
18		- floppy 720K DSQD
19		- DMA
20	20	- WD1010
21	21	- hard disk
22	22	- mouse
r29316	r29317
27	27
28	28	// Read/Write Handlers
29	29
	30	void tandy2k_state::update_drq()
	31	{
	32	int drq0 = CLEAR_LINE;
	33	int drq1 = CLEAR_LINE;
	34
	35	for (int i = 0; i < 4; i++)
	36	{
	37	if (BIT(m_dma_mux, 0 + i))
	38	{
	39	if (BIT(m_dma_mux, 4 + i))
	40	drq1 |= m_busdmarq[i];
	41	else
	42	drq0 |= m_busdmarq[i];
	43	}
	44	}
	45
	46	m_maincpu->drq0_w(drq0);
	47	m_maincpu->drq1_w(drq1);
	48	}
	49
30	50	void tandy2k_state::dma_request(int line, int state)
31	51	{
	52	m_busdmarq[line] = state;
	53	update_drq();
32	54	}
33	55
34	56	void tandy2k_state::speaker_update()
r29316	r29317
165	187	int dme = (drq0 > 2) || (drq1 > 2);
166	188
167	189	m_pic1->ir6_w(dme);
	190
	191	update_drq();
168	192	}
169	193
170	194	READ8_MEMBER( tandy2k_state::kbint_clr_r )
r29316	r29317
656	680
657	681	void tandy2k_state::machine_start()
658	682	{
659		// memory banking
660	683	address_space &program = m_maincpu->space(AS_PROGRAM);
661	684	UINT8 *ram = m_ram->pointer();
662	685	int ram_size = m_ram->size();
r29316	r29317
665	688
666	689	m_char_ram.allocate(0x1000);
667	690
	691	// HACK these should be connected to FDC HLD output
	692	m_floppy0->mon_w(0);
	693	m_floppy1->mon_w(0);
	694
668	695	// register for state saving
669	696	save_item(NAME(m_dma_mux));
670	697	save_item(NAME(m_kbdclk));
r29316	r29317
704	731	MCFG_DEVICE_ADDRESS_MAP(AS_0, vpac_mem)
705	732	MCFG_CRT9007_CHARACTER_WIDTH(10)
706	733	MCFG_CRT9007_INT_CALLBACK(DEVWRITELINE(I8259A_1_TAG, pic8259_device, ir1_w))
707		//MCFG_CRT9007_DMAR_CALLBACK(80186 HOLD)
708	734	MCFG_CRT9007_VS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_t, vsync_w))
709	735	MCFG_CRT9007_VLT_CALLBACK(WRITELINE(tandy2k_state, vpac_vlt_w))
710	736	MCFG_CRT9007_CURS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_t, cursor_w))
r29316	r29317
758	784	MCFG_PIC8259_ADD(I8259A_0_TAG, DEVWRITELINE(I80186_TAG, i80186_cpu_device, int0_w), VCC, NULL)
759	785	MCFG_PIC8259_ADD(I8259A_1_TAG, DEVWRITELINE(I80186_TAG, i80186_cpu_device, int1_w), VCC, NULL)
760	786	MCFG_I8272A_ADD(I8272A_TAG, true)
	787	downcast<i8272a_device *>(device)->set_select_lines_connected(true);
761	788	MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE(I8259A_0_TAG, pic8259_device, ir4_w))
762	789	MCFG_UPD765_DRQ_CALLBACK(WRITELINE(tandy2k_state, fdc_drq))
763	790	MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", floppy_image_device::default_floppy_formats)

branches/new_menus/src/mess/includes/tandy2k.h

r29316	r29317
95	95	m_centronics_perror(0),
96	96	m_centronics_busy(0)
97	97	{
	98	for (int i = 0; i < 4; i++)
	99	{
	100	m_busdmarq[i] = CLEAR_LINE;
	101	}
98	102	}
99	103
100	104	required_device<i80186_cpu_device> m_maincpu;
r29316	r29317
122	126
123	127	virtual void machine_start();
124	128
	129	void update_drq();
	130	void dma_request(int line, int state);
125	131	void speaker_update();
126		void dma_request(int line, int state);
127	132
128	133	DECLARE_READ8_MEMBER( char_ram_r );
129	134	DECLARE_WRITE8_MEMBER( char_ram_w );
r29316	r29317
173	178
174	179	/* DMA state */
175	180	UINT8 m_dma_mux;
	181	int m_busdmarq[4];
176	182
177	183	/* keyboard state */
178	184	int m_kbdclk;

Property changes on: branches/new_menus

Modified: svn:mergeinfo    Merged /trunk:r29311-29316

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team