summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/trs80.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/trs80.cpp')
-rw-r--r--src/mame/drivers/trs80.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index a490597f53d..51d5f93c7a8 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -145,20 +145,20 @@ There don't seem to be any JV1 boot disks for Model III/4.
#include "formats/dmk_dsk.h"
-static ADDRESS_MAP_START( trs80_map, AS_PROGRAM, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::trs80_map)
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x3800, 0x38ff) AM_READ(trs80_keyboard_r)
AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x4000, 0x7fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( trs80_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::trs80_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0xff, 0xff) AM_READWRITE(trs80_ff_r, trs80_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model1_map, AS_PROGRAM, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::model1_map)
AM_RANGE(0x0000, 0x377f) AM_ROM // sys80,ht1080 needs up to 375F
AM_RANGE(0x37de, 0x37de) AM_READWRITE(sys80_f9_r, sys80_f8_w)
AM_RANGE(0x37df, 0x37df) AM_READWRITE(trs80m4_eb_r, trs80m4_eb_w)
@@ -175,13 +175,13 @@ static ADDRESS_MAP_START( model1_map, AS_PROGRAM, 8, trs80_state )
AM_RANGE(0x4000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model1_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::model1_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0xff, 0xff) AM_READWRITE(trs80_ff_r, trs80_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sys80_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::sys80_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0xf8, 0xf8) AM_READWRITE(trs80m4_eb_r, sys80_f8_w)
@@ -191,11 +191,11 @@ static ADDRESS_MAP_START( sys80_io, AS_IO, 8, trs80_state )
AM_RANGE(0xff, 0xff) AM_READWRITE(trs80_ff_r, trs80_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lnw80_map, AS_PROGRAM, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::lnw80_map)
AM_RANGE(0x4000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lnw80_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::lnw80_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0xe8, 0xe8) AM_READWRITE(trs80m4_e8_r, trs80m4_e8_w)
@@ -206,10 +206,10 @@ static ADDRESS_MAP_START( lnw80_io, AS_IO, 8, trs80_state )
AM_RANGE(0xff, 0xff) AM_READWRITE(trs80_ff_r, trs80_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model3_map, AS_PROGRAM, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::model3_map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model3_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::model3_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0xe0, 0xe3) AM_READWRITE(trs80m4_e0_r, trs80m4_e0_w)
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( model3_io, AS_IO, 8, trs80_state )
AM_RANGE(0xfc, 0xff) AM_READWRITE(trs80m4_ff_r, trs80m4_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model4_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::model4_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x84, 0x87) AM_WRITE(trs80m4_84_w)
@@ -252,7 +252,7 @@ static ADDRESS_MAP_START( model4_io, AS_IO, 8, trs80_state )
AM_RANGE(0xfc, 0xff) AM_READWRITE(trs80m4_ff_r, trs80m4_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model4p_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::model4p_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x84, 0x87) AM_WRITE(trs80m4_84_w)
@@ -276,14 +276,14 @@ static ADDRESS_MAP_START( model4p_io, AS_IO, 8, trs80_state )
AM_RANGE(0xfc, 0xff) AM_READWRITE(trs80m4_ff_r, trs80m4_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meritum_map, AS_PROGRAM, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::meritum_map)
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x300) AM_READ(trs80_keyboard_r)
AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x4000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meritum_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::meritum_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
// There are specific writes to ports 03, F3, F7, F8, FA, FB, FD
@@ -302,7 +302,7 @@ static ADDRESS_MAP_START( meritum_io, AS_IO, 8, trs80_state )
AM_RANGE(0xff, 0xff) AM_READWRITE(trs80_ff_r, trs80_ff_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cp500_io, AS_IO, 8, trs80_state )
+ADDRESS_MAP_START(trs80_state::cp500_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0xe0, 0xe3) AM_READWRITE(trs80m4_e0_r, trs80m4_e0_w)