From f8f3b27eb397e348a80137aee075c19ac37e1f48 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 26 Mar 2017 07:02:45 -0500 Subject: Services/UDS: Use consistent spelling for WiFi and simplify the GetChannel function. --- src/core/hle/service/nwm/nwm_uds.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/hle/service/nwm') diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp index e1bf49393..f56925fee 100644 --- a/src/core/hle/service/nwm/nwm_uds.cpp +++ b/src/core/hle/service/nwm/nwm_uds.cpp @@ -35,7 +35,7 @@ static NodeInfo node_info; // Mapping of bind node ids to their respective events. static std::unordered_map> bind_node_events; -// The wifi network channel that the network is currently on. +// The WiFi network channel that the network is currently on. // Since we're not actually interacting with physical radio waves, this is just a dummy value. static u8 network_channel = DefaultNetworkChannel; @@ -320,10 +320,10 @@ static void GetChannel(Interface* self) { IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x1A, 0, 0); IPC::RequestBuilder rb = rp.MakeBuilder(2, 0); - u8 channel = network_channel; + bool is_connected = connection_status.status != + static_cast(NetworkStatus::NotConnected); - if (connection_status.status == static_cast(NetworkStatus::NotConnected)) - channel = 0; + u8 channel = is_connected ? network_channel : 0; rb.Push(RESULT_SUCCESS); rb.PushRaw(channel); -- cgit v1.2.3