diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-02-19 14:09:07 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-02-19 14:09:07 +0000 |
commit | 2c4fdd2625b0421815779363a1cf19c500b391ff (patch) | |
tree | ef4a1d1ce85fde1508035b21bd4b11f4bd64fbfa /src | |
parent | e1de7b7db139b311f1d8e1ec36d9d3361213164d (diff) |
Added possibility to see subslot devices when they are added from softlist, also removed "const" from get_default_card_software, that enable better usage and no need for it to be like that (no whatsnew)
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/dislot.h | 2 | ||||
-rw-r--r-- | src/emu/emuopts.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/emu/dislot.h b/src/emu/dislot.h index bdc7413dc92..911cae86462 100644 --- a/src/emu/dislot.h +++ b/src/emu/dislot.h @@ -49,7 +49,7 @@ public: static void static_set_slot_info(device_t &device, const slot_interface *slots_info, const char *default_card,const input_device_default *default_input); const slot_interface* get_slot_interfaces() const { return m_slot_interfaces; }; const char * get_default_card(const machine_config &config, emu_options &options) const { return m_default_card; }; - virtual const char * get_default_card_software(const machine_config &config, emu_options &options) const { return NULL; }; + virtual const char * get_default_card_software(const machine_config &config, emu_options &options) { return NULL; }; const input_device_default *input_ports_defaults() const { return m_input_defaults; } device_t* get_card_device(); protected: diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index a7bdd44c686..38c9e44126a 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -374,6 +374,7 @@ bool emu_options::parse_slot_devices(int argc, char *argv[], astring &error_stri } result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); update_slot_options(); + while (add_slot_options(false)); add_device_options(true); result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); return result; @@ -504,6 +505,7 @@ void emu_options::set_system_name(const char *name) // then add the options add_device_options(true); update_slot_options(); + while (add_slot_options(false)); add_device_options(true); } } |