Merge pull request #10884 from JosJuice/android-bba-tapless

Android: Add "Broadband Adapter (Built In)" to settings
dolphin-emu · Jul 23, 2022 · fdecd56 · fdecd56
2 parents 89c4fde + c0cf6f0
commit fdecd56
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java b/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java
@@ -17,6 +17,10 @@ public enum StringSetting implements AbstractStringSetting
   MAIN_BBA_MAC(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_MAC", ""),
   MAIN_BBA_XLINK_IP(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_XLINK_IP", ""),
 
+  // Schthack PSO Server - https://schtserv.com/
+  MAIN_BBA_BUILTIN_DNS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_BUILTIN_DNS",
+          "149.56.167.128"),
+
   MAIN_GFX_BACKEND(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "GFXBackend",
           NativeLibrary.GetDefaultGraphicsBackendName()),
 

diff --git a/...c/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/...c/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -577,12 +577,17 @@ else if (defaultCpuCore == 4)  // AArch64
 
   private void addSerialPortSubSettings(ArrayList<SettingsItem> sl, int serialPort1Type)
   {
-    if (serialPort1Type == 10) // XLink Kai
+    if (serialPort1Type == 10) // Broadband Adapter (XLink Kai)
     {
       sl.add(new HyperLinkHeaderSetting(mContext, R.string.xlink_kai_guide_header, 0));
       sl.add(new InputStringSetting(mContext, StringSetting.MAIN_BBA_XLINK_IP,
               R.string.xlink_kai_bba_ip, R.string.xlink_kai_bba_ip_description));
     }
+    else if (serialPort1Type == 12) // Broadband Adapter (Built In)
+    {
+      sl.add(new InputStringSetting(mContext, StringSetting.MAIN_BBA_BUILTIN_DNS,
+              R.string.bba_builtin_dns, R.string.bba_builtin_dns_description));
+    }
   }
 
   private void addGcPadSettings(ArrayList<SettingsItem> sl)

diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
@@ -102,11 +102,13 @@
         <item>Nothing</item>
         <item>Dummy</item>
         <item>Broadband Adapter (XLink Kai)</item>
+        <item>Broadband Adapter (Built In)</item>
     </string-array>
     <integer-array name="serialPort1DeviceValues" translatable="false">
         <item>255</item>
         <item>0</item>
         <item>10</item>
+        <item>12</item>
     </integer-array>
 
     <!-- GameCube System Languages -->

diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
@@ -166,6 +166,8 @@
     <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_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>
 
     <!-- Interface Preference Fragment -->
     <string name="interface_submenu">Interface</string>