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

API change: Memory maps are now methods of the owner class [O. Galibert]

Browse Source 
Also, a lot more freedom happened, that's going to be more visible
soon.
This commit is contained in:
Olivier Galibert 2018-02-01 10:04:01 +01:00
parent 09b6ce4687
commit c521964316
3800 changed files with 18343 additions and 10173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/bus/a2bus/a2applicard.cpp
View File

@ -29,11 +29,11 @@ DEFINE_DEVICE_TYPE(A2BUS_APPLICARD, a2bus_applicard_device, "a2aplcrd", "PCPI Ap
#define Z80_TAG "z80"
#define Z80_ROM_REGION "z80_rom"
static ADDRESS_MAP_START( z80_mem, AS_PROGRAM, 8, a2bus_applicard_device )
ADDRESS_MAP_START(a2bus_applicard_device::z80_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( z80_io, AS_IO, 8, a2bus_applicard_device )
ADDRESS_MAP_START(a2bus_applicard_device::z80_io)
AM_RANGE(0x00, 0x60) AM_MIRROR(0xff00) AM_READWRITE(z80_io_r, z80_io_w)
ADDRESS_MAP_END

2
src/devices/bus/a2bus/a2applicard.h
View File

@ -32,6 +32,8 @@ public:
DECLARE_READ8_MEMBER( z80_io_r );
DECLARE_WRITE8_MEMBER( z80_io_w );
void z80_io(address_map &map);
void z80_mem(address_map &map);
protected:
a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

2
src/devices/bus/a2bus/a2softcard.cpp
View File

@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SOFTCARD, a2bus_softcard_device, "a2softcard", "Microso
#define Z80_TAG "z80"
static ADDRESS_MAP_START( z80_mem, AS_PROGRAM, 8, a2bus_softcard_device )
ADDRESS_MAP_START(a2bus_softcard_device::z80_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w)
ADDRESS_MAP_END

1
src/devices/bus/a2bus/a2softcard.h
View File

@ -28,6 +28,7 @@ public:
DECLARE_READ8_MEMBER( dma_r );
DECLARE_WRITE8_MEMBER( dma_w );
void z80_mem(address_map &map);
protected:
a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

2
src/devices/bus/a2bus/a2themill.cpp
View File

@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(A2BUS_THEMILL, a2bus_themill_device, "a2themill", "Stellation
#define M6809_TAG "m6809"
static ADDRESS_MAP_START( m6809_mem, AS_PROGRAM, 8, a2bus_themill_device )
ADDRESS_MAP_START(a2bus_themill_device::m6809_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w)
ADDRESS_MAP_END

1
src/devices/bus/a2bus/a2themill.h
View File

@ -30,6 +30,7 @@ public:
DECLARE_READ8_MEMBER( dma_r );
DECLARE_WRITE8_MEMBER( dma_w );
void m6809_mem(address_map &map);
protected:
a2bus_themill_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

4
src/devices/bus/a2bus/pc_xporter.cpp
View File

@ -91,11 +91,11 @@
DEFINE_DEVICE_TYPE(A2BUS_PCXPORTER, a2bus_pcxporter_device, "a2pcxport", "Applied Engineering PC Transporter")
static ADDRESS_MAP_START( pc_map, AS_PROGRAM, 16, a2bus_pcxporter_device )
ADDRESS_MAP_START(a2bus_pcxporter_device::pc_map)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
static ADDRESS_MAP_START(pc_io, AS_IO, 16, a2bus_pcxporter_device )
ADDRESS_MAP_START(a2bus_pcxporter_device::pc_io)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE8("dma8237", am9517a_device, read, write, 0xffff)
AM_RANGE(0x0020, 0x002f) AM_DEVREADWRITE8("pic8259", pic8259_device, read, write, 0xffff)

2
src/devices/bus/a2bus/pc_xporter.h
View File

@ -56,6 +56,8 @@ public:
DECLARE_WRITE8_MEMBER(pc_page_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
void pc_io(address_map &map);
void pc_map(address_map &map);
protected:
a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

2
src/devices/bus/a2bus/transwarp.cpp
View File

@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(A2BUS_TRANSWARP, a2bus_transwarp_device, "a2twarp", "Applied
#define CPU_TAG "tw65c02"
static ADDRESS_MAP_START( m65c02_mem, AS_PROGRAM, 8, a2bus_transwarp_device )
ADDRESS_MAP_START(a2bus_transwarp_device::m65c02_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w)
ADDRESS_MAP_END

1
src/devices/bus/a2bus/transwarp.h
View File

@ -30,6 +30,7 @@ public:
DECLARE_READ8_MEMBER( dma_r );
DECLARE_WRITE8_MEMBER( dma_w );
void m65c02_mem(address_map &map);
protected:
a2bus_transwarp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

4
src/devices/bus/abcbus/db411223.cpp
View File

@ -49,7 +49,7 @@ const tiny_rom_entry *databoard_4112_23_t::device_rom_region() const
// ADDRESS_MAP( databoard_4112_23_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( databoard_4112_23_mem, AS_PROGRAM, 8, databoard_4112_23_t )
ADDRESS_MAP_START(databoard_4112_23_t::databoard_4112_23_mem)
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION(Z80_TAG, 0)
ADDRESS_MAP_END
@ -58,7 +58,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( databoard_4112_23_io )
//-------------------------------------------------
static ADDRESS_MAP_START( databoard_4112_23_io, AS_IO, 8, databoard_4112_23_t )
ADDRESS_MAP_START(databoard_4112_23_t::databoard_4112_23_io)
ADDRESS_MAP_END

2
src/devices/bus/abcbus/db411223.h
View File

@ -29,6 +29,8 @@ public:
// construction/destruction
databoard_4112_23_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void databoard_4112_23_io(address_map &map);
void databoard_4112_23_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/abcbus/fd2.cpp
View File

@ -114,7 +114,7 @@ WRITE8_MEMBER( abc_fd2_device::status_w )
// ADDRESS_MAP( abc_fd2_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( abc_fd2_mem, AS_PROGRAM, 8, abc_fd2_device )
ADDRESS_MAP_START(abc_fd2_device::abc_fd2_mem)
AM_RANGE(0x0000, 0x03ff) AM_ROM AM_REGION(Z80_TAG, 0)
AM_RANGE(0x0800, 0x0bff) AM_RAM
ADDRESS_MAP_END
@ -124,7 +124,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( abc_fd2_io )
//-------------------------------------------------
static ADDRESS_MAP_START( abc_fd2_io, AS_IO, 8, abc_fd2_device )
ADDRESS_MAP_START(abc_fd2_device::abc_fd2_io)
ADDRESS_MAP_GLOBAL_MASK(0x73)
AM_RANGE(0x30, 0x33) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read_alt, write_alt)
AM_RANGE(0x50, 0x53) AM_DEVREADWRITE(FD1771_TAG, fd1771_device, read, write)

2
src/devices/bus/abcbus/fd2.h
View File

@ -35,6 +35,8 @@ public:
DECLARE_WRITE8_MEMBER( status_w );
void abc_fd2_io(address_map &map);
void abc_fd2_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/abcbus/hdc.cpp
View File

@ -54,7 +54,7 @@ const tiny_rom_entry *abc_hdc_device::device_rom_region() const
// ADDRESS_MAP( abc_hdc_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( abc_hdc_mem, AS_PROGRAM, 8, abc_hdc_device )
ADDRESS_MAP_START(abc_hdc_device::abc_hdc_mem)
AM_RANGE(0x0000, 0x0ff) AM_ROM AM_REGION(Z80_TAG, 0)
ADDRESS_MAP_END
@ -63,7 +63,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( abc_hdc_io )
//-------------------------------------------------
static ADDRESS_MAP_START( abc_hdc_io, AS_IO, 8, abc_hdc_device )
ADDRESS_MAP_START(abc_hdc_device::abc_hdc_io)
ADDRESS_MAP_END

2
src/devices/bus/abcbus/hdc.h
View File

@ -31,6 +31,8 @@ public:
// construction/destruction
abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void abc_hdc_io(address_map &map);
void abc_hdc_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/abcbus/lux10828.cpp
View File

@ -171,7 +171,7 @@ const tiny_rom_entry *luxor_55_10828_device::device_rom_region() const
// ADDRESS_MAP( luxor_55_10828_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( luxor_55_10828_mem, AS_PROGRAM, 8, luxor_55_10828_device )
ADDRESS_MAP_START(luxor_55_10828_device::luxor_55_10828_mem)
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_ROM AM_REGION(Z80_TAG, 0)
AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x0c00) AM_RAM
@ -182,7 +182,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( luxor_55_10828_io )
//-------------------------------------------------
static ADDRESS_MAP_START( luxor_55_10828_io, AS_IO, 8, luxor_55_10828_device )
ADDRESS_MAP_START(luxor_55_10828_device::luxor_55_10828_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x70, 0x73) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read_alt, write_alt)
AM_RANGE(0xb0, 0xb3) AM_MIRROR(0x0c) AM_READWRITE(fdc_r, fdc_w)

2
src/devices/bus/abcbus/lux10828.h
View File

@ -60,6 +60,8 @@ public:
DECLARE_READ8_MEMBER( fdc_r );
DECLARE_WRITE8_MEMBER( fdc_w );
void luxor_55_10828_io(address_map &map);
void luxor_55_10828_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/abcbus/lux21046.cpp
View File

@ -137,7 +137,7 @@ const tiny_rom_entry *luxor_55_21046_device::device_rom_region() const
// ADDRESS_MAP( luxor_55_21046_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( luxor_55_21046_mem, AS_PROGRAM, 8, luxor_55_21046_device )
ADDRESS_MAP_START(luxor_55_21046_device::luxor_55_21046_mem)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION(Z80_TAG, 0x2000) // A13 pull-up
@ -149,7 +149,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( luxor_55_21046_io )
//-------------------------------------------------
static ADDRESS_MAP_START( luxor_55_21046_io, AS_IO, 8, luxor_55_21046_device )
ADDRESS_MAP_START(luxor_55_21046_device::luxor_55_21046_io)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0c, 0x0c) AM_MIRROR(0xff03) AM_READ(out_r)
AM_RANGE(0x1c, 0x1c) AM_MIRROR(0xff03) AM_WRITE(inp_w)

2
src/devices/bus/abcbus/lux21046.h
View File

@ -64,6 +64,8 @@ public:
DECLARE_FLOPPY_FORMATS( floppy_formats );
void luxor_55_21046_io(address_map &map);
void luxor_55_21046_mem(address_map &map);
protected:
luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

4
src/devices/bus/abcbus/lux21056.cpp
View File

@ -133,7 +133,7 @@ const tiny_rom_entry *luxor_55_21056_device::device_rom_region() const
// ADDRESS_MAP( luxor_55_21056_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( luxor_55_21056_mem, AS_PROGRAM, 8, luxor_55_21056_device )
ADDRESS_MAP_START(luxor_55_21056_device::luxor_55_21056_mem)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM AM_REGION(Z80_TAG, 0)
@ -145,7 +145,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( luxor_55_21056_io )
//-------------------------------------------------
static ADDRESS_MAP_START( luxor_55_21056_io, AS_IO, 8, luxor_55_21056_device )
ADDRESS_MAP_START(luxor_55_21056_device::luxor_55_21056_io)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xf8)
AM_RANGE(0x00, 0x00) AM_MIRROR(0xf0) AM_DEVREADWRITE(Z80DMA_TAG, z80dma_device, read, write)

2
src/devices/bus/abcbus/lux21056.h
View File

@ -45,6 +45,8 @@ public:
DECLARE_READ8_MEMBER( sasi_rst_r );
DECLARE_WRITE8_MEMBER( sasi_rst_w );
void luxor_55_21056_io(address_map &map);
void luxor_55_21056_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/abcbus/unidisk.cpp
View File

@ -54,7 +54,7 @@ const tiny_rom_entry *unidisk_t::device_rom_region() const
// ADDRESS_MAP( unidisk_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( unidisk_mem, AS_PROGRAM, 8, unidisk_t )
ADDRESS_MAP_START(unidisk_t::unidisk_mem)
AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION(TMS9995_TAG, 0)
ADDRESS_MAP_END
@ -63,7 +63,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( unidisk_io )
//-------------------------------------------------
static ADDRESS_MAP_START( unidisk_io, AS_IO, 8, unidisk_t )
ADDRESS_MAP_START(unidisk_t::unidisk_io)
ADDRESS_MAP_END

2
src/devices/bus/abcbus/unidisk.h
View File

@ -29,6 +29,8 @@ public:
// construction/destruction
unidisk_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void unidisk_io(address_map &map);
void unidisk_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/abckb/abc77.cpp
View File

@ -89,7 +89,7 @@ const tiny_rom_entry *abc77_device::device_rom_region() const
// ADDRESS_MAP( abc77_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( abc77_map, AS_PROGRAM, 8, abc77_device )
ADDRESS_MAP_START(abc77_device::abc77_map)
AM_RANGE(0x000, 0xfff) AM_ROM AM_REGION("z16", 0)
ADDRESS_MAP_END
@ -98,7 +98,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( abc77_io )
//-------------------------------------------------
static ADDRESS_MAP_START( abc77_io, AS_IO, 8, abc77_device )
ADDRESS_MAP_START(abc77_device::abc77_io)
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_WRITE(j3_w)
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_READ_PORT("DSW")
ADDRESS_MAP_END

2
src/devices/bus/abckb/abc77.h
View File

@ -39,6 +39,8 @@ public:
DECLARE_WRITE8_MEMBER( j3_w );
void abc77_io(address_map &map);
void abc77_map(address_map &map);
protected:
abc77_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

6
src/devices/bus/abckb/abc99.cpp
View File

@ -106,7 +106,7 @@ const tiny_rom_entry *abc99_device::device_rom_region() const
// ADDRESS_MAP( abc99_z2_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( abc99_z2_mem, AS_PROGRAM, 8, abc99_device )
ADDRESS_MAP_START(abc99_device::abc99_z2_mem)
AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION(I8035_Z2_TAG, 0)
ADDRESS_MAP_END
@ -115,7 +115,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( abc99_z2_io )
//-------------------------------------------------
static ADDRESS_MAP_START( abc99_z2_io, AS_IO, 8, abc99_device )
ADDRESS_MAP_START(abc99_device::abc99_z2_io)
AM_RANGE(0x21, 0x21) AM_WRITE(z2_led_w)
AM_RANGE(0x30, 0x30) AM_READ_PORT("X0") AM_WRITENOP
AM_RANGE(0x31, 0x31) AM_READ_PORT("X1") AM_WRITENOP
@ -140,7 +140,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( abc99_z5_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( abc99_z5_mem, AS_PROGRAM, 8, abc99_device )
ADDRESS_MAP_START(abc99_device::abc99_z5_mem)
AM_RANGE(0x0000, 0x07ff) AM_ROM AM_REGION(I8035_Z5_TAG, 0)
ADDRESS_MAP_END

3
src/devices/bus/abckb/abc99.h
View File

@ -41,6 +41,9 @@ public:
DECLARE_WRITE8_MEMBER( z5_p2_w );
DECLARE_READ8_MEMBER( z5_t1_r );
void abc99_z2_io(address_map &map);
void abc99_z2_mem(address_map &map);
void abc99_z5_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/adamnet/ddp.cpp
View File

@ -50,7 +50,7 @@ const tiny_rom_entry *adam_digital_data_pack_device::device_rom_region() const
// ADDRESS_MAP( adam_ddp_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_ddp_mem, AS_PROGRAM, 8, adam_digital_data_pack_device )
ADDRESS_MAP_START(adam_digital_data_pack_device::adam_ddp_mem)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE(M6801_TAG, m6801_cpu_device, m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM
@ -62,7 +62,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( adam_ddp_io )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_ddp_io, AS_IO, 8, adam_digital_data_pack_device )
ADDRESS_MAP_START(adam_digital_data_pack_device::adam_ddp_io)
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_WRITE(p1_w)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(p2_r, p2_w)
AM_RANGE(M6801_PORT3, M6801_PORT3) AM_NOP // Multiplexed Address/Data

2
src/devices/bus/adamnet/ddp.h
View File

@ -37,6 +37,8 @@ public:
DECLARE_WRITE8_MEMBER( p2_w );
DECLARE_READ8_MEMBER( p4_r );
void adam_ddp_io(address_map &map);
void adam_ddp_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/adamnet/fdc.cpp
View File

@ -77,7 +77,7 @@ const tiny_rom_entry *adam_fdc_device::device_rom_region() const
// ADDRESS_MAP( fdc6801_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_fdc_mem, AS_PROGRAM, 8, adam_fdc_device )
ADDRESS_MAP_START(adam_fdc_device::adam_fdc_mem)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE(M6801_TAG, m6801_cpu_device, m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM AM_WRITEONLY AM_SHARE("ram")
@ -99,7 +99,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( fdc6801_io )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_fdc_io, AS_IO, 8, adam_fdc_device )
ADDRESS_MAP_START(adam_fdc_device::adam_fdc_io)
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READWRITE(p1_r, p1_w)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(p2_r, p2_w)
AM_RANGE(M6801_PORT3, M6801_PORT3)

2
src/devices/bus/adamnet/fdc.h
View File

@ -38,6 +38,8 @@ public:
DECLARE_READ8_MEMBER( p2_r );
DECLARE_WRITE8_MEMBER( p2_w );
void adam_fdc_io(address_map &map);
void adam_fdc_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/adamnet/kb.cpp
View File

@ -50,7 +50,7 @@ const tiny_rom_entry *adam_keyboard_device::device_rom_region() const
// ADDRESS_MAP( adam_kb_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_kb_mem, AS_PROGRAM, 8, adam_keyboard_device )
ADDRESS_MAP_START(adam_keyboard_device::adam_kb_mem)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE(M6801_TAG, m6801_cpu_device, m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0xf800, 0xffff) AM_ROM AM_REGION(M6801_TAG, 0)
@ -61,7 +61,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( adam_kb_io )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_kb_io, AS_IO, 8, adam_keyboard_device )
ADDRESS_MAP_START(adam_keyboard_device::adam_kb_io)
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ(p1_r)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(p2_r, p2_w)
AM_RANGE(M6801_PORT3, M6801_PORT3) AM_READWRITE(p3_r, p3_w)

2
src/devices/bus/adamnet/kb.h
View File

@ -38,6 +38,8 @@ public:
DECLARE_READ8_MEMBER( p4_r );
DECLARE_WRITE8_MEMBER( p4_w );
void adam_kb_io(address_map &map);
void adam_kb_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/adamnet/printer.cpp
View File

@ -50,7 +50,7 @@ const tiny_rom_entry *adam_printer_device::device_rom_region() const
// ADDRESS_MAP( adam_prn_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_prn_mem, AS_PROGRAM, 8, adam_printer_device )
ADDRESS_MAP_START(adam_printer_device::adam_prn_mem)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE(M6801_TAG, m6801_cpu_device, m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0xf800, 0xffff) AM_ROM AM_REGION(M6801_TAG, 0)
@ -61,7 +61,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( adam_prn_io )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_prn_io, AS_IO, 8, adam_printer_device )
ADDRESS_MAP_START(adam_printer_device::adam_prn_io)
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_WRITE(p1_w)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(p2_r, p2_w)
AM_RANGE(M6801_PORT3, M6801_PORT3) AM_READ(p3_r)

2
src/devices/bus/adamnet/printer.h
View File

@ -37,6 +37,8 @@ public:
DECLARE_READ8_MEMBER( p4_r );
DECLARE_WRITE8_MEMBER( p4_w );
void adam_prn_io(address_map &map);
void adam_prn_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/adamnet/spi.cpp
View File

@ -53,7 +53,7 @@ const tiny_rom_entry *adam_spi_device::device_rom_region() const
// ADDRESS_MAP( adam_spi_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_spi_mem, AS_PROGRAM, 8, adam_spi_device )
ADDRESS_MAP_START(adam_spi_device::adam_spi_mem)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE(M6801_TAG, m6801_cpu_device, m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0xf800, 0xffff) AM_ROM AM_REGION(M6801_TAG, 0)
@ -64,7 +64,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( adam_spi_io )
//-------------------------------------------------
static ADDRESS_MAP_START( adam_spi_io, AS_IO, 8, adam_spi_device )
ADDRESS_MAP_START(adam_spi_device::adam_spi_io)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(p2_r, p2_w)
ADDRESS_MAP_END

2
src/devices/bus/adamnet/spi.h
View File

@ -36,6 +36,8 @@ public:
DECLARE_READ8_MEMBER( p2_r );
DECLARE_WRITE8_MEMBER( p2_w );
void adam_spi_io(address_map &map);
void adam_spi_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

6
src/devices/bus/amiga/keyboard/a500.cpp
View File

@ -34,9 +34,7 @@ DEFINE_DEVICE_TYPE_NS(A500_KBD_GB, bus::amiga::keyboard, a500_kbd_gb_device, "a5
namespace bus { namespace amiga { namespace keyboard {
namespace {
ADDRESS_MAP_START( mpu6500_map, AS_PROGRAM, 8, a500_kbd_device )
ADDRESS_MAP_START(a500_kbd_device::mpu6500_map)
ADDRESS_MAP_GLOBAL_MASK(0xfff)
AM_RANGE(0x000, 0x03f) AM_RAM
AM_RANGE(0x080, 0x080) AM_READWRITE(port_a_r, port_a_w)
@ -53,6 +51,8 @@ ADDRESS_MAP_START( mpu6500_map, AS_PROGRAM, 8, a500_kbd_device )
AM_RANGE(0x800, 0xfff) AM_ROM AM_REGION("ic1", 0)
ADDRESS_MAP_END
namespace {
//-------------------------------------------------
// rom_region - device-specific ROM region
//-------------------------------------------------

1
src/devices/bus/amiga/keyboard/a500.h
View File

@ -66,6 +66,7 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(check_reset);
void mpu6500_map(address_map &map);
protected:
a500_kbd_device(
const machine_config &mconfig,

6
src/devices/bus/amiga/zorro/a2232.cpp
View File

@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(A2232, a2232_device, "a2232", "CBM A2232 Serial Card")
// device_add_mconfig - add device configuration
//-------------------------------------------------
static ADDRESS_MAP_START( iocpu_map, AS_PROGRAM, 8, a2232_device)
ADDRESS_MAP_START(a2232_device::iocpu_map)
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("shared")
AM_RANGE(0x4000, 0x47ff) AM_READWRITE(acia_0_r, acia_0_w)
AM_RANGE(0x4800, 0x4fff) AM_READWRITE(acia_1_r, acia_1_w)
@ -41,7 +41,7 @@ static ADDRESS_MAP_START( iocpu_map, AS_PROGRAM, 8, a2232_device)
AM_RANGE(0x7000, 0x73ff) AM_WRITE(int2_w)
AM_RANGE(0x7400, 0x77ff) AM_READWRITE(acia_6_r, acia_6_w)
AM_RANGE(0x7800, 0x7fff) AM_READWRITE(cia_r, cia_w)
AM_RANGE(0x8000, 0x8000) AM_WRITE(irq_ack_w)
AM_RANGE(0x8000, 0x8000) AM_WRITE(irq_ack8_w)
AM_RANGE(0xc000, 0xffff) AM_RAM AM_SHARE("shared")
ADDRESS_MAP_END
@ -222,7 +222,7 @@ WRITE8_MEMBER( a2232_device::int2_w )
m_slot->int2_w(1);
}
WRITE8_MEMBER( a2232_device::irq_ack_w )
WRITE8_MEMBER( a2232_device::irq_ack8_w )
{
if (VERBOSE)
logerror("%s('%s'): irq_ack_w %04x\n", shortname(), basetag(), data);

3
src/devices/bus/amiga/zorro/a2232.h
View File

@ -37,7 +37,7 @@ public:
// cpu
WRITE8_MEMBER( int2_w );
WRITE8_MEMBER( irq_ack_w );
WRITE8_MEMBER( irq_ack8_w );
// zorro slot
DECLARE_READ16_MEMBER( shared_ram_r );
@ -71,6 +71,7 @@ public:
DECLARE_READ8_MEMBER( cia_r );
DECLARE_WRITE8_MEMBER( cia_w );
void iocpu_map(address_map &map);
protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual void device_start() override;

2
src/devices/bus/amiga/zorro/buddha.cpp
View File

@ -42,7 +42,7 @@ DEFINE_DEVICE_TYPE(BUDDHA, buddha_device, "buddha", "Buddha IDE controller")
// mmio_map - device-specific memory mapped I/O
//-------------------------------------------------
DEVICE_ADDRESS_MAP_START( mmio_map, 16, buddha_device )
ADDRESS_MAP_START(buddha_device::mmio_map)
AM_RANGE(0x7fe, 0x7ff) AM_READWRITE(speed_r, speed_w)
AM_RANGE(0x800, 0x8ff) AM_READWRITE(ide_0_cs0_r, ide_0_cs0_w)
AM_RANGE(0x900, 0x9ff) AM_READWRITE(ide_0_cs1_r, ide_0_cs1_w)

2
src/devices/bus/amiga/zorro/buddha.h
View File

@ -30,7 +30,7 @@ public:
// construction/destruction
buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_ADDRESS_MAP(mmio_map, 16);
void mmio_map(address_map &map);
// speed register
DECLARE_READ16_MEMBER( speed_r );

2
src/devices/bus/bbc/tube/tube_6502.cpp
View File

@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_6502, bbc_tube_6502_device, "bbc_tube_6502", "Acorn
// ADDRESS_MAP( tube_6502_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_6502_mem, AS_PROGRAM, 8, bbc_tube_6502_device)
ADDRESS_MAP_START(bbc_tube_6502_device::tube_6502_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write)
ADDRESS_MAP_END

1
src/devices/bus/bbc/tube/tube_6502.h
View File

@ -34,6 +34,7 @@ public:
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
void tube_6502_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/bbc/tube/tube_65c102.cpp
View File

@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_65C102, bbc_tube_65c102_device, "bbc_tube_65c102", "
// ADDRESS_MAP( tube_6502_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_6502_mem, AS_PROGRAM, 8, bbc_tube_65c102_device)
ADDRESS_MAP_START(bbc_tube_65c102_device::tube_6502_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write)
ADDRESS_MAP_END

1
src/devices/bus/bbc/tube/tube_65c102.h
View File

@ -34,6 +34,7 @@ public:
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
void tube_6502_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/bbc/tube/tube_80186.cpp
View File

@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_80186, bbc_tube_80186_device, "bbc_tube_80186", "Aco
// ADDRESS_MAP( tube_80186_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_80186_mem, AS_PROGRAM, 16, bbc_tube_80186_device)
ADDRESS_MAP_START(bbc_tube_80186_device::tube_80186_mem)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
@ -33,7 +33,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( tube_80186_io )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_80186_io, AS_IO, 16, bbc_tube_80186_device)
ADDRESS_MAP_START(bbc_tube_80186_device::tube_80186_io)
AM_RANGE(0x80, 0x8f) AM_DEVREADWRITE8("ula", tube_device, parasite_r, parasite_w, 0x00ff)
ADDRESS_MAP_END

2
src/devices/bus/bbc/tube/tube_80186.h
View File

@ -31,6 +31,8 @@ public:
// construction/destruction
bbc_tube_80186_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void tube_80186_io(address_map &map);
void tube_80186_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/bbc/tube/tube_80286.cpp
View File

@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_80286, bbc_tube_80286_device, "bbc_tube_80286", "Aco
// ADDRESS_MAP( tube_80286_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_80286_mem, AS_PROGRAM, 16, bbc_tube_80286_device)
ADDRESS_MAP_START(bbc_tube_80286_device::tube_80286_mem)
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x00000, 0xbffff) AM_RAM AM_SHARE("ram")
AM_RANGE(0xc0000, 0xc3fff) AM_ROM AM_REGION("bootstrap", 0) AM_MIRROR(0x3c000)
@ -34,7 +34,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( tube_80286_io )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_80286_io, AS_IO, 16, bbc_tube_80286_device)
ADDRESS_MAP_START(bbc_tube_80286_device::tube_80286_io)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x50, 0x51) AM_READ8(disable_boot_rom, 0x00ff)
AM_RANGE(0x60, 0x61) AM_WRITE8(irq_latch_w, 0x00ff)

2
src/devices/bus/bbc/tube/tube_80286.h
View File

@ -32,6 +32,8 @@ public:
DECLARE_READ8_MEMBER( disable_boot_rom );
DECLARE_WRITE8_MEMBER( irq_latch_w );
void tube_80286_io(address_map &map);
void tube_80286_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/bbc/tube/tube_arm.cpp
View File

@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_ARM, bbc_tube_arm_device, "bbc_tube_arm", "ARM Evalu
// ADDRESS_MAP( tube_arm_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_arm_mem, AS_PROGRAM, 32, bbc_tube_arm_device)
ADDRESS_MAP_START(bbc_tube_arm_device::tube_arm_mem)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000000, 0x03fffff) AM_READWRITE8(ram_r, ram_w, 0xffffffff)
AM_RANGE(0x1000000, 0x100001f) AM_DEVREADWRITE8("ula", tube_device, parasite_r, parasite_w, 0x000000ff)

1
src/devices/bus/bbc/tube/tube_arm.h
View File

@ -32,6 +32,7 @@ public:
DECLARE_READ8_MEMBER( ram_r );
DECLARE_WRITE8_MEMBER( ram_w );
void tube_arm_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/bbc/tube/tube_casper.cpp
View File

@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_CASPER, bbc_tube_casper_device, "bbc_tube_casper", "
// ADDRESS_MAP( tube_casper_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_casper_mem, AS_PROGRAM, 16, bbc_tube_casper_device)
ADDRESS_MAP_START(bbc_tube_casper_device::tube_casper_mem)
AM_RANGE(0x00000, 0x03fff) AM_ROM AM_REGION("casper_rom", 0)
AM_RANGE(0x10000, 0x1001f) AM_DEVREADWRITE8("via6522_1",via6522_device, read, write, 0xff)
AM_RANGE(0x20000, 0x3ffff) AM_RAM

1
src/devices/bus/bbc/tube/tube_casper.h
View File

@ -28,6 +28,7 @@ public:
// construction/destruction
bbc_tube_casper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void tube_casper_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

8
src/devices/bus/bbc/tube/tube_z80.cpp
View File

@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_Z80, bbc_tube_z80_device, "bbc_tube_z80", "Acorn Z80
// ADDRESS_MAP( tube_z80_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_z80_mem, AS_PROGRAM, 8, bbc_tube_z80_device)
ADDRESS_MAP_START(bbc_tube_z80_device::tube_z80_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(mem_r, mem_w)
ADDRESS_MAP_END
@ -33,7 +33,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( tube_z80_fetch )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_z80_fetch, AS_OPCODES, 8, bbc_tube_z80_device)
ADDRESS_MAP_START(bbc_tube_z80_device::tube_z80_fetch)
AM_RANGE(0x000, 0xffff) AM_READ(opcode_r)
ADDRESS_MAP_END
@ -41,7 +41,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( tube_z80_io )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_z80_io, AS_IO, 8, bbc_tube_z80_device)
ADDRESS_MAP_START(bbc_tube_z80_device::tube_z80_io)
AM_RANGE(0x00, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ula", tube_device, parasite_r, parasite_w)
ADDRESS_MAP_END
@ -61,7 +61,7 @@ ROM_END
MACHINE_CONFIG_START(bbc_tube_z80_device::device_add_mconfig)
MCFG_CPU_ADD("z80", Z80, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tube_z80_mem)
MCFG_CPU_DECRYPTED_OPCODES_MAP(tube_z80_fetch)
MCFG_CPU_OPCODES_MAP(tube_z80_fetch)
MCFG_CPU_IO_MAP(tube_z80_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, bbc_tube_z80_device, irq_callback)

3
src/devices/bus/bbc/tube/tube_z80.h
View File

@ -35,6 +35,9 @@ public:
DECLARE_WRITE8_MEMBER( mem_w );
DECLARE_READ8_MEMBER( opcode_r );
void tube_z80_fetch(address_map &map);
void tube_z80_io(address_map &map);
void tube_z80_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/bbc/tube/tube_zep100.cpp
View File

@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_ZEP100, bbc_tube_zep100_device, "bbc_tube_zep100", "
// ADDRESS_MAP( tube_zep100_mem )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_zep100_mem, AS_PROGRAM, 8, bbc_tube_zep100_device)
ADDRESS_MAP_START(bbc_tube_zep100_device::tube_zep100_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(mem_r, mem_w)
ADDRESS_MAP_END
@ -33,7 +33,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( tube_zep100_io )
//-------------------------------------------------
static ADDRESS_MAP_START(tube_zep100_io, AS_IO, 8, bbc_tube_zep100_device)
ADDRESS_MAP_START(bbc_tube_zep100_device::tube_zep100_io)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00, 0x07) AM_MIRROR(0xff00) AM_READWRITE(io_r, io_w)
ADDRESS_MAP_END

2
src/devices/bus/bbc/tube/tube_zep100.h
View File

@ -41,6 +41,8 @@ public:
DECLARE_READ8_MEMBER( ppi_pb_r );
DECLARE_WRITE8_MEMBER( ppi_pc_w );
void tube_zep100_io(address_map &map);
void tube_zep100_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/c64/cpm.cpp
View File

@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(C64_CPM, c64_cpm_cartridge_device, "c64_cpm", "C64 CP/M cartr
// ADDRESS_MAP( z80_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( z80_mem, AS_PROGRAM, 8, c64_cpm_cartridge_device )
ADDRESS_MAP_START(c64_cpm_cartridge_device::z80_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w)
ADDRESS_MAP_END
@ -49,7 +49,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( z80_io )
//-------------------------------------------------
static ADDRESS_MAP_START( z80_io, AS_IO, 8, c64_cpm_cartridge_device )
ADDRESS_MAP_START(c64_cpm_cartridge_device::z80_io)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w)
ADDRESS_MAP_END

2
src/devices/bus/c64/cpm.h
View File

@ -33,6 +33,8 @@ public:
DECLARE_READ8_MEMBER( dma_r );
DECLARE_WRITE8_MEMBER( dma_w );
void z80_io(address_map &map);
void z80_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/c64/fcc.cpp
View File

@ -64,7 +64,7 @@ const tiny_rom_entry *c64_final_chesscard_device::device_rom_region() const
// ADDRESS_MAP( c64_fcc_map )
//-------------------------------------------------
static ADDRESS_MAP_START( c64_fcc_map, AS_PROGRAM, 8, c64_final_chesscard_device )
ADDRESS_MAP_START(c64_final_chesscard_device::c64_fcc_map)
AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x6000) AM_READWRITE(nvram_r, nvram_w)
AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION(G65SC02P4_TAG, 0)
ADDRESS_MAP_END

1
src/devices/bus/c64/fcc.h
View File

@ -33,6 +33,7 @@ public:
DECLARE_READ8_MEMBER( nvram_r );
DECLARE_WRITE8_MEMBER( nvram_w );
void c64_fcc_map(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/c64/multiscreen.cpp
View File

@ -102,7 +102,7 @@ const tiny_rom_entry *c64_multiscreen_cartridge_device::device_rom_region() cons
}
static ADDRESS_MAP_START( multiscreen_mem, AS_PROGRAM, 8, c64_multiscreen_cartridge_device )
ADDRESS_MAP_START(c64_multiscreen_cartridge_device::multiscreen_mem)
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION(MC6802P_TAG, 0)
ADDRESS_MAP_END

1
src/devices/bus/c64/multiscreen.h
View File

@ -31,6 +31,7 @@ public:
// construction/destruction
c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void multiscreen_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/c64/supercpu.cpp
View File

@ -49,7 +49,7 @@ const tiny_rom_entry *c64_supercpu_device::device_rom_region() const
// ADDRESS_MAP( c64_supercpu_map )
//-------------------------------------------------
static ADDRESS_MAP_START( c64_supercpu_map, AS_PROGRAM, 8, c64_supercpu_device )
ADDRESS_MAP_START(c64_supercpu_device::c64_supercpu_map)
AM_RANGE(0x000000, 0x01ffff) AM_RAM AM_SHARE("sram")
AM_RANGE(0x020000, 0xf7ffff) AM_RAM AM_SHARE("dimm")
AM_RANGE(0xf80000, 0xf9ffff) AM_MIRROR(0x60000) AM_ROM AM_REGION(G65816_TAG, 0)

1
src/devices/bus/c64/supercpu.h
View File

@ -29,6 +29,7 @@ public:
// construction/destruction
c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void c64_supercpu_map(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/cbm2/hrg.cpp
View File

@ -66,7 +66,7 @@ const tiny_rom_entry *cbm2_hrg_device::device_rom_region() const
// ADDRESS_MAP( hrg_a_map )
//-------------------------------------------------
static ADDRESS_MAP_START( hrg_a_map, 0, 8, cbm2_hrg_a_device )
ADDRESS_MAP_START(cbm2_hrg_a_device::hrg_a_map)
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x7fff) AM_RAM
ADDRESS_MAP_END
@ -76,7 +76,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( hrg_b_map )
//-------------------------------------------------
static ADDRESS_MAP_START( hrg_b_map, 0, 8, cbm2_hrg_b_device )
ADDRESS_MAP_START(cbm2_hrg_b_device::hrg_b_map)
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_RAM
ADDRESS_MAP_END

2
src/devices/bus/cbm2/hrg.h
View File

@ -55,6 +55,7 @@ public:
// construction/destruction
cbm2_hrg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void hrg_a_map(address_map &map);
protected:
// optional information overrides
virtual void device_add_mconfig(machine_config &config) override;
@ -69,6 +70,7 @@ public:
// construction/destruction
cbm2_hrg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void hrg_b_map(address_map &map);
protected:
// optional information overrides
virtual void device_add_mconfig(machine_config &config) override;

2
src/devices/bus/cbmiec/c1526.cpp
View File

@ -78,7 +78,7 @@ const tiny_rom_entry *c4023_device::device_rom_region() const
// ADDRESS_MAP( c1526_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1526_mem, AS_PROGRAM, 8, c1526_device_base )
ADDRESS_MAP_START(c1526_device_base::c1526_mem)
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION(M6504_TAG, 0)
ADDRESS_MAP_END

1
src/devices/bus/cbmiec/c1526.h
View File

@ -32,6 +32,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
void c1526_mem(address_map &map);
};

8
src/devices/bus/cbmiec/c1541.cpp
View File

@ -500,7 +500,7 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::write )
// ADDRESS_MAP( c1541_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541_mem, AS_PROGRAM, 8, c1541_device_base )
ADDRESS_MAP_START(c1541_device_base::c1541_mem)
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via6522_device, read, write)
@ -512,7 +512,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( c1541dd_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541dd_mem, AS_PROGRAM, 8, c1541_device_base )
ADDRESS_MAP_START(c1541_device_base::c1541dd_mem)
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via6522_device, read, write)
@ -525,7 +525,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( c1541pd_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541pd_mem, AS_PROGRAM, 8, c1541_device_base )
ADDRESS_MAP_START(c1541_device_base::c1541pd_mem)
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via6522_device, read, write)
@ -539,7 +539,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( c1541pdc_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541pdc_mem, AS_PROGRAM, 8, c1541_prologic_dos_classic_device )
ADDRESS_MAP_START(c1541_prologic_dos_classic_device::c1541pdc_mem)
AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write)
/* AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)

5
src/devices/bus/cbmiec/c1541.h
View File

@ -61,6 +61,10 @@ protected:
required_device<floppy_image_device> m_floppy;
void c1541_mem(address_map &map);
void c1541dd_mem(address_map &map);
void c1541pd_mem(address_map &map);
private:
enum
{
@ -261,6 +265,7 @@ public:
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
void c1541pdc_mem(address_map &map);
protected:
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;

4
src/devices/bus/cbmiec/c1571.cpp
View File

@ -144,7 +144,7 @@ const tiny_rom_entry *mini_chief_device::device_rom_region() const
// ADDRESS_MAP( c1571_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1571_mem, AS_PROGRAM, 8, c1571_device )
ADDRESS_MAP_START(c1571_device::c1571_mem)
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x03f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x03f0) AM_READWRITE(via1_r, via1_w)
@ -158,7 +158,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( mini_chief_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( mini_chief_mem, AS_PROGRAM, 8, mini_chief_device )
ADDRESS_MAP_START(mini_chief_device::mini_chief_mem)
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x03f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x03f0) AM_READWRITE(via1_r, via1_w)

2
src/devices/bus/cbmiec/c1571.h
View File

@ -68,6 +68,7 @@ public:
void wpt_callback(floppy_image_device *floppy, int state);
void c1571_mem(address_map &map);
protected:
c1571_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@ -165,6 +166,7 @@ public:
// construction/destruction
mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void mini_chief_mem(address_map &map);
protected:
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;

2
src/devices/bus/cbmiec/c1581.cpp
View File

@ -89,7 +89,7 @@ const tiny_rom_entry *c1563_device::device_rom_region() const
// ADDRESS_MAP( c1581_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1581_mem, AS_PROGRAM, 8, c1581_device )
ADDRESS_MAP_START(c1581_device::c1581_mem)
AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x2000) AM_RAM
AM_RANGE(0x4000, 0x400f) AM_MIRROR(0x1ff0) AM_DEVREADWRITE(M8520_TAG, mos8520_device, read, write)
AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE(WD1772_TAG, wd1772_device, read, write)

1
src/devices/bus/cbmiec/c1581.h
View File

@ -39,6 +39,7 @@ public:
// construction/destruction
c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void c1581_mem(address_map &map);
protected:
c1581_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

2
src/devices/bus/cbmiec/cmdhd.cpp
View File

@ -61,7 +61,7 @@ const tiny_rom_entry *cmd_hd_device::device_rom_region() const
// ADDRESS_MAP( cmd_hd_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( cmd_hd_mem, AS_PROGRAM, 8, cmd_hd_device )
ADDRESS_MAP_START(cmd_hd_device::cmd_hd_mem)
AM_RANGE(0x0000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION(M6502_TAG, 0)
AM_RANGE(0x8000, 0x800f) AM_MIRROR(0x1f0) AM_DEVWRITE(M6522_1_TAG, via6522_device, write)

1
src/devices/bus/cbmiec/cmdhd.h
View File

@ -42,6 +42,7 @@ public:
DECLARE_WRITE8_MEMBER( led_w );
void cmd_hd_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/cbmiec/fd2000.cpp
View File

@ -89,7 +89,7 @@ const tiny_rom_entry *fd4000_device::device_rom_region() const
// ADDRESS_MAP( fd2000_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( fd2000_mem, AS_PROGRAM, 8, fd2000_device )
ADDRESS_MAP_START(fd2000_device::fd2000_mem)
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0x400f) AM_MIRROR(0xbf0) AM_DEVREADWRITE(G65SC22P2_TAG, via6522_device, read, write)
AM_RANGE(0x4e00, 0x4e07) AM_MIRROR(0x1f8) AM_DEVICE(DP8473V_TAG, dp8473_device, map)
@ -102,7 +102,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( fd4000_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( fd4000_mem, AS_PROGRAM, 8, fd4000_device )
ADDRESS_MAP_START(fd4000_device::fd4000_mem)
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0x400f) AM_MIRROR(0xbf0) AM_DEVREADWRITE(G65SC22P2_TAG, via6522_device, read, write)
AM_RANGE(0x4e00, 0x4e07) AM_MIRROR(0x1f8) AM_DEVICE(PC8477AV1_TAG, pc8477a_device, map)

2
src/devices/bus/cbmiec/fd2000.h
View File

@ -47,6 +47,7 @@ public:
//DECLARE_FLOPPY_FORMATS( floppy_formats );
void fd2000_mem(address_map &map);
protected:
fd2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@ -78,6 +79,7 @@ public:
// construction/destruction
fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void fd4000_mem(address_map &map);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_add_mconfig(machine_config &config) override;

2
src/devices/bus/cbmiec/interpod.cpp
View File

@ -109,7 +109,7 @@ const tiny_rom_entry *interpod_device::device_rom_region() const
// ADDRESS_MAP( interpod_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( interpod_mem, AS_PROGRAM, 8, interpod_device )
ADDRESS_MAP_START(interpod_device::interpod_mem)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x3b80) AM_DEVICE(R6532_TAG, mos6532_new_device, ram_map)
AM_RANGE(0x0400, 0x041f) AM_MIRROR(0x3be0) AM_DEVICE(R6532_TAG, mos6532_new_device, io_map)
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x9ffe) AM_DEVREADWRITE(MC6850_TAG, acia6850_device, read, write)

1
src/devices/bus/cbmiec/interpod.h
View File

@ -49,6 +49,7 @@ public:
// construction/destruction
interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void interpod_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/cbmiec/serialbox.cpp
View File

@ -59,7 +59,7 @@ const tiny_rom_entry *serial_box_device::device_rom_region() const
// ADDRESS_MAP( serial_box_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( serial_box_mem, AS_PROGRAM, 8, serial_box_device )
ADDRESS_MAP_START(serial_box_device::serial_box_mem)
AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION(M6502_TAG, 0)
ADDRESS_MAP_END

1
src/devices/bus/cbmiec/serialbox.h
View File

@ -36,6 +36,7 @@ public:
// construction/destruction
serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void serial_box_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/cbmiec/vic1515.cpp
View File

@ -42,7 +42,7 @@ const tiny_rom_entry *vic1515_device::device_rom_region() const
// ADDRESS_MAP( vic1515_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( vic1515_mem, AS_PROGRAM, 8, vic1515_device )
ADDRESS_MAP_START(vic1515_device::vic1515_mem)
AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("rom", 0)
ADDRESS_MAP_END
@ -51,7 +51,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic1515_io )
//-------------------------------------------------
static ADDRESS_MAP_START( vic1515_io, AS_IO, 8, vic1515_device )
ADDRESS_MAP_START(vic1515_device::vic1515_io)
ADDRESS_MAP_END

2
src/devices/bus/cbmiec/vic1515.h
View File

@ -28,6 +28,8 @@ public:
// construction/destruction
vic1515_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void vic1515_io(address_map &map);
void vic1515_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/cbmiec/vic1520.cpp
View File

@ -82,7 +82,7 @@ const tiny_rom_entry *vic1520_device::device_rom_region() const
// ADDRESS_MAP( vic1520_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( vic1520_mem, AS_PROGRAM, 8, vic1520_device )
ADDRESS_MAP_START(vic1520_device::vic1520_mem)
ADDRESS_MAP_GLOBAL_MASK(0xfff)
AM_RANGE(0x000, 0x03f) AM_RAM
AM_RANGE(0x800, 0xfff) AM_ROM AM_REGION(M6500_1_TAG, 0)

1
src/devices/bus/cbmiec/vic1520.h
View File

@ -28,6 +28,7 @@ public:
// construction/destruction
vic1520_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void vic1520_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/cbus/mpu_pc98.cpp
View File

@ -61,7 +61,7 @@ mpu_pc98_device::mpu_pc98_device(const machine_config &mconfig, const char *tag,
{
}
DEVICE_ADDRESS_MAP_START(map, 16, mpu_pc98_device)
ADDRESS_MAP_START(mpu_pc98_device::map)
AM_RANGE(0, 3) AM_DEVREADWRITE8(MPU_CORE_TAG, mpu401_device, mpu_r, mpu_w, 0xff)
ADDRESS_MAP_END
@ -72,7 +72,7 @@ ADDRESS_MAP_END
void mpu_pc98_device::device_start()
{
address_space &iospace = m_bus->io_space();
iospace.install_device(0xe0d0, 0xe0d3, *this, &mpu_pc98_device::map, 16, 0xffffffffffffffffU >> (64 - iospace.data_width()));
iospace.install_device(0xe0d0, 0xe0d3, *this, &mpu_pc98_device::map);
}
//-------------------------------------------------

2
src/devices/bus/cbus/mpu_pc98.h
View File

@ -19,7 +19,7 @@ class mpu_pc98_device : public device_t
public:
// construction/destruction
mpu_pc98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_ADDRESS_MAP(map, 8);
void map(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

4
src/devices/bus/centronics/comxpl80.cpp
View File

@ -62,7 +62,7 @@ const tiny_rom_entry *comx_pl80_device::device_rom_region() const
// ADDRESS_MAP( comxpl80_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( comxpl80_mem, AS_PROGRAM, 8, comx_pl80_device )
ADDRESS_MAP_START(comx_pl80_device::comxpl80_mem)
/* AM_RANGE(0x000, 0x000) AM_READWRITE(cx005_port_a_r, cx005_port_a_w)
AM_RANGE(0x001, 0x001) AM_READWRITE(cx005_port_b_r, cx005_port_b_w)
AM_RANGE(0x002, 0x002) AM_READWRITE(cx005_port_c_r, cx005_port_c_w)
@ -85,7 +85,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( comxpl80_io )
//-------------------------------------------------
static ADDRESS_MAP_START( comxpl80_io, AS_IO, 8, comx_pl80_device )
ADDRESS_MAP_START(comx_pl80_device::comxpl80_io)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00, 0x00) AM_WRITE(pa_w)
AM_RANGE(0x01, 0x01) AM_WRITE(pb_w)

2
src/devices/bus/centronics/comxpl80.h
View File

@ -35,6 +35,8 @@ public:
DECLARE_WRITE8_MEMBER( pc_w );
DECLARE_READ8_MEMBER( pd_r );
void comxpl80_io(address_map &map);
void comxpl80_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/centronics/epson_ex800.cpp
View File

@ -198,7 +198,7 @@ const tiny_rom_entry *epson_ex800_device::device_rom_region() const
// ADDRESS_MAP( ex800_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( ex800_mem, AS_PROGRAM, 8, epson_ex800_device )
ADDRESS_MAP_START(epson_ex800_device::ex800_mem)
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("maincpu", 0)
AM_RANGE(0x8000, 0xbfff) AM_RAM /* external RAM */
AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_READWRITE(devsel_r, devsel_w)

1
src/devices/bus/centronics/epson_ex800.h
View File

@ -41,6 +41,7 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(online_switch);
void ex800_mem(address_map &map);
protected:
// device-level overrides
virtual void device_start() override;

2
src/devices/bus/centronics/epson_lx800.cpp
View File

@ -52,7 +52,7 @@ const tiny_rom_entry *epson_lx800_device::device_rom_region() const
// ADDRESS_MAP( lx800_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( lx800_mem, AS_PROGRAM, 8, epson_lx800_device )
ADDRESS_MAP_START(epson_lx800_device::lx800_mem)
AM_RANGE(0x0000, 0x7fff) AM_ROM /* 32k firmware */
AM_RANGE(0x8000, 0x9fff) AM_RAM /* 8k external RAM */
AM_RANGE(0xa000, 0xbfff) AM_NOP /* not used */

1
src/devices/bus/centronics/epson_lx800.h
View File

@ -36,6 +36,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(paperempty_led_w);
DECLARE_WRITE_LINE_MEMBER(reset_w);
void lx800_mem(address_map &map);
protected:
epson_lx800_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

2
src/devices/bus/centronics/epson_lx810l.cpp
View File

@ -95,7 +95,7 @@ const tiny_rom_entry *epson_ap2000_device::device_rom_region() const
// ADDRESS_MAP( lx810l_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( lx810l_mem, AS_PROGRAM, 8, epson_lx810l_device )
ADDRESS_MAP_START(epson_lx810l_device::lx810l_mem)
AM_RANGE(0x0000, 0x7fff) AM_ROM /* 32k firmware */
AM_RANGE(0x8000, 0x9fff) AM_RAM /* 8k external RAM */
AM_RANGE(0xa000, 0xbfff) AM_READWRITE(fakemem_r, fakemem_w) /* fake memory, write one, set all */

1
src/devices/bus/centronics/epson_lx810l.h
View File

@ -63,6 +63,7 @@ public:
#define uabs(x) ((x) > 0 ? (x) : -(x))
unsigned int bitmap_line(int i) { return ((uabs(m_pf_pos_abs) / 6) + i) % m_bitmap.height(); }
void lx810l_mem(address_map &map);
protected:
epson_lx810l_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

Some files were not shown because too many files have changed in this diff Show More