atari: changed just things I need (nw)

This commit is contained in:
Miodrag Milanovic 2014-04-21 09:21:22 +00:00
parent 189eab0ec9
commit ff6c78345d
7 changed files with 28 additions and 26 deletions

View File

@ -37,8 +37,8 @@ public:
static ADDRESS_MAP_START(a5200_mem, AS_PROGRAM, 8, bartop52_state )
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd400, 0xd5ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xc000, 0xc0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd400, 0xd5ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xe800, 0xe8ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xf800, 0xffff) AM_ROM
ADDRESS_MAP_END

View File

@ -285,11 +285,11 @@ static ADDRESS_MAP_START(a600xl_mem, AS_PROGRAM, 8, maxaflex_state )
AM_RANGE(0x5000, 0x57ff) AM_ROM AM_REGION("maincpu", 0x5000) /* self test */
AM_RANGE(0x8000, 0xbfff) AM_ROM /* game cartridge */
AM_RANGE(0xc000, 0xcfff) AM_ROM /* OS */
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd100, 0xd1ff) AM_NOP
AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xd300, 0xd3ff) AM_DEVREADWRITE("pia", pia6821_device, read_alt, write_alt)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xd500, 0xd7ff) AM_NOP
AM_RANGE(0xd800, 0xffff) AM_ROM /* OS */
ADDRESS_MAP_END

View File

@ -37,6 +37,12 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER( a5200_interrupt );
DECLARE_PALETTE_INIT(atari);
DECLARE_READ8_MEMBER( atari_gtia_r );
DECLARE_WRITE8_MEMBER( atari_gtia_w );
DECLARE_READ8_MEMBER ( atari_antic_r );
DECLARE_WRITE8_MEMBER ( atari_antic_w );
private:
UINT32 tv_artifacts ;
@ -560,8 +566,6 @@ extern ANTIC antic;
void antic_reset(void);
DECLARE_READ8_HANDLER ( atari_antic_r );
DECLARE_WRITE8_HANDLER ( atari_antic_w );
#define ANTIC_RENDERER(name) void name(address_space &space, VIDEO *video)

View File

@ -53,7 +53,7 @@ void antic_reset(void)
* Read ANTIC hardware registers
*
**************************************************************/
READ8_HANDLER ( atari_antic_r )
READ8_MEMBER ( atari_common_state::atari_antic_r )
{
UINT8 data = 0xff;
@ -119,7 +119,7 @@ READ8_HANDLER ( atari_antic_r )
*
**************************************************************/
WRITE8_HANDLER ( atari_antic_w )
WRITE8_MEMBER ( atari_common_state::atari_antic_w )
{
int temp;

View File

@ -157,11 +157,11 @@ static int is_ntsc(running_machine &machine)
static void gtia_reset(running_machine &machine)
{
int i;
address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
atari_common_state *state = machine.driver_data<atari_common_state>();
/* reset the GTIA read/write/helper registers */
for (i = 0; i < 32; i++)
atari_gtia_w(space,i,0);
state->atari_gtia_w(state->generic_space(),i,0);
memset(&gtia.r, 0, sizeof(gtia.r));
if (is_ntsc(machine))
gtia.r.pal = 0xff;
@ -190,7 +190,7 @@ static void gtia_reset(running_machine &machine)
*
**************************************************************/
READ8_HANDLER( atari_gtia_r )
READ8_MEMBER( atari_common_state::atari_gtia_r )
{
switch (offset & 31)
{
@ -384,7 +384,7 @@ static void recalc_m3(void)
WRITE8_HANDLER( atari_gtia_w )
WRITE8_MEMBER( atari_common_state::atari_gtia_w )
{
/* used for mixing hue/lum of different colors */
// static UINT8 lumpm0=0,lumpm1=0,lumpm2=0,lumpm3=0,lumpm4=0;

View File

@ -134,8 +134,6 @@ struct gtia_struct
extern gtia_struct gtia;
void gtia_init(running_machine &machine, const gtia_interface *intf);
DECLARE_READ8_HANDLER( atari_gtia_r );
DECLARE_WRITE8_HANDLER( atari_gtia_w );
ANTIC_RENDERER( gtia_mode_1_32 );
ANTIC_RENDERER( gtia_mode_1_40 );

View File

@ -375,11 +375,11 @@ static ADDRESS_MAP_START(a400_mem, AS_PROGRAM, 8, a400_state)
AM_RANGE(0x0000, 0x9fff) AM_NOP /* RAM installed at runtime */
AM_RANGE(0xa000, 0xbfff) AM_RAMBANK("a000")
AM_RANGE(0xc000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd100, 0xd1ff) AM_NOP
AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xd300, 0xd3ff) AM_DEVREADWRITE("pia", pia6821_device, read_alt, write_alt)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xd500, 0xd7ff) AM_NOP
AM_RANGE(0xd800, 0xffff) AM_ROM
ADDRESS_MAP_END
@ -390,11 +390,11 @@ static ADDRESS_MAP_START(a800_mem, AS_PROGRAM, 8, a400_state)
AM_RANGE(0x8000, 0x9fff) AM_RAMBANK("8000")
AM_RANGE(0xa000, 0xbfff) AM_RAMBANK("a000")
AM_RANGE(0xc000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd100, 0xd1ff) AM_NOP
AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xd300, 0xd3ff) AM_DEVREADWRITE("pia", pia6821_device, read_alt, write_alt)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xd500, 0xd7ff) AM_NOP
AM_RANGE(0xd800, 0xffff) AM_ROM
ADDRESS_MAP_END
@ -405,11 +405,11 @@ static ADDRESS_MAP_START(a600xl_mem, AS_PROGRAM, 8, a400_state)
AM_RANGE(0x5000, 0x57ff) AM_ROM AM_REGION("maincpu", 0x5000) /* self test */
AM_RANGE(0xa000, 0xbfff) AM_ROM /* BASIC */
AM_RANGE(0xc000, 0xcfff) AM_ROM /* OS */
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd100, 0xd1ff) AM_NOP
AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xd300, 0xd3ff) AM_DEVREADWRITE("pia", pia6821_device, read_alt, write_alt)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xd500, 0xd7ff) AM_NOP
AM_RANGE(0xd800, 0xffff) AM_ROM /* OS */
ADDRESS_MAP_END
@ -421,11 +421,11 @@ static ADDRESS_MAP_START(a800xl_mem, AS_PROGRAM, 8, a400_state)
AM_RANGE(0x5800, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_RAMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAMBANK("bank3")
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd100, 0xd1ff) AM_NOP
AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xd300, 0xd3ff) AM_DEVREADWRITE("pia", pia6821_device, read_alt, write_alt)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xd500, 0xd7ff) AM_NOP
AM_RANGE(0xd800, 0xffff) AM_RAMBANK("bank4")
ADDRESS_MAP_END
@ -437,11 +437,11 @@ static ADDRESS_MAP_START(xegs_mem, AS_PROGRAM, 8, a400_state)
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank0")
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAMBANK("bank3")
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd000, 0xd0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd100, 0xd1ff) AM_NOP
AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xd300, 0xd3ff) AM_DEVREADWRITE("pia", pia6821_device, read_alt, write_alt)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xd400, 0xd4ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xd500, 0xd7ff) AM_NOP
AM_RANGE(0xd800, 0xffff) AM_RAMBANK("bank4")
ADDRESS_MAP_END
@ -450,8 +450,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(a5200_mem, AS_PROGRAM, 8, a400_state)
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_READWRITE_LEGACY(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd400, 0xd5ff) AM_READWRITE_LEGACY(atari_antic_r, atari_antic_w)
AM_RANGE(0xc000, 0xc0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
AM_RANGE(0xd400, 0xd5ff) AM_READWRITE(atari_antic_r, atari_antic_w)
AM_RANGE(0xe800, 0xe8ff) AM_DEVREADWRITE("pokey", pokey_device, read, write)
AM_RANGE(0xf800, 0xffff) AM_ROM
ADDRESS_MAP_END