Previous 15994 Revisions Next

r11481 Sunday 8th May, 2011 at 10:56:00 UTC by Miodrag Milanović
Sync with MAME (r12464) (no whatsnew)
[src/emu]addrmap.c addrmap.h
[src/emu/cpu/psx]psx.c

src/emu/cpu/psx/psx.c
r11480r11481
15291529   AM_RANGE(0x1f801040, 0x1f80105f) AM_READWRITE(psx_sio_r, psx_sio_w)
15301530   AM_RANGE(0x1f801060, 0x1f80106f) AM_RAM
15311531   AM_RANGE(0x1f801070, 0x1f801077) AM_READWRITE(psx_irq_r, psx_irq_w)
1532   AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN("dma", psxdma_device, read, write)
1532   AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN(AM_SUBDEVICE("dma"), psxdma_device, read, write)
15331533   AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(psx_counter_r, psx_counter_w)
15341534   AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w)
15351535   AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w)
r11480r11481
15531553   AM_RANGE(0x1f801040, 0x1f80105f) AM_READWRITE(psx_sio_r, psx_sio_w)
15541554   AM_RANGE(0x1f801060, 0x1f80106f) AM_RAM
15551555   AM_RANGE(0x1f801070, 0x1f801077) AM_READWRITE(psx_irq_r, psx_irq_w)
1556   AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN("dma", psxdma_device, read, write)
1556   AM_RANGE(0x1f801080, 0x1f8010ff) AM_DEVREADWRITE_MODERN(AM_SUBDEVICE("dma"), psxdma_device, read, write)
15571557   AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(psx_counter_r, psx_counter_w)
15581558   AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w)
15591559   AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w)
src/emu/addrmap.c
r11480r11481
6060      m_tag = device.owner()->tag();
6161   }
6262   else
63      m_tag = device.subtag(m_derived_tag, tag);
63      m_tag = device.siblingtag(m_derived_tag, tag);
6464}
6565
6666
r11480r11481
718718
719719   // construct the standard map */
720720   if (memintf->address_map(spacenum) != NULL)
721      (*memintf->address_map(spacenum))(*this, *device.owner());
721      (*memintf->address_map(spacenum))(*this, device);
722722
723723   // append the default device map (last so it can be overridden) */
724724   if (spaceconfig->m_default_map != NULL)
src/emu/addrmap.h
r11480r11481
10731073
10741074#endif
10751075
1076#define AM_SUBDEVICE(_tag)               device.subdevice(_tag)->tag()
10761077
1077
10781078//**************************************************************************
10791079//  GLOBAL VARIABLES
10801080//**************************************************************************

Previous 15994 Revisions Next


© 1998-2018 The MESS Team