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

Revert "Revert "asteroid: Use LS153 device for DSW1""

Browse Source 
This reverts commit b2c69470cf.
This commit is contained in:
Dirk Best 2018-01-28 19:36:37 +01:00
parent 02e61a6841
commit 00401ff480
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,6 +658,8 @@ MACHINE_CONFIG_START(asteroid_state::asteroid_base)
MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_ADD("watchdog")
MCFG_TTL153_ADD("dsw_sel")
/* video hardware */ /* video hardware */
MCFG_VECTOR_ADD("vector") MCFG_VECTOR_ADD("vector")
MCFG_SCREEN_ADD("screen", VECTOR) MCFG_SCREEN_ADD("screen", VECTOR)

5
src/mame/includes/asteroid.h
View File

@ -8,6 +8,7 @@
#include "sound/discrete.h" #include "sound/discrete.h"
#include "video/avgdvg.h" #include "video/avgdvg.h"
#include "machine/74153.h"
class asteroid_state : public driver_device class asteroid_state : public driver_device
{ {
@ -17,6 +18,8 @@ public:
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_dvg(*this, "dvg"), m_dvg(*this, "dvg"),
m_discrete(*this, "discrete"), m_discrete(*this, "discrete"),
m_dsw1(*this, "DSW1"),
m_dsw_sel(*this, "dsw_sel"),
m_ram1(*this, "ram1"), m_ram1(*this, "ram1"),
m_ram2(*this, "ram2") { } m_ram2(*this, "ram2") { }
@ -24,6 +27,8 @@ public:
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<dvg_device> m_dvg; required_device<dvg_device> m_dvg;
required_device<discrete_device> m_discrete; required_device<discrete_device> m_discrete;
required_ioport m_dsw1;
required_device<ttl153_device> m_dsw_sel;
/* memory banks */ /* memory banks */
optional_memory_bank m_ram1; optional_memory_bank m_ram1;

21
src/mame/machine/asteroid.cpp
View File

@ -84,13 +84,24 @@ READ8_MEMBER(asteroid_state::asteroid_IN1_r)
READ8_MEMBER(asteroid_state::asteroid_DSW1_r) READ8_MEMBER(asteroid_state::asteroid_DSW1_r)
{ {
int res; // 765432-- not used
int res1; // ------1- ls253 dsw selector 2y
// -------0 ls253 dsw selector 1y
res1 = ioport("DSW1")->read(); uint8_t val = m_dsw1->read();
res = 0xfc | ((res1 >> (2 * (3 - (offset & 0x3)))) & 0x3); m_dsw_sel->i3a_w(BIT(val, 0));
return res; m_dsw_sel->i3b_w(BIT(val, 1));
m_dsw_sel->i2a_w(BIT(val, 2));
m_dsw_sel->i2b_w(BIT(val, 3));
m_dsw_sel->i1a_w(BIT(val, 4));
m_dsw_sel->i1b_w(BIT(val, 5));
m_dsw_sel->i0a_w(BIT(val, 6));
m_dsw_sel->i0b_w(BIT(val, 7));
m_dsw_sel->s_w(space, 0, offset & 0x03);
return 0xfc | (m_dsw_sel->zb_r() << 1) | m_dsw_sel->za_r();
} }