summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/memory.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-26 10:07:49 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-26 10:07:49 +0000
commitea8a131e0da506fc64d4502eaff6cbb036042861 (patch)
tree3cd2f4a0df61b5e0a80cf1af39d2b8f1898bdec0 /src/emu/memory.h
parentacf55c87ef189fc7cb45432d435eca5fef07c9cb (diff)
Moved device_delegates into their own files. Employed a
non-templatized helper class so that the code can live co-located, rather than invading device.h. Changed the read/write delegates to derive from device_delegate. Updated the address map macros to create these properly. Removed remnants of the old AM_BASE/SIZE macros from the memory system.
Diffstat (limited to 'src/emu/memory.h')
-rw-r--r--src/emu/memory.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 7ee9001a94b..3646002824e 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -105,10 +105,10 @@ class address_table_write;
typedef UINT32 offs_t;
// address map constructors are functions that build up an address_map
-typedef void (*address_map_constructor)(address_map &map, const device_t &devconfig);
+typedef void (*address_map_constructor)(address_map &map, device_t &devconfig);
// submap retriever delegate
-typedef delegate<void (address_map &, const device_t &)> address_map_delegate;
+typedef delegate<void (address_map &, device_t &)> address_map_delegate;
// legacy space read/write handlers
@@ -162,19 +162,19 @@ typedef delegate<offs_t (direct_read_data &, offs_t)> direct_update_delegate;
// ======================> read_delegate
// declare delegates for each width
-typedef delegate<UINT8 (address_space &, offs_t, UINT8)> read8_delegate;
-typedef delegate<UINT16 (address_space &, offs_t, UINT16)> read16_delegate;
-typedef delegate<UINT32 (address_space &, offs_t, UINT32)> read32_delegate;
-typedef delegate<UINT64 (address_space &, offs_t, UINT64)> read64_delegate;
+typedef device_delegate<UINT8 (address_space &, offs_t, UINT8)> read8_delegate;
+typedef device_delegate<UINT16 (address_space &, offs_t, UINT16)> read16_delegate;
+typedef device_delegate<UINT32 (address_space &, offs_t, UINT32)> read32_delegate;
+typedef device_delegate<UINT64 (address_space &, offs_t, UINT64)> read64_delegate;
// ======================> write_delegate
// declare delegates for each width
-typedef delegate<void (address_space &, offs_t, UINT8, UINT8)> write8_delegate;
-typedef delegate<void (address_space &, offs_t, UINT16, UINT16)> write16_delegate;
-typedef delegate<void (address_space &, offs_t, UINT32, UINT32)> write32_delegate;
-typedef delegate<void (address_space &, offs_t, UINT64, UINT64)> write64_delegate;
+typedef device_delegate<void (address_space &, offs_t, UINT8, UINT8)> write8_delegate;
+typedef device_delegate<void (address_space &, offs_t, UINT16, UINT16)> write16_delegate;
+typedef device_delegate<void (address_space &, offs_t, UINT32, UINT32)> write32_delegate;
+typedef device_delegate<void (address_space &, offs_t, UINT64, UINT64)> write64_delegate;
// ======================> direct_read_data