summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2020-04-02 13:21:26 +0200
committer hap <happppp@users.noreply.github.com>2020-04-02 13:21:39 +0200
commitf40bf01ea6eb4a8c1e9acec4cce3352346bb90fb (patch)
tree8e08e901d9a254ab47c486032fc3c6a77bf576e5 /src
parent2e08cb0b27a6ed009c9305cb692a11f6e359650f (diff)
sag: more setnames more descriptive (nw)
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/hh_sm510.cpp2
-rw-r--r--src/mame/drivers/hh_tms1k.cpp4
-rw-r--r--src/mame/drivers/rzone.cpp4
-rw-r--r--src/mame/drivers/sag.cpp38
-rw-r--r--src/mame/drivers/saitek_mark5.cpp4
-rw-r--r--src/mame/includes/hh_sm510.h2
-rw-r--r--src/mame/mame.lst8
7 files changed, 34 insertions, 28 deletions
diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp
index 6f00550dc14..fcee0b6d14d 100644
--- a/src/mame/drivers/hh_sm510.cpp
+++ b/src/mame/drivers/hh_sm510.cpp
@@ -293,7 +293,7 @@ WRITE8_MEMBER(hh_sm510_state::input_w)
update_k_line();
}
-uint8_t hh_sm510_state::input_r()
+u8 hh_sm510_state::input_r()
{
return read_inputs(m_inp_lines, m_inp_fixed);
}
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 9ddecdef70b..cb5708dae9e 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -12238,7 +12238,7 @@ public:
void update_display();
DECLARE_WRITE16_MEMBER(write_r);
DECLARE_WRITE16_MEMBER(write_o);
- uint8_t read_k();
+ u8 read_k();
void xl25(machine_config &config);
protected:
@@ -12286,7 +12286,7 @@ WRITE16_MEMBER(xl25_state::write_o)
update_halt();
}
-uint8_t xl25_state::read_k()
+u8 xl25_state::read_k()
{
// K: multiplexed inputs
// K4 also goes to MCU halt
diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp
index 1bbeee85bca..c191db0a6ad 100644
--- a/src/mame/drivers/rzone.cpp
+++ b/src/mame/drivers/rzone.cpp
@@ -69,7 +69,7 @@ private:
DECLARE_WRITE8_MEMBER(t1_write_r);
DECLARE_WRITE8_MEMBER(t1_write_s);
- virtual uint8_t input_r() override;
+ virtual u8 input_r() override;
void t2_update_audio();
DECLARE_WRITE8_MEMBER(t2_write_r);
@@ -173,7 +173,7 @@ WRITE8_MEMBER(rzone_state::t1_write_s)
sclock_w(data >> 1 & 1);
}
-uint8_t rzone_state::input_r()
+u8 rzone_state::input_r()
{
// K1: SDATA
return sdata_r();
diff --git a/src/mame/drivers/sag.cpp b/src/mame/drivers/sag.cpp
index 17b1f064de7..0bfdd7a1b2c 100644
--- a/src/mame/drivers/sag.cpp
+++ b/src/mame/drivers/sag.cpp
@@ -68,7 +68,8 @@ protected:
required_ioport_array<6> m_inputs;
void update_display();
- u8 read_inputs();
+ u8 input_r();
+ void speaker_w(int state);
u16 m_grid = 0;
u16 m_plate = 0;
@@ -122,7 +123,7 @@ private:
I/O
******************************************************************************/
-// shared
+// main unit
void base_state::update_display()
{
@@ -134,7 +135,7 @@ void base_state::update_display()
m_display->matrix_partial(8, 6, m_grid >> 8, seg);
}
-u8 base_state::read_inputs()
+u8 base_state::input_r()
{
u8 data = 0;
@@ -146,6 +147,11 @@ u8 base_state::read_inputs()
return data;
}
+void base_state::speaker_w(int state)
+{
+ m_speaker->level_w(state);
+}
+
// cartridge type 1: HD38800
@@ -160,7 +166,7 @@ WRITE8_MEMBER(hmcs40_state::write_r)
WRITE16_MEMBER(hmcs40_state::write_d)
{
// D0: speaker out
- m_speaker->level_w(data & 1);
+ speaker_w(data & 1);
// D1-D12: vfd grid (10 and 11 unused)
m_grid = bitswap<14>(data,9,10,0,0,11,12,1,2,3,4,5,6,7,8) & 0x33ff;
@@ -170,7 +176,7 @@ WRITE16_MEMBER(hmcs40_state::write_d)
READ16_MEMBER(hmcs40_state::read_d)
{
// D13-D15: multiplexed inputs
- return read_inputs() << 13;
+ return input_r() << 13;
}
@@ -179,7 +185,7 @@ READ16_MEMBER(hmcs40_state::read_d)
WRITE16_MEMBER(tms1k_state::write_r)
{
// R0: speaker out
- m_speaker->level_w(data & 1);
+ speaker_w(data & 1);
// R1-R12: vfd grid (0 and 7 unused)
// R13,R14: vfd plate 3,2
@@ -198,7 +204,7 @@ WRITE16_MEMBER(tms1k_state::write_o)
READ8_MEMBER(tms1k_state::read_k)
{
// K1-K4: multiplexed inputs
- return read_inputs();
+ return input_r();
}
@@ -298,25 +304,25 @@ void tms1k_state::sag(machine_config &config)
ROM Definitions
******************************************************************************/
-ROM_START( sag_si2 )
+ROM_START( sag_sinv2 )
ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "inv2_hd38800a31", 0x0000, 0x1000, BAD_DUMP CRC(29c8c100) SHA1(41cd413065659c6d7d5b2408de2ca6d51c49629a) )
ROM_CONTINUE( 0x1e80, 0x0100 )
ROM_END
-ROM_START( sag_bb4 )
+ROM_START( sag_baseb4 )
ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "b-b5_hd38800a37", 0x0000, 0x1000, CRC(64852bd5) SHA1(fb1c24ca43934ceb6fc35ac7c35b71e6e843dbc5) )
ROM_CONTINUE( 0x1e80, 0x0100 )
ROM_END
-ROM_START( sag_pb )
+ROM_START( sag_pinb )
ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "pinb_hd38800a38", 0x0000, 0x1000, CRC(6e53a56b) SHA1(13f057eab2e4cfbb3ef1247a041abff15ae727c9) )
ROM_CONTINUE( 0x1e80, 0x0100 )
ROM_END
-ROM_START( sag_fb4 )
+ROM_START( sag_footb4 )
ROM_REGION( 0x1000, "maincpu", 0 )
ROM_LOAD( "ftba_mp7573", 0x0000, 0x1000, CRC(b17dd9e3) SHA1(9c9e7a56643233ef2adff7b68a6df19e6ca176c2) ) // die label TMS1400, MP7573
@@ -334,9 +340,9 @@ ROM_END
Drivers
******************************************************************************/
-// YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
-CONS( 1981, sag_si2, 0, 0, sag, sag, hmcs40_state, empty_init, "Entex", "Select-A-Game Machine: Space Invader 2", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING ) // suspect bad dump
-CONS( 1981, sag_bb4, 0, 0, sag, sag, hmcs40_state, empty_init, "Entex", "Select-A-Game Machine: Baseball 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, sag_pb, 0, 0, sag, sag, hmcs40_state, empty_init, "Entex", "Select-A-Game Machine: Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+// YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
+CONS( 1981, sag_sinv2, 0, 0, sag, sag, hmcs40_state, empty_init, "Entex", "Select-A-Game Machine: Space Invader 2", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING ) // suspect bad dump
+CONS( 1981, sag_baseb4, 0, 0, sag, sag, hmcs40_state, empty_init, "Entex", "Select-A-Game Machine: Baseball 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, sag_pinb, 0, 0, sag, sag, hmcs40_state, empty_init, "Entex", "Select-A-Game Machine: Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, sag_fb4, 0, 0, sag, sag, tms1k_state, empty_init, "Entex", "Select-A-Game Machine: Football 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, sag_footb4, 0, 0, sag, sag, tms1k_state, empty_init, "Entex", "Select-A-Game Machine: Football 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
diff --git a/src/mame/drivers/saitek_mark5.cpp b/src/mame/drivers/saitek_mark5.cpp
index 586eaec005a..2fa81958029 100644
--- a/src/mame/drivers/saitek_mark5.cpp
+++ b/src/mame/drivers/saitek_mark5.cpp
@@ -112,7 +112,7 @@ private:
DECLARE_WRITE8_MEMBER(lcd_data_w);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_READ8_MEMBER(sound_r);
- void reset_irq_w(uint8_t data);
+ void reset_irq_w(u8 data);
DECLARE_READ8_MEMBER(reset_irq_r);
DECLARE_READ8_MEMBER(input_r);
DECLARE_READ8_MEMBER(cb_rom_r);
@@ -210,7 +210,7 @@ TIMER_CALLBACK_MEMBER(mark5_state::interrupt)
write_lcd(m_lcd_lcd ^ 1);
}
-void mark5_state::reset_irq_w(uint8_t data)
+void mark5_state::reset_irq_w(u8 data)
{
// MC14020 R
m_irqtimer->adjust(attotime::from_hz((19.6608_MHz_XTAL / 10 / 0x1000) * 2));
diff --git a/src/mame/includes/hh_sm510.h b/src/mame/includes/hh_sm510.h
index 68cd2eed0f9..67de09dcbc6 100644
--- a/src/mame/includes/hh_sm510.h
+++ b/src/mame/includes/hh_sm510.h
@@ -55,7 +55,7 @@ protected:
virtual void update_k_line();
virtual DECLARE_WRITE16_MEMBER(sm510_lcd_segment_w);
virtual DECLARE_WRITE16_MEMBER(sm500_lcd_segment_w);
- virtual uint8_t input_r();
+ virtual u8 input_r();
virtual DECLARE_WRITE8_MEMBER(input_w);
virtual DECLARE_WRITE8_MEMBER(piezo_r1_w);
virtual DECLARE_WRITE8_MEMBER(piezo_r2_w);
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index be39e4623b5..0f688304d18 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -35043,10 +35043,10 @@ safarir // (c) 1980 Shin Nihon Kikaku (SNK) + Taito lice
safarirj // (c) 1979 Shin Nihon Kikaku (SNK)
@source:sag.cpp
-sag_bb4
-sag_fb4
-sag_pb
-sag_si2
+sag_baseb4
+sag_footb4
+sag_pinb
+sag_sinv2
@source:sage2.cpp
sage2 //