Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Cowering 2015-05-25 09:35:32 -05:00
commit d1e51ea9f5
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mess/drivers/a2600.c
View File

@ -11,7 +11,7 @@ TODO:
***************************************************************************/
#include "emu.h"
#include "machine/mos6530n.h"
#include "machine/6532riot.h"
#include "cpu/m6502/m6502.h"
#include "sound/tiaintf.h"
#include "video/tia.h"
@ -81,7 +81,7 @@ static ADDRESS_MAP_START(a2600_mem, AS_PROGRAM, 8, a2600_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0f00) AM_DEVREADWRITE("tia_video", tia_video_device, read, write)
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0d00) AM_RAM AM_SHARE("riot_ram")
AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d00) AM_DEVICE("riot", mos6532_t, io_map)
AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d00) AM_DEVREADWRITE("riot", riot6532_device, read, write)
// AM_RANGE(0x1000, 0x1fff) is cart data and it is configured at reset time, depending on the mounted cart!
ADDRESS_MAP_END
@ -482,12 +482,12 @@ static MACHINE_CONFIG_START( a2600, a2600_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
/* devices */
MCFG_DEVICE_ADD("riot", MOS6532n, MASTER_CLOCK_NTSC / 3)
MCFG_MOS6530n_IN_PA_CB(READ8(a2600_state, switch_A_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
MCFG_MOS6530n_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
MCFG_MOS6530n_IRQ_CB(WRITELINE(a2600_state, irq_callback))
MCFG_DEVICE_ADD("riot", RIOT6532, MASTER_CLOCK_NTSC / 3)
MCFG_RIOT6532_IN_PA_CB(READ8(a2600_state, switch_A_r))
MCFG_RIOT6532_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
MCFG_RIOT6532_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
MCFG_RIOT6532_IRQ_CB(WRITELINE(a2600_state, irq_callback))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy")
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL)
@ -523,12 +523,12 @@ static MACHINE_CONFIG_START( a2600p, a2600_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
/* devices */
MCFG_DEVICE_ADD("riot", MOS6532n, MASTER_CLOCK_PAL / 3)
MCFG_MOS6530n_IN_PA_CB(READ8(a2600_state, switch_A_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
MCFG_MOS6530n_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
MCFG_MOS6530n_IRQ_CB(WRITELINE(a2600_state, irq_callback))
MCFG_DEVICE_ADD("riot", RIOT6532, MASTER_CLOCK_PAL / 3)
MCFG_RIOT6532_IN_PA_CB(READ8(a2600_state, switch_A_r))
MCFG_RIOT6532_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
MCFG_RIOT6532_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
MCFG_RIOT6532_IRQ_CB(WRITELINE(a2600_state, irq_callback))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy")
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL)

22
src/mess/drivers/a7800.c
View File

@ -100,7 +100,7 @@
#include "cpu/m6502/m6502.h"
#include "sound/tiaintf.h"
#include "sound/tiasound.h"
#include "machine/mos6530n.h"
#include "machine/6532riot.h"
#include "video/maria.h"
#include "bus/a7800/a78_carts.h"
@ -284,8 +284,8 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
AM_RANGE(0x0020, 0x003f) AM_MIRROR(0x300) AM_DEVREADWRITE("maria", atari_maria_device, read, write)
AM_RANGE(0x0040, 0x00ff) AM_RAMBANK("zpmirror") // mirror of 0x2040-0x20ff, for zero page
AM_RANGE(0x0140, 0x01ff) AM_RAMBANK("spmirror") // mirror of 0x2140-0x21ff, for stack page
AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x60) AM_DEVICE("riot", mos6532_t, io_map)
AM_RANGE(0x0480, 0x04ff) AM_MIRROR(0x100) AM_DEVICE("riot", mos6532_t, ram_map)
AM_RANGE(0x0280, 0x02ff) AM_DEVREADWRITE("riot", riot6532_device, read, write)
AM_RANGE(0x0480, 0x04ff) AM_RAM AM_SHARE("riot_ram") AM_MIRROR(0x100)
AM_RANGE(0x1800, 0x1fff) AM_RAM AM_SHARE("6116_1")
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("6116_2") AM_MIRROR(0x0800)
// According to the official Software Guide, the RAM at 0x2000 is
@ -1375,10 +1375,10 @@ static MACHINE_CONFIG_START( a7800_ntsc, a7800_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
MCFG_DEVICE_ADD("riot", MOS6532n, A7800_NTSC_Y1/8)
MCFG_MOS6530n_IN_PA_CB(READ8(a7800_state, riot_joystick_r))
MCFG_MOS6530n_IN_PB_CB(READ8(a7800_state, riot_console_button_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(a7800_state, riot_button_pullup_w))
MCFG_DEVICE_ADD("riot", RIOT6532, A7800_NTSC_Y1/8)
MCFG_RIOT6532_IN_PA_CB(READ8(a7800_state, riot_joystick_r))
MCFG_RIOT6532_IN_PB_CB(READ8(a7800_state, riot_console_button_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(a7800_state, riot_button_pullup_w))
MCFG_A78_CARTRIDGE_ADD("cartslot", a7800_cart, NULL)
@ -1402,10 +1402,10 @@ static MACHINE_CONFIG_DERIVED( a7800_pal, a7800_ntsc )
/* devices */
MCFG_DEVICE_REMOVE("riot")
MCFG_DEVICE_ADD("riot", MOS6532n, CLK_PAL)
MCFG_MOS6530n_IN_PA_CB(READ8(a7800_state, riot_joystick_r))
MCFG_MOS6530n_IN_PB_CB(READ8(a7800_state, riot_console_button_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(a7800_state, riot_button_pullup_w))
MCFG_DEVICE_ADD("riot", RIOT6532, CLK_PAL)
MCFG_RIOT6532_IN_PA_CB(READ8(a7800_state, riot_joystick_r))
MCFG_RIOT6532_IN_PB_CB(READ8(a7800_state, riot_console_button_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(a7800_state, riot_button_pullup_w))
/* software lists */
MCFG_DEVICE_REMOVE("cart_list")