Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-01 18:41:47 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
hap 2014-11-09 21:35:01 +01:00
parent 299bec581a
commit dac953354a
4 changed files with 82 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/mame/drivers/segas24.c
View File

@ -820,7 +820,7 @@ void segas24_state::irq_timer_sync()
break; break;
} }
case 2: { case 2: {
fatalerror("egas24_state::irq_timer_sync - case 2\n"); fatalerror("segas24_state::irq_timer_sync - case 2\n");
} }
case 3: { case 3: {
int ppos = floor((irq_synctime - irq_vsynctime).as_double() * TIMER_CLOCK); int ppos = floor((irq_synctime - irq_vsynctime).as_double() * TIMER_CLOCK);
@ -851,7 +851,7 @@ void segas24_state::irq_timer_start(int old_tmode)
break; break;
} }
case 2: case 2:
fatalerror("egas24_state::irq_timer_start - case 2\n"); fatalerror("segas24_state::irq_timer_start - case 2\n");
case 3: { case 3: {
int count = 0x1000 - irq_tval; int count = 0x1000 - irq_tval;
irq_timer->adjust(attotime::from_hz(TIMER_CLOCK)*count); irq_timer->adjust(attotime::from_hz(TIMER_CLOCK)*count);
@ -1288,7 +1288,7 @@ void segas24_state::machine_reset()
* *
*************************************/ *************************************/
static INPUT_PORTS_START( system24_P1_P2 ) static INPUT_PORTS_START( system24_generic )
PORT_START("P1") PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@ -1308,9 +1308,10 @@ static INPUT_PORTS_START( system24_P1_P2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( system24_Service ) PORT_START("P3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("SERVICE") PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
@ -1320,9 +1321,7 @@ static INPUT_PORTS_START( system24_Service )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 )
INPUT_PORTS_END
static INPUT_PORTS_START( system24_DSW )
PORT_START("COINAGE") PORT_START("COINAGE")
SEGA_COINAGE_LOC(SW1) SEGA_COINAGE_LOC(SW1)
@ -1337,11 +1336,6 @@ static INPUT_PORTS_START( system24_DSW )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW2:8" ) PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW2:8" )
INPUT_PORTS_END INPUT_PORTS_END
static INPUT_PORTS_START( system24_generic )
PORT_INCLUDE( system24_P1_P2 )
PORT_INCLUDE( system24_Service )
PORT_INCLUDE( system24_DSW )
INPUT_PORTS_END
/************************************* /*************************************
* *
@ -1688,7 +1682,7 @@ static INPUT_PORTS_START( sgmastj )
INPUT_PORTS_END INPUT_PORTS_END
static INPUT_PORTS_START( quizmeku ) static INPUT_PORTS_START( quizmeku )
PORT_INCLUDE( system24_P1_P2 ) PORT_INCLUDE( system24_generic )
PORT_MODIFY("P1") PORT_MODIFY("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
@ -1700,7 +1694,7 @@ static INPUT_PORTS_START( quizmeku )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_START("P3") PORT_MODIFY("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@ -1710,9 +1704,6 @@ static INPUT_PORTS_START( quizmeku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_INCLUDE( system24_Service )
PORT_INCLUDE( system24_DSW )
PORT_MODIFY("DSW") PORT_MODIFY("DSW")
PORT_DIPNAME( 0x01, 0x00, "Play Mode" ) PORT_DIPLOCATION("SW2:1") PORT_DIPNAME( 0x01, 0x00, "Play Mode" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "2 Player" ) PORT_DIPSETTING( 0x01, "2 Player" )
@ -1739,7 +1730,7 @@ static INPUT_PORTS_START( quizmeku )
INPUT_PORTS_END INPUT_PORTS_END
static INPUT_PORTS_START( qrouka ) static INPUT_PORTS_START( qrouka )
PORT_INCLUDE( system24_P1_P2 ) PORT_INCLUDE( system24_generic )
PORT_MODIFY("P1") PORT_MODIFY("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
@ -1751,7 +1742,7 @@ static INPUT_PORTS_START( qrouka )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_START("P3") PORT_MODIFY("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@ -1761,7 +1752,7 @@ static INPUT_PORTS_START( qrouka )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_START("SERVICE") PORT_MODIFY("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_CONDITION("DSW",0x08,EQUALS,0x00) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_CONDITION("DSW",0x08,EQUALS,0x00)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_CONDITION("DSW",0x08,EQUALS,0x00) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_CONDITION("DSW",0x08,EQUALS,0x00)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@ -1776,9 +1767,6 @@ static INPUT_PORTS_START( qrouka )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW",0x08,EQUALS,0x08) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW",0x08,EQUALS,0x08)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW",0x08,EQUALS,0x08) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW",0x08,EQUALS,0x08)
PORT_INCLUDE( system24_DSW )
PORT_MODIFY("DSW") PORT_MODIFY("DSW")
PORT_DIPNAME( 0x01, 0x00, "Play Mode" ) PORT_DIPLOCATION("SW2:1") PORT_DIPNAME( 0x01, 0x00, "Play Mode" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "2 Player" ) PORT_DIPSETTING( 0x01, "2 Player" )
@ -1803,6 +1791,17 @@ static INPUT_PORTS_START( qrouka )
INPUT_PORTS_END INPUT_PORTS_END
static INPUT_PORTS_START( mahmajn ) static INPUT_PORTS_START( mahmajn )
PORT_INCLUDE( system24_generic )
PORT_MODIFY("P1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_MODIFY("P2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_MODIFY("P3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("MJ0") PORT_START("MJ0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B )
@ -1841,15 +1840,6 @@ static INPUT_PORTS_START( mahmajn )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("P1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("P2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_INCLUDE( system24_Service )
PORT_INCLUDE( system24_DSW )
PORT_MODIFY("DSW") PORT_MODIFY("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
@ -1872,9 +1862,9 @@ static INPUT_PORTS_START( mahmajn )
INPUT_PORTS_END INPUT_PORTS_END
static INPUT_PORTS_START( gground ) static INPUT_PORTS_START( gground )
PORT_INCLUDE( system24_P1_P2 ) PORT_INCLUDE( system24_generic )
PORT_START("P3") PORT_MODIFY("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
@ -1884,9 +1874,6 @@ static INPUT_PORTS_START( gground )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_INCLUDE( system24_Service )
PORT_INCLUDE( system24_DSW )
PORT_MODIFY("DSW") PORT_MODIFY("DSW")
// Here is known problem. // Here is known problem.
// Service mode works as I hoped. // Service mode works as I hoped.
@ -1924,6 +1911,7 @@ INPUT_PORTS_END
*************************************/ *************************************/
static MACHINE_CONFIG_START( system24, segas24_state ) static MACHINE_CONFIG_START( system24, segas24_state )
/* basic machine hardware */ /* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(system24_cpu1_map) MCFG_CPU_PROGRAM_MAP(system24_cpu1_map)
@ -1934,7 +1922,6 @@ static MACHINE_CONFIG_START( system24, segas24_state )
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_TIMER_DRIVER_ADD("irq_timer", segas24_state, irq_timer_cb) MCFG_TIMER_DRIVER_ADD("irq_timer", segas24_state, irq_timer_cb)
MCFG_TIMER_DRIVER_ADD("irq_timer_clear", segas24_state, irq_timer_clear_cb) MCFG_TIMER_DRIVER_ADD("irq_timer_clear", segas24_state, irq_timer_clear_cb)
MCFG_TIMER_ADD_NONE("frc_timer") MCFG_TIMER_ADD_NONE("frc_timer")
@ -2305,7 +2292,7 @@ ROM_END
/* I think the letter after the disk code is the region /* I think the letter after the disk code is the region
'b' = Japan 'b' = Japan
'c' = europe? 'c' = Europe?
'd' = US 'd' = US
*/ */

20
src/mame/includes/segas24.h
View File

@ -1,3 +1,8 @@
/*
* Sega System 24
*
*/
#include "video/segaic24.h" #include "video/segaic24.h"
#include "sound/dac.h" #include "sound/dac.h"
@ -11,8 +16,15 @@ public:
m_dac(*this, "dac"), m_dac(*this, "dac"),
m_screen(*this, "screen"), m_screen(*this, "screen"),
m_palette(*this, "palette"), m_palette(*this, "palette"),
m_generic_paletteram_16(*this, "paletteram") { } m_generic_paletteram_16(*this, "paletteram")
{ }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<dac_device> m_dac;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_shared_ptr<UINT16> m_generic_paletteram_16;
static const UINT8 mahmajn_mlt[8]; static const UINT8 mahmajn_mlt[8];
static const UINT8 mahmajn2_mlt[8]; static const UINT8 mahmajn2_mlt[8];
@ -125,10 +137,4 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(irq_timer_clear_cb); TIMER_DEVICE_CALLBACK_MEMBER(irq_timer_clear_cb);
TIMER_DEVICE_CALLBACK_MEMBER(irq_frc_cb); TIMER_DEVICE_CALLBACK_MEMBER(irq_frc_cb);
TIMER_DEVICE_CALLBACK_MEMBER(irq_vbl); TIMER_DEVICE_CALLBACK_MEMBER(irq_vbl);
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<dac_device> m_dac;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_shared_ptr<UINT16> m_generic_paletteram_16;
}; };

5
src/mame/video/segaic24.h
View File

@ -1,3 +1,8 @@
/*
Sega system24 hardware
*/
#ifndef __SEGAIC24_H #ifndef __SEGAIC24_H
#define __SEGAIC24_H #define __SEGAIC24_H

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

@ -1,3 +1,8 @@
/*
* Sega System 24
*
*/
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>