Skip to content

Commit

Permalink
Cleanups and version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmicko
mmicko committed May 27, 2015
1 parent e5caefb commit 64e16ca
Show file tree
Hide file tree
Showing 141 changed files with 1,529 additions and 1,545 deletions.
2 changes: 1 addition & 1 deletion hash/ibm5170_cdrom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<description>Acer CPR</description>
<year>1995</year>
<publisher>Acer America Corporation</publisher>
<info name="version" value="1.2a" /> <!-- floppy version 1.2a, CD version 1.2 -->
<info name="version" value="1.2a" /> <!-- floppy version 1.2a, CD version 1.2 -->

<part name="flop1" interface="floppy_3_5">
<feature name="disk_label" value="Hard Drive Recovery Start-Up Diskette" />
Expand Down
14 changes: 7 additions & 7 deletions hash/msx1_flop.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ The following floppies came with the machines.
<!--

Games, Programs, Etc.
These all had a disk release, according to http://www.generation-msx.nl/ but we have no confirmation about these dumps coming
These all had a disk release, according to http://www.generation-msx.nl/ but we have no confirmation about these dumps coming
from original disks: more investigations are definitely needed!!

-->
Expand Down Expand Up @@ -1523,7 +1523,7 @@ The following floppies came with the machines.



<!--
<!--

Coverdisks

Expand Down Expand Up @@ -1558,9 +1558,9 @@ The following floppies came with the machines.



<!--
<!--

Homebrew / Doujin
Homebrew / Doujin

-->

Expand Down Expand Up @@ -1856,7 +1856,7 @@ The following floppies came with the machines.



<!--
<!--

Sets below are hacked games "converted" from their original format (carts or tapes) into disks
However, we currently don't have the real dumps for these so we keep them in disk format for the moment
Expand All @@ -1878,7 +1878,7 @@ The following floppies came with the machines.
<software name="3dwater">
<description>3D Water Driver (Jpn)</description>
<year>19??</year>
<publisher>&lt;tape2disk hack&gt;</publisher> <!-- or maybe cart2disk -->
<publisher>&lt;tape2disk hack&gt;</publisher> <!-- or maybe cart2disk -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="737280">
Expand Down Expand Up @@ -4059,7 +4059,7 @@ The following floppies came with the machines.
</software>


<!--
<!--

Sets below are hacked games "converted" from their original format (carts or tapes) into disks
Such information has been retrieved from websites like http://www.generation-msx.nl/ and http://msx.jpn.org/tagoo/
Expand Down
28 changes: 14 additions & 14 deletions hash/msx2_flop.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ The following floppies came with the machines.
<!--

Games, Programs, Etc.
These all had a disk release, according to http://www.generation-msx.nl/ but we have no confirmation about these dumps coming
These all had a disk release, according to http://www.generation-msx.nl/ but we have no confirmation about these dumps coming
from original disks: more investigations are definitely needed!!

-->
Expand Down Expand Up @@ -375,8 +375,8 @@ The following floppies came with the machines.
<rom name="snatcher (1988)(konami)(jp)(disk 3 of 3)[scc+].dsk" size="737280" crc="35e70ac9" sha1="c653d9aab4fdda14ab92490972783f7b9d3ceb1a" offset="0" />
</dataarea>
</part>
<!-- This is the sound cartridge that came with the game Snatcher. This sound cartridge
can also be used with the MSX Game Collections from Konami. -->
<!-- This is the sound cartridge that came with the game Snatcher. This sound cartridge
can also be used with the MSX Game Collections from Konami. -->
<part name="cart" interface="msx_cart">
<feature name="slot" value="sound_snatcher" />
<dataarea name="ram" size="65536">
Expand All @@ -403,8 +403,8 @@ The following floppies came with the machines.
<rom name="snatcher (1988)(konami)(jp)(disk 3 of 3)[scc+].dsk" size="737280" crc="35e70ac9" sha1="c653d9aab4fdda14ab92490972783f7b9d3ceb1a" offset="0" />
</dataarea>
</part>
<!-- This is the sound cartridge that came with the game Snatcher. This sound cartridge
can also be used with the MSX Game Collections from Konami. -->
<!-- This is the sound cartridge that came with the game Snatcher. This sound cartridge
can also be used with the MSX Game Collections from Konami. -->
<part name="cart" interface="msx_cart">
<feature name="slot" value="sound_snatcher" />
<dataarea name="ram" size="65536">
Expand All @@ -431,8 +431,8 @@ The following floppies came with the machines.
<rom name="super deform snatcher (1990)(konami)(jp)(disk 3 of 3)[scc+].dsk" size="737280" crc="0547bb3a" sha1="e4b1b5f8b7ea4532551c103164860c8802151131" offset="0" />
</dataarea>
</part>
<!-- This is the sound cartridge that came with the game SD Snatcher. This sound cartridge
can _not_ be used with the MSX Game Collections from Konami. -->
<!-- This is the sound cartridge that came with the game SD Snatcher. This sound cartridge
can _not_ be used with the MSX Game Collections from Konami. -->
<part name="cart" interface="msx_cart">
<feature name="slot" value="sound_sdsnatch" />
<dataarea name="ram" size="65536">
Expand All @@ -459,8 +459,8 @@ The following floppies came with the machines.
<rom name="super deform snatcher (1990)(konami)(jp)(disk 3 of 3)[scc+].dsk" size="737280" crc="0547bb3a" sha1="e4b1b5f8b7ea4532551c103164860c8802151131" offset="0" />
</dataarea>
</part>
<!-- This is the sound cartridge that came with the game SD Snatcher. This sound cartridge
can _not_ be used with the MSX Game Collections from Konami. -->
<!-- This is the sound cartridge that came with the game SD Snatcher. This sound cartridge
can _not_ be used with the MSX Game Collections from Konami. -->
<part name="cart" interface="msx_cart">
<feature name="slot" value="sound_sdsnatch" />
<dataarea name="ram" size="65536">
Expand Down Expand Up @@ -13058,7 +13058,7 @@ The following floppies came with the machines.



<!--
<!--

HOMEBREW

Expand Down Expand Up @@ -16047,7 +16047,7 @@ HOMEBREW
</software>


<!--
<!--

DISKMAG

Expand Down Expand Up @@ -16701,7 +16701,7 @@ DISKMAG



<!--
<!--

Sets below are hacked games "converted" from their original format (carts or tapes) into disks
However, we currently don't have the real dumps for these so we keep them in disk format for the moment
Expand Down Expand Up @@ -16769,7 +16769,7 @@ DISKMAG



<!--
<!--

Sets below are hacked games "converted" from their original format (carts or tapes) into disks
Such information has been retrieved from websites like http://www.generation-msx.nl/ and http://msx.jpn.org/tagoo/
Expand Down Expand Up @@ -17350,7 +17350,7 @@ DISKMAG
</dataarea>
</part>
</software>

<software name="fantzon2">
<description>Fantasy Zone II - The Tears of Opa-Opa (Jpn)</description>
<year>19??</year>
Expand Down
4 changes: 2 additions & 2 deletions src/emu/bus/cbmiec/c1541.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
// ======================> c1541_base_t

class c1541_base_t : public device_t,
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
{
public:
// construction/destruction
Expand Down
4 changes: 2 additions & 2 deletions src/emu/bus/cbmiec/c1571.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
// ======================> c1571_t

class c1571_t : public device_t,
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
{
public:
// construction/destruction
Expand Down
2 changes: 1 addition & 1 deletion src/emu/bus/cbmiec/c1581.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// ======================> c1581_t

class c1581_t : public device_t,
public device_cbm_iec_interface
public device_cbm_iec_interface
{
public:
// construction/destruction
Expand Down
2 changes: 1 addition & 1 deletion src/emu/bus/cbmiec/interpod.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
// ======================> interpod_device

class interpod_device : public device_t,
public device_cbm_iec_interface
public device_cbm_iec_interface
{
public:
// construction/destruction
Expand Down
50 changes: 25 additions & 25 deletions src/emu/bus/cgenie/expansion/expansion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
50-pin slot
1 GND 26 /MREQ
2 A8 27 /WR
3 A7 28 /C4
4 A6 29 (not used)
5 A9 30 /C1
6 A5 31 BD3
7 A4 32 /C3
8 A3 33 (not used)
9 A10 34 /C2
10 A2 35 DB6
11 A11 36 /RD
12 A1 37 BD4
13 A0 38 (not used)
14 A12 39 BD7
15 A14 40 (not used)
16 A13 41 BD5
17 /RFSH 42 (not useD)
18 A15 43 BD0
19 /INT 44 (not used)
20 /BUSRQ 45 BD2
21 /NMI 46 /RESET
22 /WAIT 47 /M1
23 /HALT 48 /IORQ
24 /BUSAK 49 BD1
25 /ROMDIS 50 +5V
1 GND 26 /MREQ
2 A8 27 /WR
3 A7 28 /C4
4 A6 29 (not used)
5 A9 30 /C1
6 A5 31 BD3
7 A4 32 /C3
8 A3 33 (not used)
9 A10 34 /C2
10 A2 35 DB6
11 A11 36 /RD
12 A1 37 BD4
13 A0 38 (not used)
14 A12 39 BD7
15 A14 40 (not used)
16 A13 41 BD5
17 /RFSH 42 (not useD)
18 A15 43 BD0
19 /INT 44 (not used)
20 /BUSRQ 45 BD2
21 /NMI 46 /RESET
22 /WAIT 47 /M1
23 /HALT 48 /IORQ
24 /BUSAK 49 BD1
25 /ROMDIS 50 +5V
***************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion src/emu/bus/cgenie/expansion/floppy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static MACHINE_CONFIG_FRAGMENT( cgenie_fdc )
MCFG_FLOPPY_DRIVE_ADD("fd1793:2", cgenie_floppies, NULL, cgenie_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:3", cgenie_floppies, NULL, cgenie_fdc_device::floppy_formats)

// MCFG_SOFTWARE_LIST_ADD("floppy_list", "cgenie_flop")
// MCFG_SOFTWARE_LIST_ADD("floppy_list", "cgenie_flop")

MCFG_GENERIC_SOCKET_ADD("socket", generic_plain_slot, "cgenie_socket")
MCFG_GENERIC_EXTENSIONS("bin,rom")
Expand Down
20 changes: 10 additions & 10 deletions src/emu/bus/cgenie/parallel/parallel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
20-pin slot
1 GND 11 IOB2
2 +12V 12 IOB1
3 IOA3 13 IOB0
4 IOA4 14 IOB3
5 IOA0 15 IOB4
6 IOA5 16 IOB5
7 IOA1 17 IOB7
8 IOA2 18 IOB6
9 IOA7 19 +5V
10 IOA6 20 -12V
1 GND 11 IOB2
2 +12V 12 IOB1
3 IOA3 13 IOB0
4 IOA4 14 IOB3
5 IOA0 15 IOB4
6 IOA5 16 IOB5
7 IOA1 17 IOB7
8 IOA2 18 IOB6
9 IOA7 19 +5V
10 IOA6 20 -12V
***************************************************************************/

Expand Down
13 changes: 6 additions & 7 deletions src/emu/bus/cpc/brunword4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// copyright-holders:Barry Rodewald
/*
Brunword MK4 - Word processor ROM / expansion
Brunword MK4 - Word processor ROM / expansion
Software is provided as an expansion device, which uses it own ROM mapping
Software is provided as an expansion device, which uses it own ROM mapping
The ROM select port will be handled by this device, calling back to the standard driver when necessary.
Not enabled for the CPC Plus, as ROM selection wraps after 63, making it impossible to see cartridge
banks in the upper ROM area (0x80-0xff)
The ROM select port will be handled by this device, calling back to the standard driver when necessary.
Not enabled for the CPC Plus, as ROM selection wraps after 63, making it impossible to see cartridge
banks in the upper ROM area (0x80-0xff)
*/

#include "brunword4.h"
Expand All @@ -21,7 +21,7 @@ ROM_START( cpc_brunword4 )
ROM_LOAD( "brunw-c1.rom", 0x0000, 0x4000, CRC(3200299b) SHA1(d7d5fcacf3c6707a6629b0c65564ac44267d2b49) )
ROM_LOAD( "brunw-c2.rom", 0x4000, 0x4000, CRC(aa19aff1) SHA1(5aa4e87ae6ad2063540e3f5179298657bbd82bfb) )
ROM_LOAD( "brunw-c3.rom", 0x8000, 0x4000, CRC(eabe60fe) SHA1(41f605f1e1b5e2bc7dcbd702f2d202ab4d2f44ec) )

ROM_REGION( 0x80000, "mk4_roms", 0 )
ROM_LOAD( "brunw-c0.rom", 0x0000, 0x4000, CRC(45493337) SHA1(a971e2e63adb004c605cf642edde828e8b3ab897) )
ROM_LOAD( "brunw-c1.rom", 0x4000, 0x4000, CRC(3200299b) SHA1(d7d5fcacf3c6707a6629b0c65564ac44267d2b49) )
Expand Down Expand Up @@ -108,4 +108,3 @@ void cpc_brunword4_device::set_mapping()
membank(":bank4")->set_base(ROM+((bank*0x4000) + 0x2000));
}
}

7 changes: 3 additions & 4 deletions src/emu/bus/cpc/brunword4.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// copyright-holders:Barry Rodewald
/*
Brunword MK4 - Word processor ROM / expansion
Brunword MK4 - Word processor ROM / expansion
*/

Expand All @@ -21,19 +21,18 @@ class cpc_brunword4_device : public device_t,

DECLARE_WRITE8_MEMBER(rombank_w);
virtual void set_mapping();

protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();

private:
cpc_expansion_slot_device *m_slot;

bool m_rombank_active;
UINT8 m_bank_sel;
};

// device type definition
extern const device_type CPC_BRUNWORD_MK4;

Loading

0 comments on commit 64e16ca

Please sign in to comment.