From 4f1201a0225a868ea4c519a1d6ef8c6330090813 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 12 Nov 2025 14:38:52 -0700 Subject: [PATCH] erpt: fix ids, failed to copy the new categories --- .../include/stratosphere/erpt/erpt_ids.autogen.hpp | 14 +++++++++++--- .../include/stratosphere/erpt/erpt_types.hpp | 6 ++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp b/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp index a84962679..f60a88454 100644 --- a/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp +++ b/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp @@ -172,7 +172,7 @@ HANDLER(AudioDeviceInfo, 131 ) \ HANDLER(AbnormalWakeInfo, 132 ) \ HANDLER(ServiceProfileInfo, 133 ) \ - HANDLER(BluetoothAudioInfo, 134 ) \ + HANDLER(BluetoothAudioInfoDeprecated, 134 ) \ HANDLER(BluetoothPairingCountInfo, 135 ) \ HANDLER(FsProxyErrorInfo2, 136 ) \ HANDLER(BuiltInWirelessOUIInfo, 137 ) \ @@ -188,9 +188,17 @@ HANDLER(WlanIoctlErrorInfo, 147 ) \ HANDLER(SdCardActivationInfo, 148 ) \ HANDLER(GameCardDetailedErrorInfo, 149 ) \ + HANDLER(NetworkInfo2, 150 ) \ + HANDLER(SystemSettingInfo, 151 ) \ + HANDLER(MigrationStateInfo, 152 ) \ + HANDLER(WinVdInfo, 153 ) \ + HANDLER(PscTransitionStateInfo, 154 ) \ + HANDLER(FsProxyErrorInfo3, 155 ) \ + HANDLER(BluetoothErrorInfo, 156 ) \ HANDLER(TestNx, 1000) \ HANDLER(NANDTypeInfo, 1001) \ HANDLER(NANDExtendedCsd, 1002) \ + HANDLER(BluetoothAudioInfo, 1003) #define AMS_ERPT_FOREACH_FIELD(HANDLER) \ HANDLER(TestU64, 0, Test, FieldType_NumericU64, FieldFlag_None ) \ @@ -839,7 +847,7 @@ HANDLER(SupportingLimitedApplicationLicenses, 643, RunningApplicationInfo, FieldType_NumericU32, FieldFlag_None ) \ HANDLER(RuntimeLimitedApplicationLicenseUpgrade, 644, RunningApplicationInfo, FieldType_NumericU8, FieldFlag_None ) \ HANDLER(ServiceProfileRevisionKey, 645, ServiceProfileInfo, FieldType_NumericU64, FieldFlag_None ) \ - HANDLER(BluetoothAudioConnectionCount, 646, BluetoothAudioInfo, FieldType_NumericU8, FieldFlag_None ) \ + HANDLER(BluetoothAudioConnectionCountDeprecated, 646, BluetoothAudioInfoDeprecated, FieldType_NumericU8, FieldFlag_None ) \ HANDLER(BluetoothHidPairingInfoCountDeprecated, 647, BluetoothPairingCountInfo, FieldType_NumericU8, FieldFlag_None ) \ HANDLER(BluetoothAudioPairingInfoCountDeprecated, 648, BluetoothPairingCountInfo, FieldType_NumericU8, FieldFlag_None ) \ HANDLER(BluetoothLePairingInfoCountDeprecated, 649, BluetoothPairingCountInfo, FieldType_NumericU8, FieldFlag_None ) \ @@ -1000,5 +1008,5 @@ HANDLER(LastDvfsThresholdTripped, 1031, ThermalInfo, FieldType_NumericI32, FieldFlag_None ) \ HANDLER(ModuleClockEnableFlags, 1032, PowerClockInfo, FieldType_U8Array, FieldFlag_None ) \ HANDLER(ModulePowerEnableFlags, 1033, PowerClockInfo, FieldType_U8Array, FieldFlag_None ) \ - HANDLER(BluetoothAudioConnectionCount, 1034, BluetoothAudioInfo, FieldType_NumericU8, FieldFlag_None ) \ + HANDLER(BluetoothAudioConnectionCount, 1034, BluetoothAudioInfo, FieldType_NumericU8, FieldFlag_None ) diff --git a/libraries/libstratosphere/include/stratosphere/erpt/erpt_types.hpp b/libraries/libstratosphere/include/stratosphere/erpt/erpt_types.hpp index 3d31b2c42..93c68c6f3 100644 --- a/libraries/libstratosphere/include/stratosphere/erpt/erpt_types.hpp +++ b/libraries/libstratosphere/include/stratosphere/erpt/erpt_types.hpp @@ -194,6 +194,12 @@ namespace ams::erpt { }; }; + struct CategoryEntry { + CategoryId category; + u32 field_count; + u32 array_buffer_count; + }; + constexpr inline u32 FieldsPerContext = 20; struct ContextEntry { u32 version;