ams: resolve source dir inconsistency

libraries/config/common.mk

@@ -108,15 +108,17 @@ BUILD        := build
 DATA         := data
 INCLUDES     := include
 
-GENERAL_SOURCE_DIRS=$1 $(foreach d,$(filter-out $1/arch $1/board $1/os $1/cpu $1,$(wildcard $1/*)),$(if $(wildcard $d/.),$(call DIR_WILDCARD,$d) $d,))
+GENERAL_SOURCE_DIRS=$1 $(foreach d,$(filter-out $1/arch $1/board $1/os $1/cpu $1,$(wildcard $1/*)),$(if $(wildcard $d/.),$(filter-out $d,$(call GENERAL_SOURCE_DIRS,$d)) $d,))
 SPECIFIC_SOURCE_DIRS=$(if $(wildcard $1/$2/$3/.*),$1/$2/$3 $(call DIR_WILDCARD,$1/$2/$3),$(if $(wildcard $1/$2/generic/.*), $1/$2/generic $(call DIR_WILDCARD,$1/$2/generic),))
 UNFILTERED_SOURCE_DIRS=$1 $(foreach d,$(wildcard $1/*),$(if $(wildcard $d/.),$(call DIR_WILDCARD,$d) $d,))
 
-ALL_SOURCE_DIRS=$(call GENERAL_SOURCE_DIRS,$1) \
-                $(call SPECIFIC_SOURCE_DIRS,$1,arch,$(ATMOSPHERE_ARCH_DIR)) \
-                $(call SPECIFIC_SOURCE_DIRS,$1,board,$(ATMOSPHERE_BOARD_DIR)) \
-                $(call SPECIFIC_SOURCE_DIRS,$1,os,$(ATMOSPHERE_OS_DIR)) \
-                $(call SPECIFIC_SOURCE_DIRS,$1,cpu,$(ATMOSPHERE_ARCH_DIR)/$(ATMOSPHERE_CPU_DIR))
+ALL_SOURCE_DIRS=$(foreach d,$(call GENERAL_SOURCE_DIRS,$1), \
+                    $d \
+                    $(call SPECIFIC_SOURCE_DIRS,$d,arch,$(ATMOSPHERE_ARCH_DIR)) \
+                    $(call SPECIFIC_SOURCE_DIRS,$d,board,$(ATMOSPHERE_BOARD_DIR)) \
+                    $(call SPECIFIC_SOURCE_DIRS,$d,os,$(ATMOSPHERE_OS_DIR)) \
+                    $(call SPECIFIC_SOURCE_DIRS,$d,cpu,$(ATMOSPHERE_ARCH_DIR)/$(ATMOSPHERE_CPU_DIR)) \
+                )
 
 SOURCES      ?= $(call ALL_SOURCE_DIRS,source)
 

libraries/libstratosphere/include/stratosphere/gpio/driver/gpio_select_driver_api.hpp

@@ -22,7 +22,7 @@
 
 #if defined(ATMOSPHERE_BOARD_NINTENDO_NX)
 
-    #include <stratosphere/gpio/driver/board/nintendo_nx/gpio_driver_api.hpp>
+    #include <stratosphere/gpio/driver/board/nintendo/nx/gpio_driver_api.hpp>
 
     namespace ams::gpio::driver::board {
 

libraries/libstratosphere/include/stratosphere/i2c/driver/i2c_select_driver_api.hpp

@@ -21,7 +21,7 @@
 
 #if defined(ATMOSPHERE_BOARD_NINTENDO_NX)
 
-    #include <stratosphere/i2c/driver/board/nintendo_nx/i2c_driver_api.hpp>
+    #include <stratosphere/i2c/driver/board/nintendo/nx/i2c_driver_api.hpp>
 
     namespace ams::i2c::driver::board {
 

libraries/libstratosphere/include/stratosphere/pwm/driver/pwm_select_driver_api.hpp

@@ -20,7 +20,7 @@
 
 #if defined(ATMOSPHERE_BOARD_NINTENDO_NX)
 
-    #include <stratosphere/pwm/driver/board/nintendo_nx/pwm_driver_api.hpp>
+    #include <stratosphere/pwm/driver/board/nintendo/nx/pwm_driver_api.hpp>
 
     namespace ams::pwm::driver::board {
 

libraries/libstratosphere/source/pinmux/driver/pinmux_select_board_impl.hpp

@@ -18,7 +18,7 @@
 
 #if defined(ATMOSPHERE_BOARD_NINTENDO_NX)
 
-    #include "board/nintendo_nx/pinmux_board_driver_api.hpp"
+    #include "board/nintendo/nx/pinmux_board_driver_api.hpp"
     namespace ams::pinmux::driver::board {
         using namespace ams::pinmux::driver::board::nintendo_nx;
     }

libraries/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.cpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
-#include "../../powctl_device_management.hpp"
+#include "../../../powctl_device_management.hpp"
 #include "powctl_retry_helper.hpp"
 #include "powctl_battery_driver.hpp"
 #include "powctl_max17050_driver.hpp"

libraries/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.hpp

@@ -15,7 +15,7 @@
  */
 #pragma once
 #include <stratosphere.hpp>
-#include "../../powctl_i_power_control_driver.hpp"
+#include "../../../powctl_i_power_control_driver.hpp"
 #include "powctl_interrupt_event_handler.hpp"
 
 namespace ams::powctl::impl::board::nintendo_nx {

libraries/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.cpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
-#include "../../powctl_device_management.hpp"
+#include "../../../powctl_device_management.hpp"
 #include "powctl_board_impl.hpp"
 #include "powctl_battery_driver.hpp"
 #include "powctl_charger_driver.hpp"

libraries/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.cpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
-#include "../../powctl_device_management.hpp"
+#include "../../../powctl_device_management.hpp"
 #include "powctl_retry_helper.hpp"
 #include "powctl_charger_driver.hpp"
 #include "powctl_bq24193_driver.hpp"

libraries/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.hpp

@@ -15,7 +15,7 @@
  */
 #pragma once
 #include <stratosphere.hpp>
-#include "../../powctl_i_power_control_driver.hpp"
+#include "../../../powctl_i_power_control_driver.hpp"
 #include "powctl_interrupt_event_handler.hpp"
 
 namespace ams::powctl::impl::board::nintendo_nx {

libraries/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.hpp

@@ -15,7 +15,7 @@
  */
 #pragma once
 #include <stratosphere.hpp>
-#include "../../powctl_i_power_control_driver.hpp"
+#include "../../../powctl_i_power_control_driver.hpp"
 
 namespace ams::powctl::impl::board::nintendo_nx {
 

libraries/libstratosphere/source/powctl/impl/powctl_select_board_driver.hpp

@@ -19,7 +19,7 @@
 
 #if defined(ATMOSPHERE_BOARD_NINTENDO_NX)
 
-    #include "board/nintendo_nx/powctl_board_impl.hpp"
+    #include "board/nintendo/nx/powctl_board_impl.hpp"
 
     namespace ams::powctl::impl::board {
         using namespace ams::powctl::impl::board::nintendo_nx;