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

small cleanup+preparation

Browse Source
This commit is contained in:
Michaël Banaan Ananas 2012-11-20 18:42:05 +00:00
parent e83fe8c4d4
commit e1d32009ad
3 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/mame/drivers/starfire.c
View File

@ -62,12 +62,9 @@ WRITE8_MEMBER(starfire_state::starfire_scratch_w)
{
switch (offset & 7)
{
case 0: m_starfire_vidctrl = data; break;
case 1: m_starfire_vidctrl1 = data; break;
case 2:
/* Sounds */
m_fireone_select = (data & 0x8) ? 0 : 1;
break;
case 0: m_starfire_vidctrl = data; break;
case 1: m_starfire_vidctrl1 = data; break;
case 2: m_io2_write(space, offset, data, 0xff); break;
default: break;
}
}
@ -93,24 +90,35 @@ READ8_MEMBER(starfire_state::starfire_scratch_r)
/*************************************
*
* Game-specific input handlers
* Game-specific I/O handlers
*
*************************************/
WRITE8_MEMBER(starfire_state::starfire_sound_w)
{
// TODO: sound
}
WRITE8_MEMBER(starfire_state::fireone_io2_w)
{
// TODO: sound
m_fireone_select = (data & 0x8) ? 0 : 1;
}
READ8_MEMBER(starfire_state::starfire_input_r)
{
switch (offset & 15)
{
case 0: return ioport("DSW")->read();
case 1: return ioport("SYSTEM")->read(); /* Note: need to loopback sounds lengths on that one */
case 0: return ioport("DSW")->read();
case 1: return ioport("SYSTEM")->read(); /* Note: need to loopback sounds lengths on that one */
case 5: return ioport("STICKZ")->read();
case 6: return ioport("STICKX")->read();
case 7: return ioport("STICKY")->read();
case 6: return ioport("STICKX")->read();
case 7: return ioport("STICKY")->read();
default: return 0xff;
}
}
READ8_MEMBER(starfire_state::fireone_input_r)
{
static const UINT8 fireone_paddle_map[64] =
@ -124,17 +132,16 @@ READ8_MEMBER(starfire_state::fireone_input_r)
0x28,0x29,0x2b,0x2a,0x2e,0x2f,0x2d,0x2c,
0x24,0x25,0x27,0x26,0x22,0x23,0x21,0x20
};
int temp;
switch (offset & 15)
{
case 0: return ioport("DSW")->read();
case 1: return ioport("SYSTEM")->read();
case 0: return ioport("DSW")->read();
case 1: return ioport("SYSTEM")->read();
case 2:
temp = m_fireone_select ? ioport("P1")->read() : ioport("P2")->read();
temp = (temp & 0xc0) | fireone_paddle_map[temp & 0x3f];
return temp;
{
UINT8 input = m_fireone_select ? ioport("P1")->read() : ioport("P2")->read();
return (input & 0xc0) | fireone_paddle_map[input & 0x3f];
}
default: return 0xff;
}
}
@ -163,37 +170,37 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( starfire )
PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, "Time" )
PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, "Time" ) PORT_DIPLOCATION("3A:1,2")
PORT_DIPSETTING( 0x00, "90 Sec" )
PORT_DIPSETTING( 0x01, "80 Sec" )
PORT_DIPSETTING( 0x02, "70 Sec" )
PORT_DIPSETTING( 0x03, "60 Sec" )
PORT_DIPNAME( 0x04, 0x00, "Coin(s) to Start" )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x04, "2" )
PORT_DIPNAME( 0x08, 0x00, "Fuel per Coin" )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("3A:3")
PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPNAME( 0x08, 0x00, "Fuel per Coin" ) PORT_DIPLOCATION("3A:4")
PORT_DIPSETTING( 0x00, "300" )
PORT_DIPSETTING( 0x08, "600" )
PORT_DIPNAME( 0x30, 0x00, "Bonus" )
PORT_DIPNAME( 0x30, 0x00, "Bonus" ) PORT_DIPLOCATION("3A:5,6")
PORT_DIPSETTING( 0x00, "300 points" )
PORT_DIPSETTING( 0x10, "500 points" )
PORT_DIPSETTING( 0x20, "700 points" )
PORT_DIPSETTING( 0x30, DEF_STR( None ) )
PORT_DIPNAME( 0x40, 0x00, "Score Table Hold" )
PORT_DIPNAME( 0x40, 0x00, "Score Table Hold" ) PORT_DIPLOCATION("3A:7")
PORT_DIPSETTING( 0x00, "fixed length" )
PORT_DIPSETTING( 0x40, "fixed length+fire" )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
PORT_SERVICE_DIPLOC(0x80, IP_ACTIVE_HIGH, "3A:8" )
PORT_START("SYSTEM") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SPECIAL ) // (audio) TIE ON, see starfire_input_r
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SPECIAL ) // (audio) LASER ON, see starfire_input_r
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT ) // SLAM/STATIC
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("STICKX") /* IN2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
@ -212,7 +219,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fireone )
PORT_START("DSW") /* DSW0 */
PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "2 Coins/1 Player" )
PORT_DIPSETTING( 0x02, "2 Coins/1 or 2 Players" )
@ -382,11 +389,13 @@ ROM_END
DRIVER_INIT_MEMBER(starfire_state,starfire)
{
m_input_read = read8_delegate(FUNC(starfire_state::starfire_input_r),this);
m_io2_write = write8_delegate(FUNC(starfire_state::starfire_sound_w),this);
}
DRIVER_INIT_MEMBER(starfire_state,fireone)
{
m_input_read = read8_delegate(FUNC(starfire_state::fireone_input_r),this);
m_io2_write = write8_delegate(FUNC(starfire_state::fireone_io2_w),this);
/* register for state saving */
save_item(NAME(m_fireone_select));

11
src/mame/includes/starfire.h
View File

@ -4,7 +4,7 @@
***************************************************************************/
#define STARFIRE_MASTER_CLOCK (20000000)
#define STARFIRE_MASTER_CLOCK (XTAL_20MHz)
#define STARFIRE_CPU_CLOCK (STARFIRE_MASTER_CLOCK / 8)
#define STARFIRE_PIXEL_CLOCK (STARFIRE_MASTER_CLOCK / 4)
#define STARFIRE_HTOTAL (0x13f) /* could be 0x140, but I think this is right */
@ -24,7 +24,8 @@ public:
m_starfire_videoram(*this, "videoram")
{ }
read8_delegate m_input_read;
required_shared_ptr<UINT8> m_starfire_colorram;
required_shared_ptr<UINT8> m_starfire_videoram;
UINT8 m_fireone_select;
@ -33,8 +34,8 @@ public:
UINT8 m_starfire_color;
UINT16 m_starfire_colors[STARFIRE_NUM_PENS];
required_shared_ptr<UINT8> m_starfire_colorram;
required_shared_ptr<UINT8> m_starfire_videoram;
read8_delegate m_input_read;
write8_delegate m_io2_write;
emu_timer* m_scanline_timer;
bitmap_rgb32 m_starfire_screen;
@ -42,6 +43,8 @@ public:
DECLARE_READ8_MEMBER(starfire_scratch_r);
DECLARE_READ8_MEMBER(starfire_input_r);
DECLARE_READ8_MEMBER(fireone_input_r);
DECLARE_WRITE8_MEMBER(starfire_sound_w);
DECLARE_WRITE8_MEMBER(fireone_io2_w);
DECLARE_WRITE8_MEMBER(starfire_colorram_w);
DECLARE_READ8_MEMBER(starfire_colorram_r);
DECLARE_WRITE8_MEMBER(starfire_videoram_w);

5
src/mame/video/starfire.c
View File

@ -1,6 +1,6 @@
/***************************************************************************
Star Fire video system
Star Fire/Fire One system - video hardware
***************************************************************************/
@ -17,7 +17,6 @@
void starfire_state::video_start()
{
machine().primary_screen->register_screen_bitmap(m_starfire_screen);
m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(starfire_state::starfire_scanline_callback),this));
m_scanline_timer->adjust(machine().primary_screen->time_until_pos(STARFIRE_VBEND), STARFIRE_VBEND);
@ -38,7 +37,6 @@ void starfire_state::video_start()
WRITE8_MEMBER(starfire_state::starfire_colorram_w)
{
/* handle writes to the pseudo-color RAM */
if ((offset & 0xe0) == 0)
{
@ -72,7 +70,6 @@ WRITE8_MEMBER(starfire_state::starfire_colorram_w)
READ8_MEMBER(starfire_state::starfire_colorram_r)
{
/* handle writes to the pseudo-color RAM, which also happen on reads */
if ((offset & 0xe0) == 0)
{