From 131c8609c8055115f4ba05239f2a407260ba5fe8 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 29 Dec 2020 12:36:26 -0800 Subject: [PATCH] libmeso: explicitly blacklist ::sdmmc::, instead of relying on incorrect board tricks --- libraries/libmesosphere/Makefile | 2 +- .../{board/nintendo/nx => }/impl/sdmmc_base_device_accessor.cpp | 0 .../{board/nintendo/nx => }/impl/sdmmc_base_device_accessor.hpp | 0 .../impl/sdmmc_clock_reset_controller.board.nintendo_nx.cpp | 0 .../nintendo/nx => }/impl/sdmmc_clock_reset_controller.hpp | 0 .../impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.cpp | 0 .../impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.hpp | 0 .../impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.cpp | 0 .../impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.hpp | 0 .../{board/nintendo/nx => }/impl/sdmmc_device_detector.cpp | 0 .../{board/nintendo/nx => }/impl/sdmmc_device_detector.hpp | 0 .../nintendo/nx => }/impl/sdmmc_gc_asic_device_accessor.cpp | 0 .../nintendo/nx => }/impl/sdmmc_gc_asic_device_accessor.hpp | 0 .../{board/nintendo/nx => }/impl/sdmmc_i_device_accessor.hpp | 0 .../{board/nintendo/nx => }/impl/sdmmc_i_host_controller.hpp | 0 .../nintendo/nx => }/impl/sdmmc_io_impl.board.nintendo_nx.cpp | 0 .../nintendo/nx => }/impl/sdmmc_io_impl.board.nintendo_nx.hpp | 0 .../{board/nintendo/nx => }/impl/sdmmc_mmc_device_accessor.cpp | 0 .../{board/nintendo/nx => }/impl/sdmmc_mmc_device_accessor.hpp | 0 .../sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_gc_asic0.cpp | 0 .../sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_gc_asic0.hpp | 0 .../sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_mmc0.cpp | 0 .../sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_mmc0.hpp | 0 .../sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_sd_card0.cpp | 0 .../sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_sd_card0.hpp | 0 .../nintendo/nx => }/impl/sdmmc_sd_card_device_accessor.cpp | 0 .../nintendo/nx => }/impl/sdmmc_sd_card_device_accessor.hpp | 0 .../nintendo/nx => }/impl/sdmmc_sd_host_standard_controller.cpp | 0 .../nintendo/nx => }/impl/sdmmc_sd_host_standard_controller.hpp | 0 .../nintendo/nx => }/impl/sdmmc_sd_host_standard_registers.hpp | 0 .../nx => }/impl/sdmmc_sdmmc_controller.board.nintendo_nx.cpp | 0 .../nx => }/impl/sdmmc_sdmmc_controller.board.nintendo_nx.hpp | 0 .../nintendo/nx => }/impl/sdmmc_select_sdmmc_controller.hpp | 0 .../source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_timer.cpp | 0 .../source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_timer.hpp | 0 .../source/sdmmc/{board/nintendo/nx => }/sdmmc_common.cpp | 0 .../source/sdmmc/{board/nintendo/nx => }/sdmmc_gc_asic.cpp | 0 .../source/sdmmc/{board/nintendo/nx => }/sdmmc_mmc.cpp | 0 .../source/sdmmc/{board/nintendo/nx => }/sdmmc_sd_card.cpp | 0 39 files changed, 1 insertion(+), 1 deletion(-) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_base_device_accessor.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_base_device_accessor.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_clock_reset_controller.board.nintendo_nx.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_clock_reset_controller.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_device_detector.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_device_detector.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_gc_asic_device_accessor.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_gc_asic_device_accessor.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_i_device_accessor.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_i_host_controller.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_io_impl.board.nintendo_nx.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_io_impl.board.nintendo_nx.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_mmc_device_accessor.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_mmc_device_accessor.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_gc_asic0.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_gc_asic0.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_mmc0.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_mmc0.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_sd_card0.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_port_sd_card0.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_sd_card_device_accessor.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_sd_card_device_accessor.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_sd_host_standard_controller.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_sd_host_standard_controller.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_sd_host_standard_registers.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_sdmmc_controller.board.nintendo_nx.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_sdmmc_controller.board.nintendo_nx.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_select_sdmmc_controller.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_timer.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/impl/sdmmc_timer.hpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/sdmmc_common.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/sdmmc_gc_asic.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/sdmmc_mmc.cpp (100%) rename libraries/libvapours/source/sdmmc/{board/nintendo/nx => }/sdmmc_sd_card.cpp (100%) diff --git a/libraries/libmesosphere/Makefile b/libraries/libmesosphere/Makefile index 7e8c26d0b..18027ae78 100644 --- a/libraries/libmesosphere/Makefile +++ b/libraries/libmesosphere/Makefile @@ -16,7 +16,7 @@ CFLAGS := $(ATMOSPHERE_CFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE) CXXFLAGS := $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) -fno-use-cxa-atexit -flto ASFLAGS := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE) -SOURCES += $(call ALL_SOURCE_DIRS,../libvapours/source) +SOURCES += $(foreach v,$(call ALL_SOURCE_DIRS,../libvapours/source),$(if $(findstring ../libvapours/source/sdmmc,$v),,$v)) LIBS := diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_base_device_accessor.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_base_device_accessor.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_base_device_accessor.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_base_device_accessor.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_base_device_accessor.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_base_device_accessor.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_base_device_accessor.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_base_device_accessor.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.board.nintendo_nx.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.board.nintendo_nx.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.board.nintendo_nx.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.board.nintendo_nx.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.pcv.board.nintendo_nx.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_clock_reset_controller.reg.board.nintendo_nx.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_device_detector.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_device_detector.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_device_detector.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_device_detector.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_device_detector.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_device_detector.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_device_detector.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_device_detector.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_gc_asic_device_accessor.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_gc_asic_device_accessor.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_gc_asic_device_accessor.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_gc_asic_device_accessor.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_gc_asic_device_accessor.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_gc_asic_device_accessor.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_gc_asic_device_accessor.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_gc_asic_device_accessor.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_i_device_accessor.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_i_device_accessor.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_i_device_accessor.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_i_device_accessor.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_i_host_controller.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_i_host_controller.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_i_host_controller.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_i_host_controller.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_io_impl.board.nintendo_nx.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_io_impl.board.nintendo_nx.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_io_impl.board.nintendo_nx.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_io_impl.board.nintendo_nx.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_io_impl.board.nintendo_nx.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_io_impl.board.nintendo_nx.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_io_impl.board.nintendo_nx.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_io_impl.board.nintendo_nx.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_mmc_device_accessor.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_mmc_device_accessor.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_mmc_device_accessor.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_mmc_device_accessor.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_mmc_device_accessor.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_mmc_device_accessor.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_mmc_device_accessor.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_mmc_device_accessor.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_gc_asic0.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_gc_asic0.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_gc_asic0.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_port_gc_asic0.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_gc_asic0.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_gc_asic0.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_gc_asic0.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_port_gc_asic0.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_mmc0.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_mmc0.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_mmc0.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_mmc0.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_sd_card0.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_sd_card0.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_sd_card0.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_port_sd_card0.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_sd_card0.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_sd_card0.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_port_sd_card0.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_port_sd_card0.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_card_device_accessor.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_card_device_accessor.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_card_device_accessor.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_sd_card_device_accessor.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_card_device_accessor.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_card_device_accessor.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_card_device_accessor.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_sd_card_device_accessor.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_host_standard_controller.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_host_standard_controller.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_host_standard_controller.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_host_standard_controller.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_host_standard_registers.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_registers.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sd_host_standard_registers.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_registers.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sdmmc_controller.board.nintendo_nx.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sdmmc_controller.board.nintendo_nx.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sdmmc_controller.board.nintendo_nx.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_sdmmc_controller.board.nintendo_nx.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sdmmc_controller.board.nintendo_nx.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sdmmc_controller.board.nintendo_nx.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_sdmmc_controller.board.nintendo_nx.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_sdmmc_controller.board.nintendo_nx.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_select_sdmmc_controller.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_select_sdmmc_controller.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_select_sdmmc_controller.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_select_sdmmc_controller.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_timer.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_timer.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_timer.cpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_timer.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_timer.hpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_timer.hpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/impl/sdmmc_timer.hpp rename to libraries/libvapours/source/sdmmc/impl/sdmmc_timer.hpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_common.cpp b/libraries/libvapours/source/sdmmc/sdmmc_common.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_common.cpp rename to libraries/libvapours/source/sdmmc/sdmmc_common.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_gc_asic.cpp b/libraries/libvapours/source/sdmmc/sdmmc_gc_asic.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_gc_asic.cpp rename to libraries/libvapours/source/sdmmc/sdmmc_gc_asic.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_mmc.cpp b/libraries/libvapours/source/sdmmc/sdmmc_mmc.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_mmc.cpp rename to libraries/libvapours/source/sdmmc/sdmmc_mmc.cpp diff --git a/libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_sd_card.cpp b/libraries/libvapours/source/sdmmc/sdmmc_sd_card.cpp similarity index 100% rename from libraries/libvapours/source/sdmmc/board/nintendo/nx/sdmmc_sd_card.cpp rename to libraries/libvapours/source/sdmmc/sdmmc_sd_card.cpp