From b092850c07bd8788386d46318d7f2dde0a03b87c Mon Sep 17 00:00:00 2001
From: Zack Buhman <zack@buhman.org>
Date: Mon, 8 May 2023 06:51:18 -0700
Subject: [PATCH] smpc/input_intback: handle controller disconnection

This still only parses digital pad correctly.
---
 smpc/input_intback.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/smpc/input_intback.cpp b/smpc/input_intback.cpp
index 907b247..1eab6a7 100644
--- a/smpc/input_intback.cpp
+++ b/smpc/input_intback.cpp
@@ -160,15 +160,20 @@ void smpc_int(void) {
     switch (intback.fsm++) {
     case PORT_STATUS:
       port_connected = (PORT_STATUS__CONNECTORS(oreg) == 1);
-      break;
-    case PERIPHERAL_ID:
       if (port_connected) {
-        assert(PERIPHERAL_ID__IS_DIGITAL_PAD(oreg));
-        assert(PERIPHERAL_ID__DATA_SIZE(oreg) == 2);
+        assert(PORT_STATUS__MULTITAP_ID(oreg) == 0xf);
+      } else {
+        intback.fsm = FSM_NEXT;
       }
       break;
+    case PERIPHERAL_ID:
+      assert(port_connected);
+      assert(PERIPHERAL_ID__IS_DIGITAL_PAD(oreg));
+      assert(PERIPHERAL_ID__DATA_SIZE(oreg) == 2);
+      break;
     case DATA1:
-      if (port_connected) {
+      assert(port_connected);
+      {
         controller_state& c = intback.controller[intback.controller_ix];
         c.right = (DIGITAL__1__RIGHT & oreg) == 0;
         c.left  = (DIGITAL__1__LEFT  & oreg) == 0;
@@ -177,6 +182,7 @@ void smpc_int(void) {
       }
       break;
     case DATA2:
+      assert(port_connected);
       // ignore data2
       break;
     }