diff options
| author | Martin Michelsen <fuzziqersoftware+g@gmail.com> | 2023-02-12 17:58:17 -0800 |
|---|---|---|
| committer | Martin Michelsen <fuzziqersoftware+g@gmail.com> | 2024-03-17 18:37:55 -0700 |
| commit | 0c364cbb4cc0bc6ef2937826d67c1483cf17551a (patch) | |
| tree | 3aab3d3686855e1c306f8115541c9f9ca32da2ec /Source/Android/app/src/main/java | |
| parent | 85dee300b5bbd8c64dee5e9305a626435bef2062 (diff) | |
implement tapserver BBA on all platforms
This expands the tapserver BBA interface to be available on all platforms. tapserver itself is still macOS-only, but newserv (the PSO server) is not, and it can directly accept local and remote tapserver connections as well. This makes the tapserver interface potentially useful on all platforms.
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 17 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..8dc9e619c5 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,12 @@ 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_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..ef395ed6a4 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,17 @@ 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( |
