From e7b52d730796e3acda02c7b362a481cf8e90dea9 Mon Sep 17 00:00:00 2001 From: lizzie Date: Fri, 25 Sep 2026 16:35:03 +0000 Subject: [PATCH] 2026-09-25 16:35:03 Signed-off-by: lizzie --- src/core/hle/service/acc/acc.cpp | 154 +++++----- .../ldn/user_local_communication_service.cpp | 2 +- src/core/hle/service/ns/ns.cpp | 26 +- src/core/hle/service/ns/query_service.cpp | 12 +- src/core/hle/service/olsc/olsc.cpp | 2 +- src/core/hle/service/ro/ro.cpp | 13 +- src/core/hle/service/wlan/wlan.cpp | 288 +++++++++--------- 7 files changed, 249 insertions(+), 248 deletions(-) diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 2824fa62e2..da48f60524 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -1426,83 +1426,83 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, - FunctionInfo{ 0, nullptr, "GetUserCount"}, - FunctionInfo{ 1, nullptr, "GetUserExistence"}, - FunctionInfo{ 2, nullptr, "ListAllUsers"}, - FunctionInfo{ 3, nullptr, "ListOpenUsers"}, - FunctionInfo{ 4, nullptr, "GetLastOpenedUser"}, - FunctionInfo{ 5, nullptr, "GetProfile"}, - FunctionInfo{ 6, nullptr, "GetProfileDigest"}, - FunctionInfo{ 50, nullptr, "IsUserRegistrationRequestPermitted"}, - FunctionInfo{ 51, nullptr, "TrySelectUserWithoutInteractionDeprecated"}, - FunctionInfo{ 52, nullptr, "TrySelectUserWithoutInteraction"}, - FunctionInfo{ 99, nullptr, "DebugActivateOpenContextRetention"}, - FunctionInfo{ 100, nullptr, "GetUserRegistrationNotifier"}, - FunctionInfo{ 101, nullptr, "GetUserStateChangeNotifier"}, - FunctionInfo{ 102, nullptr, "GetBaasAccountManagerForSystemService"}, - FunctionInfo{ 103, nullptr, "GetBaasUserAvailabilityChangeNotifier"}, - FunctionInfo{ 104, nullptr, "GetProfileUpdateNotifier"}, - FunctionInfo{ 105, nullptr, "CheckNetworkServiceAvailabilityAsync"}, - FunctionInfo{ 106, nullptr, "GetProfileSyncNotifier"}, - FunctionInfo{ 110, nullptr, "StoreSaveDataThumbnail"}, - FunctionInfo{ 111, nullptr, "ClearSaveDataThumbnail"}, - FunctionInfo{ 112, nullptr, "LoadSaveDataThumbnail"}, - FunctionInfo{ 113, nullptr, "GetSaveDataThumbnailExistence"}, - FunctionInfo{ 120, nullptr, "ListOpenUsersInApplication"}, - FunctionInfo{ 130, nullptr, "ActivateOpenContextRetention"}, - FunctionInfo{ 140, nullptr, "ListQualifiedUsers"}, - FunctionInfo{ 151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"}, - FunctionInfo{ 152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"}, - FunctionInfo{ 170, nullptr, "GetNasOp2MembershipStateChangeNotifier"}, - FunctionInfo{ 191, nullptr, "UpdateNotificationReceiverInfo"}, - FunctionInfo{ 200, nullptr, "BeginUserRegistration"}, - FunctionInfo{ 201, nullptr, "CompleteUserRegistration"}, - FunctionInfo{ 202, nullptr, "CancelUserRegistration"}, - FunctionInfo{ 203, nullptr, "DeleteUser"}, - FunctionInfo{ 204, nullptr, "SetUserPosition"}, - FunctionInfo{ 205, nullptr, "GetProfileEditor"}, - FunctionInfo{ 206, nullptr, "CompleteUserRegistrationForcibly"}, - FunctionInfo{ 210, nullptr, "CreateFloatingRegistrationRequest"}, - FunctionInfo{ 211, nullptr, "CreateProcedureToRegisterUserWithNintendoAccount"}, - FunctionInfo{ 212, nullptr, "ResumeProcedureToRegisterUserWithNintendoAccount"}, - FunctionInfo{ 213, nullptr, "CreateProcedureToCreateUserWithNintendoAccount"}, - FunctionInfo{ 214, nullptr, "ResumeProcedureToCreateUserWithNintendoAccount"}, - FunctionInfo{ 215, nullptr, "ResumeProcedureToCreateUserWithNintendoAccountAfterApplyResponse"}, - FunctionInfo{ 230, nullptr, "AuthenticateServiceAsync"}, - FunctionInfo{ 250, nullptr, "GetBaasAccountAdministrator"}, - FunctionInfo{ 251, nullptr, "SynchronizeNetworkServiceAccountsSnapshotAsync"}, - FunctionInfo{ 290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"}, - FunctionInfo{ 291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"}, - FunctionInfo{ 292, nullptr, "ProxyProcedureForDeviceMigrationAuthenticatingOperatingUser"}, - FunctionInfo{ 293, nullptr, "ProxyProcedureForDeviceMigrationDownload"}, - FunctionInfo{ 299, nullptr, "SuspendBackgroundDaemon"}, - FunctionInfo{ 350, nullptr, "CreateDeviceMigrationUserExportRequest"}, - FunctionInfo{ 351, nullptr, "UploadNasCredential"}, - FunctionInfo{ 352, nullptr, "CreateDeviceMigrationUserImportRequest"}, - FunctionInfo{ 353, nullptr, "DeleteUserMigrationSaveData"}, - FunctionInfo{ 400, nullptr, "SetPinCode"}, - FunctionInfo{ 401, nullptr, "GetPinCodeLength"}, - FunctionInfo{ 402, nullptr, "GetPinCode"}, - FunctionInfo{ 403, nullptr, "GetPinCodeParity"}, - FunctionInfo{ 404, nullptr, "VerifyPinCode"}, - FunctionInfo{ 405, nullptr, "IsPinCodeVerificationForbidden"}, - FunctionInfo{ 410, nullptr, "GetPinCodeErrorCount"}, - FunctionInfo{ 411, nullptr, "ResetPinCodeErrorCount"}, - FunctionInfo{ 412, nullptr, "IncrementPinCodeErrorCount"}, - FunctionInfo{ 413, nullptr, "SetPinCodeErrorCount"}, - FunctionInfo{ 420, nullptr, "SetStartPenaltyTime"}, - FunctionInfo{ 421, nullptr, "GetStartPenaltyTime"}, - FunctionInfo{ 900, nullptr, "SetUserUnqualifiedForDebug"}, - FunctionInfo{ 901, nullptr, "UnsetUserUnqualifiedForDebug"}, - FunctionInfo{ 902, nullptr, "ListUsersUnqualifiedForDebug"}, - FunctionInfo{ 910, nullptr, "RefreshFirmwareSettingsForDebug"}, - FunctionInfo{ 997, nullptr, "DebugInvalidateTokenCacheForUser"}, - FunctionInfo{ 998, nullptr, "DebugSetUserStateClose"}, - FunctionInfo{ 999, nullptr, "DebugSetUserStateOpen"}, - FunctionInfo{ 1000, nullptr, "CreateIAccountEntityServiceForApplication"}, - FunctionInfo{ 1100, nullptr, "CreateIUserStateManager"}, - FunctionInfo{ 10050, nullptr, "IsUserRegistrationRequestPermittedForAccountPolicy"}, - FunctionInfo{ 10105, nullptr, "CheckNetworkServiceAvailabilityAsyncForAccountPolicy"} + FunctionInfo{0, nullptr, "GetUserCount"}, + FunctionInfo{1, nullptr, "GetUserExistence"}, + FunctionInfo{2, nullptr, "ListAllUsers"}, + FunctionInfo{3, nullptr, "ListOpenUsers"}, + FunctionInfo{4, nullptr, "GetLastOpenedUser"}, + FunctionInfo{5, nullptr, "GetProfile"}, + FunctionInfo{6, nullptr, "GetProfileDigest"}, + FunctionInfo{50, nullptr, "IsUserRegistrationRequestPermitted"}, + FunctionInfo{51, nullptr, "TrySelectUserWithoutInteractionDeprecated"}, + FunctionInfo{52, nullptr, "TrySelectUserWithoutInteraction"}, + FunctionInfo{99, nullptr, "DebugActivateOpenContextRetention"}, + FunctionInfo{100, nullptr, "GetUserRegistrationNotifier"}, + FunctionInfo{101, nullptr, "GetUserStateChangeNotifier"}, + FunctionInfo{102, nullptr, "GetBaasAccountManagerForSystemService"}, + FunctionInfo{103, nullptr, "GetBaasUserAvailabilityChangeNotifier"}, + FunctionInfo{104, nullptr, "GetProfileUpdateNotifier"}, + FunctionInfo{105, nullptr, "CheckNetworkServiceAvailabilityAsync"}, + FunctionInfo{106, nullptr, "GetProfileSyncNotifier"}, + FunctionInfo{110, nullptr, "StoreSaveDataThumbnail"}, + FunctionInfo{111, nullptr, "ClearSaveDataThumbnail"}, + FunctionInfo{112, nullptr, "LoadSaveDataThumbnail"}, + FunctionInfo{113, nullptr, "GetSaveDataThumbnailExistence"}, + FunctionInfo{120, nullptr, "ListOpenUsersInApplication"}, + FunctionInfo{130, nullptr, "ActivateOpenContextRetention"}, + FunctionInfo{140, nullptr, "ListQualifiedUsers"}, + FunctionInfo{151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"}, + FunctionInfo{152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"}, + FunctionInfo{170, nullptr, "GetNasOp2MembershipStateChangeNotifier"}, + FunctionInfo{191, nullptr, "UpdateNotificationReceiverInfo"}, + FunctionInfo{200, nullptr, "BeginUserRegistration"}, + FunctionInfo{201, nullptr, "CompleteUserRegistration"}, + FunctionInfo{202, nullptr, "CancelUserRegistration"}, + FunctionInfo{203, nullptr, "DeleteUser"}, + FunctionInfo{204, nullptr, "SetUserPosition"}, + FunctionInfo{205, nullptr, "GetProfileEditor"}, + FunctionInfo{206, nullptr, "CompleteUserRegistrationForcibly"}, + FunctionInfo{210, nullptr, "CreateFloatingRegistrationRequest"}, + FunctionInfo{211, nullptr, "CreateProcedureToRegisterUserWithNintendoAccount"}, + FunctionInfo{212, nullptr, "ResumeProcedureToRegisterUserWithNintendoAccount"}, + FunctionInfo{213, nullptr, "CreateProcedureToCreateUserWithNintendoAccount"}, + FunctionInfo{214, nullptr, "ResumeProcedureToCreateUserWithNintendoAccount"}, + FunctionInfo{215, nullptr, "ResumeProcedureToCreateUserWithNintendoAccountAfterApplyResponse"}, + FunctionInfo{230, nullptr, "AuthenticateServiceAsync"}, + FunctionInfo{250, nullptr, "GetBaasAccountAdministrator"}, + FunctionInfo{251, nullptr, "SynchronizeNetworkServiceAccountsSnapshotAsync"}, + FunctionInfo{290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"}, + FunctionInfo{291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"}, + FunctionInfo{292, nullptr, "ProxyProcedureForDeviceMigrationAuthenticatingOperatingUser"}, + FunctionInfo{293, nullptr, "ProxyProcedureForDeviceMigrationDownload"}, + FunctionInfo{299, nullptr, "SuspendBackgroundDaemon"}, + FunctionInfo{350, nullptr, "CreateDeviceMigrationUserExportRequest"}, + FunctionInfo{351, nullptr, "UploadNasCredential"}, + FunctionInfo{352, nullptr, "CreateDeviceMigrationUserImportRequest"}, + FunctionInfo{353, nullptr, "DeleteUserMigrationSaveData"}, + FunctionInfo{400, nullptr, "SetPinCode"}, + FunctionInfo{401, nullptr, "GetPinCodeLength"}, + FunctionInfo{402, nullptr, "GetPinCode"}, + FunctionInfo{403, nullptr, "GetPinCodeParity"}, + FunctionInfo{404, nullptr, "VerifyPinCode"}, + FunctionInfo{405, nullptr, "IsPinCodeVerificationForbidden"}, + FunctionInfo{410, nullptr, "GetPinCodeErrorCount"}, + FunctionInfo{411, nullptr, "ResetPinCodeErrorCount"}, + FunctionInfo{412, nullptr, "IncrementPinCodeErrorCount"}, + FunctionInfo{413, nullptr, "SetPinCodeErrorCount"}, + FunctionInfo{420, nullptr, "SetStartPenaltyTime"}, + FunctionInfo{421, nullptr, "GetStartPenaltyTime"}, + FunctionInfo{900, nullptr, "SetUserUnqualifiedForDebug"}, + FunctionInfo{901, nullptr, "UnsetUserUnqualifiedForDebug"}, + FunctionInfo{902, nullptr, "ListUsersUnqualifiedForDebug"}, + FunctionInfo{910, nullptr, "RefreshFirmwareSettingsForDebug"}, + FunctionInfo{997, nullptr, "DebugInvalidateTokenCacheForUser"}, + FunctionInfo{998, nullptr, "DebugSetUserStateClose"}, + FunctionInfo{999, nullptr, "DebugSetUserStateOpen"}, + FunctionInfo{1000, nullptr, "CreateIAccountEntityServiceForApplication"}, + FunctionInfo{1100, nullptr, "CreateIUserStateManager"}, + FunctionInfo{10050, nullptr, "IsUserRegistrationRequestPermittedForAccountPolicy"}, + FunctionInfo{10105, nullptr, "CheckNetworkServiceAvailabilityAsyncForAccountPolicy"} ); } }; diff --git a/src/core/hle/service/ldn/user_local_communication_service.cpp b/src/core/hle/service/ldn/user_local_communication_service.cpp index 2213ae9509..097e3b2910 100644 --- a/src/core/hle/service/ldn/user_local_communication_service.cpp +++ b/src/core/hle/service/ldn/user_local_communication_service.cpp @@ -38,7 +38,7 @@ IUserLocalCommunicationService::IUserLocalCommunicationService(Core::System& sys FunctionInfo{102, D<&IUserLocalCommunicationService::Scan>, "Scan"}, FunctionInfo{103, D<&IUserLocalCommunicationService::ScanPrivate>, "ScanPrivate"}, FunctionInfo{104, D<&IUserLocalCommunicationService::SetWirelessControllerRestriction>, "SetWirelessControllerRestriction"}, - { 106, D<&IUserLocalCommunicationService::SetProtocol>, "SetProtocol" }, + FunctionInfo{106, D<&IUserLocalCommunicationService::SetProtocol>, "SetProtocol" }, FunctionInfo{200, D<&IUserLocalCommunicationService::OpenAccessPoint>, "OpenAccessPoint"}, FunctionInfo{201, D<&IUserLocalCommunicationService::CloseAccessPoint>, "CloseAccessPoint"}, FunctionInfo{202, D<&IUserLocalCommunicationService::CreateNetwork>, "CreateNetwork"}, diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 0c9cdd0f49..7c8cab8563 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -23,19 +23,19 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, - FunctionInfo{ 0, nullptr, "NotifyAppletEvent" }, - FunctionInfo{ 2, nullptr, "NotifyOperationModeChangeEvent" }, - FunctionInfo{ 3, nullptr, "NotifyPowerStateChangeEvent" }, - FunctionInfo{ 4, nullptr, "NotifyClearAllEvent" }, - FunctionInfo{ 5, nullptr, "NotifyEventForDebug" }, - FunctionInfo{ 6, nullptr, "SuspendUserAccountEventService" }, - FunctionInfo{ 7, nullptr, "ResumeUserAccountEventService" }, - FunctionInfo{ 8, nullptr, "NotifyLibraryAppletEvent" }, - FunctionInfo{ 9, nullptr, "Cmd9" }, - FunctionInfo{ 20, nullptr, "Cmd20" }, - FunctionInfo{ 30, nullptr, "Cmd30" }, - FunctionInfo{ 100, nullptr, "Cmd100" }, - FunctionInfo{ 101, nullptr, "Cmd101" } + FunctionInfo{0, nullptr, "NotifyAppletEvent" }, + FunctionInfo{2, nullptr, "NotifyOperationModeChangeEvent" }, + FunctionInfo{3, nullptr, "NotifyPowerStateChangeEvent" }, + FunctionInfo{4, nullptr, "NotifyClearAllEvent" }, + FunctionInfo{5, nullptr, "NotifyEventForDebug" }, + FunctionInfo{6, nullptr, "SuspendUserAccountEventService" }, + FunctionInfo{7, nullptr, "ResumeUserAccountEventService" }, + FunctionInfo{8, nullptr, "NotifyLibraryAppletEvent" }, + FunctionInfo{9, nullptr, "Cmd9" }, + FunctionInfo{20, nullptr, "Cmd20" }, + FunctionInfo{30, nullptr, "Cmd30" }, + FunctionInfo{100, nullptr, "Cmd100" }, + FunctionInfo{101, nullptr, "Cmd101" } ); } }; diff --git a/src/core/hle/service/ns/query_service.cpp b/src/core/hle/service/ns/query_service.cpp index d22de1d169..f5337d8663 100644 --- a/src/core/hle/service/ns/query_service.cpp +++ b/src/core/hle/service/ns/query_service.cpp @@ -38,12 +38,12 @@ IQueryService::IQueryService(Core::System& system_) : ServiceFramework{system_, {17, D<&IQueryService::QueryLastPlayTime>, "QueryLastPlayTime"}, {18, D<&IQueryService::QueryApplicationPlayStatisticsForSystem>, "QueryApplicationPlayStatisticsForSystem"}, {19, D<&IQueryService::QueryApplicationPlayStatisticsByUserAccountIdForSystem>, "QueryApplicationPlayStatisticsByUserAccountIdForSystem"}, - { 30, nullptr, "Cmd30" }, - { 31, nullptr, "Cmd31" }, - { 100, nullptr, "Cmd100" }, - { 110, nullptr, "Cmd110" }, - { 118, nullptr, "Cmd118" }, - { 119, nullptr, "Cmd119" }, + FunctionInfo{30, nullptr, "Cmd30" }, + FunctionInfo{31, nullptr, "Cmd31" }, + FunctionInfo{100, nullptr, "Cmd100" }, + FunctionInfo{110, nullptr, "Cmd110" }, + FunctionInfo{118, nullptr, "Cmd118" }, + FunctionInfo{119, nullptr, "Cmd119" }, }; // clang-format on diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp index a86c525f9a..538972fb0f 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/core/hle/service/olsc/olsc.cpp @@ -18,7 +18,7 @@ public: : ServiceFramework{system_, "spbg:sp"} { static const FunctionInfo functions[] = { - { 100, nullptr, "OpenBgAgentController" }, + FunctionInfo{100, nullptr, "OpenBgAgentController" }, }; RegisterHandlers(functions); } diff --git a/src/core/hle/service/ro/ro.cpp b/src/core/hle/service/ro/ro.cpp index 4716f5c1a3..5ab91b8f33 100644 --- a/src/core/hle/service/ro/ro.cpp +++ b/src/core/hle/service/ro/ro.cpp @@ -505,11 +505,12 @@ private: class RoInterface : public ServiceFramework { public: - explicit RoInterface(Core::System& system_, const char* name_, std::shared_ptr ro, - NrrKind nrr_kind) - : ServiceFramework{system_, name_}, m_ro(ro), m_context_id(InvalidContextId), - m_nrr_kind(nrr_kind) { - + explicit RoInterface(Core::System& system_, const char* name_, std::shared_ptr ro, NrrKind nrr_kind) + : ServiceFramework{system_, name_} + , m_ro(ro) + , m_context_id(InvalidContextId) + , m_nrr_kind(nrr_kind) + {} FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, @@ -576,7 +577,7 @@ public: : ServiceFramework{system_, "ro:dmnt"} { static const FunctionInfo functions[] = { - { 0, nullptr, "GetProcessModuleInfo" }, + FunctionInfo{0, nullptr, "GetProcessModuleInfo" }, }; RegisterHandlers(functions); } diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp index bcd357d57a..129dcfedbb 100644 --- a/src/core/hle/service/wlan/wlan.cpp +++ b/src/core/hle/service/wlan/wlan.cpp @@ -18,103 +18,103 @@ public: : ServiceFramework{system_, "wlan:lcl"} { static const FunctionInfo functions[] = { - { 0, nullptr, "OpenMasterMode" }, - { 0, nullptr, "OpenMode_2" }, - { 1, nullptr, "CloseMasterMode" }, - { 1, nullptr, "CloseMode_2" }, - { 2, nullptr, "OpenClientMode" }, - { 2, nullptr, "GetMacAddress_2" }, - { 3, nullptr, "CloseClientMode" }, - { 3, nullptr, "CreateBss" }, - { 4, nullptr, "OpenSpectatorMode" }, - { 4, nullptr, "DestroyBss" }, - { 5, nullptr, "CloseSpectatorMode" }, - { 5, nullptr, "StartScan_2" }, - { 6, nullptr, "GetMacAddress_2" }, - { 6, nullptr, "StopScan_2" }, - { 7, nullptr, "CreateBss" }, - { 7, nullptr, "Connect_2" }, - { 8, nullptr, "DestroyBss" }, - { 8, nullptr, "CancelConnect_2" }, - { 9, nullptr, "StartScan_2" }, - { 9, nullptr, "Join" }, - { 10, nullptr, "StopScan_2" }, - { 10, nullptr, "CancelJoin" }, - { 11, nullptr, "Connect_2" }, - { 11, nullptr, "Disconnect_2" }, - { 12, nullptr, "CancelConnect_2" }, - { 12, nullptr, "SetBeaconLostCount" }, - { 13, nullptr, "Join" }, - { 13, nullptr, "GetSystemEvent_2" }, - { 14, nullptr, "CancelJoin" }, - { 14, nullptr, "GetConnectionStatus_2" }, - { 15, nullptr, "Disconnect_2" }, - { 15, nullptr, "GetClientStatus" }, - { 16, nullptr, "SetBeaconLostCount" }, - { 16, nullptr, "GetBssIndicationEvent" }, - { 17, nullptr, "GetSystemEvent_2" }, - { 17, nullptr, "GetBssIndicationInfo" }, - { 18, nullptr, "GetConnectionStatus_2" }, - { 18, nullptr, "GetState_2" }, - { 19, nullptr, "GetClientStatus" }, - { 19, nullptr, "GetAllowedChannels" }, - { 20, nullptr, "GetBssIndicationEvent" }, - { 20, nullptr, "AddIe" }, - { 21, nullptr, "GetBssIndicationInfo" }, - { 21, nullptr, "DeleteIe" }, - { 22, nullptr, "GetState_2" }, - { 22, nullptr, "PutFrameRaw" }, - { 23, nullptr, "GetAllowedChannels" }, - { 23, nullptr, "CancelGetFrame" }, - { 24, nullptr, "AddIe" }, - { 24, nullptr, "CreateRxEntry" }, - { 25, nullptr, "DeleteIe" }, - { 25, nullptr, "DeleteRxEntry" }, - { 26, nullptr, "PutFrameRaw" }, - { 26, nullptr, "AddEthertypeToRxEntry" }, - { 27, nullptr, "CancelGetFrame" }, - { 27, nullptr, "DeleteEthertypeFromRxEntry" }, - { 28, nullptr, "CreateRxEntry" }, - { 28, nullptr, "AddMatchingDataToRxEntry" }, - { 29, nullptr, "DeleteRxEntry" }, - { 29, nullptr, "RemoveMatchingDataFromRxEntry" }, - { 30, nullptr, "AddEthertypeToRxEntry" }, - { 30, nullptr, "GetScanResult_2" }, - { 31, nullptr, "DeleteEthertypeFromRxEntry" }, - { 31, nullptr, "PutActionFrameOneShot" }, - { 32, nullptr, "AddMatchingDataToRxEntry" }, - { 32, nullptr, "SetActionFrameWithBeacon" }, - { 33, nullptr, "RemoveMatchingDataFromRxEntry" }, - { 33, nullptr, "CancelActionFrameWithBeacon" }, - { 34, nullptr, "GetScanResult_2" }, - { 34, nullptr, "CreateRxEntryForActionFrame" }, - { 35, nullptr, "PutActionFrameOneShot" }, - { 35, nullptr, "DeleteRxEntryForActionFrame" }, - { 36, nullptr, "SetActionFrameWithBeacon" }, - { 36, nullptr, "AddSubtypeToRxEntryForActionFrame" }, - { 37, nullptr, "CancelActionFrameWithBeacon" }, - { 37, nullptr, "DeleteSubtypeFromRxEntryForActionFrame" }, - { 38, nullptr, "CreateRxEntryForActionFrame" }, - { 38, nullptr, "CancelGetActionFrame" }, - { 39, nullptr, "DeleteRxEntryForActionFrame" }, - { 39, nullptr, "GetRssi_2" }, - { 40, nullptr, "AddSubtypeToRxEntryForActionFrame" }, - { 40, nullptr, "SetMaxAssociationNumber" }, - { 41, nullptr, "DeleteSubtypeFromRxEntryForActionFrame" }, - { 41, nullptr, "Cmd41" }, - { 42, nullptr, "CancelGetActionFrame" }, - { 42, nullptr, "Cmd42" }, - { 43, nullptr, "GetRssi_2" }, - { 43, nullptr, "Cmd43" }, - { 44, nullptr, "SetMaxAssociationNumber" }, - { 45, nullptr, "OpenLcsMasterMode" }, - { 46, nullptr, "CloseLcsMasterMode" }, - { 47, nullptr, "OpenLcsClientMode" }, - { 48, nullptr, "CloseLcsClientMode" }, - { 49, nullptr, "GetChannelStats" }, - { 50, nullptr, "Cmd50" }, - { 51, nullptr, "Cmd51" }, - { 52, nullptr, "Cmd52" }, + FunctionInfo{0, nullptr, "OpenMasterMode" }, + FunctionInfo{0, nullptr, "OpenMode_2" }, + FunctionInfo{1, nullptr, "CloseMasterMode" }, + FunctionInfo{1, nullptr, "CloseMode_2" }, + FunctionInfo{2, nullptr, "OpenClientMode" }, + FunctionInfo{2, nullptr, "GetMacAddress_2" }, + FunctionInfo{3, nullptr, "CloseClientMode" }, + FunctionInfo{3, nullptr, "CreateBss" }, + FunctionInfo{4, nullptr, "OpenSpectatorMode" }, + FunctionInfo{4, nullptr, "DestroyBss" }, + FunctionInfo{5, nullptr, "CloseSpectatorMode" }, + FunctionInfo{5, nullptr, "StartScan_2" }, + FunctionInfo{6, nullptr, "GetMacAddress_2" }, + FunctionInfo{6, nullptr, "StopScan_2" }, + FunctionInfo{7, nullptr, "CreateBss" }, + FunctionInfo{7, nullptr, "Connect_2" }, + FunctionInfo{8, nullptr, "DestroyBss" }, + FunctionInfo{8, nullptr, "CancelConnect_2" }, + FunctionInfo{9, nullptr, "StartScan_2" }, + FunctionInfo{9, nullptr, "Join" }, + FunctionInfo{10, nullptr, "StopScan_2" }, + FunctionInfo{10, nullptr, "CancelJoin" }, + FunctionInfo{11, nullptr, "Connect_2" }, + FunctionInfo{11, nullptr, "Disconnect_2" }, + FunctionInfo{12, nullptr, "CancelConnect_2" }, + FunctionInfo{12, nullptr, "SetBeaconLostCount" }, + FunctionInfo{13, nullptr, "Join" }, + FunctionInfo{13, nullptr, "GetSystemEvent_2" }, + FunctionInfo{14, nullptr, "CancelJoin" }, + FunctionInfo{14, nullptr, "GetConnectionStatus_2" }, + FunctionInfo{15, nullptr, "Disconnect_2" }, + FunctionInfo{15, nullptr, "GetClientStatus" }, + FunctionInfo{16, nullptr, "SetBeaconLostCount" }, + FunctionInfo{16, nullptr, "GetBssIndicationEvent" }, + FunctionInfo{17, nullptr, "GetSystemEvent_2" }, + FunctionInfo{17, nullptr, "GetBssIndicationInfo" }, + FunctionInfo{18, nullptr, "GetConnectionStatus_2" }, + FunctionInfo{18, nullptr, "GetState_2" }, + FunctionInfo{19, nullptr, "GetClientStatus" }, + FunctionInfo{19, nullptr, "GetAllowedChannels" }, + FunctionInfo{20, nullptr, "GetBssIndicationEvent" }, + FunctionInfo{20, nullptr, "AddIe" }, + FunctionInfo{21, nullptr, "GetBssIndicationInfo" }, + FunctionInfo{21, nullptr, "DeleteIe" }, + FunctionInfo{22, nullptr, "GetState_2" }, + FunctionInfo{22, nullptr, "PutFrameRaw" }, + FunctionInfo{23, nullptr, "GetAllowedChannels" }, + FunctionInfo{23, nullptr, "CancelGetFrame" }, + FunctionInfo{24, nullptr, "AddIe" }, + FunctionInfo{24, nullptr, "CreateRxEntry" }, + FunctionInfo{25, nullptr, "DeleteIe" }, + FunctionInfo{25, nullptr, "DeleteRxEntry" }, + FunctionInfo{26, nullptr, "PutFrameRaw" }, + FunctionInfo{26, nullptr, "AddEthertypeToRxEntry" }, + FunctionInfo{27, nullptr, "CancelGetFrame" }, + FunctionInfo{27, nullptr, "DeleteEthertypeFromRxEntry" }, + FunctionInfo{28, nullptr, "CreateRxEntry" }, + FunctionInfo{28, nullptr, "AddMatchingDataToRxEntry" }, + FunctionInfo{29, nullptr, "DeleteRxEntry" }, + FunctionInfo{29, nullptr, "RemoveMatchingDataFromRxEntry" }, + FunctionInfo{30, nullptr, "AddEthertypeToRxEntry" }, + FunctionInfo{30, nullptr, "GetScanResult_2" }, + FunctionInfo{31, nullptr, "DeleteEthertypeFromRxEntry" }, + FunctionInfo{31, nullptr, "PutActionFrameOneShot" }, + FunctionInfo{32, nullptr, "AddMatchingDataToRxEntry" }, + FunctionInfo{32, nullptr, "SetActionFrameWithBeacon" }, + FunctionInfo{33, nullptr, "RemoveMatchingDataFromRxEntry" }, + FunctionInfo{33, nullptr, "CancelActionFrameWithBeacon" }, + FunctionInfo{34, nullptr, "GetScanResult_2" }, + FunctionInfo{34, nullptr, "CreateRxEntryForActionFrame" }, + FunctionInfo{35, nullptr, "PutActionFrameOneShot" }, + FunctionInfo{35, nullptr, "DeleteRxEntryForActionFrame" }, + FunctionInfo{36, nullptr, "SetActionFrameWithBeacon" }, + FunctionInfo{36, nullptr, "AddSubtypeToRxEntryForActionFrame" }, + FunctionInfo{37, nullptr, "CancelActionFrameWithBeacon" }, + FunctionInfo{37, nullptr, "DeleteSubtypeFromRxEntryForActionFrame" }, + FunctionInfo{38, nullptr, "CreateRxEntryForActionFrame" }, + FunctionInfo{38, nullptr, "CancelGetActionFrame" }, + FunctionInfo{39, nullptr, "DeleteRxEntryForActionFrame" }, + FunctionInfo{39, nullptr, "GetRssi_2" }, + FunctionInfo{40, nullptr, "AddSubtypeToRxEntryForActionFrame" }, + FunctionInfo{40, nullptr, "SetMaxAssociationNumber" }, + FunctionInfo{41, nullptr, "DeleteSubtypeFromRxEntryForActionFrame" }, + FunctionInfo{41, nullptr, "Cmd41" }, + FunctionInfo{42, nullptr, "CancelGetActionFrame" }, + FunctionInfo{42, nullptr, "Cmd42" }, + FunctionInfo{43, nullptr, "GetRssi_2" }, + FunctionInfo{43, nullptr, "Cmd43" }, + FunctionInfo{44, nullptr, "SetMaxAssociationNumber" }, + FunctionInfo{45, nullptr, "OpenLcsMasterMode" }, + FunctionInfo{46, nullptr, "CloseLcsMasterMode" }, + FunctionInfo{47, nullptr, "OpenLcsClientMode" }, + FunctionInfo{48, nullptr, "CloseLcsClientMode" }, + FunctionInfo{49, nullptr, "GetChannelStats" }, + FunctionInfo{50, nullptr, "Cmd50" }, + FunctionInfo{51, nullptr, "Cmd51" }, + FunctionInfo{52, nullptr, "Cmd52" }, }; RegisterHandlers(functions); } @@ -126,7 +126,7 @@ public: : ServiceFramework{system_, "wlan:lg"} { static const FunctionInfo functions[] = { - { 0, nullptr, "GetFrameRaw" }, + FunctionInfo{0, nullptr, "GetFrameRaw" }, }; RegisterHandlers(functions); } @@ -138,7 +138,7 @@ public: : ServiceFramework{system_, "wlan:lga"} { static const FunctionInfo functions[] = { - { 0, nullptr, "GetActionFrame" }, + FunctionInfo{0, nullptr, "GetActionFrame" }, }; RegisterHandlers(functions); } @@ -150,7 +150,7 @@ public: : ServiceFramework{system_, "wlan:sg"} { static const FunctionInfo functions[] = { - { 0, nullptr, "GetFrameRaw" }, + FunctionInfo{0, nullptr, "GetFrameRaw" }, }; RegisterHandlers(functions); } @@ -162,19 +162,19 @@ public: : ServiceFramework{system_, "wlan:soc"} { static const FunctionInfo functions[] = { - { 0, nullptr, "PutFrameRaw_2" }, - { 1, nullptr, "CancelGetFrame_2" }, - { 2, nullptr, "CreateRxEntry_2" }, - { 3, nullptr, "DeleteRxEntry_2" }, - { 4, nullptr, "AddEthertypeToRxEntry_2" }, - { 5, nullptr, "DeleteEthertypeFromRxEntry_2" }, - { 6, nullptr, "GetMacAddress_3" }, - { 7, nullptr, "SwitchTsfTimerFunction" }, - { 8, nullptr, "GetDeltaTimeBetweenSystemAndTsf" }, - { 9, nullptr, "RegisterSharedMemory" }, - { 10, nullptr, "UnregisterSharedMemory" }, - { 11, nullptr, "EnableSharedMemory" }, - { 12, nullptr, "SetMulticastFilter" }, + FunctionInfo{0, nullptr, "PutFrameRaw_2" }, + FunctionInfo{1, nullptr, "CancelGetFrame_2" }, + FunctionInfo{2, nullptr, "CreateRxEntry_2" }, + FunctionInfo{3, nullptr, "DeleteRxEntry_2" }, + FunctionInfo{4, nullptr, "AddEthertypeToRxEntry_2" }, + FunctionInfo{5, nullptr, "DeleteEthertypeFromRxEntry_2" }, + FunctionInfo{6, nullptr, "GetMacAddress_3" }, + FunctionInfo{7, nullptr, "SwitchTsfTimerFunction" }, + FunctionInfo{8, nullptr, "GetDeltaTimeBetweenSystemAndTsf" }, + FunctionInfo{9, nullptr, "RegisterSharedMemory" }, + FunctionInfo{10, nullptr, "UnregisterSharedMemory" }, + FunctionInfo{11, nullptr, "EnableSharedMemory" }, + FunctionInfo{12, nullptr, "SetMulticastFilter" }, }; RegisterHandlers(functions); } @@ -186,34 +186,34 @@ public: : ServiceFramework{system_, "wlan:dtc"} { static const FunctionInfo functions[] = { - { 0, nullptr, "Cmd0" }, - { 1, nullptr, "Cmd1" }, - { 2, nullptr, "Cmd2" }, - { 3, nullptr, "Cmd3" }, - { 4, nullptr, "Cmd4" }, - { 5, nullptr, "Cmd5" }, - { 6, nullptr, "Cmd6" }, - { 7, nullptr, "Cmd7" }, - { 8, nullptr, "Cmd8" }, - { 9, nullptr, "Cmd9" }, - { 10, nullptr, "Cmd10" }, - { 11, nullptr, "Cmd11" }, - { 12, nullptr, "Cmd12" }, - { 13, nullptr, "Cmd13" }, - { 14, nullptr, "Cmd14" }, - { 15, nullptr, "Cmd15" }, - { 16, nullptr, "Cmd16" }, - { 17, nullptr, "Cmd17" }, - { 18, nullptr, "Cmd18" }, - { 19, nullptr, "Cmd19" }, - { 20, nullptr, "Cmd20" }, - { 21, nullptr, "Cmd21" }, - { 22, nullptr, "Cmd22" }, - { 23, nullptr, "Cmd23" }, - { 24, nullptr, "Cmd24" }, - { 25, nullptr, "Cmd25" }, - { 26, nullptr, "Cmd26" }, - { 27, nullptr, "Cmd27" }, + FunctionInfo{0, nullptr, "Cmd0" }, + FunctionInfo{1, nullptr, "Cmd1" }, + FunctionInfo{2, nullptr, "Cmd2" }, + FunctionInfo{3, nullptr, "Cmd3" }, + FunctionInfo{4, nullptr, "Cmd4" }, + FunctionInfo{5, nullptr, "Cmd5" }, + FunctionInfo{6, nullptr, "Cmd6" }, + FunctionInfo{7, nullptr, "Cmd7" }, + FunctionInfo{8, nullptr, "Cmd8" }, + FunctionInfo{9, nullptr, "Cmd9" }, + FunctionInfo{10, nullptr, "Cmd10" }, + FunctionInfo{11, nullptr, "Cmd11" }, + FunctionInfo{12, nullptr, "Cmd12" }, + FunctionInfo{13, nullptr, "Cmd13" }, + FunctionInfo{14, nullptr, "Cmd14" }, + FunctionInfo{15, nullptr, "Cmd15" }, + FunctionInfo{16, nullptr, "Cmd16" }, + FunctionInfo{17, nullptr, "Cmd17" }, + FunctionInfo{18, nullptr, "Cmd18" }, + FunctionInfo{19, nullptr, "Cmd19" }, + FunctionInfo{20, nullptr, "Cmd20" }, + FunctionInfo{21, nullptr, "Cmd21" }, + FunctionInfo{22, nullptr, "Cmd22" }, + FunctionInfo{23, nullptr, "Cmd23" }, + FunctionInfo{24, nullptr, "Cmd24" }, + FunctionInfo{25, nullptr, "Cmd25" }, + FunctionInfo{26, nullptr, "Cmd26" }, + FunctionInfo{27, nullptr, "Cmd27" }, }; RegisterHandlers(functions); } @@ -225,8 +225,8 @@ public: : ServiceFramework{system_, "wlan:p"} { static const FunctionInfo functions[] = { - { 0, nullptr, "CreateWirelessCommunicationService" }, - { 1, nullptr, "CreatePrivateWirelessCommunicationService" }, + FunctionInfo{0, nullptr, "CreateWirelessCommunicationService" }, + FunctionInfo{1, nullptr, "CreatePrivateWirelessCommunicationService" }, }; RegisterHandlers(functions); } @@ -238,7 +238,7 @@ public: : ServiceFramework{system_, "wlan:nd"} { static const FunctionInfo functions[] = { - { 0, nullptr, "CreateDriverService" }, + FunctionInfo{0, nullptr, "CreateDriverService" }, }; RegisterHandlers(functions); }