summaryrefslogtreecommitdiffstats
path: root/src/mame/machine/nes.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/nes.cpp')
-rw-r--r--src/mame/machine/nes.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/mame/machine/nes.cpp b/src/mame/machine/nes.cpp
index 993215b9b1c..00052b0c437 100644
--- a/src/mame/machine/nes.cpp
+++ b/src/mame/machine/nes.cpp
@@ -185,14 +185,11 @@ void nes_base_state::nes_in0_w(uint8_t data)
uint8_t nes_state::fc_in0_r()
{
uint8_t ret = 0x40;
- // bit 0 to controller port
+ // bit 0 from controller port
ret |= m_ctrl1->read_bit0();
- // expansion port bits (in the original FC, P2 controller was hooked to these lines
- // too, so in principle some homebrew hardware modification could use the same
- // connection with P1 controller too)
- ret |= m_ctrl1->read_exp(0);
- ret |= m_ctrl2->read_exp(0);
+ // bit 2 from P2 controller microphone
+ ret |= m_ctrl2->read_bit2();
// at the same time, we might have a standard joypad connected to the expansion port which
// shall be read as P3 (this is needed here to avoid implementing the expansion port as a
@@ -206,15 +203,9 @@ uint8_t nes_state::fc_in0_r()
uint8_t nes_state::fc_in1_r()
{
uint8_t ret = 0x40;
- // bit 0 to controller port
+ // bit 0 from controller port
ret |= m_ctrl2->read_bit0();
- // expansion port bits (in the original FC, P2 controller was hooked to these lines
- // too, so in principle some homebrew hardware modification could use the same
- // connection with P1 controller too)
- ret |= m_ctrl1->read_exp(1);
- ret |= m_ctrl2->read_exp(1);
-
// finally, read the expansion port as expected (standard pad cannot be hooked as P4, so
// no read_bit0 here)
ret |= m_exp->read_exp(1);