Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Added ability to add optional or required device/ioport/memory_region/... [Miodrag Milanovic]

Browse Source 
and similar device finders to any device, and also created ability to 
set tag inside static configuration of device so you can reference it in
driver machine configuration
This commit is contained in:
Miodrag Milanovic 2014-02-15 08:39:53 +00:00
parent 8eccd21187
commit 292d16c120
5 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/devfind.c
View File

@ -68,6 +68,12 @@ void *finder_base::find_memory(UINT8 width, size_t &bytes, bool required)
bool finder_base::report_missing(bool found, const char *objname, bool required)
{
if (required && strcmp(m_tag, FINDER_DUMMY_TAG)==0)
{
mame_printf_error("Tag not defined for required device\n");
return false;
}
// just pass through in the found case
if (found)
return true;

28
src/emu/devfind.h
View File

@ -17,6 +17,7 @@
#ifndef __DEVFIND_H__
#define __DEVFIND_H__
#define FINDER_DUMMY_TAG "finder_dummy_tag"
//**************************************************************************
// TYPE DEFINITIONS
@ -37,6 +38,9 @@ public:
// getters
virtual bool findit(bool isvalidation = false) = 0;
// setter for setting the object
void set_tag(const char *tag) { m_tag = tag; }
protected:
// helpers
void *find_memory(UINT8 width, size_t &bytes, bool required);
@ -110,7 +114,7 @@ template<class _DeviceClass>
class optional_device : public device_finder<_DeviceClass, false>
{
public:
optional_device(device_t &base, const char *tag) : device_finder<_DeviceClass, false>(base, tag) { }
optional_device(device_t &base, const char *tag = FINDER_DUMMY_TAG) : device_finder<_DeviceClass, false>(base, tag) { }
};
// required devices are similar but throw an error if they are not found
@ -118,7 +122,7 @@ template<class _DeviceClass>
class required_device : public device_finder<_DeviceClass, true>
{
public:
required_device(device_t &base, const char *tag) : device_finder<_DeviceClass, true>(base, tag) { }
required_device(device_t &base, const char *tag = FINDER_DUMMY_TAG) : device_finder<_DeviceClass, true>(base, tag) { }
};
@ -149,14 +153,14 @@ public:
class optional_memory_region : public memory_region_finder<false>
{
public:
optional_memory_region(device_t &base, const char *tag) : memory_region_finder<false>(base, tag) { }
optional_memory_region(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_region_finder<false>(base, tag) { }
};
// required devices are similar but throw an error if they are not found
class required_memory_region : public memory_region_finder<true>
{
public:
required_memory_region(device_t &base, const char *tag) : memory_region_finder<true>(base, tag) { }
required_memory_region(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_region_finder<true>(base, tag) { }
};
@ -187,14 +191,14 @@ public:
class optional_memory_bank : public memory_bank_finder<false>
{
public:
optional_memory_bank(device_t &base, const char *tag) : memory_bank_finder<false>(base, tag) { }
optional_memory_bank(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_bank_finder<false>(base, tag) { }
};
// required devices are similar but throw an error if they are not found
class required_memory_bank : public memory_bank_finder<true>
{
public:
required_memory_bank(device_t &base, const char *tag) : memory_bank_finder<true>(base, tag) { }
required_memory_bank(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_bank_finder<true>(base, tag) { }
};
@ -225,14 +229,14 @@ public:
class optional_ioport : public ioport_finder<false>
{
public:
optional_ioport(device_t &base, const char *tag) : ioport_finder<false>(base, tag) { }
optional_ioport(device_t &base, const char *tag = FINDER_DUMMY_TAG) : ioport_finder<false>(base, tag) { }
};
// required devices are similar but throw an error if they are not found
class required_ioport : public ioport_finder<true>
{
public:
required_ioport(device_t &base, const char *tag) : ioport_finder<true>(base, tag) { }
required_ioport(device_t &base, const char *tag = FINDER_DUMMY_TAG) : ioport_finder<true>(base, tag) { }
};
@ -293,7 +297,7 @@ template<class _PointerType>
class optional_shared_ptr : public shared_ptr_finder<_PointerType, false>
{
public:
optional_shared_ptr(device_t &base, const char *tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, false>(base, tag, width) { }
optional_shared_ptr(device_t &base, const char *tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, false>(base, tag, width) { }
};
// required shared pointer finder
@ -301,7 +305,7 @@ template<class _PointerType>
class required_shared_ptr : public shared_ptr_finder<_PointerType, true>
{
public:
required_shared_ptr(device_t &base, const char *tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, true>(base, tag, width) { }
required_shared_ptr(device_t &base, const char *tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, true>(base, tag, width) { }
};
@ -342,7 +346,7 @@ template<class _PointerType, int _Count>
class optional_shared_ptr_array : public shared_ptr_array_finder<_PointerType, _Count, false>
{
public:
optional_shared_ptr_array(device_t &base, const char *tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, false>(base, tag, width) { }
optional_shared_ptr_array(device_t &base, const char *tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, false>(base, tag, width) { }
};
// required shared pointer array finder
@ -350,7 +354,7 @@ template<class _PointerType, int _Count>
class required_shared_ptr_array : public shared_ptr_array_finder<_PointerType, _Count, true>
{
public:
required_shared_ptr_array(device_t &base, const char *tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, true>(base, tag, width) { }
required_shared_ptr_array(device_t &base, const char *tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, true>(base, tag, width) { }
};

2
src/emu/device.c
View File

@ -361,7 +361,7 @@ void device_t::set_machine(running_machine &machine)
// list and return status
//-------------------------------------------------
bool device_t::findit(bool isvalidation)
bool device_t::findit(bool isvalidation) const
{
bool allfound = true;
for (finder_base *autodev = m_auto_finder_list; autodev != NULL; autodev = autodev->m_next)

2
src/emu/device.h
View File

@ -211,7 +211,7 @@ public:
void set_default_bios(UINT8 bios) { m_default_bios = bios; }
void set_system_bios(UINT8 bios) { m_system_bios = bios; }
bool findit(bool isvalidation = false);
bool findit(bool isvalidation = false) const;
protected:
// miscellaneous helpers

6
src/emu/validity.c
View File

@ -1067,7 +1067,11 @@ void validity_checker::validate_devices()
{
int_map device_map;
m_current_config->root_device().findit(true);
device_iterator iter_find(m_current_config->root_device());
for (const device_t *device = iter_find.first(); device != NULL; device = iter_find.next())
{
device->findit(true);
}
// iterate over devices
device_iterator iter(m_current_config->root_device());