diff --git a/nx/include/switch/services/ldn.h b/nx/include/switch/services/ldn.h index c6447173..817dbd10 100644 --- a/nx/include/switch/services/ldn.h +++ b/nx/include/switch/services/ldn.h @@ -238,37 +238,37 @@ void ldnmExit(void); Service* ldnmGetServiceSession_MonitorService(void); /** - * @brief GetStateForMonitor + * @brief GetState * @param[out] out \ref LdnState */ -Result ldnmGetStateForMonitor(LdnState *out); +Result ldnmGetState(LdnState *out); /** - * @brief GetNetworkInfoForMonitor + * @brief GetNetworkInfo * @param[out] out \ref LdnNetworkInfo */ -Result ldnmGetNetworkInfoForMonitor(LdnNetworkInfo *out); +Result ldnmGetNetworkInfo(LdnNetworkInfo *out); /** - * @brief GetIpv4AddressForMonitor + * @brief GetIpv4Address * @param[out] addr \ref LdnIpv4Address * @param[out] mask \ref LdnSubnetMask */ -Result ldnmGetIpv4AddressForMonitor(LdnIpv4Address *addr, LdnSubnetMask *mask); +Result ldnmGetIpv4Address(LdnIpv4Address *addr, LdnSubnetMask *mask); /** - * @brief GetSecurityParameterForMonitor - * @note Not exposed by official sw. + * @brief GetSecurityParameter + * @note Not exposed by official sw. * @param[out] out \ref LdnSecurityParameter */ -Result ldnmGetSecurityParameterForMonitor(LdnSecurityParameter *out); +Result ldnmGetSecurityParameter(LdnSecurityParameter *out); /** - * @brief GetNetworkConfigForMonitor - * @note Not exposed by official sw. + * @brief GetNetworkConfig + * @note Not exposed by official sw. * @param[out] out \ref LdnNetworkConfig */ -Result ldnmGetNetworkConfigForMonitor(LdnNetworkConfig *out); +Result ldnmGetNetworkConfig(LdnNetworkConfig *out); ///@} @@ -322,20 +322,20 @@ Result ldnGetSecurityParameter(LdnSecurityParameter *out); Result ldnGetNetworkConfig(LdnNetworkConfig *out); /** - * @brief AttachStateChangeEvent + * @brief GetStateChangeEvent * @note The Event must be closed by the user once finished with it. * @note This is signaled when the data returned by \ref ldnGetNetworkInfo / \ref ldnGetNetworkInfoLatestUpdate is updated. * @param[out] out_event Output Event with autoclear=true. */ -Result ldnAttachStateChangeEvent(Event* out_event); +Result ldnGetStateChangeEvent(Event* out_event); /** - * @brief GetNetworkInfoLatestUpdate + * @brief GetNetworkInfoAndHistory * @param[out] network_info \ref LdnNetworkInfo * @param[out] nodes Output array of \ref LdnNodeLatestUpdate. * @param[in] count Size of the nodes array in entries, must be 8. */ -Result ldnGetNetworkInfoLatestUpdate(LdnNetworkInfo *network_info, LdnNodeLatestUpdate *nodes, s32 count); +Result ldnGetNetworkInfoAndHistory(LdnNetworkInfo *network_info, LdnNodeLatestUpdate *nodes, s32 count); /** * @brief Scan diff --git a/nx/source/services/ldn.c b/nx/source/services/ldn.c index e7e63d75..6278ccd9 100644 --- a/nx/source/services/ldn.c +++ b/nx/source/services/ldn.c @@ -50,26 +50,26 @@ Service* ldnmGetServiceSession_MonitorService(void) { return &g_ldnmSrv; } -Result ldnmGetStateForMonitor(LdnState *out) { +Result ldnmGetState(LdnState *out) { u32 tmp=0; Result rc = _ldnCmdNoInOutU32(&g_ldnmSrv, &tmp, 0); if (R_SUCCEEDED(rc) && out) *out = tmp; return rc; } -Result ldnmGetNetworkInfoForMonitor(LdnNetworkInfo *out) { +Result ldnmGetNetworkInfo(LdnNetworkInfo *out) { return _ldnGetNetworkInfo(&g_ldnmSrv, out); } -Result ldnmGetIpv4AddressForMonitor(LdnIpv4Address *addr, LdnSubnetMask *mask) { +Result ldnmGetIpv4Address(LdnIpv4Address *addr, LdnSubnetMask *mask) { return _ldnGetIpv4Address(&g_ldnmSrv, addr, mask); } -Result ldnmGetSecurityParameterForMonitor(LdnSecurityParameter *out) { +Result ldnmGetSecurityParameter(LdnSecurityParameter *out) { return _ldnGetSecurityParameter(&g_ldnmSrv, out); } -Result ldnmGetNetworkConfigForMonitor(LdnNetworkConfig *out) { +Result ldnmGetNetworkConfig(LdnNetworkConfig *out) { return _ldnGetNetworkConfig(&g_ldnmSrv, out); } @@ -277,11 +277,11 @@ Result ldnGetNetworkConfig(LdnNetworkConfig *out) { return _ldnGetNetworkConfig(&g_ldnSrv, out); } -Result ldnAttachStateChangeEvent(Event* out_event) { +Result ldnGetStateChangeEvent(Event* out_event) { return _ldnCmdGetEvent(&g_ldnSrv, out_event, true, 100); } -Result ldnGetNetworkInfoLatestUpdate(LdnNetworkInfo *network_info, LdnNodeLatestUpdate *nodes, s32 count) { +Result ldnGetNetworkInfoAndHistory(LdnNetworkInfo *network_info, LdnNodeLatestUpdate *nodes, s32 count) { return serviceDispatch(&g_ldnSrv, 101, .buffer_attrs = { SfBufferAttr_FixedSize | SfBufferAttr_HipcPointer | SfBufferAttr_Out,