From 05a24b5726c31be8ebb39a6938809f2c82e80e8a Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 24 Feb 2020 09:49:43 -0800 Subject: [PATCH] boot: fix more typos/copy paste errors --- .../boot_wake_pin_configuration_calcio.inc | 2 +- .../boot_wake_pin_configuration_hoag.inc | 2 +- .../boot_wake_pin_configuration_iowa.inc | 2 +- stratosphere/boot/source/boot_wake_pins.cpp | 20 +++++++++---------- .../gpio_initial_configuration_calcio.inc | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stratosphere/boot/source/boot_wake_pin_configuration_calcio.inc b/stratosphere/boot/source/boot_wake_pin_configuration_calcio.inc index 2c5de654b..abeb3e6c5 100644 --- a/stratosphere/boot/source/boot_wake_pin_configuration_calcio.inc +++ b/stratosphere/boot/source/boot_wake_pin_configuration_calcio.inc @@ -66,4 +66,4 @@ static constexpr WakePinConfig WakePinConfigsCalcio[] = { {0x3F, false, 0x02}, }; -static constexpr size_t WakePinConfigsCalcio = util::size(WakePinConfigsCalcio); +static constexpr size_t NumWakePinConfigsCalcio = util::size(WakePinConfigsCalcio); diff --git a/stratosphere/boot/source/boot_wake_pin_configuration_hoag.inc b/stratosphere/boot/source/boot_wake_pin_configuration_hoag.inc index 6f7353714..c199fecd1 100644 --- a/stratosphere/boot/source/boot_wake_pin_configuration_hoag.inc +++ b/stratosphere/boot/source/boot_wake_pin_configuration_hoag.inc @@ -67,4 +67,4 @@ static constexpr WakePinConfig WakePinConfigsHoag[] = { {0x3F, false, 0x02}, }; -static constexpr size_t WakePinConfigsHoag = util::size(WakePinConfigsHoag); +static constexpr size_t NumWakePinConfigsHoag = util::size(WakePinConfigsHoag); diff --git a/stratosphere/boot/source/boot_wake_pin_configuration_iowa.inc b/stratosphere/boot/source/boot_wake_pin_configuration_iowa.inc index 88cf9c9fd..53dbe0007 100644 --- a/stratosphere/boot/source/boot_wake_pin_configuration_iowa.inc +++ b/stratosphere/boot/source/boot_wake_pin_configuration_iowa.inc @@ -66,4 +66,4 @@ static constexpr WakePinConfig WakePinConfigsIowa[] = { {0x3F, false, 0x02}, }; -static constexpr size_t WakePinConfigsIowa = util::size(WakePinConfigsIowa); +static constexpr size_t NumWakePinConfigsIowa = util::size(WakePinConfigsIowa); diff --git a/stratosphere/boot/source/boot_wake_pins.cpp b/stratosphere/boot/source/boot_wake_pins.cpp index d7b441598..f4921d051 100644 --- a/stratosphere/boot/source/boot_wake_pins.cpp +++ b/stratosphere/boot/source/boot_wake_pins.cpp @@ -99,23 +99,23 @@ namespace ams::boot { switch (spl::GetHardwareType()) { case spl::HardwareType::Icosa: - configs = WakePinsIcosa; - num_configs = NumWakePinsIcosa; + configs = WakePinConfigsIcosa; + num_configs = NumWakePinConfigsIcosa; break; case spl::HardwareType::Copper: - configs = WakePinsCopper; - num_configs = NumWakePinsCopper; + configs = WakePinConfigsCopper; + num_configs = NumWakePinConfigsCopper; break; case spl::HardwareType::Hoag: - configs = WakePinsHoag; - num_configs = NumWakePinsHoag; + configs = WakePinConfigsHoag; + num_configs = NumWakePinConfigsHoag; break; case spl::HardwareType::Iowa: - configs = WakePinsIowa; - num_configs = NumWakePinsIowa; + configs = WakePinConfigsIowa; + num_configs = NumWakePinConfigsIowa; case spl::HardwareType::Calcio: - configs = WakePinsCalcio; - num_configs = NumWakePinsCalcio; + configs = WakePinConfigsCalcio; + num_configs = NumWakePinConfigsCalcio; break; AMS_UNREACHABLE_DEFAULT_CASE(); } diff --git a/stratosphere/boot/source/gpio/gpio_initial_configuration_calcio.inc b/stratosphere/boot/source/gpio/gpio_initial_configuration_calcio.inc index d3ff8581a..0a2f72d5b 100644 --- a/stratosphere/boot/source/gpio/gpio_initial_configuration_calcio.inc +++ b/stratosphere/boot/source/gpio/gpio_initial_configuration_calcio.inc @@ -48,4 +48,4 @@ constexpr InitialConfig InitialConfigsCalcio[] = { {0x4E, GpioDirection_Input, GpioValue_Low}, }; -constexpr u32 NumInitialConfigsCopper = (sizeof(InitialConfigsCalcio) / sizeof(InitialConfigsCalcio[0])); +constexpr u32 NumInitialConfigsCalcio = util::size(InitialConfigsCalcio);