Skip to content

Commit 9ece34e

Browse files
FirehawkeFirehawke
committed
Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame""
This reverts commit 5415544.
1 parent 5415544 commit 9ece34e

File tree

745 files changed

+24539
-13255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

745 files changed

+24539
-13255
lines changed

‎docs/source/license.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The MAME License
44

55
The MAME project as a whole is distributed under the terms of the `GNU General Public License, version 2 or later <http://opensource.org/licenses/GPL-2.0>`_ (GPL-2.0+), since it contains code made available under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the `BSD-3-Clause License <http://opensource.org/licenses/BSD-3-Clause>`_ and we would encourage new contributors to distribute files under this license.
66

7-
Please note that MAME is a registered trademark of Nicola Salmoria, and permission is required to use the "MAME" name, logo, or wordmark.
7+
Please note that MAME is a registered trademark of Gregory Ember, and permission is required to use the "MAME" name, logo, or wordmark.
88

99
Copyright (C) 1997-2017 MAMEDev and contributors
1010

‎docs/source/techspecs/device_rom_interface.rst

+20-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ as rom. In the region/block cases, banking is automatically handled.
1515
2. Setup
1616
--------
1717

18-
| **device_rom_interface**\ (const machine_config &mconfig, device_t &device, UINT8 addrwidth, endianness_t endian = ENDIANNESS_LITTLE, UINT8 datawidth = 8)
18+
| **device_rom_interface**\ (const machine_config &mconfig, device_t &device, u8 addrwidth, endianness_t endian = ENDIANNESS_LITTLE, u8 datawidth = 8)
1919
2020
The constructor of the interface wants, in addition to the standard
2121
parameters, the address bus width of the dedicated bus. In addition
@@ -41,7 +41,16 @@ rom description for the system, it will be automatically picked up as
4141
the connected rom. An address map has priority over the region if
4242
present in the machine config.
4343

44-
| void **set_rom**\ (const void \*base, UINT32 size);
44+
| void **set_rom_endianness**\ (endianness_t endian)
45+
| void **set_rom_data_width**\ (u8 width)
46+
| void **set_rom_addr_width**\ (u8 width)
47+
48+
These methods, intended for generic devices with indefinite hardware
49+
specifications, override the endianness, data bus width and address
50+
bus width assigned through the constructor. They must be called from
51+
within the device before **config_complete** time.
52+
53+
| void **set_rom**\ (const void \*base, u32 size);
4554
4655
At any time post- **interface_pre_start**, a memory block can be
4756
setup as the connected rom with that method. It overrides any
@@ -51,10 +60,10 @@ times.
5160
3. Rom access
5261
-------------
5362

54-
| UINT8 **read_byte**\ (offs_t byteaddress)
55-
| UINT16 **read_word**\ (offs_t byteaddress)
56-
| UINT32 **read_dword**\ (offs_t byteaddress)
57-
| UINT64 **read_qword**\ (offs_t byteaddress)
63+
| u8 **read_byte**\ (offs_t byteaddress)
64+
| u16 **read_word**\ (offs_t byteaddress)
65+
| u32 **read_dword**\ (offs_t byteaddress)
66+
| u64 **read_qword**\ (offs_t byteaddress)
5867
5968
These methods provide read access to the connected rom. Out-of-bounds
6069
access results in standard unmapped read logerror messages.
@@ -76,3 +85,8 @@ Using that interface makes the device derive from
7685
**device_memory_interface**. If the device wants to actually use the
7786
memory interface for itself, remember that AS_0/AS_PROGRAM is used by
7887
the rom interface, and don't forget to upcall **memory_space_config**.
88+
89+
For devices which have outputs that can be used to address ROMs but
90+
only to forward the data to another device for processing, it may be
91+
helpful to disable the interface when it is not required. This can be
92+
done by overriding **memory_space_config** to return an empty vector.

‎docs/source/whatis.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ MAME's purpose is to preserve decades of software history. As electronic technol
88
|
99
| **MAME(R)**
1010
| **Copyright (c) 1997-2017 by Nicola Salmoria and the MAME team**
11-
| **MAME is a trademark owned by Nicola Salmoria**
11+
| **MAME is a trademark owned by Gregory Ember**
1212
|
1313
1414

‎hash/fmtowns_cd.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -8614,7 +8614,6 @@ User/save disks that can be created from the game itself are not included.
86148614

86158615
<!--
86168616
Originally labeled as "mp3 source". It probably needs a redump.
8617-
Also, the floppy disk seems to be an overdump.
86188617
-->
86198618
<software name="sspirits">
86208619
<!--
@@ -8628,8 +8627,8 @@ User/save disks that can be created from the game itself are not included.
86288627
<info name="release" value="199509xx" />
86298628
<part name="flop1" interface="floppy_3_5">
86308629
<feature name="part_id" value="Boot Disk" />
8631-
<dataarea name="flop" size="1281280">
8632-
<rom name="samurai spirits (boot disk).bin" size="1281280" crc="2f1793ac" sha1="bd0f7f5f3fc4b0bd58d04812449cae853b58b5a8" offset="000000" />
8630+
<dataarea name="flop" size="1261568">
8631+
<rom name="samurai spirits (boot disk).bin" size="1261568" crc="7d10e903" sha1="5893035421003ce336e7516863c3c17a3ed86c0b" offset="000000" />
86338632
</dataarea>
86348633
</part>
86358634
<part name="cdrom" interface="fmt_cdrom">

‎hash/ibm5150.xml

+51-2
Original file line numberDiff line numberDiff line change
@@ -6168,8 +6168,57 @@ has been replaced with an all-zero block. -->
61686168
</part>
61696169
</software>
61706170

6171+
<software name="azurebndb" cloneof="azurebnd">
6172+
<description>Advanced Dungeons &amp; Dragons - Curse of the Azure Bonds (V1.0)</description>
6173+
<year>1989</year>
6174+
<publisher>SSI</publisher>
6175+
<info name="developer" value="SSI" />
6176+
<part name="flop1" interface="floppy_5_25">
6177+
<dataarea name="flop" size = "368640">
6178+
<rom name="Curse of the Azure Bonds (V1.0) [SSI] [1989] [5.25DD] [disk A].img" size="368640" crc="37a54248" sha1="81c63263b52a39d2e38ab1fb71ab4568fe1419c2" offset="0"/>
6179+
</dataarea>
6180+
</part>
6181+
<part name="flop2" interface="floppy_5_25">
6182+
<dataarea name="flop" size = "368640">
6183+
<rom name="Curse of the Azure Bonds (V1.0) [SSI] [1989] [5.25DD] [disk B].img" size="368640" crc="014bb852" sha1="73eea7540f6edc512ed89d73d7faefe0abd8400a" offset="0"/>
6184+
</dataarea>
6185+
</part>
6186+
<part name="flop3" interface="floppy_5_25">
6187+
<dataarea name="flop" size = "368640">
6188+
<rom name="Curse of the Azure Bonds (V1.0) [SSI] [1989] [5.25DD] [disk C].img" size="368640" crc="f86fea1b" sha1="b1e1f4daa42abb7738309bfc4afad65d2883a5e8" offset="0"/>
6189+
</dataarea>
6190+
</part>
6191+
<part name="flop4" interface="floppy_5_25">
6192+
<dataarea name="flop" size = "368640">
6193+
<rom name="Curse of the Azure Bonds (V1.0) [SSI] [1989] [5.25DD] [disk D].img" size="368640" crc="7aa75fa1" sha1="62659d805a255fa640e4a24ffb7dcff51a4da68e" offset="0"/>
6194+
</dataarea>
6195+
</part>
6196+
</software>
6197+
61716198
<software name="poolrad">
6172-
<description>Advanced Dungeons &amp; Dragons - Pool of Radiance</description>
6199+
<description>Advanced Dungeons &amp; Dragons - Pool of Radiance (5.25")</description>
6200+
<year>1988</year>
6201+
<publisher>SSI</publisher>
6202+
<info name="developer" value="SSI" />
6203+
<part name="flop1" interface="floppy_5_25">
6204+
<dataarea name="flop" size = "368640">
6205+
<rom name="Pool of Radiance [1988] [SSI] [5.25DD] [disk A].img" size="368640" crc="83b031fa" sha1="7b3bd9c4e37b925a9bed895317aefcfe1298f206" offset="0"/>
6206+
</dataarea>
6207+
</part>
6208+
<part name="flop2" interface="floppy_5_25">
6209+
<dataarea name="flop" size = "368640">
6210+
<rom name="Pool of Radiance [1988] [SSI] [5.25DD] [disk B].img" size="368640" crc="82ae7aed" sha1="71bc17c47ecbb42d650fc6797b8cccfba7876f99" offset="0"/>
6211+
</dataarea>
6212+
</part>
6213+
<part name="flop3" interface="floppy_5_25">
6214+
<dataarea name="flop" size = "368640">
6215+
<rom name="Pool of Radiance [1988] [SSI] [5.25DD] [disk C].img" size="368640" crc="c10a2962" sha1="0452af2639973bda8630cc5f13333e63f7677537" offset="0"/>
6216+
</dataarea>
6217+
</part>
6218+
</software>
6219+
6220+
<software name="poolrad35" cloneof="poolrad">
6221+
<description>Advanced Dungeons &amp; Dragons - Pool of Radiance (3.5")</description>
61736222
<year>1988</year>
61746223
<publisher>SSI</publisher>
61756224
<info name="version" value="1.2" />
@@ -8211,9 +8260,9 @@ has been replaced with an all-zero block. -->
82118260
<software name="nightmar">
82128261
<description>A Nightmare on Elm Street</description>
82138262
<year>1989</year>
8263+
<publisher>Monarch Software</publisher>
82148264
<info name="version" value="2.00" />
82158265
<info name="developer" value="Westwood Associates" />
8216-
<publisher>Monarch Software</publisher>
82178266
<part name="flop1" interface="floppy_5_25">
82188267
<dataarea name="flop" size = "368640">
82198268
<rom name="A Nightmare on Elm Street (USA) (v2.00) (Disk 1).img" size="368640" crc="fed37ad6" sha1="f0adcd8164d3bdc7bb2ca742067ce1cc3ea1a4c2" offset="0"/>

‎hash/ibm5170.xml

+110-1
Original file line numberDiff line numberDiff line change
@@ -4511,6 +4511,71 @@
45114511
</part>
45124512
</software>
45134513

4514+
<software name="gravutil">
4515+
<!-- included with UltraSound MAX card; includes Commander Keen 4 shareware -->
4516+
<description>Gravis Utilities V2.1</description>
4517+
<year>1993</year>
4518+
<publisher>Advanced Gravis</publisher>
4519+
<part name="flop1" interface="floppy_3_5">
4520+
<dataarea name="flop" size = "737280">
4521+
<rom name="GravisUtilities.img" size="737280" crc="35973f99" sha1="74a4bf84ba452f3d86420dcf28f9dd5b0d0aa19e" offset="0"/>
4522+
</dataarea>
4523+
</part>
4524+
</software>
4525+
4526+
<software name="ultrasnd">
4527+
<description>Gravis UltraSound (GUS) Installation - V3.53</description>
4528+
<year>1994</year>
4529+
<publisher>Advanced Gravis</publisher>
4530+
<part name="flop1" interface="floppy_3_5">
4531+
<dataarea name="flop" size = "1474560">
4532+
<rom name="353_Disk1.img" size="1474560" crc="d1a8b7ab" sha1="e0027ee4cc10077a97d1e21e250bf159253b345f" offset="0"/>
4533+
</dataarea>
4534+
</part>
4535+
<part name="flop2" interface="floppy_3_5">
4536+
<dataarea name="flop" size = "1474560">
4537+
<rom name="353_Disk2.img" size="1474560" crc="7b7e4f0e" sha1="1eb3fd5564dae4e5993a2c9f3398c5a260b197a5" offset="0"/>
4538+
</dataarea>
4539+
</part>
4540+
<part name="flop3" interface="floppy_3_5">
4541+
<dataarea name="flop" size = "1474560">
4542+
<rom name="353_Disk3.img" size="1474560" crc="c57f118e" sha1="715d5769729bc7b15b03748c1c63e092393dbfa6" offset="0"/>
4543+
</dataarea>
4544+
</part>
4545+
<part name="flop4" interface="floppy_3_5">
4546+
<dataarea name="flop" size = "1474560">
4547+
<rom name="353_Disk4.img" size="1474560" crc="1fafddb9" sha1="4cc40f709be068156b62029336acd03f7afa016b" offset="0"/>
4548+
</dataarea>
4549+
</part>
4550+
<part name="flop5" interface="floppy_3_5">
4551+
<dataarea name="flop" size = "1474560">
4552+
<rom name="353_Disk5.img" size="1474560" crc="c6f8c717" sha1="04f275b0e0cbb676cea73597a1516afae2eb4b9b" offset="0"/>
4553+
</dataarea>
4554+
</part>
4555+
<part name="flop6" interface="floppy_3_5">
4556+
<dataarea name="flop" size = "1474560">
4557+
<rom name="353_Disk6.img" size="1474560" crc="59b15abe" sha1="35e485e64dd4828a935a25a8cf71fcfb11d371ec" offset="0"/>
4558+
</dataarea>
4559+
</part>
4560+
</software>
4561+
4562+
<software name="gusbonus" supported="no">
4563+
<!-- includes WinSoft Sound Station, UltraSound Studio -->
4564+
<description>Gravis UltraSound BONUS Software Installation v. 1.52</description>
4565+
<year>1994</year>
4566+
<publisher>Advanced Gravis</publisher>
4567+
<part name="flop1" interface="floppy_3_5">
4568+
<dataarea name="flop" size = "1474560">
4569+
<rom name="bonus152_1.img" size="1474560" crc="b6fdc5b1" sha1="72c66435c1af013ccfe7be1031eeccc01311be31" offset="0"/>
4570+
</dataarea>
4571+
</part>
4572+
<part name="flop2" interface="floppy_3_5">
4573+
<dataarea name="flop" size = "1474560">
4574+
<rom name="bonus152_2.img" size="1474560" crc="af96295d" sha1="5927d4503dc27accc6602f01bfea1530b8af35a0" offset="0"/>
4575+
</dataarea>
4576+
</part>
4577+
</software>
4578+
45144579
<software name="hscd414">
45154580
<description>High-Speed CD-ROM Driver (Version 4.14)</description>
45164581
<year>199?</year>
@@ -9374,9 +9439,9 @@
93749439
<!-- Dumped via Kryoflux from original disks, all tracks show as modified -->
93759440
<description>WarCraft - Orcs &amp; Humans</description>
93769441
<year>1994</year>
9442+
<publisher>Interplay</publisher>
93779443
<info name="version" value="1.05" />
93789444
<info name="developer" value="Blizzard Entertainment" />
9379-
<publisher>Interplay</publisher>
93809445
<part name="flop1" interface="floppy_3_5">
93819446
<dataarea name="flop" size = "1474560">
93829447
<rom name="[PC] Warcraft Orcs and Humans [3.5HD] [Disk 1 of 4].img" size="1474560" crc="528d9208" sha1="4a3fb4cf21acce1a51754e4cdd29d906d6cff6c4" offset="0"/>
@@ -10146,4 +10211,48 @@
1014610211
</part>
1014710212
</software>
1014810213

10214+
<software name="l123r3">
10215+
<!-- missing all other disks -->
10216+
<description>Lotus 1-2-3 Release 3</description>
10217+
<year>1989</year>
10218+
<publisher>Lotus Development</publisher>
10219+
<part name="flop1" interface="floppy_3_5">
10220+
<!--
10221+
Lotus 1-2-3 Release 3
10222+
Drivers Disk 2
10223+
10224+
(C) Copyright 1989 Lotus Development Corporation.
10225+
All rights reserved. Part No. 100007L
10226+
-->
10227+
<feature name="part_id" value="Drivers Disk 2"/>
10228+
<dataarea name="flop" size="737280">
10229+
<rom name="100007l.img" size="737280" crc="bd2be994" sha1="3c3a3bcbf5b4b4a037ab896c5a607a930f7536fe" offset="0"/>
10230+
</dataarea>
10231+
</part>
10232+
</software>
10233+
10234+
<software name="ontrakdm">
10235+
<description>Ontrack Disk Manager</description>
10236+
<year>1997</year>
10237+
<publisher>Quantum Data Systems</publisher>
10238+
<part name="flop1" interface="floppy_3_5">
10239+
<!--
10240+
Ontrack Disk Manager
10241+
For Quantum ATA (IDE) Disk Drives
10242+
Quantum(TM)
10243+
Capacity for the Extraordinary(TM)
10244+
10245+
Supports ATA disk drives greater than 528 MB under DOS, Windows 3.1X, Windows 95, Windows NT and OS/2
10246+
10247+
For detailed installation instructions and to view the on-line manual: insert Disk Manager diskette and type "A: HELP". This diskette is bootable with Ontrack's OS Boot Kernel.
10248+
10249+
Rev. G
10250+
Quantum P/N: 77-109028-01
10251+
-->
10252+
<dataarea name="flop" size="1474560">
10253+
<rom name="77-109028-01.img" size="1474560" crc="565510f6" sha1="d862aec61ee23e9499db92b1d955c01939eabdeb" offset="0"/>
10254+
</dataarea>
10255+
</part>
10256+
</software>
10257+
1014910258
</softwarelist>

0 commit comments

Comments
 (0)