diff --git a/core/common/include/softbus_network_utils.h b/core/common/include/softbus_network_utils.h index 5e3ed93ebc8acb47e78b86fdea3923619cfee086..f4c3e0da0f778d6647947d6bceea19984be661b7 100644 --- a/core/common/include/softbus_network_utils.h +++ b/core/common/include/softbus_network_utils.h @@ -25,13 +25,13 @@ extern "C" { #endif #endif -int ChannelToFrequency(int channel); +int SoftBusChannelToFrequency(int channel); -int FrequencyToChannel(int frequency); +int SoftBusFrequencyToChannel(int frequency); -bool Is5GBand(int frequency); +bool SoftBusIs5GBand(int frequency); -bool Is2GBand(int frequency); +bool SoftBusIs2GBand(int frequency); #ifdef __cplusplus #if __cplusplus diff --git a/core/common/network/softbus_network_utils.c b/core/common/network/softbus_network_utils.c index e614e353bf46ae15f4ce46dc7c279dfdc6652d98..32c10f65f7bab625dcfad9837dcf81eadab79f6f 100644 --- a/core/common/network/softbus_network_utils.c +++ b/core/common/network/softbus_network_utils.c @@ -29,7 +29,7 @@ #define FREQUENCY_INVALID (-1) #define CHANNEL_INVALID (-1) -int ChannelToFrequency(int channel) +int SoftBusChannelToFrequency(int channel) { if (channel >= CHANNEL_2G_FIRST && channel <= CHANNEL_2G_LAST) { return (channel - CHANNEL_2G_FIRST) * FREQUENCY_STEP + FREQUENCY_2G_FIRST; @@ -40,7 +40,7 @@ int ChannelToFrequency(int channel) } } -int FrequencyToChannel(int frequency) +int SoftBusFrequencyToChannel(int frequency) { if (frequency >= FREQUENCY_2G_FIRST && frequency <= FREQUENCY_2G_LAST) { return (frequency - FREQUENCY_2G_FIRST) / FREQUENCY_STEP + CHANNEL_2G_FIRST; @@ -51,7 +51,7 @@ int FrequencyToChannel(int frequency) } } -bool Is5GBand(int frequency) +bool SoftBusIs5GBand(int frequency) { if (frequency >= FREQUENCY_5G_FIRST && frequency <= FREQUENCY_5G_LAST) { return true; @@ -59,7 +59,7 @@ bool Is5GBand(int frequency) return false; } -bool Is2GBand(int frequency) +bool SoftBusIs2GBand(int frequency) { if (frequency >= FREQUENCY_2G_FIRST && frequency <= FREQUENCY_2G_LAST) { return true;