Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

nascom2: Moved floppy softlist to machine and fixed validation (nw)

Browse source
This commit is contained in:
Nigel Barnes 2017-05-06 18:40:40 +01:00
parent 6ddf273b3d
commit 731fbe59b3
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hash/nascom_flop.xml
View file

@ -14,7 +14,7 @@
</part>
</software>
<software name="avc-demo">
<software name="avcdemo">
<description>AVC Demo Disk</description>
<year>1982</year>
<publisher>Lucas Logic</publisher>
@ -47,7 +47,7 @@
</part>
</software>
<software name="nas-sem">
<software name="nassem">
<description>NAS-Sembler 1.5</description>
<year>1982</year>
<publisher>Lucas Logic</publisher>

3
src/devices/bus/nasbus/floppy.cpp
View file

@ -9,7 +9,6 @@
#include "emu.h"
#include "floppy.h"
#include "formats/nascom_dsk.h"
#include "softlist.h"
//**************************************************************************
// CONSTANTS/MACROS
@ -46,8 +45,6 @@ static MACHINE_CONFIG_FRAGMENT( nascom_fdc )
MCFG_FLOPPY_DRIVE_ADD("fd1793:1", nascom_floppies, "55f", nascom_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:2", nascom_floppies, nullptr, nascom_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:3", nascom_floppies, nullptr, nascom_fdc_device::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("floppy_list", "nascom_flop")
MACHINE_CONFIG_END
machine_config_constructor nascom_fdc_device::device_mconfig_additions() const

6
src/mame/drivers/nascom1.cpp
View file

@ -705,8 +705,6 @@ static MACHINE_CONFIG_DERIVED_CLASS( nascom2, nascom1, nascom2_state )
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_LOAD(nascom2_state, socket2_load)
MCFG_SOFTWARE_LIST_ADD("socket_list", "nascom_socket")
// nasbus expansion bus
MCFG_NASBUS_ADD(NASBUS_TAG)
MCFG_NASBUS_RAM_DISABLE_HANDLER(WRITELINE(nascom2_state, ram_disable_w))
@ -714,6 +712,10 @@ static MACHINE_CONFIG_DERIVED_CLASS( nascom2, nascom1, nascom2_state )
MCFG_NASBUS_SLOT_ADD("nasbus2", nasbus_slot_cards, nullptr)
MCFG_NASBUS_SLOT_ADD("nasbus3", nasbus_slot_cards, nullptr)
MCFG_NASBUS_SLOT_ADD("nasbus4", nasbus_slot_cards, nullptr)
// software
MCFG_SOFTWARE_LIST_ADD("socket_list", "nascom_socket")
MCFG_SOFTWARE_LIST_ADD("floppy_list", "nascom_flop")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( nascom2c, nascom2, nascom2_state )