Revert "Remove unused event"

This reverts commit 02a489794c97576ab05e82b3d2591777554e0b46.

diff --git a/include/NanEvent.h b/include/NanEvent.h
index b7b8bdc255d9e983d37bf4eff6415843e021213d..da16bf5bbae884ff9065c4fd3a0f6c9dd0cea551 100644 (file)
--- a/include/NanEvent.h
+++ b/include/NanEvent.h
@@ -90,4 +90,10 @@ public:
        uint32_t *dataPathIds;
 };
 
+class NanMacAddressChangedEvent
+{
+public:
+       uint8_t addr[NAN_MAC_ADDR_LEN];
+};
+
 NAN_NAMESPACE_END

diff --git a/src/NanHalEventCallbackHandler.cpp b/src/NanHalEventCallbackHandler.cpp
index 4f0b9be3864d9b5f1f191a6c122a18e84e15d05e..e43a72390d0bf819026f844d98cb3d531b4be314 100644 (file)
--- a/src/NanHalEventCallbackHandler.cpp
+++ b/src/NanHalEventCallbackHandler.cpp
@@ -54,7 +54,7 @@ std::function<void(const NanDataPathConfirmEvent&)> on_notify_data_path_confirm_
 std::function<void(const NanDataPathEndEvent&)> on_notify_data_path_end_event;
 std::function<void(uint16_t, NanError)> on_notify_publish_terminated_event;
 std::function<void(uint16_t, NanError)> on_notify_subscribe_terminated_event;
-std::function<void(unsigned char *)> on_notify_mac_address_changed_event;
+std::function<void(uint8_t *)> on_notify_mac_address_changed_event;
 
 typedef enum {
        NAN_EVENT_PUBLISH_TERMINATED,
@@ -413,7 +413,7 @@ void raiseDataPathEndEvent(NanDataPathEndInd *event)
        __NAN_LOG_FUNC_EXIT__;
 }
 
-void raiseMacAddressChangedEvent(unsigned char *addr)
+void raiseMacAddressChangedEvent(uint8_t *addr)
 {
        __NAN_LOG_FUNC_ENTER__;
        if (!on_notify_mac_address_changed_event) {
@@ -479,8 +479,8 @@ gboolean handleEvent(gpointer event)
                delete (NanDataPathEndInd *)eventData->data;
                break;
        case NAN_EVENT_MAC_ADDRESS_CHANGED:
-               raiseMacAddressChangedEvent((unsigned char*) eventData->data);
-               delete [] (unsigned char*)eventData->data;
+               raiseMacAddressChangedEvent((uint8_t *) eventData->data);
+               delete [] (uint8_t *)eventData->data;
        default:
                NAN_LOGI("Unhandled Event.");
                break;
@@ -578,7 +578,7 @@ void onEventFollowup(NanFollowupInd *event)
 void onEventMacAddress(NanDiscEngEventInd *event)
 {
        __NAN_LOG_FUNC_ENTER__;
-       unsigned char *addr = new unsigned char[NAN_MAC_ADDR_LEN];
+       uint8_t *addr = new uint8_t[NAN_MAC_ADDR_LEN];
        memcpy(addr, event->data.mac_addr.addr, NAN_MAC_ADDR_LEN);
        attachEventSource(NAN_EVENT_MAC_ADDRESS_CHANGED, (void *)addr);
        __NAN_LOG_FUNC_EXIT__;