Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 17:56:43 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup address map remnants (nw)

Browse Source
This commit is contained in:
Olivier Galibert 2018-03-08 07:34:35 +01:00
parent ab7b09b178
commit 50c7386b66
18 changed files with 34 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/bus/ecbbus/grip.cpp
View File

@ -164,12 +164,11 @@ ADDRESS_MAP_START(ecb_grip21_device::grip_io)
// AM_RANGE(0xf0, 0xf0) AM_WRITE(clrg1_w)
ADDRESS_MAP_END
/*
//-------------------------------------------------
// ADDRESS_MAP( grip5_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( grip5_mem, AS_PROGRAM, 8, grip5_state )
ADDRESS_MAP_START(grip5_state::grip5_mem)
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("eprom")
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_RAMBANK("videoram")
@ -180,7 +179,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( grip5_io )
//-------------------------------------------------
static ADDRESS_MAP_START( grip5_io, AS_IO, 8, grip5_device )
ADDRESS_MAP_START(grip5_device::grip5_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(cxstb_r, cxstb_w)
AM_RANGE(0x10, 0x10) AM_WRITE(eprom_w)
@ -215,7 +214,6 @@ static ADDRESS_MAP_START( grip5_io, AS_IO, 8, grip5_device )
// AM_RANGE(0xe0, 0xe0) AM_WRITE(redout_w)
// AM_RANGE(0xf0, 0xf0) AM_WRITE(clrg1_w)
ADDRESS_MAP_END
*/

17
src/devices/cpu/sm510/sm590core.cpp
View File

@ -27,28 +27,11 @@ ADDRESS_MAP_START(sm590_device::program_1x128x4)
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
/*static ADDRESS_MAP_START(program_2x128x4, AS_PROGRAM, 8, sm510_base_device)
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START(program_1x128x4_1x128x2, AS_PROGRAM, 8, sm510_base_device)
AM_RANGE(0x000, 0x2ff) AM_ROM
ADDRESS_MAP_END*/
ADDRESS_MAP_START(sm590_device::data_16x2x4)
AM_RANGE(0x00, 0x0f) AM_RAM
AM_RANGE(0x10, 0x1f) AM_RAM
ADDRESS_MAP_END
/*
static ADDRESS_MAP_START(data_16x3.5x4, AS_DATA, 8, sm510_base_device)
AM_RANGE(0x00, 0x0f) AM_RAM
AM_RANGE(0x10, 0x1f) AM_RAM
AM_RANGE(0x20, 0x2f) AM_RAM
AM_RANGE(0x30, 0x37) AM_RAM
ADDRESS_MAP_END
*/
// device definitions
sm590_device::sm590_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: sm590_device(mconfig, SM590, tag, owner, clock, 4 /* stack levels */, 9 /* prg width */, address_map_constructor(FUNC(sm590_device::program_1x128x4), this), 5 /* data width */, address_map_constructor(FUNC(sm590_device::data_16x2x4), this))

3
src/mame/drivers/acd.cpp
View File

@ -23,9 +23,6 @@ private:
// required_device<cpu_device> m_maincpu;
};
//static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, acd_state )
//ADDRESS_MAP_END
static INPUT_PORTS_START( acd )
INPUT_PORTS_END

20
src/mame/drivers/atom.cpp
View File

@ -292,16 +292,16 @@ ADDRESS_MAP_END
ADDRESS_MAP( prophet_mem )
-------------------------------------------------*/
//static ADDRESS_MAP_START( prophet_mem, AS_PROGRAM, 8, atom_state )
// AM_RANGE(0x0000, 0x09ff) AM_RAM
// AM_RANGE(0x0a00, 0x7fff) AM_RAM
// AM_RANGE(0x8000, 0x97ff) AM_RAM AM_SHARE("video_ram")
// AM_RANGE(0x9800, 0x9fff) AM_RAM
// AM_RANGE(0xa000, 0xafff) AM_ROM AM_REGION("ic24", 0)
// AM_RANGE(0xb000, 0xb003) AM_MIRROR(0x3fc) AM_DEVREADWRITE(INS8255_TAG, i8255_device, read, write)
// AM_RANGE(0xb800, 0xb80f) AM_MIRROR(0x3f0) AM_DEVREADWRITE(R6522_TAG, via6522_device, read, write)
// AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION(SY6502_TAG, 0)
//ADDRESS_MAP_END
ADDRESS_MAP_START(atom_state::prophet_mem)
AM_RANGE(0x0000, 0x09ff) AM_RAM
AM_RANGE(0x0a00, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x97ff) AM_RAM AM_SHARE("video_ram")
AM_RANGE(0x9800, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xafff) AM_ROM AM_REGION("ic24", 0)
AM_RANGE(0xb000, 0xb003) AM_MIRROR(0x3fc) AM_DEVREADWRITE(INS8255_TAG, i8255_device, read, write)
AM_RANGE(0xb800, 0xb80f) AM_MIRROR(0x3f0) AM_DEVREADWRITE(R6522_TAG, via6522_device, read, write)
AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION(SY6502_TAG, 0)
ADDRESS_MAP_END
/***************************************************************************
INPUT PORTS

5
src/mame/drivers/de_2.cpp
View File

@ -58,6 +58,7 @@ public:
void de_type1(machine_config &config);
void de_type2_alpha3(machine_config &config);
void de_type3(machine_config &config);
void de_2_map(address_map &map);
void de_2_audio_map(address_map &map);
protected:
@ -122,7 +123,7 @@ private:
uint8_t m_msm_prescaler;
};
/*static ADDRESS_MAP_START( de_2_map, AS_PROGRAM, 8, de_2_state )
ADDRESS_MAP_START(de_2_state::de_2_map)
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2100, 0x2103) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids
AM_RANGE(0x2200, 0x2200) AM_WRITE(sol3_w) // solenoids
@ -133,7 +134,7 @@ private:
AM_RANGE(0x3400, 0x3403) AM_DEVREADWRITE("pia34", pia6821_device, read, write) // widget
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
*/
ADDRESS_MAP_START(de_2_state::de_2_audio_map)
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym2151", ym2151_device, read, write)

3
src/mame/drivers/hp2100.cpp
View File

@ -246,9 +246,6 @@ private:
// required_device<cpu_device> m_maincpu;
};
//static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 16, hp2100_state )
//ADDRESS_MAP_END
static INPUT_PORTS_START( hp2100 )
INPUT_PORTS_END

6
src/mame/drivers/lilith.cpp
View File

@ -23,12 +23,6 @@ private:
// required_device<cpu_device> m_maincpu;
};
//static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, lilith_state )
//ADDRESS_MAP_END
//static ADDRESS_MAP_START( io_map, AS_PROGRAM, 8, lilith_state )
//ADDRESS_MAP_END
static INPUT_PORTS_START( lilith )
INPUT_PORTS_END

6
src/mame/drivers/onyx.cpp
View File

@ -96,12 +96,6 @@ ADDRESS_MAP_START(onyx_state::c8002_mem)
AM_RANGE(0x08000, 0x0ffff) AM_RAM AM_SHARE("share2") // Z8002 has 64k memory
ADDRESS_MAP_END
//static ADDRESS_MAP_START(c8002_data, AS_DATA, 16, onyx_state)
// AM_RANGE(0x00000, 0x00fff) AM_ROM AM_SHARE("share0")
// AM_RANGE(0x01000, 0x07fff) AM_RAM AM_SHARE("share1")
// AM_RANGE(0x08000, 0xfffff) AM_RAM AM_SHARE("share2")
//ADDRESS_MAP_END
ADDRESS_MAP_START(onyx_state::c8002_io)
map(0xff00, 0xff07).lrw8("sio1_rw", [this](address_space &space, offs_t offset, u8 mem_mask) { return m_sio1->cd_ba_r(space, offset >> 1, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sio1->cd_ba_w(space, offset >> 1, data, mem_mask); });
map(0xff08, 0xff0f).lrw8("sio2_rw", [this](address_space &space, offs_t offset, u8 mem_mask) { return m_sio1->cd_ba_r(space, offset >> 1, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sio1->cd_ba_w(space, offset >> 1, data, mem_mask); });

3
src/mame/drivers/perq.cpp
View File

@ -26,9 +26,6 @@ private:
// required_device<cpu_device> m_maincpu;
};
//static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, perq_state )
//ADDRESS_MAP_END
static INPUT_PORTS_START( perq )
INPUT_PORTS_END

4
src/mame/drivers/powerstack.cpp
View File

@ -24,10 +24,6 @@ private:
// required_device<cpu_device> m_maincpu;
};
//static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 64, powerstack_state )
// AM_RANGE(0xFFF80000, 0xFFFFFFFF) AM_ROM AM_REGION("roms", 0)
//ADDRESS_MAP_END
static INPUT_PORTS_START( powerstack )
INPUT_PORTS_END

8
src/mame/drivers/s11c.cpp
View File

@ -25,15 +25,16 @@ ADDRESS_MAP_START(s11c_state::s11c_main_map)
AM_RANGE(0x3400, 0x3403) AM_MIRROR(0x0bfc) AM_DEVREADWRITE("pia34", pia6821_device, read, write) // widget
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
/*
static ADDRESS_MAP_START( s11c_audio_map, AS_PROGRAM, 8, s11c_state )
ADDRESS_MAP_START(s11c_state::s11c_audio_map)
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_WRITE(bank_w)
AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x0ffc) AM_DEVREADWRITE("pias", pia6821_device, read, write)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank0")
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
static ADDRESS_MAP_START( s11c_bg_map, AS_PROGRAM, 8, s11c_state )
ADDRESS_MAP_START(s11c_state::s11c_bg_map)
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x1ffe) AM_DEVREADWRITE("ym2151", ym2151_device, read, write)
AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("pia40", pia6821_device, read, write)
@ -42,7 +43,6 @@ static ADDRESS_MAP_START( s11c_bg_map, AS_PROGRAM, 8, s11c_state )
AM_RANGE(0x7800, 0x7fff) AM_WRITE(bgbank_w)
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bgbank")
ADDRESS_MAP_END
*/
static INPUT_PORTS_START( s11c )
PORT_START("X0")

7
src/mame/drivers/segaybd.cpp
View File

@ -718,13 +718,6 @@ ADDRESS_MAP_START(segaybd_state::motor_map)
AM_RANGE(0x8000, 0xffff) AM_RAM
ADDRESS_MAP_END
/*
static ADDRESS_MAP_START( motor_portmap, AS_IO, 8, segaybd_state )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
*/
//**************************************************************************
// GENERIC PORT DEFINITIONS
//**************************************************************************

2
src/mame/drivers/sg1000.cpp
View File

@ -188,7 +188,7 @@ ADDRESS_MAP_START(sg1000_state::sc3000_io_map)
ADDRESS_MAP_END
/* This is how the I/O ports are really mapped, but MAME does not support overlapping ranges
static ADDRESS_MAP_START( sc3000_io_map, AS_IO, 8, sg1000_state )
ADDRESS_MAP_START(sg1000_state::sc3000_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_MIRROR(0xdf) AM_DEVREADWRITE(UPD9255_TAG, i8255_device, read, write)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_device, write)

3
src/mame/drivers/solbourne.cpp
View File

@ -23,9 +23,6 @@ private:
// required_device<cpu_device> m_maincpu;
};
//static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, solbourne_state )
//ADDRESS_MAP_END
static INPUT_PORTS_START( solbourne )
INPUT_PORTS_END

17
src/mame/drivers/techno.cpp
View File

@ -47,8 +47,13 @@ public:
DECLARE_WRITE16_MEMBER(sol2_w);
DECLARE_WRITE16_MEMBER(sound_w);
DECLARE_READ8_MEMBER(rd_r) { return 0; }
DECLARE_WRITE8_MEMBER(wr_w) {}
void techno(machine_config &config);
void techno_map(address_map &map);
void techno_sub_map(address_map &map);
private:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void machine_start() override;
@ -82,13 +87,13 @@ ADDRESS_MAP_START(techno_state::techno_map)
AM_RANGE(0x17800, 0x17fff) AM_WRITE(setout_w)
ADDRESS_MAP_END
//static ADDRESS_MAP_START( techno_sub_map, AS_IO, 8, techno_state )
ADDRESS_MAP_START(techno_state::techno_sub_map)
// no ram here, must be internal to the cpu
// AM_RANGE(0x0000, 0x3fff) AM_READ(rd_r) // to TKY2016A audio processor which has its own 3.58MHz clock
// AM_RANGE(0x4000, 0x7fff) AM_WRITE(wr_w) // A11=LED;A12=WR2 (DAC) ;A13=WR1 (TKY2016A as above)
// AM_RANGE(0x4000, 0xbfff) AM_ROM // 4000-7FFF is same as 8000-BFFF; 4x 16k ROMS bankswitched
// AM_RANGE(0xc000, 0xffff) AM_ROM // another 16k ROM
//ADDRESS_MAP_END
AM_RANGE(0x0000, 0x3fff) AM_READ(rd_r) // to TKY2016A audio processor which has its own 3.58MHz clock
AM_RANGE(0x4000, 0x7fff) AM_WRITE(wr_w) // A11=LED;A12=WR2 (DAC) ;A13=WR1 (TKY2016A as above)
AM_RANGE(0x4000, 0xbfff) AM_ROM // 4000-7FFF is same as 8000-BFFF; 4x 16k ROMS bankswitched
AM_RANGE(0xc000, 0xffff) AM_ROM // another 16k ROM
ADDRESS_MAP_END
WRITE16_MEMBER( techno_state::disp1_w )
{

4
src/mame/drivers/zt8802.cpp
View File

@ -30,10 +30,6 @@ private:
// required_device<cpu_device> m_maincpu;
};
//static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, zt8802_state )
// AM_RANGE(0x80000,0xfffff) AM_ROM AM_REGION("roms", 0)
//ADDRESS_MAP_END
static INPUT_PORTS_START( zt8802 )
INPUT_PORTS_END

1
src/mame/includes/atom.h
View File

@ -122,6 +122,7 @@ public:
void atom(machine_config &config);
void atom_mem(address_map &map);
void atombb_mem(address_map &map);
void prophet_mem(address_map &map);
};
class atomeb_state : public atom_state

2
src/mame/includes/s11c.h
View File

@ -23,6 +23,8 @@ public:
void s11c(machine_config &config);
void s11c_main_map(address_map &map);
void s11c_audio_map(address_map &map);
void s11c_bg_map(address_map &map);
protected:
private: