am 05e31d4..3df1ce6 from mirror-m-wireless-internal-release

3df1ce6 Merge "Issue start/stop HAL along with load/unload driver" into m-wireless-dev
f7098f4 net:wireless:bcmdhd: Update bcm4354/56 FW(7.35.79.85)

Change-Id: I6e8fa3854726e01ef9a24826bf5486cd05a0356c

6 files changed, 49 insertions, 15 deletions

diff --git a/bcmdhd/firmware/bcm4354/fw_bcm4354.bin b/bcmdhd/firmware/bcm4354/fw_bcm4354.bin
index 53a3b0a..3b3ce37 100755
--- a/bcmdhd/firmware/bcm4354/fw_bcm4354.bin
+++ b/bcmdhd/firmware/bcm4354/fw_bcm4354.bin
diff --git a/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin b/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin
index 4243c50..52db020 100755
--- a/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin
+++ b/bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin
diff --git a/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin b/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin
index e1db341..ed7e597 100755
--- a/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin
+++ b/bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin
diff --git a/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin b/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin
index 4272237..5e26690 100755
--- a/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin
+++ b/bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin
diff --git a/bcmdhd/wifi_hal/common.h b/bcmdhd/wifi_hal/common.h
index c56a038..26bb9a6 100644
--- a/bcmdhd/wifi_hal/common.h
+++ b/bcmdhd/wifi_hal/common.h
@@ -145,6 +145,7 @@ typedef struct {
     struct nl_sock *cmd_sock;                       // command socket object
     struct nl_sock *event_sock;                     // event socket object
     int nl80211_family_id;                          // family id for 80211 driver
+    int cleanup_socks[2];                           // sockets used to implement wifi_cleanup
 
     bool in_event_loop;                             // Indicates that event loop is active
     bool clean_up;                                  // Indication to clean up the socket
diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp
index 0bb904d..d2e0c34 100644
--- a/bcmdhd/wifi_hal/wifi_hal.cpp
+++ b/bcmdhd/wifi_hal/wifi_hal.cpp
@@ -162,6 +162,11 @@ wifi_error wifi_initialize(wifi_handle *handle)
     memset(info, 0, sizeof(*info));
 
     ALOGI("Creating socket");
+    if (socketpair(AF_UNIX, SOCK_STREAM, 0, info->cleanup_socks) == -1) {
+        ALOGE("Could not create cleanup sockets");
+        return WIFI_ERROR_UNKNOWN;
+    }
+
     struct nl_sock *cmd_sock = wifi_create_nl_socket(WIFI_HAL_CMD_SOCK_PORT);
     if (cmd_sock == NULL) {
         ALOGE("Could not create handle");
@@ -250,6 +255,8 @@ static void internal_cleaned_up_handler(wifi_handle handle)
     wifi_cleaned_up_handler cleaned_up_handler = info->cleaned_up_handler;
 
     if (info->cmd_sock != 0) {
+        close(info->cleanup_socks[0]);
+        close(info->cleanup_socks[1]);
         nl_socket_free(info->cmd_sock);
         nl_socket_free(info->event_sock);
         info->cmd_sock = NULL;
@@ -269,7 +276,25 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler)
     info->cleaned_up_handler = handler;
     info->clean_up = true;
 
-    ALOGI("Wifi cleanup completed");
+    pthread_mutex_lock(&info->cb_lock);
+
+    for (int i = 0; i < info->num_event_cb; i++) {
+        cb_info *cbi = &(info->event_cb[i]);
+        WifiCommand *cmd = (WifiCommand *)cbi->cb_arg;
+        if (cmd != NULL) {
+            cmd->addRef();
+            cmd->cancel();
+            cmd->releaseRef();
+        }
+    }
+
+    pthread_mutex_unlock(&info->cb_lock);
+
+    if (write(info->cleanup_socks[0], "T", 1) < 1) {
+        ALOGE("could not write to cleanup socket");
+    } else {
+        ALOGI("Wifi cleanup completed");
+    }
 }
 
 static int internal_pollin_handler(wifi_handle handle)
@@ -292,38 +317,44 @@ void wifi_event_loop(wifi_handle handle)
         info->in_event_loop = true;
     }
 
-    pollfd pfd;
-    memset(&pfd, 0, sizeof(pfd));
+    pollfd pfd[2];
+    memset(&pfd[0], 0, sizeof(pollfd) * 2);
 
-    pfd.fd = nl_socket_get_fd(info->event_sock);
-    pfd.events = POLLIN;
+    pfd[0].fd = nl_socket_get_fd(info->event_sock);
+    pfd[0].events = POLLIN;
+    pfd[1].fd = info->cleanup_socks[1];
+    pfd[1].events = POLLIN;
 
+    char buf[2048];
     /* TODO: Add support for timeouts */
 
     do {
         int timeout = -1;                   /* Infinite timeout */
-        pfd.revents = 0;
+        pfd[0].revents = 0;
+        pfd[1].revents = 0;
         // ALOGI("Polling socket");
-        int result = poll(&pfd, 1, -1);
+        int result = poll(pfd, 2, timeout);
         if (result < 0) {
             ALOGE("Error polling socket");
-        } else if (pfd.revents & POLLERR) {
+        } else if (pfd[0].revents & POLLERR) {
             ALOGE("POLL Error; error no = %d", errno);
-            char buf[2048];
-            int result2 = read(pfd.fd, buf, sizeof(buf));
+            int result2 = read(pfd[0].fd, buf, sizeof(buf));
             ALOGE("Read after POLL returned %d, error no = %d", result2, errno);
-        } else if (pfd.revents & POLLHUP) {
+        } else if (pfd[0].revents & POLLHUP) {
             ALOGE("Remote side hung up");
             break;
-        } else if (pfd.revents & POLLIN) {
-            // ALOGI("Found some events!!!");
+        } else if (pfd[0].revents & POLLIN) {
+            ALOGI("Found some events!!!");
             internal_pollin_handler(handle);
+        } else if (pfd[1].revents & POLLIN) {
+            ALOGI("Got a signal to exit!!!");
+            int result2 = read(pfd[1].fd, buf, sizeof(buf));
+            ALOGE("Read after POLL returned %d, error no = %d", result2, errno);
         } else {
-            ALOGE("Unknown event - %0x", pfd.revents);
+            ALOGE("Unknown event - %0x, %0x", pfd[0].revents, pfd[1].revents);
         }
     } while (!info->clean_up);
 
-
     ALOGI("Cleaning up");
     internal_cleaned_up_handler(handle);
 }
@@ -337,6 +368,8 @@ static int internal_no_seq_check(struct nl_msg *msg, void *arg)
 
 static int internal_valid_message_handler(nl_msg *msg, void *arg)
 {
+    ALOGI("got an event");
+
     wifi_handle handle = (wifi_handle)arg;
     hal_info *info = getHalInfo(handle);