(WiiU) Switch from libiosuhax to libmocha, enable libfat

Users need to be running an updated Tiramisu or Aroma, otherwise we'll fall
back to the standard wut devoptab. Since Aroma ships with plugins that keep
the SD card mounted all the time, we have some restrictions:
- On Tiramisu, use libfat for the USB and SD card
- On Aroma, use libfat for the USB only - stock devoptab for SD card

This makes loading on aroma preeeettty slow.

Author: ashquarky

Makefile.common

@@ -2381,12 +2381,37 @@ ifeq ($(HAVE_STATIC_VIDEO_FILTERS), 1)
           gfx/video_filters/upscale_mix_240x160_320x240.o
 endif
 
-ifeq ($(WANT_IOSUHAX), 1)
-   DEFINES += -DHAVE_IOSUHAX
-   INCLUDE_DIRS += -I$(DEPS_DIR)/libiosuhax/include
-   OBJ += $(DEPS_DIR)/libiosuhax/source/iosuhax.o \
-          $(DEPS_DIR)/libiosuhax/source/iosuhax_devoptab.o \
-          $(DEPS_DIR)/libiosuhax/source/iosuhax_disc_interface.o
+ifeq ($(WANT_LIBMOCHA), 1)
+   DEFINES += -DHAVE_LIBMOCHA
+   INCLUDE_DIRS += -I$(DEPS_DIR)/libmocha/include
+   OBJ += $(DEPS_DIR)/libmocha/source/disc_interface.o \
+          $(DEPS_DIR)/libmocha/source/fsa.o \
+          $(DEPS_DIR)/libmocha/source/utils.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_chdir.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_chmod.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_close.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_dirclose.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_dirnext.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_diropen.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_dirreset.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_fchmod.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_fstat.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_fsync.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_link.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_mkdir.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_open.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_read.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_rename.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_rmdir.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_seek.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_stat.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_statvfs.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_truncate.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_unlink.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_utils.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_utimes.o \
+          $(DEPS_DIR)/libmocha/source/devoptab/devoptab_fsa_write.o
 endif
 
 ifeq ($(WANT_LIBFAT), 1)

Makefile.wiiu

@@ -100,7 +100,7 @@ endif
 
       INCDIRS += -Ilibretro-common/include/compat/zlib
       # for stb, libfat, iosuhax
-      INCDIRS += -Ideps -Ideps/libfat/include -Ideps/libiosuhax/include
+      INCDIRS += -Ideps
       # pad_functions uses wiiu/input.h
       INCDIRS += -Iinput/include
       INCDIRS += -Ideps/SPIRV-Cross
@@ -116,7 +116,6 @@ endif
       #DEFINES += -DHAVE_FREETYPE
       DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
       DEFINES += -DHAVE_HID
-      DEFINES += -DWANT_LIBFAT -DHAVE_LIBFAT -DWANT_IOSUHAX -DHAVE_IOSUHAX
       DEFINES += -DHAVE_CORE_INFO_CACHE
       DEFINES += -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
 
@@ -161,7 +160,7 @@ endif
       HAVE_STATIC_VIDEO_FILTERS = 1
       HAVE_STATIC_AUDIO_FILTERS = 1
       WANT_LIBFAT = 1
-      WANT_IOSUHAX = 1
+      WANT_LIBMOCHA = 1
       HAVE_CORE_INFO_CACHE = 1
 
       include Makefile.common

deps/libfat/common.h

@@ -42,7 +42,7 @@
 
 /* Platform specific includes */
 #if   defined (__wiiu__)
-   #include <iosuhax_disc_interface.h>
+   #include <mocha/disc_interface.h>
    typedef uint8_t u8;
    typedef uint16_t u16;
    typedef int32_t s32;

deps/libfat/disc.c

@@ -40,16 +40,16 @@ The list is terminated by a NULL/NULL entry.
 
 /* ====================== Wii U ====================== */
 #if   defined (__wiiu__)
-#include <iosuhax_disc_interface.h>
+#include <mocha/disc_interface.h>
 
 static const DISC_INTERFACE* get_io_wiiu_sd (void)
 {
-	return &IOSUHAX_sdio_disc_interface;
+	return &Mocha_sdio_disc_interface;
 }
 
 static const DISC_INTERFACE* get_io_wiiu_usb (void)
 {
-	return &IOSUHAX_usb_disc_interface;
+	return &Mocha_usb_disc_interface;
 }
 
 const INTERFACE_ID _FAT_disc_interfaces[] = {

deps/libfat/include/fat.h

@@ -48,7 +48,7 @@ extern "C" {
 #include <stdint.h>
 
 #if   defined (__wiiu__)
-#  include <iosuhax_disc_interface.h>
+#  include <mocha/disc_interface.h>
 #elif defined(__gamecube__) || defined (__wii__)
 #  include <ogc/disc_io.h>
 #else

deps/libfat/mem_allocate.h

@@ -5,7 +5,7 @@
  malloc is unavailable
 
  Copyright (c) 2006 Michael "Chishm" Chisholm
-	
+
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
 
@@ -42,6 +42,8 @@ static inline void* _FAT_mem_align (size_t size)
 {
 #ifdef __wii__
    return memalign (32, size);
+#elif defined(__wiiu__)
+   return memalign (64, size);
 #else
    return malloc (size);
 #endif