Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

reapplied change until someone can actually explain where it causes a problem.

Browse Source
This commit is contained in:
smf- 2011-05-08 13:41:43 +00:00
parent f7faf93b85
commit dbf11f83ae
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/addrmap.c
View File

@ -60,7 +60,7 @@ inline void map_handler_data::set_tag(const device_t &device, const char *tag)
m_tag = device.owner()->tag();
}
else
m_tag = device.siblingtag(m_derived_tag, tag);
m_tag = device.subtag(m_derived_tag, tag);
}
@ -718,7 +718,7 @@ address_map::address_map(const device_t &device, address_spacenum spacenum)
// construct the standard map */
if (memintf->address_map(spacenum) != NULL)
(*memintf->address_map(spacenum))(*this, device);
(*memintf->address_map(spacenum))(*this, *device.owner());
// append the default device map (last so it can be overridden) */
if (spaceconfig->m_default_map != NULL)

2
src/emu/addrmap.h
View File

@ -1073,7 +1073,7 @@ void ADDRESS_MAP_NAME(_name)(address_map &map, const device_t &device) \
#endif
#define AM_SUBDEVICE(_tag) device.subdevice(_tag)->tag()
//**************************************************************************
// GLOBAL VARIABLES

4
src/emu/cpu/psx/psx.c
View File

@ -1529,7 +1529,7 @@ static ADDRESS_MAP_START( psxcpu_internal_map, AS_PROGRAM, 32 )
AM_RANGE(0x1f801040, 0x1f80105f) AM_READWRITE(psx_sio_r, psx_sio_w)
AM_RANGE(0x1f801060, 0x1f80106f) AM_RAM
AM_RANGE(0x1f801070, 0x1f801077) AM_READWRITE(psx_irq_r, psx_irq_w)
AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN(AM_SUBDEVICE("dma"), psxdma_device, read, write)
AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN("dma", psxdma_device, read, write)
AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(psx_counter_r, psx_counter_w)
AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w)
AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w)
@ -1553,7 +1553,7 @@ static ADDRESS_MAP_START( cxd8661r_internal_map, AS_PROGRAM, 32 )
AM_RANGE(0x1f801040, 0x1f80105f) AM_READWRITE(psx_sio_r, psx_sio_w)
AM_RANGE(0x1f801060, 0x1f80106f) AM_RAM
AM_RANGE(0x1f801070, 0x1f801077) AM_READWRITE(psx_irq_r, psx_irq_w)
AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN(AM_SUBDEVICE("dma"), psxdma_device, read, write)
AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN("dma", psxdma_device, read, write)
AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(psx_counter_r, psx_counter_w)
AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w)
AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w)