Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mame/atari/harddriv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ static INPUT_PORTS_START( harddriv )
PORT_BIT( 0xff, 0x00, IPT_PEDAL3 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_NAME("Clutch Pedal")

PORT_START("mainpcb:8BADC.2") /* b00000 - 8 bit ADC 2 - seat */
PORT_BIT( 0xff, 0x80, IPT_CUSTOM )
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20) PORT_NAME("Seat")

PORT_START("mainpcb:8BADC.3") /* b00000 - 8 bit ADC 3 - shifter lever Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(128) PORT_CODE_DEC(KEYCODE_R) PORT_CODE_INC(KEYCODE_F) PORT_NAME("Shifter Lever Y")
Expand Down Expand Up @@ -921,7 +921,7 @@ static INPUT_PORTS_START( racedriv )
PORT_BIT( 0xff, 0x00, IPT_PEDAL3 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_NAME("Clutch Pedal")

PORT_START("mainpcb:8BADC.2") /* b00000 - 8 bit ADC 2 - seat */
PORT_BIT( 0xff, 0x80, IPT_CUSTOM )
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20) PORT_NAME("Seat")

PORT_START("mainpcb:8BADC.3") /* b00000 - 8 bit ADC 3 - shifter lever Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(128) PORT_CODE_DEC(KEYCODE_R) PORT_CODE_INC(KEYCODE_F) PORT_NAME("Shifter Lever Y")
Expand Down
7 changes: 6 additions & 1 deletion src/mame/konami/gticlub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ class gticlub_base_state : public driver_device
optional_memory_bank_array<2> m_cgboard_bank;
optional_ioport_array<4> m_analog;
required_ioport_array<4> m_ports;
output_finder<2> m_pcb_digit;
output_finder<3> m_pcb_digit;
memory_view m_cg_view;

emu_timer *m_sound_irq_timer = nullptr;
Expand Down Expand Up @@ -440,6 +440,11 @@ void gticlub_base_state::sysreg_w(offs_t offset, uint8_t data)
m_pcb_digit[offset] = bitswap<7>(~data,0,1,2,3,4,5,6);
break;

case 2:
// GTI club drive commands
m_pcb_digit[offset] = data;
break;

case 3:
m_eeprom->di_write(BIT(data, 0));
m_eeprom->clk_write(BIT(data, 1));
Expand Down
10 changes: 10 additions & 0 deletions src/mame/namco/namcos22.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2816,9 +2816,19 @@ void namcos22_state::handle_driving_io()
m_shareram[0x034/2] = gas;
m_shareram[0x036/2] = brake;
handle_coinage(flags);
handle_output_io();
}
}

/* TODO: REMOVE (THIS IS HANDLED BY "IOMCU") */
void namcos22_state::handle_output_io()
{
// outputs
m_mcu_out[0] = m_shareram[0x20/2] & 0xff; // lamps, coin counters
m_mcu_out[1] = m_shareram[0x40/2] & 0xff; // drive commands (raverace, acedrive, victlap)
m_mcu_out[2] = m_shareram[0x42/2] & 0xff; // led outputs (acedrive, victlap)
}

/* TODO: REMOVE (THIS IS HANDLED BY "IOMCU") */
void namcos22_state::handle_cybrcomm_io()
{
Expand Down
1 change: 1 addition & 0 deletions src/mame/namco/namcos22.h
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ class namcos22_state : public driver_device
void handle_driving_io();
void handle_coinage(u16 flags);
void handle_cybrcomm_io();
void handle_output_io();
void pdp_handle_commands(u16 offs);
inline u32 pdp_polygonram_read(offs_t offs) { return m_polygonram[offs & 0x7fff]; }
inline void pdp_polygonram_write(offs_t offs, u32 data) { m_polygonram[offs & 0x7fff] = data; }
Expand Down
2 changes: 1 addition & 1 deletion src/osd/modules/file/posixsocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class posix_osd_socket : public osd_file
m_listening = false;
actual = 0;

return std::error_condition();
return std::errc::operation_would_block;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/osd/modules/file/winrtsocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class win_osd_socket : public osd_file
m_listening = false;
actual = 0;

return error::NONE;
return error::FAILURE;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t think this will compile at all – note that osd_file::error no longer exists at all, and this class no longer implements osd_file properly. It’s probably better not to change it at all unless you’re going to test that it actually still builds for WinRT partition.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still the behaviour should be identical to the other osd_file socket implementations, right?
It it does not build right now, the change won't hurt anyway.

}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/osd/modules/file/winsocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class win_osd_socket : public osd_file
m_listening = false;
actual = 0;

return std::error_condition();
return std::errc::operation_would_block;
}
}
}
Expand Down
Loading