real fix (nw)

This commit is contained in:
Miodrag Milanovic 2016-02-08 19:29:42 +01:00
parent ae55e9ffcb
commit a29920336d
4 changed files with 21 additions and 6 deletions

View File

@ -2558,3 +2558,17 @@ if (BUSES["CGENIE_PARALLEL"]~=null) then
MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.h", MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.h",
} }
end end
---------------------------------------------------
--
--@src/devices/bus/m5/slot.h,BUSES["M5"] = true
---------------------------------------------------
if (BUSES["M5"]~=null) then
files {
MAME_DIR .. "src/devices/bus/m5/slot.cpp",
MAME_DIR .. "src/devices/bus/m5/slot.h",
MAME_DIR .. "src/devices/bus/m5/rom.cpp",
MAME_DIR .. "src/devices/bus/m5/rom.h",
}
end

View File

@ -619,6 +619,7 @@ BUSES["ISA"] = true
BUSES["ISBX"] = true BUSES["ISBX"] = true
BUSES["KC"] = true BUSES["KC"] = true
BUSES["LPCI"] = true BUSES["LPCI"] = true
BUSES["M5"] = true
BUSES["MACPDS"] = true BUSES["MACPDS"] = true
BUSES["MIDI"] = true BUSES["MIDI"] = true
BUSES["MEGADRIVE"] = true BUSES["MEGADRIVE"] = true

View File

@ -210,7 +210,7 @@ bool m5_cart_slot_device::call_load()
bool m5_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) bool m5_cart_slot_device::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
{ {
load_software_part_region(*this, swlist, swname, start_entry); machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
return TRUE; return TRUE;
} }
@ -219,12 +219,13 @@ bool m5_cart_slot_device::call_softlist_load(software_list_device &swlist, const
get default card software get default card software
-------------------------------------------------*/ -------------------------------------------------*/
void m5_cart_slot_device::get_default_card_software(std::string &result) std::string m5_cart_slot_device::get_default_card_software()
{ {
std::string result;
if (open_image_file(mconfig().options())) if (open_image_file(mconfig().options()))
{ {
const char *slot_string = "std"; const char *slot_string = "std";
UINT32 size = core_fsize(m_file); //UINT32 size = core_fsize(m_file);
int type = M5_STD; int type = M5_STD;
@ -234,10 +235,10 @@ void m5_cart_slot_device::get_default_card_software(std::string &result)
clear(); clear();
result.assign(slot_string); result.assign(slot_string);
return; return result;
} }
software_get_default_slot(result, "std"); return software_get_default_slot("std");
} }
/*------------------------------------------------- /*-------------------------------------------------

View File

@ -93,7 +93,6 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom); virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_READ8_MEMBER(read_ram); virtual DECLARE_READ8_MEMBER(read_ram);
virtual DECLARE_WRITE8_MEMBER(write_ram); virtual DECLARE_WRITE8_MEMBER(write_ram);
virtual DECLARE_SETOFFSET_MEMBER (read_off);
protected: protected: