From: jnashok Date: Wed, 1 Apr 2015 12:35:42 +0000 (+0900) Subject: [Jira] IOT 409 Fix for CAInitializeWiFi naming to be in consistent with other APIs X-Git-Tag: 1.2.0+RC1~1855^2~35 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cae342fa6225f830117b2f975a64ab500d981c75;p=platform%2Fupstream%2Fiotivity.git [Jira] IOT 409 Fix for CAInitializeWiFi naming to be in consistent with other APIs Change-Id: Ib2fac3df7084cffff8f7a31cc63c972aad0bb327 Signed-off-by: jnashok Reviewed-on: https://gerrit.iotivity.org/gerrit/624 Tested-by: jenkins-iotivity Reviewed-by: Sakthivel Samidurai Reviewed-by: Erich Keane --- diff --git a/resource/csdk/connectivity/inc/cawifiadapter.h b/resource/csdk/connectivity/inc/cawifiadapter.h index 69e76e7..4d45123 100644 --- a/resource/csdk/connectivity/inc/cawifiadapter.h +++ b/resource/csdk/connectivity/inc/cawifiadapter.h @@ -47,7 +47,7 @@ extern "C" * @param handle [IN] Threadpool Handle * @return #CA_STATUS_OK or Appropriate error code */ -CAResult_t CAInitializeWifi(CARegisterConnectivityCallback registerCallback, +CAResult_t CAInitializeWIFI(CARegisterConnectivityCallback registerCallback, CANetworkPacketReceivedCallback networkPacketCallback, CANetworkChangeCallback netCallback, u_thread_pool_t handle); diff --git a/resource/csdk/connectivity/inc/cawifiadapter_singlethread.h b/resource/csdk/connectivity/inc/cawifiadapter_singlethread.h index 4fd07f3..8a82ccf 100644 --- a/resource/csdk/connectivity/inc/cawifiadapter_singlethread.h +++ b/resource/csdk/connectivity/inc/cawifiadapter_singlethread.h @@ -45,7 +45,7 @@ extern "C" * Abstraction Layer. * @return #CA_STATUS_OK or Appropriate error code */ -CAResult_t CAInitializeWifi(CARegisterConnectivityCallback registerCallback, +CAResult_t CAInitializeWIFI(CARegisterConnectivityCallback registerCallback, CANetworkPacketReceivedCallback networkPacketCallback, CANetworkChangeCallback netCallback); diff --git a/resource/csdk/connectivity/src/cainterfacecontroller.c b/resource/csdk/connectivity/src/cainterfacecontroller.c index c05b01a..f92f984 100644 --- a/resource/csdk/connectivity/src/cainterfacecontroller.c +++ b/resource/csdk/connectivity/src/cainterfacecontroller.c @@ -143,7 +143,7 @@ void CAInitializeAdapters(u_thread_pool_t handle) #endif /* ETHERNET_ADAPTER */ #ifdef WIFI_ADAPTER - CAInitializeWifi(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback, + CAInitializeWIFI(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback, handle); #endif /* WIFI_ADAPTER */ diff --git a/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c b/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c index eedf318..9f26b69 100644 --- a/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c +++ b/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c @@ -136,7 +136,7 @@ void CAInitializeAdapters() #endif /* ETHERNET_ADAPTER */ #ifdef WIFI_ADAPTER - CAInitializeWifi(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback); + CAInitializeWIFI(CARegisterCallback, CAReceivedPacketCallback, CANetworkChangedCallback); #endif /* WIFI_ADAPTER */ #ifdef EDR_ADAPTER diff --git a/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter.c b/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter.c index 22f83eb..67336b6 100644 --- a/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter.c +++ b/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter.c @@ -372,7 +372,7 @@ void CAWiFiPacketReceivedCB(const char *ipAddress, uint16_t port, OIC_LOG(DEBUG, WIFI_ADAPTER_TAG, "OUT"); } -CAResult_t CAInitializeWifi(CARegisterConnectivityCallback registerCallback, +CAResult_t CAInitializeWIFI(CARegisterConnectivityCallback registerCallback, CANetworkPacketReceivedCallback networkPacketCallback, CANetworkChangeCallback netCallback, u_thread_pool_t handle) { @@ -427,7 +427,7 @@ CAResult_t CAInitializeWifi(CARegisterConnectivityCallback registerCallback, return CA_STATUS_FAILED; } - OIC_LOG(INFO, WIFI_ADAPTER_TAG, "IntializeWifi is Success"); + OIC_LOG(INFO, WIFI_ADAPTER_TAG, "Intialize WIFI is Success"); return CA_STATUS_OK; } diff --git a/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter_singlethread.c b/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter_singlethread.c index b7aeb87..3a5aacc 100644 --- a/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter_singlethread.c +++ b/resource/csdk/connectivity/src/wifi_adapter/cawifiadapter_singlethread.c @@ -212,7 +212,7 @@ void CAWiFiPacketReceivedCB(const char *ipAddress, uint32_t port, OIC_LOG(DEBUG, WIFI_ADAPTER_TAG, "OUT"); } -CAResult_t CAInitializeWifi(CARegisterConnectivityCallback registerCallback, +CAResult_t CAInitializeWIFI(CARegisterConnectivityCallback registerCallback, CANetworkPacketReceivedCallback networkPacketCallback, CANetworkChangeCallback netCallback) { @@ -254,7 +254,7 @@ CAResult_t CAInitializeWifi(CARegisterConnectivityCallback registerCallback, wifiHandler.terminate = CATerminateWIFI; registerCallback(wifiHandler, CA_WIFI); - OIC_LOG(INFO, WIFI_ADAPTER_TAG, "IntializeWifi Success"); + OIC_LOG(INFO, WIFI_ADAPTER_TAG, "Intialize WIFI Success"); OIC_LOG(DEBUG, WIFI_ADAPTER_TAG, "OUT"); return CA_STATUS_OK; }