From e27e1114c77088c594c3368c970db941c2f83c03 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Fri, 7 Dec 2018 14:18:43 +0000
Subject: [PATCH] (3DS) Improve default configuration

---
 config.def.h                    |  5 +++++
 configuration.c                 |  7 +++++--
 frontend/drivers/platform_ctr.c | 27 ++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/config.def.h b/config.def.h
index 02fe8569cc..362672ca6b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -244,6 +244,11 @@ static const bool aspect_ratio_auto = false;
 static unsigned aspect_ratio_idx = ASPECT_RATIO_16_9;
 #elif defined(PSP)
 static unsigned aspect_ratio_idx = ASPECT_RATIO_CORE;
+#elif defined(_3DS)
+/* Previously defaulted to ASPECT_RATIO_4_3.
+ * Non-4:3 content looks dreadful when stretched
+ * to 4:3 on the 3DS screen... */
+static unsigned aspect_ratio_idx = ASPECT_RATIO_CORE;
 #elif defined(RARCH_CONSOLE)
 static unsigned aspect_ratio_idx = ASPECT_RATIO_4_3;
 #else
diff --git a/configuration.c b/configuration.c
index 4264d236a5..e778f43a09 100644
--- a/configuration.c
+++ b/configuration.c
@@ -543,6 +543,9 @@ static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_CORELOCATION
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
 #endif
 
+#if defined(_3DS) && defined(HAVE_RGUI)
+static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_RGUI;
+#else
 #if defined(HAVE_XUI)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI;
 #elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE)
@@ -556,7 +559,7 @@ static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_RGUI;
 #else
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_NULL;
 #endif
-
+#endif
 
 #define GENERAL_SETTING(key, configval, default_enable, default_setting, type, handle_setting) \
 { \
@@ -678,7 +681,7 @@ const char *config_get_default_audio(void)
       case AUDIO_PS2:
          return "ps2";
       case AUDIO_CTR:
-         return "csnd";
+         return "dsp";
       case AUDIO_SWITCH:
          return "switch";
       case AUDIO_RWEBAUDIO:
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index 68110a0f28..58fb331736 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -240,13 +240,15 @@ static void frontend_ctr_exec(const char* path, bool should_load_game)
       }
       else
       {
-         RARCH_LOG("\n");
-         RARCH_LOG("\n");
-         RARCH_LOG("Warning:\n");
-         RARCH_LOG("First core launch may take 20 seconds!\n");
-         RARCH_LOG("Do not force quit before then or your memory card may be corrupted!\n");
-         RARCH_LOG("\n");
-         RARCH_LOG("\n");
+         RARCH_WARN("\n");
+         RARCH_WARN("\n");
+         RARCH_WARN("Warning:\n");
+         RARCH_WARN("First core launch may take 20\n");
+         RARCH_WARN("seconds! Do not force quit\n");
+         RARCH_WARN("before then or your memory\n");
+         RARCH_WARN("card may be corrupted!\n");
+         RARCH_WARN("\n");
+         RARCH_WARN("\n");
          exec_cia(path, arg_data);
       }
 
@@ -356,6 +358,17 @@ static void ctr_check_dspfirm(void)
          }
          fclose(code_fp);
       }
+      else
+      {
+         RARCH_WARN("\n");
+         RARCH_WARN("\n");
+         RARCH_WARN("Warning:\n");
+         RARCH_WARN("3DS DSP dump is missing.\n");
+         RARCH_WARN("A working DSP dump is required\n");
+         RARCH_WARN("for correct operation.\n");
+         RARCH_WARN("\n");
+         RARCH_WARN("\n");
+      }
    }
 }