diff options
author | 2018-04-30 23:32:41 +1000 | |
---|---|---|
committer | 2018-04-30 23:32:41 +1000 | |
commit | b60c852f119db04564731fa86d73e0a986771258 (patch) | |
tree | f3f48148a13484a407b7054c78239258708c5a18 /src/devices/bus/msx_slot | |
parent | 89b356a0f5d874f2cabe2e0a96ccfb611b735109 (diff) |
Set finder tag relative to current device being configured rather than
the finder's owner. This meand you no longer need to care about the
your relationship to the object being configured and a lot of ^ and :
can disappear. There's a bit reduction in string pasting in macros from
this.
Yes, I have to make this apply to devcb etc. as well, but that's a job
for another day.
There's probably at least one thing broken by this where optional
objects are involved. Most things can be solved by just getting rid of
the now-problematic ^ and : prefixes.
Diffstat (limited to 'src/devices/bus/msx_slot')
-rw-r--r-- | src/devices/bus/msx_slot/bunsetsu.h | 4 | ||||
-rw-r--r-- | src/devices/bus/msx_slot/disk.h | 12 | ||||
-rw-r--r-- | src/devices/bus/msx_slot/fs4600.h | 2 | ||||
-rw-r--r-- | src/devices/bus/msx_slot/music.h | 2 | ||||
-rw-r--r-- | src/devices/bus/msx_slot/panasonic08.h | 2 | ||||
-rw-r--r-- | src/devices/bus/msx_slot/rom.h | 2 | ||||
-rw-r--r-- | src/devices/bus/msx_slot/sony08.h | 5 |
7 files changed, 14 insertions, 15 deletions
diff --git a/src/devices/bus/msx_slot/bunsetsu.h b/src/devices/bus/msx_slot/bunsetsu.h index da26e5350fb..70649340824 100644 --- a/src/devices/bus/msx_slot/bunsetsu.h +++ b/src/devices/bus/msx_slot/bunsetsu.h @@ -14,8 +14,8 @@ DECLARE_DEVICE_TYPE(MSX_SLOT_BUNSETSU, msx_slot_bunsetsu_device) #define MCFG_MSX_SLOT_BUNSETSU_ADD(_tag, _startpage, _numpages, _region, _offset, _bunsetsu_region_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_BUNSETSU, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ - downcast<msx_slot_bunsetsu_device &>(*device).set_bunsetsu_region_tag("^" _bunsetsu_region_tag); + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ + downcast<msx_slot_bunsetsu_device &>(*device).set_bunsetsu_region_tag(_bunsetsu_region_tag); class msx_slot_bunsetsu_device : public msx_slot_rom_device { diff --git a/src/devices/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h index 698b49b9764..d619cb1aa25 100644 --- a/src/devices/bus/msx_slot/disk.h +++ b/src/devices/bus/msx_slot/disk.h @@ -29,35 +29,35 @@ DECLARE_DEVICE_TYPE(MSX_SLOT_DISK6, msx_slot_disk6_device) #define MCFG_MSX_SLOT_DISK1_ADD(_tag, _startpage, _numpages, _region, _offset, _fdc_tag, _floppy0_tag, _floppy1_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_DISK1, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ downcast<msx_slot_disk_device &>(*device).set_fdc_tag(_fdc_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy0_tag(_floppy0_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy1_tag(_floppy1_tag); #define MCFG_MSX_SLOT_DISK2_ADD(_tag, _startpage, _numpages, _region, _offset, _fdc_tag, _floppy0_tag, _floppy1_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_DISK2, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ downcast<msx_slot_disk_device &>(*device).set_fdc_tag(_fdc_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy0_tag(_floppy0_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy1_tag(_floppy1_tag); #define MCFG_MSX_SLOT_DISK3_ADD(_tag, _startpage, _numpages, _region, _offset, _fdc_tag, _floppy0_tag, _floppy1_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_DISK3, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ downcast<msx_slot_disk_device &>(*device).set_fdc_tag(_fdc_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy0_tag(_floppy0_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy1_tag(_floppy1_tag); #define MCFG_MSX_SLOT_DISK4_ADD(_tag, _startpage, _numpages, _region, _offset, _fdc_tag, _floppy0_tag, _floppy1_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_DISK4, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ downcast<msx_slot_disk_device &>(*device).set_fdc_tag(_fdc_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy0_tag(_floppy0_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy1_tag(_floppy1_tag); #define MCFG_MSX_SLOT_DISK5_ADD(_tag, _startpage, _numpages, _region, _offset, _fdc_tag, _floppy0_tag, _floppy1_tag, _floppy2_tag, _floppy3_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_DISK5, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ downcast<msx_slot_disk_device &>(*device).set_fdc_tag(_fdc_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy0_tag(_floppy0_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy1_tag(_floppy1_tag); \ @@ -66,7 +66,7 @@ DECLARE_DEVICE_TYPE(MSX_SLOT_DISK6, msx_slot_disk6_device) #define MCFG_MSX_SLOT_DISK6_ADD(_tag, _startpage, _numpages, _region, _offset, _fdc_tag, _floppy0_tag, _floppy1_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_DISK6, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ downcast<msx_slot_disk_device &>(*device).set_fdc_tag(_fdc_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy0_tag(_floppy0_tag); \ downcast<msx_slot_disk_device &>(*device).set_floppy1_tag(_floppy1_tag); diff --git a/src/devices/bus/msx_slot/fs4600.h b/src/devices/bus/msx_slot/fs4600.h index b342b07f3fb..c92bd7a3a1f 100644 --- a/src/devices/bus/msx_slot/fs4600.h +++ b/src/devices/bus/msx_slot/fs4600.h @@ -14,7 +14,7 @@ DECLARE_DEVICE_TYPE(MSX_SLOT_FS4600, msx_slot_fs4600_device) #define MCFG_MSX_SLOT_FS4600_ADD(_tag, _startpage, _numpages, _region, _offset) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_FS4600, _startpage, _numpages) \ - downcast<msx_slot_fs4600_device &>(*device).set_rom_start("^" _region, _offset); + downcast<msx_slot_fs4600_device &>(*device).set_rom_start(_region, _offset); class msx_slot_fs4600_device : public device_t, public msx_internal_slot_interface { diff --git a/src/devices/bus/msx_slot/music.h b/src/devices/bus/msx_slot/music.h index 3e8b54686c9..ae2ddc979d0 100644 --- a/src/devices/bus/msx_slot/music.h +++ b/src/devices/bus/msx_slot/music.h @@ -15,7 +15,7 @@ DECLARE_DEVICE_TYPE(MSX_SLOT_MUSIC, msx_slot_music_device) #define MCFG_MSX_SLOT_MUSIC_ADD(_tag, _startpage, _numpages, _region, _offset, _ym2413_tag) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_MUSIC, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); \ + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); \ downcast<msx_slot_music_device &>(*device).set_ym2413_tag(_ym2413_tag); class msx_slot_music_device : public msx_slot_rom_device diff --git a/src/devices/bus/msx_slot/panasonic08.h b/src/devices/bus/msx_slot/panasonic08.h index 7b4f62429f5..33da0b6620b 100644 --- a/src/devices/bus/msx_slot/panasonic08.h +++ b/src/devices/bus/msx_slot/panasonic08.h @@ -14,7 +14,7 @@ DECLARE_DEVICE_TYPE(MSX_SLOT_PANASONIC08, msx_slot_panasonic08_device) #define MCFG_MSX_SLOT_PANASONIC08_ADD(_tag, _startpage, _numpages, _region, _offset) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_PANASONIC08, _startpage, _numpages) \ - downcast<msx_slot_panasonic08_device &>(*device).set_rom_start("^" _region, _offset); + downcast<msx_slot_panasonic08_device &>(*device).set_rom_start(_region, _offset); class msx_slot_panasonic08_device : public device_t, public msx_internal_slot_interface { diff --git a/src/devices/bus/msx_slot/rom.h b/src/devices/bus/msx_slot/rom.h index f2f84bd8589..eee554a362a 100644 --- a/src/devices/bus/msx_slot/rom.h +++ b/src/devices/bus/msx_slot/rom.h @@ -9,7 +9,7 @@ #define MCFG_MSX_SLOT_ROM_ADD(_tag, _startpage, _numpages, _region, _offset) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_ROM, _startpage, _numpages) \ - downcast<msx_slot_rom_device &>(*device).set_rom_start("^" _region, _offset); + downcast<msx_slot_rom_device &>(*device).set_rom_start(_region, _offset); class msx_slot_rom_device : public device_t, public msx_internal_slot_interface diff --git a/src/devices/bus/msx_slot/sony08.h b/src/devices/bus/msx_slot/sony08.h index c9df3701938..8dfd0297951 100644 --- a/src/devices/bus/msx_slot/sony08.h +++ b/src/devices/bus/msx_slot/sony08.h @@ -14,10 +14,9 @@ DECLARE_DEVICE_TYPE(MSX_SLOT_SONY08, msx_slot_sony08_device) #define MCFG_MSX_SLOT_SONY08_ADD(_tag, _startpage, _numpages, _region, _offset) \ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_SONY08, _startpage, _numpages) \ - downcast<msx_slot_sony08_device &>(*device).set_rom_start("^" _region, _offset); + downcast<msx_slot_sony08_device &>(*device).set_rom_start(_region, _offset); -class msx_slot_sony08_device : public device_t, - public msx_internal_slot_interface +class msx_slot_sony08_device : public device_t, public msx_internal_slot_interface { public: msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); |