mirror of
https://github.com/holub/mame
synced 2025-04-22 16:31:49 +03:00
emu/ioport.h: Got rid of [DECLARE_]CUSTOM_INPUT_MEMBR - it's just obfuscation at this point.
This commit is contained in:
Vas Crabb
parent
835d6fa5d6
commit
dc26fcd1bb
@ -184,7 +184,7 @@ INPUT_CHANGED_MEMBER( abc99_device::keyboard_reset )
|
||||
// INPUT_PORTS( abc99 )
|
||||
//-------------------------------------------------
|
||||
|
||||
CUSTOM_INPUT_MEMBER( abc99_device::cursor_x4_r )
|
||||
ioport_value abc99_device::cursor_x4_r()
|
||||
{
|
||||
u8 cursor = m_cursor->read();
|
||||
u8 data = 0;
|
||||
@ -205,7 +205,7 @@ CUSTOM_INPUT_MEMBER( abc99_device::cursor_x4_r )
|
||||
return data;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER( abc99_device::cursor_x6_r )
|
||||
ioport_value abc99_device::cursor_x6_r()
|
||||
{
|
||||
u8 cursor = m_cursor->read();
|
||||
u8 data = 0;
|
||||
|
||||
@ -33,8 +33,8 @@ public:
|
||||
// construction/destruction
|
||||
abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER( cursor_x4_r );
|
||||
DECLARE_CUSTOM_INPUT_MEMBER( cursor_x6_r );
|
||||
ioport_value cursor_x4_r();
|
||||
ioport_value cursor_x6_r();
|
||||
|
||||
DECLARE_INPUT_CHANGED_MEMBER( keyboard_reset );
|
||||
|
||||
|
||||
@ -117,7 +117,7 @@ public:
|
||||
return m_kdat_in ^ 0x01U;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(cols_r)
|
||||
ioport_value cols_r()
|
||||
{
|
||||
ioport_value result(0xffU);
|
||||
for (unsigned i = 0U; m_rows.size() > i; ++i)
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
DEFINE_DEVICE_TYPE(COLECO_HAND_CONTROLLER, coleco_hand_controller_device, "coleco_hand", "ColecoVision Hand Controller")
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER( coleco_hand_controller_device::keypad_r )
|
||||
ioport_value coleco_hand_controller_device::keypad_r()
|
||||
{
|
||||
uint8_t data = 0xf;
|
||||
uint16_t keypad = m_io_keypad->read();
|
||||
|
||||
@ -31,7 +31,7 @@ public:
|
||||
// optional information overrides
|
||||
virtual ioport_constructor device_input_ports() const override;
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER( keypad_r );
|
||||
ioport_value keypad_r();
|
||||
|
||||
protected:
|
||||
// device-level overrides
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
DEFINE_DEVICE_TYPE(COLECO_SUPER_ACTION_CONTROLLER, coleco_super_action_controller_device, "coleco_sac", "ColecoVision Super Action Controller")
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER( coleco_super_action_controller_device::keypad_r )
|
||||
ioport_value coleco_super_action_controller_device::keypad_r()
|
||||
{
|
||||
uint8_t data = 0xf;
|
||||
uint16_t keypad = m_io_keypad->read();
|
||||
|
||||
@ -31,7 +31,7 @@ public:
|
||||
// optional information overrides
|
||||
virtual ioport_constructor device_input_ports() const override;
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER( keypad_r );
|
||||
ioport_value keypad_r();
|
||||
DECLARE_INPUT_CHANGED_MEMBER( slider_w );
|
||||
|
||||
protected:
|
||||
|
||||
@ -235,7 +235,7 @@ template <unsigned Rows>
|
||||
class peripheral_base : public device_t, public device_mac_keyboard_interface
|
||||
{
|
||||
public:
|
||||
CUSTOM_INPUT_MEMBER(columns_r)
|
||||
ioport_value columns_r()
|
||||
{
|
||||
ioport_value result(make_bitmask<ioport_value>(Rows));
|
||||
for (unsigned i = 0U; Rows > i; ++i)
|
||||
@ -247,7 +247,7 @@ public:
|
||||
return result ^ make_bitmask<ioport_value>(Rows);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(host_data_r)
|
||||
ioport_value host_data_r()
|
||||
{
|
||||
return m_host_data_in ^ 0x01;
|
||||
}
|
||||
@ -402,12 +402,12 @@ protected:
|
||||
class keypad_base : public peripheral_base<3>
|
||||
{
|
||||
public:
|
||||
CUSTOM_INPUT_MEMBER(keyboard_clock_r)
|
||||
ioport_value keyboard_clock_r()
|
||||
{
|
||||
return m_keyboard_clock_in ^ 0x01;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(keyboard_data_r)
|
||||
ioport_value keyboard_data_r()
|
||||
{
|
||||
return m_keyboard_data_in ^ 0x01;
|
||||
}
|
||||
|
||||
@ -107,7 +107,7 @@ ROM_END
|
||||
class keyboard_base : public device_t, public device_mac_keyboard_interface
|
||||
{
|
||||
public:
|
||||
CUSTOM_INPUT_MEMBER(host_data_r)
|
||||
ioport_value host_data_r()
|
||||
{
|
||||
return m_host_data_in ^ 0x01;
|
||||
}
|
||||
|
||||
@ -144,7 +144,7 @@ public:
|
||||
spectrum_gamma_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
|
||||
spectrum_gamma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(busy_r) { return !m_centronics_busy; }
|
||||
ioport_value busy_r() { return !m_centronics_busy; }
|
||||
protected:
|
||||
virtual void device_start() override;
|
||||
virtual void device_add_mconfig(machine_config &config) override;
|
||||
|
||||
@ -76,10 +76,10 @@ public:
|
||||
DECLARE_INPUT_CHANGED_MEMBER(ui_init);
|
||||
DECLARE_INPUT_CHANGED_MEMBER(ui_refresh) { refresh(); }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(check_sensor_busy) { return (m_sensorpos == -1) ? 0 : 1; }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(check_bs_mask) { return m_bs_mask; }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(check_ss_mask) { return m_ss_mask; }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(check_ui_enabled) { return m_ui_enabled; }
|
||||
ioport_value check_sensor_busy() { return (m_sensorpos == -1) ? 0 : 1; }
|
||||
ioport_value check_bs_mask() { return m_bs_mask; }
|
||||
ioport_value check_ss_mask() { return m_ss_mask; }
|
||||
ioport_value check_ui_enabled() { return m_ui_enabled; }
|
||||
|
||||
protected:
|
||||
// device-level overrides
|
||||
|
||||
@ -329,10 +329,10 @@ void wd90c00_vga_device::device_reset()
|
||||
m_pr15 = 0;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(wd90c00_vga_device::egasw1_r) { return BIT(m_pr11, 4); }
|
||||
CUSTOM_INPUT_MEMBER(wd90c00_vga_device::egasw2_r) { return BIT(m_pr11, 5); }
|
||||
CUSTOM_INPUT_MEMBER(wd90c00_vga_device::egasw3_r) { return BIT(m_pr11, 6); }
|
||||
CUSTOM_INPUT_MEMBER(wd90c00_vga_device::egasw4_r) { return BIT(m_pr11, 7); }
|
||||
ioport_value wd90c00_vga_device::egasw1_r() { return BIT(m_pr11, 4); }
|
||||
ioport_value wd90c00_vga_device::egasw2_r() { return BIT(m_pr11, 5); }
|
||||
ioport_value wd90c00_vga_device::egasw3_r() { return BIT(m_pr11, 6); }
|
||||
ioport_value wd90c00_vga_device::egasw4_r() { return BIT(m_pr11, 7); }
|
||||
|
||||
static INPUT_PORTS_START(paradise_vga_sense)
|
||||
PORT_START("VGA_SENSE")
|
||||
|
||||
@ -62,10 +62,10 @@ public:
|
||||
auto read_cnf12_callback() { return m_cnf12_read_cb.bind(); }
|
||||
|
||||
// NOTE: these are internal shadows, for the input sense.
|
||||
CUSTOM_INPUT_MEMBER(egasw4_r);
|
||||
CUSTOM_INPUT_MEMBER(egasw3_r);
|
||||
CUSTOM_INPUT_MEMBER(egasw2_r);
|
||||
CUSTOM_INPUT_MEMBER(egasw1_r);
|
||||
ioport_value egasw4_r();
|
||||
ioport_value egasw3_r();
|
||||
ioport_value egasw2_r();
|
||||
ioport_value egasw1_r();
|
||||
protected:
|
||||
wd90c00_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
|
||||
@ -1097,10 +1097,6 @@ private:
|
||||
|
||||
#define UCHAR_MAMEKEY(code) (UCHAR_MAMEKEY_BEGIN + ITEM_ID_##code)
|
||||
|
||||
// macro for a read callback function (PORT_CUSTOM)
|
||||
#define CUSTOM_INPUT_MEMBER(name) ioport_value name()
|
||||
#define DECLARE_CUSTOM_INPUT_MEMBER(name) ioport_value name()
|
||||
|
||||
// macro for port write callback functions (PORT_CHANGED)
|
||||
#define INPUT_CHANGED_MEMBER(name) void name(ioport_field &field, u32 param, ioport_value oldval, ioport_value newval)
|
||||
#define DECLARE_INPUT_CHANGED_MEMBER(name) void name(ioport_field &field, u32 param, ioport_value oldval, ioport_value newval)
|
||||
|
||||
@ -782,8 +782,8 @@ public:
|
||||
void init_aristmk5();
|
||||
|
||||
INPUT_CHANGED_MEMBER(coin_start);
|
||||
CUSTOM_INPUT_MEMBER(coin_r);
|
||||
CUSTOM_INPUT_MEMBER(coin_usa_r);
|
||||
ioport_value coin_r();
|
||||
ioport_value coin_usa_r();
|
||||
int hopper_r();
|
||||
|
||||
private:
|
||||
@ -1283,7 +1283,7 @@ int aristmk5_state::hopper_r()
|
||||
return (m_hopper_test && !m_hopper->line_r()) ? 0 : 1;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(aristmk5_state::coin_usa_r)
|
||||
ioport_value aristmk5_state::coin_usa_r()
|
||||
{
|
||||
// ---x Coin Acceptor
|
||||
// --x- Credit Sense
|
||||
@ -1313,7 +1313,7 @@ CUSTOM_INPUT_MEMBER(aristmk5_state::coin_usa_r)
|
||||
return data;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(aristmk5_state::coin_r)
|
||||
ioport_value aristmk5_state::coin_r()
|
||||
{
|
||||
uint8_t data = 0x01;
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@ public:
|
||||
, m_triggers(*this, "TRIGGERS")
|
||||
{ }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(lightgun_pos_r);
|
||||
ioport_value lightgun_pos_r();
|
||||
int lightgun_trigger_r();
|
||||
int lightgun_holster_r();
|
||||
|
||||
@ -167,7 +167,7 @@ void alg_state::potgo_w(uint16_t data)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(alg_state::lightgun_pos_r)
|
||||
ioport_value alg_state::lightgun_pos_r()
|
||||
{
|
||||
int x = 0, y = 0;
|
||||
|
||||
|
||||
@ -576,7 +576,7 @@ public:
|
||||
void handle_joystick_cia(u8 pra, u8 dra);
|
||||
u16 handle_joystick_potgor(u16 potgor);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER( cd32_input );
|
||||
ioport_value cd32_input();
|
||||
template <int P> int cd32_sel_mirror_input();
|
||||
|
||||
void init_pal();
|
||||
@ -1165,7 +1165,7 @@ u16 cd32_state::handle_joystick_potgor(u16 potgor)
|
||||
return potgor;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER( cd32_state::cd32_input )
|
||||
ioport_value cd32_state::cd32_input()
|
||||
{
|
||||
return handle_joystick_potgor(m_potgo_value) >> 8;
|
||||
}
|
||||
@ -1495,7 +1495,7 @@ void a4000_state::a4000t_mem(address_map &map)
|
||||
//**************************************************************************
|
||||
|
||||
template <int P>
|
||||
CUSTOM_INPUT_MEMBER( amiga_state::amiga_joystick_convert )
|
||||
ioport_value amiga_state::amiga_joystick_convert()
|
||||
{
|
||||
uint8_t bits = m_joy_ports[P].read_safe(0xff);
|
||||
|
||||
|
||||
@ -442,8 +442,8 @@ public:
|
||||
TIMER_CALLBACK_MEMBER( blitter_process_callback );
|
||||
void update_irqs();
|
||||
|
||||
template <int P> DECLARE_CUSTOM_INPUT_MEMBER( amiga_joystick_convert );
|
||||
DECLARE_CUSTOM_INPUT_MEMBER( floppy_drive_status );
|
||||
template <int P> ioport_value amiga_joystick_convert();
|
||||
ioport_value floppy_drive_status();
|
||||
|
||||
void m68k_reset(int state);
|
||||
void kbreset_w(int state);
|
||||
|
||||
@ -1048,7 +1048,7 @@ void amiga_state::gayle_cia_w(offs_t offset, uint16_t data, uint16_t mem_mask)
|
||||
cia_w(offset, data, mem_mask);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER( amiga_state::floppy_drive_status )
|
||||
ioport_value amiga_state::floppy_drive_status()
|
||||
{
|
||||
return m_fdc->ciaapra_r();
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@ public:
|
||||
void init_dlta();
|
||||
void init_argh();
|
||||
|
||||
template <int Coin> DECLARE_CUSTOM_INPUT_MEMBER(coin_counter_r);
|
||||
template <int Coin> ioport_value coin_counter_r();
|
||||
DECLARE_INPUT_CHANGED_MEMBER(coin_changed_callback);
|
||||
|
||||
protected:
|
||||
@ -167,7 +167,7 @@ void arcadia_amiga_state::arcadia_cia_0_portb_w(uint8_t data)
|
||||
*************************************/
|
||||
|
||||
template <int Coin>
|
||||
CUSTOM_INPUT_MEMBER(arcadia_amiga_state::coin_counter_r)
|
||||
ioport_value arcadia_amiga_state::coin_counter_r()
|
||||
{
|
||||
/* return coin counter values */
|
||||
return m_coin_counter[Coin] & 3;
|
||||
|
||||
@ -343,7 +343,7 @@ public:
|
||||
void handle_joystick_cia(uint8_t pra, uint8_t dra);
|
||||
uint16_t handle_joystick_potgor(uint16_t potgor);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(cubo_input);
|
||||
ioport_value cubo_input();
|
||||
template <int P> int cd32_sel_mirror_input();
|
||||
|
||||
void akiko_int_w(int state);
|
||||
@ -537,7 +537,7 @@ uint16_t cubo_state::handle_joystick_potgor(uint16_t potgor)
|
||||
return potgor;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER( cubo_state::cubo_input )
|
||||
ioport_value cubo_state::cubo_input()
|
||||
{
|
||||
return handle_joystick_potgor(m_potgo_value) >> 8;
|
||||
}
|
||||
|
||||
@ -95,7 +95,7 @@ public:
|
||||
|
||||
DECLARE_INPUT_CHANGED_MEMBER(reset_switch) { update_reset(newval); }
|
||||
DECLARE_INPUT_CHANGED_MEMBER(overlay_switch) { update_overlay(); }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(overlay_r);
|
||||
ioport_value overlay_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -190,7 +190,7 @@ void ggm_state::update_reset(ioport_value state)
|
||||
Keypad Overlay
|
||||
*******************************************************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ggm_state::overlay_r)
|
||||
ioport_value ggm_state::overlay_r()
|
||||
{
|
||||
u8 data = m_inputs[5]->read() & 0xf;
|
||||
return (data == 0xf) ? m_overlay : data;
|
||||
|
||||
@ -164,7 +164,7 @@ public:
|
||||
m_mainbank(*this, "mainbank")
|
||||
{ }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(audio_comm_stat_0c01_r);
|
||||
ioport_value audio_comm_stat_0c01_r();
|
||||
void jedi(machine_config &config);
|
||||
|
||||
protected:
|
||||
@ -264,7 +264,7 @@ u8 jedi_state::audio_comm_stat_r()
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(jedi_state::audio_comm_stat_0c01_r)
|
||||
ioport_value jedi_state::audio_comm_stat_0c01_r()
|
||||
{
|
||||
return (m_soundlatch->pending_r() << 1) | m_sacklatch->pending_r();
|
||||
}
|
||||
|
||||
@ -277,7 +277,7 @@ public:
|
||||
|
||||
void mhavoc(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(coin_service_r);
|
||||
ioport_value coin_service_r();
|
||||
int gamma_rcvd_r();
|
||||
int gamma_xmtd_r();
|
||||
int alpha_rcvd_r();
|
||||
@ -557,7 +557,7 @@ void alphaone_state::rom_banksel_w(uint8_t data)
|
||||
*
|
||||
*************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mhavoc_state::coin_service_r)
|
||||
ioport_value mhavoc_state::coin_service_r()
|
||||
{
|
||||
return (m_player_1 ? m_service : m_coin)->read() & 0x03;
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ public:
|
||||
m_lamps(*this, "lamp%u", 0U)
|
||||
{ }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tape_headpos_r);
|
||||
ioport_value tape_headpos_r();
|
||||
DECLARE_INPUT_CHANGED_MEMBER(category_select);
|
||||
void init_quizshow();
|
||||
void quizshow(machine_config &config);
|
||||
@ -271,7 +271,7 @@ void quizshow_state::mem_map(address_map &map)
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(quizshow_state::tape_headpos_r)
|
||||
ioport_value quizshow_state::tape_headpos_r()
|
||||
{
|
||||
return 1 << m_tape_head_pos;
|
||||
}
|
||||
|
||||
@ -71,8 +71,8 @@ public:
|
||||
|
||||
void starshp1(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(analog_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(collision_latch_r);
|
||||
ioport_value analog_r();
|
||||
ioport_value collision_latch_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -562,7 +562,7 @@ void starshp1_state::collision_reset_w(uint8_t data)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(starshp1_state::analog_r)
|
||||
ioport_value starshp1_state::analog_r()
|
||||
{
|
||||
int val = 0;
|
||||
|
||||
@ -586,7 +586,7 @@ CUSTOM_INPUT_MEMBER(starshp1_state::analog_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(starshp1_state::collision_latch_r)
|
||||
ioport_value starshp1_state::collision_latch_r()
|
||||
{
|
||||
return m_collision_latch & 0x0f;
|
||||
}
|
||||
|
||||
@ -322,8 +322,8 @@ public:
|
||||
|
||||
void tempest(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tempest_knob_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tempest_buttons_r);
|
||||
ioport_value tempest_knob_r();
|
||||
ioport_value tempest_buttons_r();
|
||||
int clock_r();
|
||||
|
||||
protected:
|
||||
@ -385,12 +385,12 @@ void tempest_state::wdclr_w(uint8_t data)
|
||||
*
|
||||
*************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(tempest_state::tempest_knob_r)
|
||||
ioport_value tempest_state::tempest_knob_r()
|
||||
{
|
||||
return (m_player_select == 0) ? m_knob_p1->read() : m_knob_p2->read();
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(tempest_state::tempest_buttons_r)
|
||||
ioport_value tempest_state::tempest_buttons_r()
|
||||
{
|
||||
return (m_player_select == 0) ? m_buttons_p1->read() : m_buttons_p2->read();
|
||||
}
|
||||
|
||||
@ -178,8 +178,8 @@ public:
|
||||
|
||||
void init_kenseim();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(cmd_1234_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(cmd_5678_r);
|
||||
ioport_value cmd_1234_r();
|
||||
ioport_value cmd_5678_r();
|
||||
int cmd_9_r();
|
||||
int cmd_req_r();
|
||||
int cmd_LVm_r();
|
||||
@ -374,12 +374,12 @@ void kenseim_state::cpu_portc_w(uint8_t data)
|
||||
|
||||
/* 68k side COMMS reads */
|
||||
|
||||
CUSTOM_INPUT_MEMBER(kenseim_state::cmd_1234_r)
|
||||
ioport_value kenseim_state::cmd_1234_r()
|
||||
{
|
||||
return (m_to_68k_cmd_low & 0x0f) >> 0;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(kenseim_state::cmd_5678_r)
|
||||
ioport_value kenseim_state::cmd_5678_r()
|
||||
{
|
||||
return (m_to_68k_cmd_low & 0xf0) >> 4;
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@ public:
|
||||
|
||||
void ctk2000(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(lcd_r) { return m_lcdc->db_r() >> 4; }
|
||||
ioport_value lcd_r() { return m_lcdc->db_r() >> 4; }
|
||||
void lcd_w(int state) { m_lcdc->db_w(state << 4); }
|
||||
|
||||
void apo_w(int state);
|
||||
|
||||
@ -230,7 +230,7 @@ public:
|
||||
void pwm_row_w(int state) { m_pwm->write_my(state); }
|
||||
void pwm_col_w(int state) { m_pwm->write_mx(state ^ 0xff); }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(lcd_r) { return m_lcdc->db_r() >> 4; }
|
||||
ioport_value lcd_r() { return m_lcdc->db_r() >> 4; }
|
||||
void lcd_w(int state)
|
||||
{
|
||||
m_lcd_data = state << 4;
|
||||
@ -241,7 +241,7 @@ public:
|
||||
// (and even those don't always have them wired the same way -
|
||||
// in some cases they're not even all connected to the same port)
|
||||
template <unsigned Bit>
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(lcd_bit_r) { return BIT(m_lcdc->db_r(), Bit); }
|
||||
ioport_value lcd_bit_r() { return BIT(m_lcdc->db_r(), Bit); }
|
||||
template <unsigned Bit>
|
||||
void lcd_bit_w(int state)
|
||||
{
|
||||
@ -252,13 +252,13 @@ public:
|
||||
// handle the 4-position mode switch
|
||||
// some models treat this as 3 modes plus power off,
|
||||
// while others have 4 modes and move power to a separate button instead
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(switch_r) { return m_switch; }
|
||||
ioport_value switch_r() { return m_switch; }
|
||||
DECLARE_INPUT_CHANGED_MEMBER(switch_w);
|
||||
DECLARE_INPUT_CHANGED_MEMBER(power_w);
|
||||
DECLARE_INPUT_CHANGED_MEMBER(switch_power_w);
|
||||
|
||||
void inputs_w(int state) { m_input_sel = state; }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(inputs_r);
|
||||
ioport_value inputs_r();
|
||||
|
||||
void dsp_data_w(uint8_t data);
|
||||
void dsp_cmd_w(uint8_t cmd);
|
||||
@ -331,7 +331,7 @@ INPUT_CHANGED_MEMBER(ctk551_state::switch_power_w)
|
||||
}
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ctk551_state::inputs_r)
|
||||
ioport_value ctk551_state::inputs_r()
|
||||
{
|
||||
uint8_t result = 0xff;
|
||||
for (unsigned i = 0U; i < m_inputs.size(); i++)
|
||||
|
||||
@ -69,17 +69,17 @@ public:
|
||||
|
||||
void keys_w(int state) { m_key_sel = state; }
|
||||
void keys_mux_w(int state) { m_key_mux = state; }
|
||||
template <int Row> DECLARE_CUSTOM_INPUT_MEMBER(keys_row_r);
|
||||
template <int Row> ioport_value keys_row_r();
|
||||
template <int Row> u8 keys_analog_r();
|
||||
|
||||
DECLARE_INPUT_CHANGED_MEMBER(rhythm_w);
|
||||
template <int Bit> DECLARE_CUSTOM_INPUT_MEMBER(rhythm_r) { return m_rhythm >> Bit; }
|
||||
template <int Bit> ioport_value rhythm_r() { return m_rhythm >> Bit; }
|
||||
DECLARE_INPUT_CHANGED_MEMBER(mode_w);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(mode_r) { return m_mode; }
|
||||
ioport_value mode_r() { return m_mode; }
|
||||
|
||||
void cassette_w(int state);
|
||||
void cassette_motor_w(int state);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(cassette_r);
|
||||
ioport_value cassette_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -491,7 +491,7 @@ u8 cz230s_state::keys_r()
|
||||
|
||||
/**************************************************************************/
|
||||
template <int Row>
|
||||
CUSTOM_INPUT_MEMBER(cz230s_state::keys_row_r)
|
||||
ioport_value cz230s_state::keys_row_r()
|
||||
{
|
||||
u8 data = 0xff;
|
||||
|
||||
@ -536,7 +536,7 @@ void cz230s_state::cassette_motor_w(int state)
|
||||
}
|
||||
|
||||
/**************************************************************************/
|
||||
CUSTOM_INPUT_MEMBER(cz230s_state::cassette_r)
|
||||
ioport_value cz230s_state::cassette_r()
|
||||
{
|
||||
return m_cassette->input() > 0 ? 0 : 1;
|
||||
}
|
||||
|
||||
@ -74,7 +74,7 @@ public:
|
||||
|
||||
void ld50(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(dial_r);
|
||||
ioport_value dial_r();
|
||||
|
||||
private:
|
||||
u8 port0_r();
|
||||
@ -239,7 +239,7 @@ void ld50_state::port3_w(u8 data)
|
||||
}
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ld50_state::dial_r)
|
||||
ioport_value ld50_state::dial_r()
|
||||
{
|
||||
// return the dial position as a 2-bit gray code
|
||||
const u8 val = m_dial->read();
|
||||
|
||||
@ -65,7 +65,7 @@ public:
|
||||
void pickytlk(machine_config &config);
|
||||
|
||||
DECLARE_CROSSHAIR_MAPPER_MEMBER(pen_y_mapper);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(pen_y_rescale_r);
|
||||
ioport_value pen_y_rescale_r();
|
||||
ioport_value pen_target_r();
|
||||
|
||||
private:
|
||||
@ -155,7 +155,7 @@ CROSSHAIR_MAPPER_MEMBER(pickytlk_state::pen_y_mapper)
|
||||
return (float) pen_y_rescale_r() / 0xff;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(pickytlk_state::pen_y_rescale_r)
|
||||
ioport_value pickytlk_state::pen_y_rescale_r()
|
||||
{
|
||||
/*
|
||||
There are two distinct areas that can be interacted with the pen:
|
||||
|
||||
@ -45,8 +45,8 @@ public:
|
||||
template <ioport_value V> DECLARE_INPUT_CHANGED_MEMBER(sw_function);
|
||||
template <ioport_value V> DECLARE_INPUT_CHANGED_MEMBER(sw_mode);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(function_in) { return m_sw_function; }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(mode_in) { return m_sw_mode; }
|
||||
ioport_value function_in() { return m_sw_function; }
|
||||
ioport_value mode_in() { return m_sw_mode; }
|
||||
|
||||
private:
|
||||
void sk1_memory(address_map &map);
|
||||
|
||||
@ -124,13 +124,13 @@ INPUT_CHANGED_MEMBER(astrof_state::service_coin_inserted)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(astrof_state::astrof_p1_controls_r)
|
||||
ioport_value astrof_state::astrof_p1_controls_r()
|
||||
{
|
||||
return ioport("P1")->read();
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(astrof_state::astrof_p2_controls_r)
|
||||
ioport_value astrof_state::astrof_p2_controls_r()
|
||||
{
|
||||
uint32_t ret;
|
||||
|
||||
@ -146,7 +146,7 @@ CUSTOM_INPUT_MEMBER(astrof_state::astrof_p2_controls_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(astrof_state::tomahawk_controls_r)
|
||||
ioport_value astrof_state::tomahawk_controls_r()
|
||||
{
|
||||
uint32_t ret;
|
||||
|
||||
|
||||
@ -40,9 +40,9 @@ public:
|
||||
void spfghmk2_audio(machine_config &config);
|
||||
void tomahawk_audio(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(astrof_p1_controls_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(astrof_p2_controls_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tomahawk_controls_r);
|
||||
ioport_value astrof_p1_controls_r();
|
||||
ioport_value astrof_p2_controls_r();
|
||||
ioport_value tomahawk_controls_r();
|
||||
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
|
||||
DECLARE_INPUT_CHANGED_MEMBER(service_coin_inserted);
|
||||
|
||||
|
||||
@ -1112,7 +1112,7 @@ static INPUT_PORTS_START( metlsavr )
|
||||
PORT_DIPSETTING( 0x0000, "80 Seconds" )
|
||||
INPUT_PORTS_END
|
||||
|
||||
CUSTOM_INPUT_MEMBER(tumbleb_state::suprtrio_prot_latch_r)
|
||||
ioport_value tumbleb_state::suprtrio_prot_latch_r()
|
||||
{
|
||||
return m_suprtrio_prot_latch;
|
||||
}
|
||||
|
||||
@ -70,7 +70,7 @@ public:
|
||||
void init_magipur();
|
||||
void init_carket();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(suprtrio_prot_latch_r);
|
||||
ioport_value suprtrio_prot_latch_r();
|
||||
|
||||
protected:
|
||||
/* memory pointers */
|
||||
|
||||
@ -213,9 +213,9 @@ public:
|
||||
void init_rongrong();
|
||||
|
||||
int blitter_irq_r();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(ddenlovj_blitter_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(nettoqc_special_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(mjflove_blitter_r);
|
||||
ioport_value ddenlovj_blitter_r();
|
||||
ioport_value nettoqc_special_r();
|
||||
ioport_value mjflove_blitter_r();
|
||||
|
||||
protected:
|
||||
auto blitter_irq() { return m_blitter_irq_handler.bind(); }
|
||||
@ -2094,7 +2094,7 @@ void ddenlovr_state::ddenlovj_coincounter_w(uint8_t data)
|
||||
// data & 0x80 ?
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ddenlovr_state::ddenlovj_blitter_r)
|
||||
ioport_value ddenlovr_state::ddenlovj_blitter_r()
|
||||
{
|
||||
return m_ddenlovr_blitter_irq_flag ? 0x03 : 0x00; // bit 4 = 1 -> blitter busy
|
||||
}
|
||||
@ -2226,7 +2226,7 @@ void ddenlovr_state::ddenlovr_map(address_map &map)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ddenlovr_state::nettoqc_special_r)
|
||||
ioport_value ddenlovr_state::nettoqc_special_r()
|
||||
{
|
||||
return m_ddenlovr_blitter_irq_flag ? 0x03 : 0x00;
|
||||
}
|
||||
@ -3921,7 +3921,7 @@ uint8_t ddenlovr_state::mjflove_keyb_r(offs_t offset)
|
||||
return val;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ddenlovr_state::mjflove_blitter_r)
|
||||
ioport_value ddenlovr_state::mjflove_blitter_r()
|
||||
{
|
||||
// bit 7 = 1 -> blitter busy
|
||||
// bit 6 = 0 -> VBLANK?
|
||||
|
||||
@ -686,7 +686,7 @@ INPUT_PORTS_END
|
||||
***************************************************************************/
|
||||
|
||||
template <int Player>
|
||||
CUSTOM_INPUT_MEMBER(fantland_state::wheelrun_wheel_r)
|
||||
ioport_value fantland_state::wheelrun_wheel_r()
|
||||
{
|
||||
int delta = m_wheel[Player]->read();
|
||||
delta = (delta & 0x7f) - (delta & 0x80) + 4;
|
||||
|
||||
@ -30,7 +30,7 @@ public:
|
||||
void wheelrun(machine_config &config);
|
||||
void galaxygn(machine_config &config);
|
||||
|
||||
template <int Player> DECLARE_CUSTOM_INPUT_MEMBER(wheelrun_wheel_r);
|
||||
template <int Player> ioport_value wheelrun_wheel_r();
|
||||
|
||||
protected:
|
||||
/* misc */
|
||||
|
||||
@ -52,7 +52,7 @@ public:
|
||||
|
||||
void lastbank(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(sound_status_r);
|
||||
ioport_value sound_status_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -161,7 +161,7 @@ void lastbank_state::sound_flags_w(uint8_t data)
|
||||
m_oki->reset();
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(lastbank_state::sound_status_r)
|
||||
ioport_value lastbank_state::sound_status_r()
|
||||
{
|
||||
return BIT(m_sound_flags, 0) << 1 | BIT(m_sound_flags, 1);
|
||||
}
|
||||
|
||||
@ -209,7 +209,7 @@ public:
|
||||
void mtrap(machine_config &config);
|
||||
void pepper2(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(intsource_coins_r);
|
||||
ioport_value intsource_coins_r();
|
||||
DECLARE_INPUT_CHANGED_MEMBER(coin_count_w);
|
||||
|
||||
protected:
|
||||
@ -289,8 +289,8 @@ public:
|
||||
void rallys(machine_config &config);
|
||||
void phantoma(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(spectar_coins_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(rallys_coin1_r);
|
||||
ioport_value spectar_coins_r();
|
||||
ioport_value rallys_coin1_r();
|
||||
|
||||
void init_sidetrac();
|
||||
void init_spectar();
|
||||
@ -364,7 +364,7 @@ public:
|
||||
|
||||
void teetert(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(teetert_input_r);
|
||||
ioport_value teetert_input_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -404,26 +404,26 @@ private:
|
||||
*
|
||||
*************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(exidy_state::intsource_coins_r)
|
||||
ioport_value exidy_state::intsource_coins_r()
|
||||
{
|
||||
uint8_t const dsw = m_dsw->read();
|
||||
uint8_t const in0 = m_in0->read();
|
||||
return (BIT(~in0, 7) << 1) | BIT(dsw, 0);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(spectar_state::spectar_coins_r)
|
||||
ioport_value spectar_state::spectar_coins_r()
|
||||
{
|
||||
uint8_t const dsw = m_dsw->read();
|
||||
uint8_t const in0 = m_in0->read();
|
||||
return (BIT(~in0, 7) << 1) | BIT(~dsw, 0);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(spectar_state::rallys_coin1_r)
|
||||
ioport_value spectar_state::rallys_coin1_r()
|
||||
{
|
||||
return BIT(m_in0->read(), 7);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(teetert_state::teetert_input_r)
|
||||
ioport_value teetert_state::teetert_input_r()
|
||||
{
|
||||
uint8_t const dial = m_dial->read();
|
||||
|
||||
|
||||
@ -280,7 +280,7 @@ int exidy440_state::firq_vblank_r()
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(exidy440_state::hitnmiss_button1_r)
|
||||
ioport_value exidy440_state::hitnmiss_button1_r()
|
||||
{
|
||||
/* button 1 shows up in two bits */
|
||||
uint32_t button1 = ioport("HITNMISS_BUTTON1")->read();
|
||||
|
||||
@ -33,7 +33,7 @@ public:
|
||||
|
||||
int firq_beam_r();
|
||||
int firq_vblank_r();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(hitnmiss_button1_r);
|
||||
ioport_value hitnmiss_button1_r();
|
||||
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
|
||||
void init_showdown();
|
||||
void init_yukon();
|
||||
|
||||
@ -1344,7 +1344,7 @@ INPUT_CHANGED_MEMBER(gmgalax_state::game_changed)
|
||||
|
||||
|
||||
template <int N>
|
||||
CUSTOM_INPUT_MEMBER(gmgalax_state::port_r)
|
||||
ioport_value gmgalax_state::port_r()
|
||||
{
|
||||
return (m_selected_game != 0 ? m_glin : m_gmin)[N]->read();
|
||||
}
|
||||
@ -6250,7 +6250,7 @@ INPUT_PORTS_END
|
||||
|
||||
// Coinage Dips are spread across two input ports
|
||||
template <int Mask>
|
||||
CUSTOM_INPUT_MEMBER(galaxian_state::ckongg_coinage_r)
|
||||
ioport_value galaxian_state::ckongg_coinage_r()
|
||||
{
|
||||
switch (Mask)
|
||||
{
|
||||
@ -6656,7 +6656,7 @@ static INPUT_PORTS_START( scobras )
|
||||
INPUT_PORTS_END
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(moonwar_state::dial_r)
|
||||
ioport_value moonwar_state::dial_r()
|
||||
{
|
||||
// see http://www.cityofberwyn.com/schematics/stern/MoonWar_opto.tiff for schematic
|
||||
// i.e. a 74ls161 counts from 0 to 15 which is the absolute number of bars passed on the quadrature
|
||||
|
||||
@ -324,7 +324,7 @@ public:
|
||||
void bigkonggx(machine_config &config);
|
||||
void scrammr(machine_config &config);
|
||||
|
||||
template <int Mask> CUSTOM_INPUT_MEMBER(ckongg_coinage_r);
|
||||
template <int Mask> ioport_value ckongg_coinage_r();
|
||||
template <int Mask> int ckongs_coinage_r();
|
||||
|
||||
protected:
|
||||
@ -494,7 +494,7 @@ public:
|
||||
void gmgalax(machine_config &config);
|
||||
|
||||
DECLARE_INPUT_CHANGED_MEMBER(game_changed);
|
||||
template <int N> DECLARE_CUSTOM_INPUT_MEMBER(port_r);
|
||||
template <int N> ioport_value port_r();
|
||||
|
||||
void init_gmgalax();
|
||||
|
||||
@ -862,7 +862,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(dial_r);
|
||||
ioport_value dial_r();
|
||||
|
||||
void moonwar(machine_config &config);
|
||||
|
||||
|
||||
@ -1102,7 +1102,7 @@ INPUT_PORTS_END
|
||||
|
||||
// Coinage Dips are spread across two input ports
|
||||
template <int Mask>
|
||||
CUSTOM_INPUT_MEMBER(galaxold_state::dkongjrm_coinage_r)
|
||||
ioport_value galaxold_state::dkongjrm_coinage_r()
|
||||
{
|
||||
switch (Mask)
|
||||
{
|
||||
|
||||
@ -149,7 +149,7 @@ public:
|
||||
uint8_t rescueb_a002_r() { return 0xfc; }
|
||||
template <int Mask> int _4in1_fake_port_r();
|
||||
template <int Mask> int vpool_lives_r();
|
||||
template <int Mask> DECLARE_CUSTOM_INPUT_MEMBER(dkongjrm_coinage_r);
|
||||
template <int Mask> ioport_value dkongjrm_coinage_r();
|
||||
|
||||
void init_bullsdrtg();
|
||||
void init_ladybugg();
|
||||
|
||||
@ -43,7 +43,7 @@ public:
|
||||
|
||||
memory_bank_creator m_cavelon_bank_object;
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(darkplnt_dial_r);
|
||||
ioport_value darkplnt_dial_r();
|
||||
uint8_t hncholms_prot_r();
|
||||
uint8_t scramble_soundram_r(offs_t offset);
|
||||
uint8_t mars_ppi8255_0_r(offs_t offset);
|
||||
|
||||
@ -33,7 +33,7 @@ MACHINE_RESET_MEMBER(scramble_state,explorer)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(scramble_state::darkplnt_dial_r)
|
||||
ioport_value scramble_state::darkplnt_dial_r()
|
||||
{
|
||||
static const uint8_t remap[] = {0x03, 0x02, 0x00, 0x01, 0x21, 0x20, 0x22, 0x23,
|
||||
0x33, 0x32, 0x30, 0x31, 0x11, 0x10, 0x12, 0x13,
|
||||
|
||||
@ -277,8 +277,8 @@ public:
|
||||
void init_qbert();
|
||||
void init_qbertqub();
|
||||
|
||||
template <int N> DECLARE_CUSTOM_INPUT_MEMBER(track_delta_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(stooges_joystick_r);
|
||||
template <int N> ioport_value track_delta_r();
|
||||
ioport_value stooges_joystick_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -665,7 +665,7 @@ uint32_t gottlieb_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm
|
||||
*************************************/
|
||||
|
||||
template <int N>
|
||||
CUSTOM_INPUT_MEMBER(gottlieb_state::track_delta_r)
|
||||
ioport_value gottlieb_state::track_delta_r()
|
||||
{
|
||||
return (N ? m_track_y : m_track_x)->read() - m_track[N];
|
||||
}
|
||||
@ -679,7 +679,7 @@ void gottlieb_state::analog_reset_w(u8 data)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(gottlieb_state::stooges_joystick_r)
|
||||
ioport_value gottlieb_state::stooges_joystick_r()
|
||||
{
|
||||
static const char *const joyport[] = { "P2JOY", "P3JOY", "P1JOY", nullptr };
|
||||
return (joyport[m_joystick_select & 3] != nullptr) ? ioport(joyport[m_joystick_select & 3])->read() : 0xff;
|
||||
|
||||
@ -1115,7 +1115,7 @@ public:
|
||||
void mbaskb2(machine_config &config);
|
||||
void msoccer2(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(switch_r);
|
||||
ioport_value switch_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -1188,7 +1188,7 @@ u8 mbaskb2_state::sub_read_in()
|
||||
|
||||
// inputs
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mbaskb2_state::switch_r)
|
||||
ioport_value mbaskb2_state::switch_r()
|
||||
{
|
||||
// The power switch is off-1-2, and the game relies on power-on starting at 1,
|
||||
// otherwise msoccer2 boots up to what looks like a factory test mode.
|
||||
|
||||
@ -12388,8 +12388,8 @@ public:
|
||||
|
||||
void wtalker(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(sensor_r) { return m_dial & 1; }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(pulse_r) { return (m_pulse > machine().time()) ? 1 : 0; }
|
||||
ioport_value sensor_r() { return m_dial & 1; }
|
||||
ioport_value pulse_r() { return (m_pulse > machine().time()) ? 1 : 0; }
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
|
||||
@ -199,7 +199,7 @@ Pin #11(+) | | R |
|
||||
*
|
||||
*************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(lethalj_state::cclownz_paddle)
|
||||
ioport_value lethalj_state::cclownz_paddle()
|
||||
{
|
||||
int value = m_paddle->read();
|
||||
return ((value << 4) & 0xf00) | (value & 0x00f);
|
||||
|
||||
@ -40,7 +40,7 @@ public:
|
||||
void init_ripribit();
|
||||
void init_cclownz();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(cclownz_paddle);
|
||||
ioport_value cclownz_paddle();
|
||||
|
||||
private:
|
||||
void ripribit_control_w(uint16_t data);
|
||||
|
||||
@ -71,7 +71,7 @@ public:
|
||||
m_out_lamps(*this, "lamp%u", 1U)
|
||||
{ }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(kbd_ioport_r);
|
||||
ioport_value kbd_ioport_r();
|
||||
|
||||
template <unsigned N> void counter_w(int state);
|
||||
|
||||
@ -1483,7 +1483,7 @@ u32 igs_m027_state::lhdmg_gpio_r()
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(igs_m027_state::kbd_ioport_r)
|
||||
ioport_value igs_m027_state::kbd_ioport_r()
|
||||
{
|
||||
return kbd_r<0, 0, 0>();
|
||||
}
|
||||
|
||||
@ -266,7 +266,7 @@ public:
|
||||
void init_pepluss64();
|
||||
void init_peplussbw();
|
||||
|
||||
template <int N> DECLARE_CUSTOM_INPUT_MEMBER(input_r);
|
||||
template <int N> ioport_value input_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -1085,7 +1085,7 @@ void peplus_state::main_iomap(address_map &map)
|
||||
*************************/
|
||||
|
||||
template <int N>
|
||||
CUSTOM_INPUT_MEMBER(peplus_state::input_r)
|
||||
ioport_value peplus_state::input_r()
|
||||
{
|
||||
uint8_t inp_ret = 0x00;
|
||||
uint8_t inp_read = m_inp_bank[N]->read();
|
||||
|
||||
@ -1166,7 +1166,7 @@ INPUT_PORTS_END
|
||||
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(itech8_state::gtg_mux)
|
||||
ioport_value itech8_state::gtg_mux()
|
||||
{
|
||||
return m_p1->read() & m_p2->read();
|
||||
}
|
||||
|
||||
@ -57,7 +57,7 @@ public:
|
||||
void init_hstennis();
|
||||
|
||||
int special_r();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(gtg_mux);
|
||||
ioport_value gtg_mux();
|
||||
|
||||
protected:
|
||||
static constexpr u32 VRAM_SIZE = 0x40000;
|
||||
|
||||
@ -128,7 +128,7 @@ public:
|
||||
|
||||
void init_bnstars();
|
||||
|
||||
template <int P> DECLARE_CUSTOM_INPUT_MEMBER(mahjong_ctrl_r);
|
||||
template <int P> ioport_value mahjong_ctrl_r();
|
||||
|
||||
private:
|
||||
|
||||
@ -436,7 +436,7 @@ template <int chip> void ms32_bnstars_state::palette_ram_w(offs_t offset, u16 da
|
||||
}
|
||||
|
||||
template <int P>
|
||||
CUSTOM_INPUT_MEMBER(ms32_bnstars_state::mahjong_ctrl_r)
|
||||
ioport_value ms32_bnstars_state::mahjong_ctrl_r()
|
||||
{
|
||||
required_ioport_array<4> &keys = (P == 0) ? m_p1_keys : m_p2_keys;
|
||||
// different routing than other ms32.cpp mahjong games, using 0x2080 as mask
|
||||
|
||||
@ -835,7 +835,7 @@ void captflag_state::motor_move(int side, uint16_t data)
|
||||
}
|
||||
|
||||
template <int N>
|
||||
CUSTOM_INPUT_MEMBER(captflag_state::motor_pos_r)
|
||||
ioport_value captflag_state::motor_pos_r()
|
||||
{
|
||||
const uint8_t pos[4] = {1,0,2,3}; // -> 2,3,1,0 offsets -> 0123
|
||||
return ~pos[m_motor_pos[N]];
|
||||
@ -1668,19 +1668,19 @@ INPUT_PORTS_END
|
||||
Arm Champs II
|
||||
**************************************************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(armchamp2_state::left_sensor_r)
|
||||
ioport_value armchamp2_state::left_sensor_r()
|
||||
{
|
||||
int arm_x = ioport("ARM")->read();
|
||||
return (arm_x < 0x40);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(armchamp2_state::right_sensor_r)
|
||||
ioport_value armchamp2_state::right_sensor_r()
|
||||
{
|
||||
int arm_x = ioport("ARM")->read();
|
||||
return (arm_x > 0xc0);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(armchamp2_state::center_sensor_r)
|
||||
ioport_value armchamp2_state::center_sensor_r()
|
||||
{
|
||||
int arm_x = ioport("ARM")->read();
|
||||
return ((arm_x > 0x60) && (arm_x < 0xa0));
|
||||
|
||||
@ -183,9 +183,9 @@ public:
|
||||
void armchmp2(machine_config &config);
|
||||
void armchmp2_map(address_map &map);
|
||||
TIMER_DEVICE_CALLBACK_MEMBER(armchamp2_scanline);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(left_sensor_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(right_sensor_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(center_sensor_r);
|
||||
ioport_value left_sensor_r();
|
||||
ioport_value right_sensor_r();
|
||||
ioport_value center_sensor_r();
|
||||
|
||||
private:
|
||||
u16 m_arm_motor_command;
|
||||
@ -232,7 +232,7 @@ public:
|
||||
|
||||
void captflag(machine_config &config);
|
||||
template <int N> int motor_busy_r();
|
||||
template <int N> DECLARE_CUSTOM_INPUT_MEMBER(motor_pos_r);
|
||||
template <int N> ioport_value motor_pos_r();
|
||||
void init_captflag();
|
||||
void init_vscaptfl();
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ public:
|
||||
void ddayjlc(machine_config &config);
|
||||
|
||||
void init_ddayjlc();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(prot_r);
|
||||
ioport_value prot_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -282,7 +282,7 @@ static const uint8_t prot_data[0x10] =
|
||||
0x03, 0x01, 0x00, 0x03
|
||||
};
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ddayjlc_state::prot_r)
|
||||
ioport_value ddayjlc_state::prot_r()
|
||||
{
|
||||
return prot_data[m_prot_addr];
|
||||
}
|
||||
|
||||
@ -168,7 +168,7 @@ public:
|
||||
void init_exerionb();
|
||||
void init_irion();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(controls_r);
|
||||
ioport_value controls_r();
|
||||
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
|
||||
|
||||
protected:
|
||||
@ -628,7 +628,7 @@ uint32_t exerion_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
|
||||
*************************************/
|
||||
|
||||
// Players inputs are muxed at 0xa000
|
||||
CUSTOM_INPUT_MEMBER(exerion_state::controls_r)
|
||||
ioport_value exerion_state::controls_r()
|
||||
{
|
||||
return m_inputs[m_cocktail_flip]->read() & 0x3f;
|
||||
}
|
||||
|
||||
@ -147,7 +147,7 @@ public:
|
||||
|
||||
int sprite0_r();
|
||||
int homerun_d7756_busy_r();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(ganjaja_hopper_status_r);
|
||||
ioport_value ganjaja_hopper_status_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -409,7 +409,7 @@ int homerun_state::homerun_d7756_busy_r()
|
||||
return m_samples->playing(0) ? 0 : 1;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(homerun_state::ganjaja_hopper_status_r)
|
||||
ioport_value homerun_state::ganjaja_hopper_status_r()
|
||||
{
|
||||
// gives hopper error if not 0
|
||||
return 0;
|
||||
|
||||
@ -482,7 +482,7 @@ Notes from Charles MacDonald
|
||||
|
||||
/********** READ INPUTS **********/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ms32_state::mahjong_ctrl_r)
|
||||
ioport_value ms32_state::mahjong_ctrl_r()
|
||||
{
|
||||
u32 mj_input;
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ public:
|
||||
void init_bnstars();
|
||||
void init_ss92046_01();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(mahjong_ctrl_r);
|
||||
ioport_value mahjong_ctrl_r();
|
||||
|
||||
protected:
|
||||
required_device<jaleco_ms32_sysctrl_device> m_sysctrl;
|
||||
|
||||
@ -230,7 +230,7 @@ void rocknms_state::rocknms_main2sub_w(offs_t offset, u16 data, u16 mem_mask)
|
||||
m_rocknms_main2sub = (data ^ 0xffff);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(rocknms_state::rocknms_main2sub_status_r)
|
||||
ioport_value rocknms_state::rocknms_main2sub_status_r()
|
||||
{
|
||||
return m_rocknms_sub2main & 0x0003;
|
||||
}
|
||||
|
||||
@ -162,7 +162,7 @@ public:
|
||||
|
||||
void rocknms(machine_config &config);
|
||||
void init_rocknms();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(rocknms_main2sub_status_r);
|
||||
ioport_value rocknms_main2sub_status_r();
|
||||
|
||||
private:
|
||||
required_device<cpu_device> m_subcpu;
|
||||
|
||||
@ -497,7 +497,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(skns_state::irq)
|
||||
**********************************************************************************/
|
||||
|
||||
template <int P>
|
||||
CUSTOM_INPUT_MEMBER(skns_state::paddle_r)
|
||||
ioport_value skns_state::paddle_r()
|
||||
{
|
||||
return m_paddle[P]->read();
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@ public:
|
||||
void init_galpani4();
|
||||
void init_ryouran();
|
||||
|
||||
template <int P> DECLARE_CUSTOM_INPUT_MEMBER(paddle_r);
|
||||
template <int P> ioport_value paddle_r();
|
||||
|
||||
private:
|
||||
struct hit_t
|
||||
|
||||
@ -47,7 +47,7 @@ public:
|
||||
m_rombank(*this, "rombank")
|
||||
{ }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(system_r);
|
||||
ioport_value system_r();
|
||||
void crimfght(machine_config &config);
|
||||
|
||||
private:
|
||||
@ -414,7 +414,7 @@ void crimfght_state::banking_callback(uint8_t data)
|
||||
m_init = BIT(data, 7);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER( crimfght_state::system_r )
|
||||
ioport_value crimfght_state::system_r()
|
||||
{
|
||||
uint8_t data = 0;
|
||||
|
||||
|
||||
@ -342,7 +342,7 @@ public:
|
||||
uint16_t tokimeki_serial_r();
|
||||
void tokimeki_serial_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tokimeki_device_check_r);
|
||||
ioport_value tokimeki_device_check_r();
|
||||
void tokimeki_device_check_w(int state);
|
||||
|
||||
private:
|
||||
@ -1122,7 +1122,7 @@ void tokimeki_state::tmoshsp_init()
|
||||
m_printer_is_manual_layout = true;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(tokimeki_state::tokimeki_device_check_r)
|
||||
ioport_value tokimeki_state::tokimeki_device_check_r()
|
||||
{
|
||||
return BIT(m_device_val, 15);
|
||||
}
|
||||
|
||||
@ -450,7 +450,7 @@ void konamigx_state::esc_w(address_space &space, uint32_t data)
|
||||
/**********************************************************************************/
|
||||
/* EEPROM handlers */
|
||||
|
||||
CUSTOM_INPUT_MEMBER(konamigx_state::gx_rdport1_3_r)
|
||||
ioport_value konamigx_state::gx_rdport1_3_r()
|
||||
{
|
||||
return (m_gx_rdport1_3 >> 1);
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ public:
|
||||
void konamigx_t4_psacmap_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
|
||||
void vblank_irq_ack_w(int state);
|
||||
void hblank_irq_ack_w(int state);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(gx_rdport1_3_r);
|
||||
ioport_value gx_rdport1_3_r();
|
||||
void init_konamigx();
|
||||
TILE_GET_INFO_MEMBER(get_gx_psac_tile_info);
|
||||
TILE_GET_INFO_MEMBER(get_gx_psac3_tile_info);
|
||||
|
||||
@ -767,7 +767,7 @@ public:
|
||||
void dsem(machine_config &config);
|
||||
void dsem2(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER( gn845pwbb_read );
|
||||
ioport_value gn845pwbb_read();
|
||||
|
||||
void init_ddr();
|
||||
|
||||
@ -1425,7 +1425,7 @@ void ddr_state::gn845pwbb_clk_w( int offset, int data )
|
||||
m_stage_state[ offset ].state, m_stage_state[ offset ].DO, m_stage_state[ offset ].shift, m_stage_state[ offset ].bit, m_stage_mask );
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER( ddr_state::gn845pwbb_read )
|
||||
ioport_value ddr_state::gn845pwbb_read()
|
||||
{
|
||||
return m_stage->read() & m_stage_mask;
|
||||
}
|
||||
|
||||
@ -70,8 +70,8 @@ public:
|
||||
|
||||
void piratesh(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(helm_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(battery_r);
|
||||
ioport_value helm_r();
|
||||
ioport_value battery_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -443,7 +443,7 @@ void piratesh_state::k054539_nmi_gen(int state)
|
||||
m_sound_intck = state;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(piratesh_state::helm_r)
|
||||
ioport_value piratesh_state::helm_r()
|
||||
{
|
||||
// Appears to be a quadrature encoder
|
||||
uint8_t xa, xb;
|
||||
@ -455,7 +455,7 @@ CUSTOM_INPUT_MEMBER(piratesh_state::helm_r)
|
||||
return (xb << 1) | xa;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(piratesh_state::battery_r)
|
||||
ioport_value piratesh_state::battery_r()
|
||||
{
|
||||
// .x MB3790 /ALARM1
|
||||
// x. MB3790 /ALARM2
|
||||
|
||||
@ -58,7 +58,7 @@ public:
|
||||
void qdrmfgp(machine_config &config);
|
||||
void qdrmfgp2(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(battery_sensor_r);
|
||||
ioport_value battery_sensor_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_reset() override;
|
||||
@ -178,7 +178,7 @@ uint16_t qdrmfgp_state::inputs_r()
|
||||
return m_control & 0x0080 ? m_inputs_port->read() : m_dsw_port->read();
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(qdrmfgp_state::battery_sensor_r)
|
||||
ioport_value qdrmfgp_state::battery_sensor_r()
|
||||
{
|
||||
/* bit 0-1 battery power sensor: 3=good, 2=low, other=bad */
|
||||
return 0x0003;
|
||||
|
||||
@ -237,7 +237,7 @@ MACHINE_START_MEMBER(_8080bw_state,extra_8080bw)
|
||||
/* */
|
||||
/*******************************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_clone_state::sicv_in2_control_r)
|
||||
ioport_value invaders_clone_state::sicv_in2_control_r()
|
||||
{
|
||||
return m_player_controls[is_cabinet_cocktail() ? 1 : 0]->read() | ioport("P2GATE")->read();
|
||||
}
|
||||
@ -404,12 +404,12 @@ INPUT_PORTS_END
|
||||
/* */
|
||||
/*******************************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_clone_state::invadpt2_in1_control_r)
|
||||
ioport_value invaders_clone_state::invadpt2_in1_control_r()
|
||||
{
|
||||
return m_player_controls[0]->read() | (m_player_controls[1]->read() & ~m_cabinet_type->read());
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_clone_state::invadpt2_in2_control_r)
|
||||
ioport_value invaders_clone_state::invadpt2_in2_control_r()
|
||||
{
|
||||
return m_player_controls[1]->read() | (m_player_controls[0]->read() & ~m_cabinet_type->read());
|
||||
}
|
||||
@ -1504,7 +1504,7 @@ INPUT_PORTS_END
|
||||
/* */
|
||||
/*******************************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(rollingc_state::game_select_r)
|
||||
ioport_value rollingc_state::game_select_r()
|
||||
{
|
||||
// need the joystick left/right inputs to show in two places
|
||||
return bitswap<2>(m_player_controls[0]->read(), 1, 2);
|
||||
|
||||
@ -32,9 +32,9 @@
|
||||
class invaders_clone_state : public invaders_state
|
||||
{
|
||||
public:
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(sicv_in2_control_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(invadpt2_in1_control_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(invadpt2_in2_control_r);
|
||||
ioport_value sicv_in2_control_r();
|
||||
ioport_value invadpt2_in1_control_r();
|
||||
ioport_value invadpt2_in2_control_r();
|
||||
|
||||
protected:
|
||||
invaders_clone_state(const machine_config &mconfig, device_type type, const char *tag) :
|
||||
@ -404,7 +404,7 @@ public:
|
||||
|
||||
void rollingc(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(game_select_r);
|
||||
ioport_value game_select_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
|
||||
@ -414,7 +414,7 @@ void seawolf_state::periscope_lamp_w(u8 data)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(seawolf_state::erase_input_r)
|
||||
ioport_value seawolf_state::erase_input_r()
|
||||
{
|
||||
return m_erase_sw->read() & m_erase_dip->read();
|
||||
}
|
||||
@ -654,13 +654,13 @@ uint8_t mw8080bw_state::tornbase_get_cabinet_type()
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mw8080bw_state::tornbase_hit_left_input_r)
|
||||
ioport_value mw8080bw_state::tornbase_hit_left_input_r()
|
||||
{
|
||||
return ioport(TORNBASE_L_HIT_PORT_TAG)->read();
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mw8080bw_state::tornbase_hit_right_input_r)
|
||||
ioport_value mw8080bw_state::tornbase_hit_right_input_r()
|
||||
{
|
||||
uint32_t ret;
|
||||
|
||||
@ -681,7 +681,7 @@ CUSTOM_INPUT_MEMBER(mw8080bw_state::tornbase_hit_right_input_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mw8080bw_state::tornbase_pitch_left_input_r)
|
||||
ioport_value mw8080bw_state::tornbase_pitch_left_input_r()
|
||||
{
|
||||
uint32_t ret;
|
||||
|
||||
@ -702,13 +702,13 @@ CUSTOM_INPUT_MEMBER(mw8080bw_state::tornbase_pitch_left_input_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mw8080bw_state::tornbase_pitch_right_input_r)
|
||||
ioport_value mw8080bw_state::tornbase_pitch_right_input_r()
|
||||
{
|
||||
return ioport(TORNBASE_L_PITCH_PORT_TAG)->read();
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mw8080bw_state::tornbase_score_input_r)
|
||||
ioport_value mw8080bw_state::tornbase_score_input_r()
|
||||
{
|
||||
return ioport(TORNBASE_SCORE_SW_PORT_TAG)->read() &
|
||||
ioport(TORNBASE_SCORE_DIP_PORT_TAG)->read();
|
||||
@ -1303,13 +1303,13 @@ void desertgu_state::machine_start()
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(desertgu_state::gun_input_r)
|
||||
ioport_value desertgu_state::gun_input_r()
|
||||
{
|
||||
return m_gun_port[m_controller_select]->read();
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(desertgu_state::dip_sw_0_1_r)
|
||||
ioport_value desertgu_state::dip_sw_0_1_r()
|
||||
{
|
||||
return m_dip_sw_0_1[m_controller_select]->read();
|
||||
}
|
||||
@ -1413,7 +1413,7 @@ void desertgu_state::desertgu(machine_config &config)
|
||||
#define DPLAY_CAB_TYPE_COCKTAIL (1)
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(dplay_state::dplay_pitch_left_input_r)
|
||||
ioport_value dplay_state::dplay_pitch_left_input_r()
|
||||
{
|
||||
uint32_t ret;
|
||||
|
||||
@ -1426,7 +1426,7 @@ CUSTOM_INPUT_MEMBER(dplay_state::dplay_pitch_left_input_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(dplay_state::dplay_pitch_right_input_r)
|
||||
ioport_value dplay_state::dplay_pitch_right_input_r()
|
||||
{
|
||||
return m_l_pitch->read();
|
||||
}
|
||||
@ -1779,7 +1779,7 @@ void clowns_state::machine_start()
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(clowns_state::controller_r)
|
||||
ioport_value clowns_state::controller_r()
|
||||
{
|
||||
return m_controllers[m_controller_select]->read();
|
||||
}
|
||||
@ -2572,7 +2572,7 @@ void invaders_state::machine_start()
|
||||
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_state::invaders_sw6_sw7_r)
|
||||
ioport_value invaders_state::invaders_sw6_sw7_r()
|
||||
{
|
||||
// upright PCB : switches visible
|
||||
// cocktail PCB: HI
|
||||
@ -2584,7 +2584,7 @@ CUSTOM_INPUT_MEMBER(invaders_state::invaders_sw6_sw7_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_state::invaders_sw5_r)
|
||||
ioport_value invaders_state::invaders_sw5_r()
|
||||
{
|
||||
// upright PCB : switch visible
|
||||
// cocktail PCB: HI
|
||||
@ -2596,7 +2596,7 @@ CUSTOM_INPUT_MEMBER(invaders_state::invaders_sw5_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_state::invaders_in0_control_r)
|
||||
ioport_value invaders_state::invaders_in0_control_r()
|
||||
{
|
||||
// upright PCB : P1 controls
|
||||
// cocktail PCB: HI
|
||||
@ -2608,13 +2608,13 @@ CUSTOM_INPUT_MEMBER(invaders_state::invaders_in0_control_r)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_state::invaders_in1_control_r)
|
||||
ioport_value invaders_state::invaders_in1_control_r()
|
||||
{
|
||||
return m_player_controls[0]->read();
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(invaders_state::invaders_in2_control_r)
|
||||
ioport_value invaders_state::invaders_in2_control_r()
|
||||
{
|
||||
// upright PCB : P1 controls
|
||||
// cocktail PCB: P2 controls
|
||||
@ -2739,7 +2739,7 @@ void invaders_state::invaders(machine_config &config)
|
||||
#define BLUESHRK_COIN_INPUT_PORT_TAG ("COIN")
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mw8080bw_state::blueshrk_coin_input_r)
|
||||
ioport_value mw8080bw_state::blueshrk_coin_input_r()
|
||||
{
|
||||
uint32_t ret = ioport(BLUESHRK_COIN_INPUT_PORT_TAG)->read();
|
||||
|
||||
|
||||
@ -67,12 +67,12 @@ public:
|
||||
|
||||
DECLARE_INPUT_CHANGED_MEMBER(direct_coin_count);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tornbase_hit_left_input_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tornbase_hit_right_input_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tornbase_pitch_left_input_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tornbase_pitch_right_input_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(tornbase_score_input_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(blueshrk_coin_input_r);
|
||||
ioport_value tornbase_hit_left_input_r();
|
||||
ioport_value tornbase_hit_right_input_r();
|
||||
ioport_value tornbase_pitch_left_input_r();
|
||||
ioport_value tornbase_pitch_right_input_r();
|
||||
ioport_value tornbase_score_input_r();
|
||||
ioport_value blueshrk_coin_input_r();
|
||||
|
||||
IRQ_CALLBACK_MEMBER(interrupt_vector);
|
||||
|
||||
@ -165,7 +165,7 @@ public:
|
||||
|
||||
void seawolf(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(erase_input_r);
|
||||
ioport_value erase_input_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -250,8 +250,8 @@ public:
|
||||
|
||||
void desertgu(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(gun_input_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(dip_sw_0_1_r);
|
||||
ioport_value gun_input_r();
|
||||
ioport_value dip_sw_0_1_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -282,8 +282,8 @@ public:
|
||||
|
||||
void dplay(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(dplay_pitch_left_input_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(dplay_pitch_right_input_r);
|
||||
ioport_value dplay_pitch_left_input_r();
|
||||
ioport_value dplay_pitch_right_input_r();
|
||||
|
||||
private:
|
||||
void io_map(address_map &map);
|
||||
@ -306,7 +306,7 @@ public:
|
||||
void clowns(machine_config &config);
|
||||
void spacwalk(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(controller_r);
|
||||
ioport_value controller_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -388,11 +388,11 @@ public:
|
||||
|
||||
void invaders(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(invaders_sw6_sw7_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(invaders_sw5_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(invaders_in0_control_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(invaders_in1_control_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(invaders_in2_control_r);
|
||||
ioport_value invaders_sw6_sw7_r();
|
||||
ioport_value invaders_sw5_r();
|
||||
ioport_value invaders_in0_control_r();
|
||||
ioport_value invaders_in1_control_r();
|
||||
ioport_value invaders_in2_control_r();
|
||||
|
||||
protected:
|
||||
void machine_start() override;
|
||||
|
||||
@ -249,7 +249,7 @@ void astrocde_state::sparkle_w(int state)
|
||||
*
|
||||
*************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(ebases_state::trackball_r)
|
||||
ioport_value ebases_state::trackball_r()
|
||||
{
|
||||
return (m_trackball[m_input_select]->read() - m_trackball_last) & 0xff;
|
||||
}
|
||||
@ -301,7 +301,7 @@ void demndrgn_state::input_select_w(int state)
|
||||
m_input_select = state;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(demndrgn_state::trackball_r)
|
||||
ioport_value demndrgn_state::trackball_r()
|
||||
{
|
||||
return (m_trackball[m_input_select]->read() - m_trackball_last) & 0xff;
|
||||
}
|
||||
|
||||
@ -215,7 +215,7 @@ public:
|
||||
{ }
|
||||
|
||||
void ebases(machine_config &config);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(trackball_r);
|
||||
ioport_value trackball_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -240,7 +240,7 @@ public:
|
||||
{ }
|
||||
|
||||
void demndrgn(machine_config &config);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(trackball_r);
|
||||
ioport_value trackball_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
|
||||
@ -188,7 +188,7 @@ private:
|
||||
|
||||
void duart_irq_callback(int state);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(port_mod_r);
|
||||
ioport_value port_mod_r();
|
||||
uint16_t port_ctrl_r(offs_t offset);
|
||||
void port_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
|
||||
uint16_t m_port_data = 0;
|
||||
|
||||
@ -68,7 +68,7 @@ public:
|
||||
void st1002(machine_config &config);
|
||||
void spiker(machine_config &config);
|
||||
void triviamb(machine_config &config);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(nstocker_bits_r);
|
||||
ioport_value nstocker_bits_r();
|
||||
void init_otwalls();
|
||||
void init_triviaes();
|
||||
void init_triviaes2();
|
||||
|
||||
@ -360,7 +360,7 @@ void balsente_state::teamht_multiplex_select_w(offs_t offset, uint8_t data)
|
||||
*
|
||||
*************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(balsente_state::nstocker_bits_r)
|
||||
ioport_value balsente_state::nstocker_bits_r()
|
||||
{
|
||||
return m_nstocker_bits;
|
||||
}
|
||||
|
||||
@ -504,7 +504,7 @@ void midvunit_state::wheel_board_w(uint32_t data)
|
||||
}
|
||||
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(crusnusa_state::motion_r)
|
||||
ioport_value crusnusa_state::motion_r()
|
||||
{
|
||||
uint8_t const status = m_motion->read();
|
||||
for (uint8_t bit = 0; bit < 8; bit++)
|
||||
|
||||
@ -203,7 +203,7 @@ public:
|
||||
void init_crusnu21();
|
||||
void init_crusnusa();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(motion_r);
|
||||
ioport_value motion_r();
|
||||
|
||||
protected:
|
||||
void init_crusnusa_common(offs_t speedup);
|
||||
|
||||
@ -162,7 +162,7 @@ int midzunit_state::narc_talkback_strobe_r()
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(midzunit_state::narc_talkback_data_r)
|
||||
ioport_value midzunit_state::narc_talkback_data_r()
|
||||
{
|
||||
return m_narc_sound->read() & 0xff;
|
||||
}
|
||||
|
||||
@ -132,7 +132,7 @@ public:
|
||||
void init_narc();
|
||||
|
||||
int narc_talkback_strobe_r();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(narc_talkback_data_r);
|
||||
ioport_value narc_talkback_data_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_reset() override;
|
||||
|
||||
@ -140,7 +140,7 @@ public:
|
||||
|
||||
void crusnexo(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(keypad_r);
|
||||
ioport_value keypad_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override
|
||||
@ -186,7 +186,7 @@ public:
|
||||
|
||||
void thegrid(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(custom_49way_r);
|
||||
ioport_value custom_49way_r();
|
||||
|
||||
private:
|
||||
uint32_t trackball_r(offs_t offset);
|
||||
@ -668,7 +668,7 @@ void midzeus_state::tms32032_control_w(offs_t offset, uint32_t data, uint32_t me
|
||||
*
|
||||
*************************************/
|
||||
|
||||
CUSTOM_INPUT_MEMBER(thegrid_state::custom_49way_r)
|
||||
ioport_value thegrid_state::custom_49way_r()
|
||||
{
|
||||
static const uint8_t translate49[7] = { 0x8, 0xc, 0xe, 0xf, 0x3, 0x1, 0x0 };
|
||||
return (translate49[m_io_49way_y->read() >> 4] << 4) | translate49[m_io_49way_x->read() >> 4];
|
||||
@ -682,7 +682,7 @@ void crusnexo_state::keypad_select_w(offs_t offset, uint32_t data)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(crusnexo_state::keypad_r)
|
||||
ioport_value crusnexo_state::keypad_r()
|
||||
{
|
||||
uint32_t bits = m_io_keypad->read();
|
||||
uint8_t select = m_keypad_select;
|
||||
|
||||
@ -37,7 +37,7 @@ public:
|
||||
|
||||
void mw18w(machine_config &config);
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(mw18w_sensors_r);
|
||||
ioport_value mw18w_sensors_r();
|
||||
|
||||
private:
|
||||
void mw18w_sound0_w(uint8_t data);
|
||||
@ -165,7 +165,7 @@ void mw18w_state::mw18w_irq0_clear_w(uint8_t data)
|
||||
m_maincpu->set_input_line(0, CLEAR_LINE);
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(mw18w_state::mw18w_sensors_r)
|
||||
ioport_value mw18w_state::mw18w_sensors_r()
|
||||
{
|
||||
// d7: off road
|
||||
// d6: in dock area
|
||||
|
||||
@ -330,9 +330,9 @@ public:
|
||||
void init_mace();
|
||||
void init_blitz99();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(blitz_49way_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(i40_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
|
||||
ioport_value blitz_49way_r();
|
||||
ioport_value i40_r();
|
||||
ioport_value gearshift_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -770,7 +770,7 @@ const uint8_t seattle_state::translate49[7] = { 0x8, 0xc, 0xe, 0xf, 0x3, 0x1, 0x
|
||||
/*************************************
|
||||
* 2 player 49 Way Joystick on Blitz
|
||||
*************************************/
|
||||
CUSTOM_INPUT_MEMBER(seattle_state::blitz_49way_r)
|
||||
ioport_value seattle_state::blitz_49way_r()
|
||||
{
|
||||
return (translate49[m_io_49way_y[1]->read() >> 4] << 12) | (translate49[m_io_49way_x[1]->read() >> 4] << 8) |
|
||||
(translate49[m_io_49way_y[0]->read() >> 4] << 4) | (translate49[m_io_49way_x[0]->read() >> 4] << 0);
|
||||
@ -786,7 +786,7 @@ void seattle_state::i40_w(uint32_t data)
|
||||
m_i40_data = data;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(seattle_state::i40_r)
|
||||
ioport_value seattle_state::i40_r()
|
||||
{
|
||||
if (m_io_dips->read() & 0x100) {
|
||||
// 8 way joysticks
|
||||
@ -844,7 +844,7 @@ CUSTOM_INPUT_MEMBER(seattle_state::i40_r)
|
||||
* Gearshift (calspeed)
|
||||
*
|
||||
*************************************/
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(seattle_state::gearshift_r)
|
||||
ioport_value seattle_state::gearshift_r()
|
||||
{
|
||||
// Check for gear change and save gear selection
|
||||
uint32_t gear = m_io_gearshift->read();
|
||||
|
||||
@ -380,11 +380,11 @@ public:
|
||||
void init_sf2049();
|
||||
void init_sf2049se();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(i40_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(gauntleg_p12_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(gauntleg_p34_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(keypad_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
|
||||
ioport_value i40_r();
|
||||
ioport_value gauntleg_p12_r();
|
||||
ioport_value gauntleg_p34_r();
|
||||
ioport_value keypad_r();
|
||||
ioport_value gearshift_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -1062,7 +1062,7 @@ void vegas_state::i40_w(uint32_t data)
|
||||
m_i40_data = data;
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(vegas_state::i40_r)
|
||||
ioport_value vegas_state::i40_r()
|
||||
{
|
||||
if (m_io_dips->read() & 0x100) {
|
||||
// 8 way joysticks
|
||||
@ -1117,7 +1117,7 @@ CUSTOM_INPUT_MEMBER(vegas_state::i40_r)
|
||||
/*************************************
|
||||
* Gauntlet Player 1 & 2 control read
|
||||
*************************************/
|
||||
CUSTOM_INPUT_MEMBER(vegas_state::gauntleg_p12_r)
|
||||
ioport_value vegas_state::gauntleg_p12_r()
|
||||
{
|
||||
if (m_io_dips->read() & 0x2000) {
|
||||
// 8 way joysticks
|
||||
@ -1133,7 +1133,7 @@ CUSTOM_INPUT_MEMBER(vegas_state::gauntleg_p12_r)
|
||||
/*************************************
|
||||
* Gauntlet Player 3 & 4 control read
|
||||
*************************************/
|
||||
CUSTOM_INPUT_MEMBER(vegas_state::gauntleg_p34_r)
|
||||
ioport_value vegas_state::gauntleg_p34_r()
|
||||
{
|
||||
if (m_io_dips->read() & 0x2000) {
|
||||
// 8 way joysticks
|
||||
@ -1182,7 +1182,7 @@ void vegas_state::wheel_board_w(uint32_t data)
|
||||
}
|
||||
}
|
||||
|
||||
CUSTOM_INPUT_MEMBER(vegas_state::keypad_r)
|
||||
ioport_value vegas_state::keypad_r()
|
||||
{
|
||||
int row_sel;
|
||||
for (row_sel=0; row_sel<4; row_sel++)
|
||||
@ -1204,7 +1204,7 @@ CUSTOM_INPUT_MEMBER(vegas_state::keypad_r)
|
||||
* Gearshift
|
||||
*
|
||||
*************************************/
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(vegas_state::gearshift_r)
|
||||
ioport_value vegas_state::gearshift_r()
|
||||
{
|
||||
// Check for gear change and save gear selection
|
||||
uint32_t gear = m_io_gearshift->read();
|
||||
|
||||
@ -1385,7 +1385,7 @@ INPUT_PORTS_END
|
||||
|
||||
|
||||
template <int P>
|
||||
CUSTOM_INPUT_MEMBER(tshoot_state::gun_r)
|
||||
ioport_value tshoot_state::gun_r()
|
||||
{
|
||||
int data = m_gun[P]->read();
|
||||
return (data & 0x3f) ^ ((data & 0x3f) >> 1);
|
||||
|
||||
@ -203,8 +203,8 @@ public:
|
||||
m_dial(*this, "DIAL")
|
||||
{ }
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(dial0_r) { return m_dial->read() & 3; }
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(dial1_r) { return m_dial->read() >> 2 & 3; }
|
||||
ioport_value dial0_r() { return m_dial->read() & 3; }
|
||||
ioport_value dial1_r() { return m_dial->read() >> 2 & 3; }
|
||||
|
||||
private:
|
||||
required_ioport m_dial;
|
||||
@ -366,7 +366,7 @@ public:
|
||||
|
||||
void tshoot(machine_config &config);
|
||||
|
||||
template <int P> DECLARE_CUSTOM_INPUT_MEMBER(gun_r);
|
||||
template <int P> ioport_value gun_r();
|
||||
|
||||
private:
|
||||
virtual void machine_start() override;
|
||||
|
||||
@ -97,7 +97,7 @@ public:
|
||||
|
||||
void wmg(machine_config &config);
|
||||
|
||||
template <int N> DECLARE_CUSTOM_INPUT_MEMBER(wmg_mux_r);
|
||||
template <int N> ioport_value wmg_mux_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -442,7 +442,7 @@ void wmg_state::wmg_port_select_w(int state)
|
||||
}
|
||||
|
||||
template <int N>
|
||||
CUSTOM_INPUT_MEMBER(wmg_state::wmg_mux_r)
|
||||
ioport_value wmg_state::wmg_mux_r()
|
||||
{
|
||||
if (N == 0)
|
||||
{
|
||||
|
||||
@ -184,8 +184,8 @@ public:
|
||||
|
||||
void init_enigma2();
|
||||
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(p1_controls_r);
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(p2_controls_r);
|
||||
ioport_value p1_controls_r();
|
||||
ioport_value p2_controls_r();
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
@ -535,13 +535,13 @@ void enigma2_state::enigma2_flip_screen_w(uint8_t data)
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(enigma2_state::p1_controls_r)
|
||||
ioport_value enigma2_state::p1_controls_r()
|
||||
{
|
||||
return ioport("P1CONTROLS")->read();
|
||||
}
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(enigma2_state::p2_controls_r)
|
||||
ioport_value enigma2_state::p2_controls_r()
|
||||
{
|
||||
if (m_flip_screen)
|
||||
return ioport("P2CONTROLS")->read();
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user