diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-03-22 02:47:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-22 02:47:06 +0100 |
| commit | b510ac89a31febc07b6764d3f5d704b1e1a5fe8b (patch) | |
| tree | 91666e6136efae1fd0791cdc62f0ef7294815e7e /Source/Android/app/src | |
| parent | f535b61d5d4e14d3930eafba2ae94f488619090d (diff) | |
| parent | f7a01471767400d025f2467a611e58b344e0afc4 (diff) | |
Merge pull request #12355 from fuzziqersoftware/tapserver-modem-adapter
Implement tapserver-based modem adapter
Diffstat (limited to 'Source/Android/app/src')
3 files changed, 36 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 + ) + ) } } diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 251886b98a..89ddc6b705 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -133,6 +133,10 @@ <string name="xlink_kai_guide_header">For setup instructions, <a href="https://www.teamxlink.co.uk/wiki/Dolphin">refer to this page.</a></string> <string name="xlink_kai_bba_ip">XLink Kai IP Address/hostname</string> <string name="xlink_kai_bba_ip_description">IP address or hostname of device running the XLink Kai client</string> + <string name="bba_tapserver_destination">Tapserver destination</string> + <string name="bba_tapserver_destination_description">Enter the socket path or netloc (address:port) of the tapserver instance</string> + <string name="modem_tapserver_destination">Tapserver destination</string> + <string name="modem_tapserver_destination_description">Enter the socket path or netloc (address:port) of the tapserver instance</string> <string name="bba_builtin_dns">DNS Server</string> <string name="bba_builtin_dns_description">Use 8.8.8.8 for normal DNS, else enter your custom one</string> |