Fix overriding firmware language in DSi mode, add experimental support for Chinese language option

Author: asiekierka

src/SPI_Firmware.h

@@ -164,7 +164,7 @@ class Firmware
     static_assert(sizeof(ExtendedWifiAccessPoint) == 512, "WifiAccessPoint should be 512 bytes");
 
 
-    enum class FirmwareConsoleType : u8
+    enum FirmwareConsoleType : u8
     {
         DS = 0xFF,
         DSLite = 0x20,
@@ -266,7 +266,7 @@ class Firmware
             u8 BuildMonth;
             u8 BuildYear;
 
-            FirmwareConsoleType ConsoleType;
+            u8 ConsoleType;
 
             u8 Unused0[2];
 

src/Wifi.cpp

@@ -183,16 +183,16 @@ void Wifi::Reset()
 
     CurChannel = 0;
 
-    Firmware::FirmwareConsoleType console = fwheader.ConsoleType;
-    if (console == Firmware::FirmwareConsoleType::DS)
+    auto consoletype = fwheader.ConsoleType;
+    if (consoletype == Firmware::FirmwareConsoleType::DS || consoletype == Firmware::FirmwareConsoleType::iQueDS)
         IOPORT(0x000) = 0x1440;
-    else if (console == Firmware::FirmwareConsoleType::DSLite)
+    else if (consoletype == Firmware::FirmwareConsoleType::DSLite || consoletype == Firmware::FirmwareConsoleType::iQueDSLite)
         IOPORT(0x000) = 0xC340;
-    else if (NDS.ConsoleType == 1 && console == Firmware::FirmwareConsoleType::DSi)
+    else if (NDS.ConsoleType == 1 && consoletype == Firmware::FirmwareConsoleType::DSi)
         IOPORT(0x000) = 0xC340; // DSi has the modern DS-wifi variant
     else
     {
-        Log(LogLevel::Warn, "wifi: unknown console type %02X\n", console);
+        Log(LogLevel::Warn, "wifi: unknown console type %02X\n", consoletype);
         IOPORT(0x000) = 0x1440;
     }
 

src/frontend/qt_sdl/EmuInstance.cpp

@@ -1691,6 +1691,7 @@ void EmuInstance::customizeFirmware(Firmware& firmware, bool overridesettings) n
 {
     if (overridesettings)
     {
+        auto &currentHeader = firmware.GetHeader();
         auto &currentData = firmware.GetEffectiveUserData();
 
         auto firmcfg = localCfg.GetTable("Firmware");
@@ -1707,8 +1708,25 @@ void EmuInstance::customizeFirmware(Firmware& firmware, bool overridesettings) n
         auto language = static_cast<Firmware::Language>(firmcfg.GetInt("Language"));
         if (language != Firmware::Language::Reserved)
         { // If the frontend specifies a language (rather than using the existing value)...
-            currentData.Settings &= ~Firmware::Language::Reserved; // ..clear the existing language...
-            currentData.Settings |= language; // ...and set the new one.
+            bool extlang = language >= Firmware::Language::Chinese;
+
+            // ..clear the existing language...
+            currentData.Settings &= ~Firmware::Language::Reserved;
+
+            // ...and set the new one.
+            currentData.Settings |= extlang ? Firmware::Language::English : language;
+            currentData.ExtendedSettings.ExtendedLanguage = language;
+
+            if (extlang && !(currentHeader.ConsoleType & 0x40))
+            {
+                // enable the extended settings header if not present
+                if (currentHeader.ConsoleType == 0xFF)
+                    currentHeader.ConsoleType = 0x43;
+                else
+                    currentHeader.ConsoleType |= 0x43;
+                currentData.ExtendedSettings.Unknown0 = 0x01;
+                currentData.ExtendedSettings.SupportedLanguageMask = 0x7F;
+            }
         }
 
         // setting up color

src/frontend/qt_sdl/FirmwareSettingsDialog.h

@@ -79,7 +79,8 @@ class FirmwareSettingsDialog : public QDialog
         "French",
         "German",
         "Italian",
-        "Spanish"
+        "Spanish",
+        "Chinese"
     };
 
     const QStringList months