Merge pull request #12355 from fuzziqersoftware/tapserver-modem-adapter

Implement tapserver-based modem adapter

2 files changed, 32 insertions, 0 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
index ea685b817d..f959764564 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
@@ -23,6 +23,18 @@ enum class StringSetting(
         "BBA_BUILTIN_DNS",
         "3.18.217.27"
     ),
+    MAIN_BBA_TAPSERVER_DESTINATION(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "BBA_TAPSERVER_DESTINATION",
+        "/tmp/dolphin-tap"
+    ),
+    MAIN_MODEM_TAPSERVER_DESTINATION(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "MODEM_TAPSERVER_DESTINATION",
+        "/tmp/dolphin-modem-tap"
+    ),
     MAIN_CUSTOM_RTC_VALUE(
         Settings.FILE_DOLPHIN,
         Settings.SECTION_INI_CORE,
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
index 44e2b2b915..a3ec018b46 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -1101,6 +1101,16 @@ class SettingsFragmentPresenter(
                     R.string.xlink_kai_bba_ip_description
                 )
             )
+        } else if (serialPort1Type == 11) {
+            // Broadband Adapter (tapserver)
+            sl.add(
+                InputStringSetting(
+                    context,
+                    StringSetting.MAIN_BBA_TAPSERVER_DESTINATION,
+                    R.string.bba_tapserver_destination,
+                    R.string.bba_tapserver_destination_description
+                )
+            )
         } else if (serialPort1Type == 12) {
             // Broadband Adapter (Built In)
             sl.add(
@@ -1111,6 +1121,16 @@ class SettingsFragmentPresenter(
                     R.string.bba_builtin_dns_description
                 )
             )
+        } else if (serialPort1Type == 13) {
+            // Modem Adapter (tapserver)
+            sl.add(
+                InputStringSetting(
+                    context,
+                    StringSetting.MAIN_MODEM_TAPSERVER_DESTINATION,
+                    R.string.modem_tapserver_destination,
+                    R.string.modem_tapserver_destination_description
+                )
+            )
         }
     }