From 248e8ad1ca794e1bd245e45252ef6466f6c87e27 Mon Sep 17 00:00:00 2001
From: Toad King <toadking@toadking.com>
Date: Mon, 20 Jul 2015 20:08:13 -0500
Subject: [PATCH] [GX] properly shut down dev thread

---
 frontend/drivers/platform_gx.c | 35 +++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index d4b010639e..57a551baf5 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -2,7 +2,7 @@
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2015 - Daniel De Matteis
  *  Copyright (C) 2012-2015 - Michael Lelli
- * 
+ *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU General Public License as published by the Free Software Found-
  *  ation, either version 3 of the License, or (at your option) any later version.
@@ -53,6 +53,7 @@ extern void system_exec_wii(const char *path, bool should_load_game);
 #endif
 #include <sdcard/gcsd.h>
 #include <fat.h>
+#include <rthreads/rthreads.h>
 
 #ifdef USBGECKO
 #include <debug.h>
@@ -108,10 +109,12 @@ static struct {
 static slock_t *gx_device_mutex;
 static slock_t *gx_device_cond_mutex;
 static scond_t *gx_device_cond;
+static sthread_t *gx_device_thread;
+static volatile bool gx_stop_dev_thread;
 
-static void *gx_devthread(void *a)
+static void gx_devthread(void *a)
 {
-   while (1)
+   while (!gx_stop_dev_thread)
    {
       unsigned i;
 
@@ -119,7 +122,7 @@ static void *gx_devthread(void *a)
 
       for (i = 0; i < GX_DEVICE_END; i++)
       {
-         if (gx_devices[i].mounted && 
+         if (gx_devices[i].mounted &&
                !gx_devices[i].interface->isInserted())
          {
             gx_devices[i].mounted = false;
@@ -135,8 +138,6 @@ static void *gx_devthread(void *a)
       scond_wait_timeout(gx_device_cond, gx_device_cond_mutex, 1000000);
       slock_unlock(gx_device_cond_mutex);
    }
-
-   return NULL;
 }
 
 static int gx_get_device_from_path(const char *path)
@@ -222,7 +223,7 @@ static void frontend_gx_get_environment_settings(int *argc, char *argv[],
       gx_rom_path[0] = '\0';
 #else
 #ifdef HW_RVL
-   /* needed on Wii; loaders follow a dumb standard where the path and 
+   /* needed on Wii; loaders follow a dumb standard where the path and
     * filename are separate in the argument list */
    if (*argc > 2 && argv[1] != NULL && argv[2] != NULL)
    {
@@ -297,7 +298,6 @@ static void frontend_gx_init(void *data)
 #endif
 
 #if defined(HW_RVL) && !defined(IS_SALAMANDER)
-   OSThread gx_device_thread;
    gx_devices[GX_DEVICE_SD].interface = &__io_wiisd;
    gx_devices[GX_DEVICE_SD].name = "sd";
    gx_devices[GX_DEVICE_SD].mounted = fatMountSimple(
@@ -312,7 +312,20 @@ static void frontend_gx_init(void *data)
    gx_device_cond_mutex = slock_new();
    gx_device_cond       = scond_new();
    gx_device_mutex      = slock_new();
-   OSCreateThread(&gx_device_thread, gx_devthread, 0, NULL, NULL, 0, 66, 0);
+   gx_device_thread     = sthread_create(gx_devthread, NULL);
+#endif
+}
+
+static void frontend_gx_deinit(void *data)
+{
+   (void)data;
+
+#if defined(HW_RVL) && !defined(IS_SALAMANDER)
+   slock_lock(gx_device_cond_mutex);
+   gx_stop_dev_thread = true;
+   slock_unlock(gx_device_cond_mutex);
+   scond_signal(gx_device_cond);
+   sthread_join(gx_device_thread);
 #endif
 }
 
@@ -346,7 +359,7 @@ static void frontend_gx_process_args(int *argc, char *argv[])
 #ifndef IS_SALAMANDER
    settings_t *settings = config_get_ptr();
 
-   /* A big hack: sometimes Salamander doesn't save the new core 
+   /* A big hack: sometimes Salamander doesn't save the new core
     * it loads on first boot, so we make sure
     * settings->libretro is set here. */
    if (!settings->libretro[0] && *argc >= 1 && strrchr(argv[0], '/'))
@@ -407,7 +420,7 @@ static int frontend_gx_parse_drive_list(void *data)
 const frontend_ctx_driver_t frontend_ctx_gx = {
    frontend_gx_get_environment_settings,
    frontend_gx_init,
-   NULL,                            /* deinit */
+   frontend_gx_deinit,
    frontend_gx_exitspawn,
    frontend_gx_process_args,
    frontend_gx_exec,