diff options
author | 2018-02-01 10:04:01 +0100 | |
---|---|---|
committer | 2018-02-12 10:04:52 +0100 | |
commit | c5219643162cb7d2a8688425a09008d28c8e2437 (patch) | |
tree | f2775ca3b1770ab0d3fb568f0bdd6d9212c68bf6 /src/devices/bus/cbmiec | |
parent | 09b6ce46873b38de9030a3c0378ff327f17af881 (diff) |
API change: Memory maps are now methods of the owner class [O. Galibert]
Also, a lot more freedom happened, that's going to be more visible
soon.
Diffstat (limited to 'src/devices/bus/cbmiec')
-rw-r--r-- | src/devices/bus/cbmiec/c1526.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1526.h | 1 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1541.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1541.h | 5 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1571.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1571.h | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1581.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/c1581.h | 1 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/cmdhd.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/cmdhd.h | 1 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/fd2000.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/fd2000.h | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/interpod.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/interpod.h | 1 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/serialbox.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/serialbox.h | 1 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/vic1515.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/vic1515.h | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/vic1520.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbmiec/vic1520.h | 1 |
20 files changed, 33 insertions, 16 deletions
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index 49c4279d508..255642b9696 100644 --- a/src/devices/bus/cbmiec/c1526.cpp +++ b/src/devices/bus/cbmiec/c1526.cpp @@ -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 diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h index 87c7f07f7a0..d5042f283f1 100644 --- a/src/devices/bus/cbmiec/c1526.h +++ b/src/devices/bus/cbmiec/c1526.h @@ -32,6 +32,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + void c1526_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 5bc72ce3d60..9d708a588a1 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -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) diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index d2f3cfca377..36b4dac257e 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -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; diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index 58f5b2e6d46..e12008a139d 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -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) diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index 1864313fe8c..272b5ffc123 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -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; diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index ed1d0ebfe26..1244df1f418 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -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) diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index 46d60c05e56..17332c6aab3 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -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); diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp index 813c3ce8c7a..b6aaefa2008 100644 --- a/src/devices/bus/cbmiec/cmdhd.cpp +++ b/src/devices/bus/cbmiec/cmdhd.cpp @@ -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) diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h index 5b19ef10656..e2b1e99df84 100644 --- a/src/devices/bus/cbmiec/cmdhd.h +++ b/src/devices/bus/cbmiec/cmdhd.h @@ -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; diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index bac81b01567..34323500fbc 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -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) diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index 0331ce535de..29525a54490 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -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; diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp index ceaaad1341f..146f1ecc49c 100644 --- a/src/devices/bus/cbmiec/interpod.cpp +++ b/src/devices/bus/cbmiec/interpod.cpp @@ -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) diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h index b7345ea7377..18940128f03 100644 --- a/src/devices/bus/cbmiec/interpod.h +++ b/src/devices/bus/cbmiec/interpod.h @@ -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; diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp index 6f68ccae9c4..d89712fbe01 100644 --- a/src/devices/bus/cbmiec/serialbox.cpp +++ b/src/devices/bus/cbmiec/serialbox.cpp @@ -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 diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h index 8633e374ec2..6400fe92ff5 100644 --- a/src/devices/bus/cbmiec/serialbox.h +++ b/src/devices/bus/cbmiec/serialbox.h @@ -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; diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp index 229f3ed76ec..f0569d2f44e 100644 --- a/src/devices/bus/cbmiec/vic1515.cpp +++ b/src/devices/bus/cbmiec/vic1515.cpp @@ -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 diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h index 7c6876897bc..94ed0d236a7 100644 --- a/src/devices/bus/cbmiec/vic1515.h +++ b/src/devices/bus/cbmiec/vic1515.h @@ -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; diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp index 30291266d9f..c20904403ae 100644 --- a/src/devices/bus/cbmiec/vic1520.cpp +++ b/src/devices/bus/cbmiec/vic1520.cpp @@ -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) diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h index dba79b29618..19ec85de510 100644 --- a/src/devices/bus/cbmiec/vic1520.h +++ b/src/devices/bus/cbmiec/vic1520.h @@ -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; |