summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/corona.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/corona.cpp')
-rw-r--r--src/mame/drivers/corona.cpp48
1 files changed, 32 insertions, 16 deletions
diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp
index ad6f4504ccf..15e38a57824 100644
--- a/src/mame/drivers/corona.cpp
+++ b/src/mame/drivers/corona.cpp
@@ -365,6 +365,22 @@ public:
void rcirulet(machine_config &config);
void luckyrlt(machine_config &config);
void re800(machine_config &config);
+ void luckyrlt_cpu_io_map(address_map &map);
+ void luckyrlt_map(address_map &map);
+ void luckyrlt_sound_cpu_io_map(address_map &map);
+ void luckyrlt_sound_map(address_map &map);
+ void re800_cpu_io_map(address_map &map);
+ void re800_map(address_map &map);
+ void re800_sound_cpu_io_map(address_map &map);
+ void re800_sound_map(address_map &map);
+ void winner81_cpu_io_map(address_map &map);
+ void winner81_map(address_map &map);
+ void winner81_sound_cpu_io_map(address_map &map);
+ void winner81_sound_map(address_map &map);
+ void winner82_cpu_io_map(address_map &map);
+ void winner82_map(address_map &map);
+ void winner82_sound_cpu_io_map(address_map &map);
+ void winner82_sound_map(address_map &map);
};
@@ -611,13 +627,13 @@ WRITE8_MEMBER(corona_state::wc_meters_w)
*/
-static ADDRESS_MAP_START( winner81_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner81_map)
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xb800, 0xb8ff) AM_RAM // copied from 8000 (0x10 bytes, repeated)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner81_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner81_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x70, 0x70) AM_WRITE(blitter_x_w)
AM_RANGE(0x71, 0x71) AM_WRITE(blitter_unk_w)
@@ -639,12 +655,12 @@ static ADDRESS_MAP_START( winner81_cpu_io_map, AS_IO, 8, corona_state )
AM_RANGE(0xef, 0xef) AM_WRITE(wc_meters_w) /* meters: coin1 = bit0, coin2 = bit1, coinout = bit2 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner81_sound_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner81_sound_map)
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner81_sound_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner81_sound_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
@@ -668,13 +684,13 @@ ADDRESS_MAP_END
FE ---> Sound Latch (writes 01, 02 and 03 during attract)...
*/
-static ADDRESS_MAP_START( winner82_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner82_map)
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0x80ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner82_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner82_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_WRITE(blitter_x_w)
AM_RANGE(0xf1, 0xf1) AM_WRITE(blitter_y_w)
@@ -693,12 +709,12 @@ static ADDRESS_MAP_START( winner82_cpu_io_map, AS_IO, 8, corona_state )
AM_RANGE(0xff, 0xff) AM_READ_PORT("DSW2") /* no idea */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner82_sound_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner82_sound_map)
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner82_sound_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::winner82_sound_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
@@ -732,13 +748,13 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( re800_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::re800_map)
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram") //801a comm?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( re800_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::re800_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_WRITE(blitter_x_w)
AM_RANGE(0xf1, 0xf1) AM_WRITE(blitter_y_w)
@@ -754,12 +770,12 @@ static ADDRESS_MAP_START( re800_cpu_io_map, AS_IO, 8, corona_state )
AM_RANGE(0xff, 0xff) AM_WRITE(ball_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( re800_sound_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::re800_sound_map)
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( re800_sound_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::re800_sound_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
@@ -792,12 +808,12 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( luckyrlt_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::luckyrlt_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( luckyrlt_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::luckyrlt_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_WRITE(blitter_x_w)
AM_RANGE(0xf1, 0xf1) AM_WRITE(blitter_y_w)
@@ -814,12 +830,12 @@ static ADDRESS_MAP_START( luckyrlt_cpu_io_map, AS_IO, 8, corona_state )
AM_RANGE(0xfe, 0xfe) AM_WRITE(sound_latch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( luckyrlt_sound_map, AS_PROGRAM, 8, corona_state )
+ADDRESS_MAP_START(corona_state::luckyrlt_sound_map)
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( luckyrlt_sound_cpu_io_map, AS_IO, 8, corona_state )
+ADDRESS_MAP_START(corona_state::luckyrlt_sound_cpu_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)