From 2112c8cf87f7feff19474f84d1b47b3fc3691c20 Mon Sep 17 00:00:00 2001
From: Mattias Agren <magren@broadcom.com>
Date: Mon, 18 Jun 2012 15:46:47 +0200
Subject: configure avdtp signalling timeout to default value (4 secs)

also added mutex protection for any a2dp control path signalling to
ensure only one outstanding request at a time

Change-Id: I06d95793a8632f6a8baec967a1d8440ecce8a65d

Conflicts:

	audio_a2dp_hw/audio_a2dp_hw.c
---
 btif/include/btif_av.h            | 0
 btif/include/btif_hl.h            | 0
 btif/include/btif_profile_queue.h | 0
 btif/include/btif_storage.h       | 0
 btif/src/btif_av.c                | 0
 btif/src/btif_core.c              | 0
 btif/src/btif_dm.c                | 0
 btif/src/btif_hf.c                | 0
 btif/src/btif_hh.c                | 0
 btif/src/btif_hl.c                | 0
 btif/src/btif_media_task.c        | 0
 btif/src/btif_profile_queue.c     | 0
 btif/src/btif_rc.c                | 0
 btif/src/btif_storage.c           | 8 ++++----
 14 files changed, 4 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 btif/include/btif_av.h
 mode change 100755 => 100644 btif/include/btif_hl.h
 mode change 100755 => 100644 btif/include/btif_profile_queue.h
 mode change 100755 => 100644 btif/include/btif_storage.h
 mode change 100755 => 100644 btif/src/btif_av.c
 mode change 100755 => 100644 btif/src/btif_core.c
 mode change 100755 => 100644 btif/src/btif_dm.c
 mode change 100755 => 100644 btif/src/btif_hf.c
 mode change 100755 => 100644 btif/src/btif_hh.c
 mode change 100755 => 100644 btif/src/btif_hl.c
 mode change 100755 => 100644 btif/src/btif_media_task.c
 mode change 100755 => 100644 btif/src/btif_profile_queue.c
 mode change 100755 => 100644 btif/src/btif_rc.c
 mode change 100755 => 100644 btif/src/btif_storage.c

(limited to 'btif')

diff --git a/btif/include/btif_av.h b/btif/include/btif_av.h
old mode 100755
new mode 100644
diff --git a/btif/include/btif_hl.h b/btif/include/btif_hl.h
old mode 100755
new mode 100644
diff --git a/btif/include/btif_profile_queue.h b/btif/include/btif_profile_queue.h
old mode 100755
new mode 100644
diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
old mode 100755
new mode 100644
diff --git a/btif/src/btif_av.c b/btif/src/btif_av.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_hf.c b/btif/src/btif_hf.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_hh.c b/btif/src/btif_hh.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_media_task.c b/btif/src/btif_media_task.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_profile_queue.c b/btif/src/btif_profile_queue.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c
old mode 100755
new mode 100644
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
old mode 100755
new mode 100644
index bb18b85..bc7b771
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -145,7 +145,7 @@
 #define BTIF_STORAGE_KEY_AUTOPAIR_FIXPIN_KBLIST "FixedPinZerosKeyboardBlacklist"
 #define BTIF_STORAGE_KEY_AUTOPAIR_DYNAMIC_BLACKLIST_ADDR "DynamicAddressBlacklist"
 
-#define BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR ","
+#define BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR ","
 #define BTIF_AUTO_PAIR_CONF_SPACE ' '
 #define BTIF_AUTO_PAIR_CONF_COMMENT '#'
 #define BTIF_AUTO_PAIR_CONF_KEY_VAL_DELIMETER "="
@@ -1851,13 +1851,13 @@ BOOLEAN  btif_storage_is_device_autopair_blacklisted(bt_bdaddr_t *remote_dev_add
                               linebuf, BTIF_STORAGE_MAX_LINE_SZ);
         if (value != NULL)
         {
-            token = strtok(value, BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR);
+            token = strtok(value, BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR);
             while (token != NULL)
             {
                 if (strstr(dev_name_str, token) != NULL)
                     return TRUE;
 
-                token = strtok(NULL, BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR);
+                token = strtok(NULL, BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR);
             }
         }
     }
@@ -1894,7 +1894,7 @@ bt_status_t btif_storage_add_device_to_autopair_blacklist(bt_bdaddr_t *remote_de
 
     bd2str(remote_dev_addr, &bdstr);
     strncpy(input_value, (char*)bdstr, 20);
-    strncat (input_value,BTIF_AUTO_PAIR_CONF_VALUE_SEPERATOR, 20);
+    strncat (input_value,BTIF_AUTO_PAIR_CONF_VALUE_SEPARATOR, 20);
 
     /* create filepath */
     fname = btif_in_make_filename(NULL, BTIF_STORAGE_PATH_AUTOPAIR_BLACKLIST);
-- 
cgit v1.1