From c4215bc6dd84d7802e8456f207d28102bef59c93 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 28 Dec 2020 15:41:21 -0800 Subject: [PATCH] ams: update five -> aula, per CalWriterManu --- libexosphere/include/exosphere/fuse.hpp | 12 ++++++------ libexosphere/source/fuse/fuse_api.cpp | 4 ++-- .../include/stratosphere/spl/spl_types.hpp | 12 ++++++------ .../nintendo_nx/impl/gpio_initial_config.cpp | 16 ++++++++-------- ...fig_five.inc => gpio_initial_config_aula.inc} | 4 ++-- ...inc => gpio_initial_wake_pin_config_aula.inc} | 4 ++-- .../nintendo_nx/pinmux_board_driver_api.cpp | 10 +++++----- ...ve.inc => pinmux_initial_pad_config_aula.inc} | 4 ++-- ...wctl_charger_parameters.board.nintendo_nx.cpp | 4 ++-- ...wctl_charger_parameters.board.nintendo_nx.inc | 6 +++--- libstratosphere/source/spl/spl_api.cpp | 2 +- libstratosphere/source/updater/updater_api.cpp | 2 +- 12 files changed, 40 insertions(+), 40 deletions(-) rename libstratosphere/source/gpio/driver/board/nintendo_nx/impl/{gpio_initial_config_five.inc => gpio_initial_config_aula.inc} (96%) rename libstratosphere/source/gpio/driver/board/nintendo_nx/impl/{gpio_initial_wake_pin_config_five.inc => gpio_initial_wake_pin_config_aula.inc} (97%) rename libstratosphere/source/pinmux/driver/board/nintendo_nx/{pinmux_initial_pad_config_five.inc => pinmux_initial_pad_config_aula.inc} (98%) diff --git a/libexosphere/include/exosphere/fuse.hpp b/libexosphere/include/exosphere/fuse.hpp index c7756109..cf8b54e9 100644 --- a/libexosphere/include/exosphere/fuse.hpp +++ b/libexosphere/include/exosphere/fuse.hpp @@ -26,7 +26,7 @@ namespace ams::fuse { HardwareType_Hoag = 2, HardwareType_Iowa = 3, HardwareType_Calcio = 4, - HardwareType_Five = 5, + HardwareType_Aula = 5, HardwareType_Undefined = 0xF, }; @@ -51,7 +51,7 @@ namespace ams::fuse { DramId_IcosaSamsung4GB = 0, DramId_IcosaHynix4GB = 1, DramId_IcosaMicron4GB = 2, - DramId_FiveHynix1y4GB = 3, + DramId_AulaHynix1y4GB = 3, DramId_IcosaSamsung6GB = 4, DramId_CopperHynix4GB = 5, DramId_CopperMicron4GB = 6, @@ -70,13 +70,13 @@ namespace ams::fuse { DramId_HoagSamsung1y4GBX = 19, DramId_IowaSamsung1y4GBY = 20, DramId_IowaSamsung1y8GBY = 21, - DramId_FiveSamsung1y4GB = 22, + DramId_AulaSamsung1y4GB = 22, DramId_HoagSamsung1y8GBX = 23, - DramId_FiveSamsung1y4GBX = 24, + DramId_AulaSamsung1y4GBX = 24, DramId_IowaMicron1y4GB = 25, DramId_HoagMicron1y4GB = 26, - DramId_FiveMicron1y4GB = 27, - DramId_FiveSamsung1y8GBX = 28, + DramId_AulaMicron1y4GB = 27, + DramId_AulaSamsung1y8GBX = 28, DramId_Count, }; diff --git a/libexosphere/source/fuse/fuse_api.cpp b/libexosphere/source/fuse/fuse_api.cpp index 7e0b4935..40047a9b 100644 --- a/libexosphere/source/fuse/fuse_api.cpp +++ b/libexosphere/source/fuse/fuse_api.cpp @@ -316,7 +316,7 @@ namespace ams::fuse { case 0x02: return (true /* TODO: GetSocType() == SocType_Mariko */) ? HardwareType_Calcio : HardwareType_Copper; case 0x04: return HardwareType_Iowa; case 0x08: return HardwareType_Hoag; - case 0x10: return HardwareType_Five; + case 0x10: return HardwareType_Aula; default: return HardwareType_Undefined; } } @@ -371,7 +371,7 @@ namespace ams::fuse { case HardwareType_Iowa: case HardwareType_Hoag: case HardwareType_Calcio: - case HardwareType_Five: + case HardwareType_Aula: return SocType_Mariko; default: return SocType_Undefined; diff --git a/libstratosphere/include/stratosphere/spl/spl_types.hpp b/libstratosphere/include/stratosphere/spl/spl_types.hpp index 1225cd6e..3e1f2d74 100644 --- a/libstratosphere/include/stratosphere/spl/spl_types.hpp +++ b/libstratosphere/include/stratosphere/spl/spl_types.hpp @@ -106,12 +106,12 @@ namespace ams::spl { } enum class HardwareType { - Icosa = 0, - Copper = 1, - Hoag = 2, - Iowa = 3, - Calcio = 4, - _Five_ = 5, + Icosa = 0, + Copper = 1, + Hoag = 2, + Iowa = 3, + Calcio = 4, + Aula = 5, }; enum SocType { diff --git a/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config.cpp b/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config.cpp index d229ea01..b6b10224 100644 --- a/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config.cpp +++ b/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config.cpp @@ -36,14 +36,14 @@ namespace ams::gpio::driver::board::nintendo_nx::impl { #include "gpio_initial_wake_pin_config_hoag.inc" #include "gpio_initial_wake_pin_config_iowa.inc" #include "gpio_initial_wake_pin_config_calcio.inc" - #include "gpio_initial_wake_pin_config_five.inc" + #include "gpio_initial_wake_pin_config_aula.inc" #include "gpio_initial_config_icosa.inc" /* #include "gpio_initial_config_copper.inc" */ #include "gpio_initial_config_hoag.inc" #include "gpio_initial_config_iowa.inc" #include "gpio_initial_config_calcio.inc" - #include "gpio_initial_config_five.inc" + #include "gpio_initial_config_aula.inc" } @@ -70,9 +70,9 @@ namespace ams::gpio::driver::board::nintendo_nx::impl { configs = InitialGpioConfigsCalcio; num_configs = NumInitialGpioConfigsCalcio; break; - case spl::HardwareType::_Five_: - configs = InitialGpioConfigsFive; - num_configs = NumInitialGpioConfigsFive; + case spl::HardwareType::Aula: + configs = InitialGpioConfigsAula; + num_configs = NumInitialGpioConfigsAula; break; case spl::HardwareType::Copper: AMS_UNREACHABLE_DEFAULT_CASE(); @@ -151,9 +151,9 @@ namespace ams::gpio::driver::board::nintendo_nx::impl { configs = InitialWakePinConfigsCalcio; num_configs = NumInitialWakePinConfigsCalcio; break; - case spl::HardwareType::_Five_: - configs = InitialWakePinConfigsFive; - num_configs = NumInitialWakePinConfigsFive; + case spl::HardwareType::Aula: + configs = InitialWakePinConfigsAula; + num_configs = NumInitialWakePinConfigsAula; break; case spl::HardwareType::Copper: AMS_UNREACHABLE_DEFAULT_CASE(); diff --git a/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config_five.inc b/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config_aula.inc similarity index 96% rename from libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config_five.inc rename to libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config_aula.inc index bc86cb93..e1c90ee5 100644 --- a/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config_five.inc +++ b/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_config_aula.inc @@ -16,7 +16,7 @@ /* NOTE: This file is auto-generated by gpio_pad_gen.py, do not edit manually. */ -constexpr inline const GpioInitialConfig InitialGpioConfigsFive[] = { +constexpr inline const GpioInitialConfig InitialGpioConfigsAula[] = { { DeviceCode_GameCardReset, Direction_Output, GpioValue_Low }, { DeviceCode_CodecAlert, Direction_Input, GpioValue_Low }, { DeviceCode_Debug0, Direction_Output, GpioValue_Low }, @@ -67,4 +67,4 @@ constexpr inline const GpioInitialConfig InitialGpioConfigsFive[] = { { DeviceCode_ExtconChgS, Direction_Output, GpioValue_Low }, }; -constexpr inline size_t NumInitialGpioConfigsFive = util::size(InitialGpioConfigsFive); +constexpr inline size_t NumInitialGpioConfigsAula = util::size(InitialGpioConfigsAula); diff --git a/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_wake_pin_config_five.inc b/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_wake_pin_config_aula.inc similarity index 97% rename from libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_wake_pin_config_five.inc rename to libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_wake_pin_config_aula.inc index 809cbf59..d955382f 100644 --- a/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_wake_pin_config_five.inc +++ b/libstratosphere/source/gpio/driver/board/nintendo_nx/impl/gpio_initial_wake_pin_config_aula.inc @@ -16,7 +16,7 @@ /* NOTE: This file is auto-generated by wake_pin_gen.py, do not edit manually. */ -constexpr inline const WakePinConfig InitialWakePinConfigsFive[] = { +constexpr inline const WakePinConfig InitialWakePinConfigsAula[] = { { ams::wec::WakeEvent_PexWakeN, false, ams::wec::WakeEventLevel_Auto }, { ams::wec::WakeEvent_GpioPortA6, false, ams::wec::WakeEventLevel_Auto }, { ams::wec::WakeEvent_QspiCsN, false, ams::wec::WakeEventLevel_Auto }, @@ -77,4 +77,4 @@ constexpr inline const WakePinConfig InitialWakePinConfigsFive[] = { { ams::wec::WakeEvent_MotionInt, false, ams::wec::WakeEventLevel_Auto }, }; -constexpr inline size_t NumInitialWakePinConfigsFive = util::size(InitialWakePinConfigsFive); +constexpr inline size_t NumInitialWakePinConfigsAula = util::size(InitialWakePinConfigsAula); diff --git a/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_board_driver_api.cpp b/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_board_driver_api.cpp index fabedbbd..fc35ce96 100644 --- a/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_board_driver_api.cpp +++ b/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_board_driver_api.cpp @@ -28,7 +28,7 @@ namespace ams::pinmux::driver::board::nintendo_nx { #include "pinmux_initial_pad_config_hoag.inc" #include "pinmux_initial_pad_config_iowa.inc" #include "pinmux_initial_pad_config_calcio.inc" - #include "pinmux_initial_pad_config_five.inc" + #include "pinmux_initial_pad_config_aula.inc" #include "pinmux_initial_drive_pad_config.inc" #include "pinmux_initial_drive_pad_config_hoag.inc" @@ -73,9 +73,9 @@ namespace ams::pinmux::driver::board::nintendo_nx { num_configs = NumPinmuxPadConfigsCalcio; is_mariko = true; break; - case spl::HardwareType::_Five_: - configs = PinmuxPadConfigsFive; - num_configs = NumPinmuxPadConfigsFive; + case spl::HardwareType::Aula: + configs = PinmuxPadConfigsAula; + num_configs = NumPinmuxPadConfigsAula; is_mariko = true; break; AMS_UNREACHABLE_DEFAULT_CASE(); @@ -121,7 +121,7 @@ namespace ams::pinmux::driver::board::nintendo_nx { configs = PinmuxDrivePadConfigs; num_configs = NumPinmuxDrivePadConfigs; break; - case spl::HardwareType::_Five_: + case spl::HardwareType::Aula: configs = PinmuxDrivePadConfigs; num_configs = NumPinmuxDrivePadConfigs; break; diff --git a/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_initial_pad_config_five.inc b/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_initial_pad_config_aula.inc similarity index 98% rename from libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_initial_pad_config_five.inc rename to libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_initial_pad_config_aula.inc index 02791366..14bcc767 100644 --- a/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_initial_pad_config_five.inc +++ b/libstratosphere/source/pinmux/driver/board/nintendo_nx/pinmux_initial_pad_config_aula.inc @@ -16,7 +16,7 @@ /* NOTE: This file is auto-generated by pinmux_initial_config.py, do not edit manually. */ -constexpr inline const PinmuxPadConfig PinmuxPadConfigsFive[] = { +constexpr inline const PinmuxPadConfig PinmuxPadConfigsAula[] = { { PinmuxPadIndex_AudMclk, 0x00000000, 0x0000007F }, { PinmuxPadIndex_Dap1Din, 0x00000028, 0x0000007F }, { PinmuxPadIndex_Dap1Dout, 0x00000000, 0x0000007F }, @@ -193,4 +193,4 @@ constexpr inline const PinmuxPadConfig PinmuxPadConfigsFive[] = { { PinmuxPadIndex_HdmiCec, 0x00000005, 0x00000007 }, }; -constexpr inline const size_t NumPinmuxPadConfigsFive = util::size(PinmuxPadConfigsFive); +constexpr inline const size_t NumPinmuxPadConfigsAula = util::size(PinmuxPadConfigsAula); diff --git a/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.cpp b/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.cpp index aa49183b..6c38cba2 100644 --- a/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.cpp +++ b/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.cpp @@ -63,8 +63,8 @@ namespace ams::powctl::driver::impl { } else if (battery_version == 1) { return ChargeParametersForBatteryVersion1; } else { - if (spl::GetHardwareType() == spl::HardwareType::_Five_) { - return ChargeParametersForBatteryVersion0ForFive; + if (spl::GetHardwareType() == spl::HardwareType::Aula) { + return ChargeParametersForBatteryVersion0ForAula; } else { return ChargeParametersForBatteryVersion0; } diff --git a/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.inc b/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.inc index 70f86ac0..a88f5f4d 100644 --- a/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.inc +++ b/libstratosphere/source/powctl/driver/impl/powctl_charger_parameters.board.nintendo_nx.inc @@ -51,7 +51,7 @@ constexpr inline const ChargeParametersRule ChargeParametersRulesForBatteryVersi { BatteryTemperatureLevel::TooHigh, 4080, Max, Min, Max, Min, Max, AcceptablePowerStates, util::size(AcceptablePowerStates), false, false, 4320, 1664, 0, 0 }, }; -constexpr inline const ChargeParametersRule ChargeParametersRulesForBatteryVersion0ForFive[] = { +constexpr inline const ChargeParametersRule ChargeParametersRulesForBatteryVersion0ForAula[] = { { BatteryTemperatureLevel::TooLow, Min, Max, Min, Max, Min, Max, AcceptablePowerStates, util::size(AcceptablePowerStates), false, false, 4208, 768, 0, 0 }, { BatteryTemperatureLevel::Low, Min, Max, Min, Max, Min, Max, AcceptablePowerStates, util::size(AcceptablePowerStates), false, true, 4208, 768, 0, 0 }, { BatteryTemperatureLevel::Medium, Min, Max, Min, 4001, 2049, Max, AcceptablePowerStatesForNotAwakeCharge, util::size(AcceptablePowerStatesForNotAwakeCharge), true, true, 4000, 3072, 40, 112 }, @@ -74,6 +74,6 @@ constexpr inline const ChargeParameters ChargeParametersForBatteryVersion2 = { 1, 19, 48, 59, 1664, 4320, UnknownXTableForBatteryVersion2, util::size(UnknownXTableForBatteryVersion2), 95.0, 100.4, ChargeParametersRulesForBatteryVersion2, util::size(ChargeParametersRulesForBatteryVersion2) }; -constexpr inline const ChargeParameters ChargeParametersForBatteryVersion0ForFive = { - 4, 17, 51, 60, 512, 4208, nullptr, 0, 95.0, 99.0, ChargeParametersRulesForBatteryVersion0ForFive, util::size(ChargeParametersRulesForBatteryVersion0ForFive) +constexpr inline const ChargeParameters ChargeParametersForBatteryVersion0ForAula = { + 4, 17, 51, 60, 512, 4208, nullptr, 0, 95.0, 99.0, ChargeParametersRulesForBatteryVersion0ForAula, util::size(ChargeParametersRulesForBatteryVersion0ForAula) }; diff --git a/libstratosphere/source/spl/spl_api.cpp b/libstratosphere/source/spl/spl_api.cpp index ed5de785..721ff7df 100644 --- a/libstratosphere/source/spl/spl_api.cpp +++ b/libstratosphere/source/spl/spl_api.cpp @@ -254,7 +254,7 @@ namespace ams::spl { return SocType_Erista; case HardwareType::Hoag: case HardwareType::Iowa: - case HardwareType::_Five_: + case HardwareType::Aula: return SocType_Mariko; AMS_UNREACHABLE_DEFAULT_CASE(); } diff --git a/libstratosphere/source/updater/updater_api.cpp b/libstratosphere/source/updater/updater_api.cpp index 124cee5d..00071b8e 100644 --- a/libstratosphere/source/updater/updater_api.cpp +++ b/libstratosphere/source/updater/updater_api.cpp @@ -464,7 +464,7 @@ namespace ams::updater { case spl::HardwareType::Hoag: case spl::HardwareType::Iowa: case spl::HardwareType::Calcio: - case spl::HardwareType::_Five_: + case spl::HardwareType::Aula: return BootImageUpdateType::Mariko; AMS_UNREACHABLE_DEFAULT_CASE(); }