diff --git a/Kconfig b/Kconfig
index 9419e6fae73..f0077d4050b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -3,7 +3,6 @@ menu "Arduino Configuration"
 config ENABLE_ARDUINO_DEPENDS
     bool
     select LWIP_SO_RCVBUF
-    select BT_ENABLED
     select ETHERNET
     select WIFI_ENABLED
     select ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
diff --git a/cores/esp32/Esp.cpp b/cores/esp32/Esp.cpp
index e80a5e92272..59211445d78 100644
--- a/cores/esp32/Esp.cpp
+++ b/cores/esp32/Esp.cpp
@@ -212,3 +212,11 @@ bool EspClass::flashRead(uint32_t offset, uint32_t *data, size_t size)
 {
     return spi_flash_read(offset, (uint32_t*) data, size) == ESP_OK;
 }
+
+
+uint64_t EspClass::getEfuseMac(void)
+{
+    uint64_t _chipmacid;
+    esp_efuse_read_mac((uint8_t*) (&_chipmacid));
+    return _chipmacid;
+}
diff --git a/cores/esp32/Esp.h b/cores/esp32/Esp.h
index 2af27de9cf7..80e995a6e16 100644
--- a/cores/esp32/Esp.h
+++ b/cores/esp32/Esp.h
@@ -76,6 +76,8 @@ class EspClass
     bool flashWrite(uint32_t offset, uint32_t *data, size_t size);
     bool flashRead(uint32_t offset, uint32_t *data, size_t size);
 
+    uint64_t getEfuseMac();
+
 };
 
 extern EspClass ESP;
diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c
index 35899c31a7a..0d19e5d5b9f 100644
--- a/cores/esp32/esp32-hal-bt.c
+++ b/cores/esp32/esp32-hal-bt.c
@@ -14,6 +14,8 @@
 
 #include "esp32-hal-bt.h"
 
+#if CONFIG_BT_ENABLED
+
 #include "bt.h"
 #include "esp_bt_defs.h"
 #include "esp_bt_main.h"
@@ -62,5 +64,20 @@ bool btStop(){
     return false;
 }
 
+#else
+bool btStarted()
+{
+    return false;
+}
+
+bool btStart()
+{
+    return false;
+}
 
+bool btStop()
+{
+    return false;
+}
+#endif
 
diff --git a/cores/esp32/esp32-hal-spi.c b/cores/esp32/esp32-hal-spi.c
index a26042b0e0a..36258d414a3 100644
--- a/cores/esp32/esp32-hal-spi.c
+++ b/cores/esp32/esp32-hal-spi.c
@@ -332,11 +332,11 @@ void spiSetDataMode(spi_t * spi, uint8_t dataMode)
         break;
     case SPI_MODE2:
         spi->dev->pin.ck_idle_edge = 1;
-        spi->dev->user.ck_out_edge = 0;
+        spi->dev->user.ck_out_edge = 1;
         break;
     case SPI_MODE3:
         spi->dev->pin.ck_idle_edge = 1;
-        spi->dev->user.ck_out_edge = 1;
+        spi->dev->user.ck_out_edge = 0;
         break;
     case SPI_MODE0:
     default:
diff --git a/cores/esp32/libb64/cdecode.c b/cores/esp32/libb64/cdecode.c
index 2963d5f7dc1..aa84ef60a8d 100755
--- a/cores/esp32/libb64/cdecode.c
+++ b/cores/esp32/libb64/cdecode.c
@@ -6,89 +6,94 @@ For details, see http://sourceforge.net/projects/libb64
 */
 
 #include "cdecode.h"
+#include <stdint.h>
 
-int base64_decode_value(char value_in)
-{
-    static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
-    static const char decoding_size = sizeof(decoding);
-    value_in -= 43;
-    if (value_in < 0 || value_in > decoding_size) {
-        return -1;
-    }
-    return decoding[(int)value_in];
+static int base64_decode_value_signed(int8_t value_in){
+  static const int8_t decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+  static const int8_t decoding_size = sizeof(decoding);
+  value_in -= 43;
+  if (value_in < 0 || value_in > decoding_size) return -1;
+  return decoding[(int)value_in];
+}
+
+void base64_init_decodestate(base64_decodestate* state_in){
+  state_in->step = step_a;
+  state_in->plainchar = 0;
 }
 
-void base64_init_decodestate(base64_decodestate* state_in)
-{
-    state_in->step = step_a;
-    state_in->plainchar = 0;
+static int base64_decode_block_signed(const int8_t* code_in, const int length_in, int8_t* plaintext_out, base64_decodestate* state_in){
+  const int8_t* codechar = code_in;
+  int8_t* plainchar = plaintext_out;
+  int8_t fragment;
+  
+  *plainchar = state_in->plainchar;
+  
+  switch (state_in->step){
+    while (1){
+      case step_a:
+        do {
+          if (codechar == code_in+length_in){
+            state_in->step = step_a;
+            state_in->plainchar = *plainchar;
+            return plainchar - plaintext_out;
+          }
+          fragment = (int8_t)base64_decode_value_signed(*codechar++);
+        } while (fragment < 0);
+        *plainchar    = (fragment & 0x03f) << 2;
+      case step_b:
+        do {
+          if (codechar == code_in+length_in){
+            state_in->step = step_b;
+            state_in->plainchar = *plainchar;
+            return plainchar - plaintext_out;
+          }
+          fragment = (int8_t)base64_decode_value_signed(*codechar++);
+        } while (fragment < 0);
+        *plainchar++ |= (fragment & 0x030) >> 4;
+        *plainchar    = (fragment & 0x00f) << 4;
+      case step_c:
+        do {
+          if (codechar == code_in+length_in){
+            state_in->step = step_c;
+            state_in->plainchar = *plainchar;
+            return plainchar - plaintext_out;
+          }
+          fragment = (int8_t)base64_decode_value_signed(*codechar++);
+        } while (fragment < 0);
+        *plainchar++ |= (fragment & 0x03c) >> 2;
+        *plainchar    = (fragment & 0x003) << 6;
+      case step_d:
+        do {
+          if (codechar == code_in+length_in){
+            state_in->step = step_d;
+            state_in->plainchar = *plainchar;
+            return plainchar - plaintext_out;
+          }
+          fragment = (int8_t)base64_decode_value_signed(*codechar++);
+        } while (fragment < 0);
+        *plainchar++   |= (fragment & 0x03f);
+    }
+  }
+  /* control should not reach here */
+  return plainchar - plaintext_out;
 }
 
-int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in)
-{
-    const char* codechar = code_in;
-    char* plainchar = plaintext_out;
-    char fragment;
+static int base64_decode_chars_signed(const int8_t* code_in, const int length_in, int8_t* plaintext_out){
+  base64_decodestate _state;
+  base64_init_decodestate(&_state);
+  int len = base64_decode_block_signed(code_in, length_in, plaintext_out, &_state);
+  if(len > 0) plaintext_out[len] = 0;
+  return len;
+}
 
-    *plainchar = state_in->plainchar;
+int base64_decode_value(char value_in){
+  return base64_decode_value_signed(*((int8_t *) &value_in));
+}
 
-    switch (state_in->step) {
-        while (1) {
-        case step_a:
-            do {
-                if (codechar == code_in+length_in) {
-                    state_in->step = step_a;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while (fragment < 0);
-            *plainchar    = (fragment & 0x03f) << 2;
-        case step_b:
-            do {
-                if (codechar == code_in+length_in) {
-                    state_in->step = step_b;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while (fragment < 0);
-            *plainchar++ |= (fragment & 0x030) >> 4;
-            *plainchar    = (fragment & 0x00f) << 4;
-        case step_c:
-            do {
-                if (codechar == code_in+length_in) {
-                    state_in->step = step_c;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while (fragment < 0);
-            *plainchar++ |= (fragment & 0x03c) >> 2;
-            *plainchar    = (fragment & 0x003) << 6;
-        case step_d:
-            do {
-                if (codechar == code_in+length_in) {
-                    state_in->step = step_d;
-                    state_in->plainchar = *plainchar;
-                    return plainchar - plaintext_out;
-                }
-                fragment = (char)base64_decode_value(*codechar++);
-            } while (fragment < 0);
-            *plainchar++   |= (fragment & 0x03f);
-        }
-    }
-    /* control should not reach here */
-    return plainchar - plaintext_out;
+int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in){
+  return base64_decode_block_signed((int8_t *) code_in, length_in, (int8_t *) plaintext_out, state_in);
 }
 
-int base64_decode_chars(const char* code_in, const int length_in, char* plaintext_out)
-{
-    base64_decodestate _state;
-    base64_init_decodestate(&_state);
-    int len = base64_decode_block(code_in, length_in, plaintext_out, &_state);
-    if(len > 0) {
-        plaintext_out[len] = 0;
-    }
-    return len;
+int base64_decode_chars(const char* code_in, const int length_in, char* plaintext_out){
+  return base64_decode_chars_signed((int8_t *) code_in, length_in, (int8_t *) plaintext_out);
 }
diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp
index 747d32373e4..6efa0ba7367 100644
--- a/cores/esp32/nefry/Nefry.cpp
+++ b/cores/esp32/nefry/Nefry.cpp
@@ -24,7 +24,7 @@ BootMode
 1 : WriteMode切替をする
 */
 
-#define LIBVERSION ("0.6.2")
+#define LIBVERSION ("0.7.0")
 #include "Nefry.h"
 
 Adafruit_NeoPixel _NefryLED[40];
diff --git a/cores/esp32/nefry/NefryWeb.cpp b/cores/esp32/nefry/NefryWeb.cpp
index 1669000a614..8846888227a 100644
--- a/cores/esp32/nefry/NefryWeb.cpp
+++ b/cores/esp32/nefry/NefryWeb.cpp
@@ -56,12 +56,13 @@ void Nefry_Web::beginWeb() {
 		content += Nefry.getAddressStr(WiFi.localIP());
 		content += F("</div><div>Module ID: ");
 		content += Nefry.getModuleID();
+		content += F("</div><div>");
+		if (Nefry.getWriteMode())content += F("WriteMode");
 		content += F(
-			"</div><div class=\"writemode\">"
 			"</div><ul>"
 			"<li><a href='/wifi_conf'>Setup WiFi</a>"
 			"<li><a href='/config'>Data Store</a>"
-			"<li><a href='/web_update'>Module Config</a>"
+			"<li><a href='/module'>Module Config</a>"
 			"<li><a href='/web_update'>Web Sketch Download</a>"
 			"<li><a href='/update'>Upload Sketch</a>"
 			"<li><a href='/console'>Web Console</a>"
@@ -103,6 +104,66 @@ void Nefry_Web::beginWeb() {
 			F("<h1>Nefry Write mode</h1><p>Reset start!</p><a href=\"/\">Back to top</a>")));
 		NefryWebServer.resetTimer(2);
 	});
+
+	NefryWebServer.getWebServer()->on("/module", [&]() {
+		String content = F(
+			"<h1>Module Config</h1>"
+			"<p>Nefryモジュールに関する設定をすることができます。</p><table><tr>"
+			"<th>Wifi Sport</th><td>"
+		);
+		content += WiFi.SSID();
+		content += F("</td></tr><tr><th>IP Address</th><td>");
+		content += Nefry.getAddressStr(WiFi.localIP());
+		content += F("</td></tr><tr><th>SubnetMask</th><td>");
+		content += Nefry.getAddressStr(WiFi.subnetMask());
+		content += F("</td></tr><tr><th>Gateway IP Address</th><td>");
+		content += Nefry.getAddressStr(WiFi.gatewayIP());
+		content += F("</td></tr><tr><th>MAC Address</th><td>");
+		content += WiFi.macAddress();
+		content += F("</td></tr><tr><th>Module ID</th><td>");
+		content += Nefry.getModuleID();
+		content += F("</td></tr><tr><th>Nefry library</th><td>");
+		content += Nefry.getVersion();
+		content += F("</td></tr><tr><th>Running ProgramName　</th><td>");
+		content += Nefry.getProgramName();
+		content += F("</td></tr><tr><th></th><td>");
+		if(Nefry.getWriteMode())content += F("WriteMode");
+		content += F(
+			"</td></tr></table></br><form method='get'action='setmodule'><div class=\"row\"><label>Module ID:</label>"
+			"<div><input name=\"id\"maxlength=\"32\"value=\""
+		);
+		content += Nefry.getModuleID();
+		content += F(
+			"\"></div></div>"
+			"<div class=\"row\"><label>Module class:</label><div><input name=\"cls\"maxlength=\"32\"value=\"");
+		content += Nefry.getModuleClass();
+		content += F(
+			"\"></div></div>"
+			"<div class=\"row\"><label>Nefry WiFi Pass:</label><div><input type=\"password\"name=\"pwd\"maxlength=\"64\"></div></div>"
+			"<div class=\"row\"><label>Nefry User:</label><div><input name=\"user\"maxlength=\"32\"value=\"");
+		content += Nefry.getUser();
+		content += F("\"></div></div><div class = \"row\"><label>Nefry User Pass:</label><div><input type=\"password\"name=\"uPas\"maxlength=\"32\"value=\"\"></div></div>");
+		content += F("<div class=\"psrow\"><div><input type=\"button\"value=\"Save\"onclick=\"return jsSubmit(this.form);\"></div></form>"
+			"<div><form method='get'action='reset'><input type=\"button\"value=\"Restart\"onclick=\"return jsSubmit(this.form);\"></form></div>"
+			"<div><form method='get'action='onreset'><input type=\"button\"value=\"Write Mode\"onclick=\"return jsSubmit(this.form);\"></form></div>"
+			" </div><a href=\"/\">Back to top</a>");
+		
+		NefryWebServer.getWebServer()->send(200, "text/html", createHtml(F("Module Config"),"",content));
+	});
+
+	NefryWebServer.getWebServer()->on("/setmodule", [&]() {
+		String pwd = NefryWebServer.getWebServer()->arg("pwd");
+		String upwd = NefryWebServer.getWebServer()->arg("uPas");
+		Nefry.setModuleID(NefryWebServer.getWebServer()->arg("id"));
+		Nefry.setModuleClass(NefryWebServer.getWebServer()->arg("cls"));
+		if(pwd.length() > 0)
+			Nefry.setModulePass(pwd);
+		Nefry.setUser(NefryWebServer.getWebServer()->arg("user"));
+		if (upwd.length() > 0)
+			Nefry.setUserPass(upwd);
+		NefryWebServer.getWebServer()->send(200, "text/html", createHtml(F("Save Module Config"), "", F("<h1>Nefry Module Set</h1><p>Saveing & Restart...</p><a href=\"/\">Back to top</a>")));
+		NefryWebServer.resetTimer(2);
+	});
 }
 
 void Nefry_Web::begin()
diff --git a/libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino b/libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino
new file mode 100644
index 00000000000..de8a7386b93
--- /dev/null
+++ b/libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino
@@ -0,0 +1,14 @@
+uint64_t chipid;  
+
+void setup() {
+	Serial.begin(115200);
+}
+
+void loop() {
+	chipid=ESP.getEfuseMac();//The chip ID is essentially its MAC address(length: 6 bytes).
+	Serial.printf("ESP32 Chip ID = %04X",(uint16_t)(chipid>>32));//print High 2 bytes
+	Serial.printf("%08X\n",(uint32_t)chipid);//print Low 4bytes.
+
+	delay(3000);
+
+}
diff --git a/libraries/Nefry/examples/FullColorLED/FullColorLED.ino b/libraries/Nefry/examples/FullColorLED/FullColorLED.ino
new file mode 100644
index 00000000000..17dab9d7d77
--- /dev/null
+++ b/libraries/Nefry/examples/FullColorLED/FullColorLED.ino
@@ -0,0 +1,14 @@
+#include <Nefry.h>
+//フルカラーLED　ランダムに色が変わります。
+void setup() {
+  Nefry.setProgramName("FullColorLED"); //プログラム名を管理することができます。
+  randomSeed(analogRead(A0));
+}
+int red,green,blue;
+void loop() {
+  red=random(255);                      //random関数は0-255の数値をランダムに返します。
+  green=random(255);
+  blue=random(255);
+  Nefry.setLed(red,green,blue);         //LEDがランダムに点灯します。
+  delay(1000);                          //1秒待つ
+}
diff --git a/libraries/Nefry/library.properties b/libraries/Nefry/library.properties
index ff6f51f356d..aea9a5ee7ac 100644
--- a/libraries/Nefry/library.properties
+++ b/libraries/Nefry/library.properties
@@ -1,5 +1,5 @@
 name=Nefry
-version=0.6.2
+version=0.7.0
 author=Nefry community
 maintainer=
 sentence=nefry.
diff --git a/libraries/Nefy_IFTTT/examples/IFTTT_DataSend_Sample/IFTTT_DataSend_Sample.ino b/libraries/Nefy_IFTTT/examples/IFTTT_DataSend_Sample/IFTTT_DataSend_Sample.ino
index 1dc1af2d338..983380e4331 100644
--- a/libraries/Nefy_IFTTT/examples/IFTTT_DataSend_Sample/IFTTT_DataSend_Sample.ino
+++ b/libraries/Nefy_IFTTT/examples/IFTTT_DataSend_Sample/IFTTT_DataSend_Sample.ino
@@ -8,6 +8,7 @@ void setup() {
   Nefry.setStoreTitle("Event",1);     //Nefry DataStoreのタイトルを指定
   SecretKey = Nefry.getStoreStr(0);   //Nefry DataStoreからデータを取得
   Event = Nefry.getStoreStr(1);       //Nefry DataStoreからデータを取得
+  Nefry.enableSW();                   //SWを有効化
 }
  
 void loop() {
diff --git a/libraries/Nefy_IFTTT/examples/IFTTT_simple_Sample/IFTTT_simple_Sample.ino b/libraries/Nefy_IFTTT/examples/IFTTT_simple_Sample/IFTTT_simple_Sample.ino
index b553ab7726a..bc9a95ef139 100644
--- a/libraries/Nefy_IFTTT/examples/IFTTT_simple_Sample/IFTTT_simple_Sample.ino
+++ b/libraries/Nefy_IFTTT/examples/IFTTT_simple_Sample/IFTTT_simple_Sample.ino
@@ -7,6 +7,7 @@ void setup() {
   Nefry.setStoreTitle("Event",1);     //Nefry DataStoreのタイトルを指定
   SecretKey = Nefry.getStoreStr(0);   //Nefry DataStoreからデータを取得
   Event = Nefry.getStoreStr(1);       //Nefry DataStoreからデータを取得
+  Nefry.enableSW();                   //SW有効化
 }
  
 void loop() {
diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h
index 36f66e16ae4..5b10db7dcad 100644
--- a/libraries/WiFi/src/WiFiClient.h
+++ b/libraries/WiFi/src/WiFiClient.h
@@ -23,6 +23,8 @@
 
 #include "Arduino.h"
 #include "Client.h"
+#undef min
+#undef max
 #include <memory>
 
 class WiFiClientSocketHandle;
@@ -47,7 +49,7 @@ class WiFiClient : public Client
     int read(uint8_t *buf, size_t size);
     int peek()
     {
-        return 0;
+        return -1;
     }
     void flush();
     void stop();
diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json
index 21940bc50e6..cd341bf80f9 100644
--- a/package/package_esp32_index.template.json
+++ b/package/package_esp32_index.template.json
@@ -38,7 +38,7 @@
             {
               "packager": "esp32",
               "name": "esptool",
-              "version": "fe69994"
+              "version": "96698a3"
             }
           ]
         }
@@ -80,20 +80,20 @@
         },
         {
           "name": "esptool",
-          "version": "9072736",
+          "version": "96698a3",
           "systems": [
             {
               "host": "i686-mingw32",
-              "url": "https://dl.espressif.com/dl/esptool-9072736-windows.zip",
-              "archiveFileName": "esptool-9072736-windows.zip",
-              "checksum": "SHA-256:eac14998df3fed9998943ace5c2f07114b678869f143c3316f4ff26cc851e268",
+              "url": "https://dl.espressif.com/dl/esptool-96698a3-windows.zip",
+              "archiveFileName": "esptool-96698a3-windows.zip",
+              "checksum": "SHA-256:12f026c84869f0bd2f6a863191ec84d27b91f21d17e2e2e9e11c79be50f2d0fc",
               "size": "3390935"
             },
             {
               "host": "x86_64-apple-darwin",
-              "url": "https://dl.espressif.com/dl/esptool-9072736-macos.tar.gz",
-              "archiveFileName": "esptool-9072736-macos.tar.gz",
-              "checksum": "SHA-256:2b88ce516719f8b54c22ae637109b1437f3ab5f81a1e6260ef14799e4dd3b355",
+              "url": "https://dl.espressif.com/dl/esptool-96698a3-macos.tar.gz",
+              "archiveFileName": "esptool-96698a3-macos.tar.gz",
+              "checksum": "SHA-256:e3154dbf32c3ba5e5ebd45e913178b167cf761e5ce0152b2bb069a2453f6839b",
               "size": "3805789"
             }
           ]
diff --git a/platform.txt b/platform.txt
index 875c8bbc489..ff9a6d9234b 100644
--- a/platform.txt
+++ b/platform.txt
@@ -21,7 +21,7 @@ compiler.warning_flags.all=-Wall -Werror=all -Wextra
 
 compiler.path={runtime.tools.xtensa-esp32-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk
-compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bluedroid" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mbedtls_port" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
+compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bluedroid" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mbedtls_port" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
 
 compiler.c.cmd=xtensa-esp32-elf-gcc
 compiler.c.flags=-std=gnu99 -Os -g3 -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith {compiler.warning_flags} -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration -MMD -c
@@ -34,7 +34,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
 
 compiler.c.elf.cmd=xtensa-esp32-elf-gcc
 compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority
-compiler.c.elf.libs=-lgcc -lstdc++ -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lcore -lcxx -ldriver -lesp32 -lethernet -lexpat -lfatfs -lfreertos -lhal -ljsmn -ljson -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -ltcpip_adapter -lulp -lvfs -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module 
+compiler.c.elf.libs=-lgcc -lstdc++ -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lcore -lcxx -ldriver -lesp32 -lethernet -lexpat -lfatfs -lfreertos -lhal -ljsmn -ljson -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -ltcpip_adapter -lulp -lvfs -lwear_levelling -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module 
 
 compiler.as.cmd=xtensa-esp32-elf-as
 
diff --git a/release note.md b/release note.md
index af28c17994b..e346869fc84 100644
--- a/release note.md	
+++ b/release note.md	
@@ -1,4 +1,14 @@
 # このノートはNefry(ESP32版)のリリースノートになります。
+## 0.7.0
+
+NefryのModule設定機能の追加
+
+新規機能
+
+- モジュール情報設定機能
+- esp32/arduino[3b86e0c]コミットまでマージ
+- サンプルプログラムを追加
+
 
 ## 0.6.2
 
diff --git a/tools/esptool.py b/tools/esptool.py
index 6327cc86443..c39fcd21e5f 100755
--- a/tools/esptool.py
+++ b/tools/esptool.py
@@ -30,7 +30,7 @@
 import zlib
 import shlex
 
-__version__ = "2.0-beta2"
+__version__ = "2.0-beta3"
 
 MAX_UINT32 = 0xffffffff
 MAX_UINT24 = 0xffffff
@@ -574,14 +574,19 @@ def read_flash(self, offset, length, progress_fn=None):
             raise FatalError('Digest mismatch: expected %s, got %s' % (expected_digest, digest))
         return data
 
-    def flash_spi_attach(self,is_hspi,is_legacy):
+    def flash_spi_attach(self, hspi_arg):
         """Send SPI attach command to enable the SPI flash pins
 
         ESP8266 ROM does this when you send flash_begin, ESP32 ROM
         has it as a SPI command.
         """
         # last 3 bytes in ESP_SPI_ATTACH argument are reserved values
-        arg = struct.pack('<IBBBB', 1 if is_hspi else 0, 1 if is_legacy else 0, 0, 0, 0)
+        arg = struct.pack('<I', hspi_arg)
+        if not self.IS_STUB:
+            # ESP32 ROM loader takes additional 'is legacy' arg, which is not
+            # currently supported in the stub loader or esptool.py (as it's not usually needed.)
+            is_legacy = 0
+            arg += struct.pack('BBBB', is_legacy, 0, 0, 0)
         self.check_command("configure SPI flash pins", ESP32ROM.ESP_SPI_ATTACH, arg)
 
     def flash_set_parameters(self, size):
@@ -809,9 +814,9 @@ class ESP8266ROM(ESPLoader):
 
     FLASH_HEADER_OFFSET = 0
 
-    def flash_spi_attach(self, is_spi, is_legacy):
+    def flash_spi_attach(self, hspi_arg):
         if self.IS_STUB:
-            super(ESP8266ROM, self).flash_spi_attach(is_spi, is_legacy)
+            super(ESP8266ROM, self).flash_spi_attach(hspi_arg)
         else:
             # ESP8266 ROM has no flash_spi_attach command in serial protocol,
             # but flash_begin will do it
@@ -1892,6 +1897,11 @@ def main():
         dest='operation',
         help='Run esptool {command} -h for additional help')
 
+    def add_spi_connection_arg(parent):
+        parent.add_argument('--spi-connection', '-sc', help='ESP32-only argument. Override default SPI Flash connection. ' +
+                            'Value can be SPI, HSPI or a comma-separated list of 5 I/O numbers to use for SPI flash (CLK,Q,D,HD,CS).',
+                            action=SpiConnectionAction)
+
     parser_load_ram = subparsers.add_parser(
         'load_ram',
         help='Download an image to RAM and execute')
@@ -1928,8 +1938,7 @@ def add_spi_flash_subparsers(parent, auto_detect=False):
                             ' plus ESP8266-only (256KB, 512KB, 2MB-c1, 4MB-c1, 4MB-2)',
                             action=FlashSizeAction, auto_detect=auto_detect,
                             default=os.environ.get('ESPTOOL_FS', 'detect' if auto_detect else '1MB'))
-        parent.add_argument('--ucIsHspi', '-ih', help='Config SPI PORT/PINS (Espressif internal feature)',action='store_true')
-        parent.add_argument('--ucIsLegacy', '-il', help='Config SPI LEGACY (Espressif internal feature)',action='store_true')
+        add_spi_connection_arg(parent)
 
     parser_write_flash = subparsers.add_parser(
         'write_flash',
@@ -1978,20 +1987,23 @@ def add_spi_flash_subparsers(parent, auto_detect=False):
         'chip_id',
         help='Read Chip ID from OTP ROM')
 
-    subparsers.add_parser(
+    parser_flash_id = subparsers.add_parser(
         'flash_id',
         help='Read SPI flash manufacturer and device ID')
+    add_spi_connection_arg(parser_flash_id)
 
     parser_read_status = subparsers.add_parser(
         'read_flash_status',
         help='Read SPI flash status register')
 
+    add_spi_connection_arg(parser_read_status)
     parser_read_status.add_argument('--bytes', help='Number of bytes to read (1-3)', type=int, choices=[1,2,3], default=2)
 
     parser_write_status = subparsers.add_parser(
         'write_flash_status',
         help='Write SPI flash status register')
 
+    add_spi_connection_arg(parser_write_status)
     parser_write_status.add_argument('--non-volatile', help='Write non-volatile bits (use with caution)', action='store_true')
     parser_write_status.add_argument('--bytes', help='Number of status bytes to write (1-3)', type=int, choices=[1,2,3], default=2)
     parser_write_status.add_argument('value', help='New value', type=arg_auto_int)
@@ -1999,6 +2011,7 @@ def add_spi_flash_subparsers(parent, auto_detect=False):
     parser_read_flash = subparsers.add_parser(
         'read_flash',
         help='Read SPI flash content')
+    add_spi_connection_arg(parser_read_flash)
     parser_read_flash.add_argument('address', help='Start address', type=arg_auto_int)
     parser_read_flash.add_argument('size', help='Size of region to dump', type=arg_auto_int)
     parser_read_flash.add_argument('filename', help='Name of binary dump')
@@ -2013,13 +2026,15 @@ def add_spi_flash_subparsers(parent, auto_detect=False):
                                      choices=['no', 'yes'], default='no')
     add_spi_flash_subparsers(parser_verify_flash, auto_detect=True)
 
-    subparsers.add_parser(
+    parser_erase_flash = subparsers.add_parser(
         'erase_flash',
         help='Perform Chip Erase on SPI flash')
+    add_spi_connection_arg(parser_erase_flash)
 
     parser_erase_region = subparsers.add_parser(
         'erase_region',
         help='Erase a region of the flash')
+    add_spi_connection_arg(parser_erase_region)
     parser_erase_region.add_argument('address', help='Start address (must be multiple of 4096)', type=arg_auto_int)
     parser_erase_region.add_argument('size', help='Size of region to erase (must be multiple of 4096)', type=arg_auto_int)
 
@@ -2066,12 +2081,17 @@ def add_spi_flash_subparsers(parent, auto_detect=False):
             except NotImplementedInROMError:
                 print("WARNING: ROM doesn't support changing baud rate. Keeping initial baud rate %d" % initial_baud)
 
-        # override common SPI flash parameter stuff as required
-        if hasattr(args, "ucIsHspi"):
-            print("Attaching SPI flash...")
-            esp.flash_spi_attach(args.ucIsHspi,args.ucIsLegacy)
-        else:
-            esp.flash_spi_attach(0, 0)
+        # override common SPI flash parameter stuff if configured to do so
+        if hasattr(args, "spi_connection") and args.spi_connection is not None:
+            if esp.CHIP_NAME != "ESP32":
+                raise FatalError("Chip %s does not support --spi-connection option." % esp.CHIP_NAME)
+            print("Configuring SPI flash mode...")
+            esp.flash_spi_attach(args.spi_connection)
+        elif args.no_stub:
+            print("Enabling default SPI flash mode...")
+            # ROM loader doesn't enable flash unless we explicitly do it
+            esp.flash_spi_attach(0)
+
         if hasattr(args, "flash_size"):
             print("Configuring flash size...")
             detect_flash_size(esp, args)
@@ -2152,6 +2172,34 @@ def __call__(self, parser, namespace, values, option_string=None):
         setattr(namespace, self.dest, value)
 
 
+class SpiConnectionAction(argparse.Action):
+    """ Custom action to parse 'spi connection' override. Values are SPI, HSPI, or a sequence of 5 pin numbers separated by commas.
+    """
+    def __call__(self, parser, namespace, value, option_string=None):
+        if value.upper() == "SPI":
+            value = 0
+        elif value.upper() == "HSPI":
+            value = 1
+        elif "," in value:
+            values = value.split(",")
+            if len(values) != 5:
+                raise argparse.ArgumentError(self, '%s is not a valid list of comma-separate pin numbers. Must be 5 numbers - CLK,Q,D,HD,CS.' % value)
+            try:
+                values = tuple(int(v,0) for v in values)
+            except ValueError:
+                raise argparse.ArgumentError(self, '%s is not a valid argument. All pins must be numeric values' % values)
+            if any([v for v in values if v > 33 or v < 0]):
+                raise argparse.ArgumentError(self, 'Pin numbers must be in the range 0-33.')
+            # encode the pin numbers as a 32-bit integer with packed 6-bit values, the same way ESP32 ROM takes them
+            # TODO: make this less ESP32 ROM specific somehow...
+            clk,q,d,hd,cs = values
+            value = (hd << 24) | (cs << 18) | (d << 12) | (q << 6) | clk
+        else:
+            raise argparse.ArgumentError(self, '%s is not a valid spi-connection value. ' +
+                                         'Values are SPI, HSPI, or a sequence of 5 pin numbers CLK,Q,D,HD,CS).' % values)
+        setattr(namespace, self.dest, value)
+
+
 class AddrFilenamePairAction(argparse.Action):
     """ Custom parser class for the address/filename pairs passed as arguments """
     def __init__(self, option_strings, dest, nargs='+', **kwargs):
@@ -2190,108 +2238,112 @@ def __call__(self, parser, namespace, values, option_string=None):
 
 # Binary stub code (see flasher_stub dir for source & details)
 ESP8266ROM.STUB_CODE = eval(zlib.decompress(base64.b64decode(b"""
-eNrNPWtj00a2f8VSQkhMaDWSrEcIxXaCSSlsA5QUet020kiCsoVNjHdDWfrfr85rZiQ7BNrt3vsh1CONZs6cc+a8Z/rv68v63fLnt8tisby+N1BBGqd5EAfB7uB6VSwL902UhkEYZu0b+KZ9Vl6fvyuy+TsVzN8F\
-wbj9R83fNQ38zQ7hUfcva/+a+s63R5Ov2+/i9q+Ernfat5ob9R3qljmflW1PlcMsY+pJL057E6j1v5XTh0BzANLdmWiGHtT2o/Ha5czf5foGr6MI5Fc77XW3+z9pDUHUW3mvIZ+XHex0EDLYcWBrkZ9VCMYzByCg\
-ifk6h0btNHKD6Nh5Ax+r0g5dBPNFDxmZAWG+lJ/H7T+101ChM4R2wCgDp6Eas4j99nHOAAUuqECconKgCxzogs5LTXOZedTIQZHq0jwIHFbDhsxeAmsJobPMaRS28Qy/Gu8+wP8Et/A/744Me9znX2X8Nf/S+gv+\
-pdoJ6pAbVZbjr5fmWTtIJTPmLWA1cvH4wZaAxEN67egVLSpvvywUMTl8otrfOvCLDR8JSAsOi4P2aVhM2/HDYgLzFe1wTVjcoa1SpzSaNiiCKSJ4qIgVEYGAnvZ3kLgbDEAKv/HTEJiRZ8300IP+B3eJHIFqmwVv\
-I62ExkoeDndh7gENqQEt4VTgl4WMaNKqWANqgQ8ZFYEygwFVwiAemAc49C78w6PF/dEuew6wIkIm8uMR7d2mOZcfjKKwZEB4MN2sGwy5soU9B+5r9kID4zYJCZUs5DNBTEZvaBLzYsc+VVE4ATYJuZPyHx3gk5Ff\
-+MAtMC4QCd9GoR0rAzwrFfiDZjpfbu92oAnbr5kMmtdUlv01CelBVkMjg2ELlhpZS72Ccd7ItJHvzk/jKTWAHwOPNiCK3pY5y7aLSu+CpMVl0ch1zcCoS4ARaItmlcy65eKqYr4hbNF/qxAEN6AKkZwQ9EGQho8a\
-gbZ9mLPQa5K3Gw12nv0oTw7mb5oN6fqA54RvKlcMNQf41Tn+fuJMF1kI86wr8vIOcEHyniADLDdvnSFEQyXcOWjkq9k7O1rpjDZ7Dc9n7TcsK5XuISKnubYbkg20urF0hgctIG9o5KYH5xcWCVlqP1EuAFN57jsP\
-nwtUoUPXSkEPFe22Ey7lWUDPgMMB2t97vNAla5Zcc99F3XeMhJGLK1WBJAfNBaM/Z4mUGD3Y8Efh7Ad5d+4Kld9WWbBuxVZdEVMrnPi1UbC7E/joX/2PTkjkqwIXRAyMi/+CemX64QBYMD55AkqN5WUIuuQrFlEJ\
-S3FrT8CWQ/H6ZmW6x4TOOqC5NM71Jf9Iv6I1wByowlaHpmU0ly0jWbuME1btNWD6e0sCsDOqULb2lkH4M2H2nxnzQpCyEYr+KDS5tfJqn17p5G8usbeky+whPM4eeENHxLuAhMJ3znafZTwfjBXzdCpsR9n8tFFm\
-IgJSGggwFMSziYtcj5jRDhfybguccRPS7nYXo/mS7YL98ZhYA/UTMA2oEW1lJw+Tg55Azhf1XjczO1NdHEwt2cGArOuxD8OlX8D4jxm6USkWxJR/oJx6CjJfJHB6+hSVziE8PD4cQAcAXI2jAcClRadoJWse4O5t\
-gZzdcPACYwNeLBoc3Kgkmi9Bnpi32QmLtCxkIYTI0cnAiqqM5AfxBIkDoTDav8g1s8GqOPCE9WjbdrgvSHzhvp4DEzTfCi943ZnsDiBRpdLOZ4ZviTvM1Dj4hCldu5R/R+TTOu3yTaP/oUjJNu60+UsyOJo02YXP\
-B8DiXbBywzFkm+csVQMEtd1IYPqigZ1941MrGA2/H1AvjcwDMqt5TqBhh2iGTsfIYJaXr5ytVlk0rWKUhJRYxQIvskkwWN5dsC3c/oYRF46hoR2XckWQgSmuS7FllEwBZosKW6aJUARMheBtZ9zLTWmfACxBvBUS\
-3a6j+2wJq/RGSjhEqgKZgjgUrYbT3GZ1GqXsgOHAHkO7wiQeGZNNbS0yFLamQ7br0URNHUwmw01GTdPvdxumujkX1FX99z4Zy3XGHfJ+B2bO2HXRfDTQ0UyPpvBv/Gw+ByvsnzDKjDwx6r7elIzQjowGwIXAqCg6\
-kB3v/sCETICXul7hx81iH2U07R4rD4sbzHi1Y2vFHnuj4L9pXnIZ+sx3StzPkjkl8tFWXHg3yuIaOUysa6+nLFllL4XYISyA30cP2PoNvdE5OyU18Il34+wb1tDFIXnNYJVXxd/LYgcH2R0/Y5exIOMYNqlCMfQr\
-zHhBBj4pjF8JBrBEa73YpQ8zII8abf8KExZbi2ITBx7uPwHZ+QG2GnSIX4IYAY4uI8vuGAeJFaGr5TDcZdv0HjESMpNmwqSukI2Ij2A/wH+zMIdtkJODUaR3cvRvN1/TJ+3PLbZfQFe02AHDT28EGE9q50iZqcEI\
-y8WPir8ufyTM4WZtkLpvCBFFSiK2RjcLWcj7jcYA7aebnKxVFEAj9jrxAQ9lzSQzQO/TFfhR/dcw9/7OzPFhcMQFLenacYpLem3Xo6LntI7ZF07sQ+AfWfhf9uDPQ6PhZTcEXu100tjJ0/wI/htBACp8ydI+uAYb\
-55U/LYLHRVwWXwJ9gEeZexUx3Yo0QKinXvDYi0sPP/Ii4nHadDW574OG+FDrfx0PYtmc2QDdp+PvwOctn/Jw4flzZiOMDKHHgi76i9TiPxiNxxB2EcMiGcO2iYIGmEbPeKhkBfnePRh79yBnRJM5EkSuZGFWapLb\
-YyIhM4f70vAZM6g/2OYtqmlxgY68fZgrL4VJaRgtUUWhayiE9GV5PIcN3Pg2jkrk5N/VWKQ2+OE17JisZPZLWAHgiOesMlptudkup0wH3mSHVAbstTqakFaDZTXVCVBhA/XsJgqD6hYiYvMjiMgNInY4hqufnJB2\
-awo2J+IeR2frVz5zLYE/sPSss3ReBofWxrxgoJT6APQb0EcqsGauSh6SLGiAP6scF79x6eIXsnL0CXAcfcJqOp59+rr/JMVh2ajvIEwVZKzQwN5q6lf+ng+sNiXFZEjNvmKdTWTlvcBruj/5dO6HqSr6y7VEjhY7\
-mkYoayKJFchg8IC+rSZsotZGxL3y7/uCJYKap7Z26YQN4+pVdD/yD6CPQbbHqICRgf2ayshFGFnwIKhVAE+TzLomHgZsFVhLoPyXud+6ISAqKe7VtDbG8lY4X+65dgcEIxGowMcAR56w55Rw0KWLwt23MwknSzAK\
-OG4fMX/tUzluPzohdVon/EncJyOjPPnLZE0T2A1XY/5jiSbGlsNhlu0chzQI9g9mtPAgXBUqrTTJAXrYjcHCg9h62SzuCoBPrfFHuughNargAOyD0w20Eq6TSQWhLCRE1YvSRUCFcg0AGQKQGQAYUWydG5m3CzbT\
-Eg3+99aIX0O4XVBS7WRltmY3IZUgotnSd+cYgNbozLyHfy4oqhooCJSF0EqkldwEaQW2vYbVp6TAF2hf9XR4ldP2tDp84YWiu0lrgwaHGfX7p2cNh3eAOE3G4QlEd7u3F7O+x9ZbD+Z8Ig6MImtsWXeH/GTmJ/8F\
-bJ9dMcZBFFTTF+SQcTrhI4vS8ZpFSewjG14oMpyhi11iu+J23YC5VHIX2fRA2Cq6YGsX/FodnlHWTuL2eTyV4Gfps6/XpL6kESTHAzTWy75rOz0yn9IOyzIZAiw8SLXU2R772xDISGW8Zni0OLQfs5WOoUCMRCon\
-9AbYhTh4Kx0hF8CbzdHl1z7HqMHgswgZrf/PhAwGNxrvLRGTNryzvsk5v4ChQhwKDC01njGFAV81+pvBwEZI11gGR8SKcxjvfjTYgu8hTwTaFJVFmSSIpxcWlNb7RbgfY4q4bzwnfR4VQrVc6JrNM2YcN6Gd3N6/\
-kmZr7C+w605Ivejw/4Fi8L5FjfxVnytbnAebw83JA0KRtUOtojZGaot8L0V97mP8JCEVq3SE5IlwTkjkq/NDlzRnCyAX7vTx2TtQTwswf5+BK6IOxeVp9ZVyabcoaKz/WRUw8+uTPXhK6x7OrzuxqkCd9D/wmP4t\
-mXBIBGq4M6VcJOZ/1KNVFmk5TLUMsg0BIJTRWGvBU2UhbE/lFzcR8i+sKnS9sCxxo+wC/BCTUJErinCvBNMN4fLDqaafLRBfkBJEJz6WeYDRFKQz1UNXA7P+x6jOAtHbtgpS43kGahJaGUpln8M9NGO0Q9TOi0NO\
-WtUju1w0L5NNVh8G3ZxCZlIv93yBY0AiHP4AazlGED6QWQp2bpOzT3qJqo7AiAQ/UIMLh2m6TCZHIuZFxokuwWPCmxe9XaiNwJS25IDTaYHb7BBy8NGiyM7SAYfxlQqLNPSSqZciKPHCS8JiexwNpl52do6Mf7go\
-kmmR3aPYTpWwggWbJk2DsyPCYh4c2pj8eKymxbb1PxHIjHOAWE2C8TkEf9quafwWBph620CjaPo9tBaSQAdRkZKdhEZUI18FZ6ASxxf4LdMZff3KxxGQO8Tnr4N8Ivhg3GOZSNiu/AxWfnYIWwDolI7vIa/CExy5\
-iufLdj0wRyzxBNhALcD+dyjUpybwVy88RPZFi7X2Z6AmLYZh52ujz1I2LcuFl8J82RmiHoPrQZAFvDlzBGKMbHQW0dry8ImVhHnu7hGMlrG4tWUf3s2tHRsEL1Kb780qqw1AVFecP6e+kluGKDxAXiS+vNqR0PAI\
-g3YgRQEx55w/18ONM58RZzI2zBawYXKJf6rx10r2zD2CWXLrbvkCdkjHlHlN+Rl6S9fsYkzJjyZbgRazQ4EaMHob/YFMSUfpYhwHtosOIKYTxPcBy0VEyA5tnA94vo7YUy2nN1obCKxetOJi1rGJOJkQreiWvnzc\
-aUfvLDqB6Ub/PafdUj10nM/UcSJMJsDQcGoLILLyZmeOyJaysAG0ibNuDGjiGwSVqFiMqMJecvnnd5d5Qpd5UFAFA2Ee1N5BrmDsjAqN3lg9k0vIUDM7xEx5VYoRElvyg6VpyO+jaiAAfJ4IyQ/JSRQn7FU0qdgW\
-Pjia7SbcMvUMNEXUMeuctDia1UqhAafVGfxLQRK0EpQEBTRloHELb/V9zSnnCwL0yUB4ZtFpKPsjJZmLfJW9Fs1RbF3lNiltDJk5mrv/ICQSBDnW9lBuw5hQfsFxujtXxOnWcP0GR+myeNVENMyfXhGpczhfs4sQ\
-kOWwuboHLP8FmdkP6W2YyvsfWitRMqfPNeXDsoJTMirHsS5grFVcAFwXQPALWOHwwrsLQ6Kxpodb92mMZYctSKYTZ/CASosEbFBwLcHGaVnkcO8wJBypK5ztn2kl1ppr7Tdytt83PYO/6xCcb8GXU6SQQjdPhUOi\
-byKVP03zgvcFx5do7Suc9ASkoo/Feyh8IZrR6NUI/4Kqve73YW4B9sAM4noHNWVwovdgHUEardGctkOMqYP+CKs+t4cRNUhoYpy8jHL6BRYhxt31NuU7QdwDXCVasU/stjHasE6mLCE1aQbUNxHXVSYjs3V3jnPR\
-nxsiZ7+1Cc2GqxSNdtXJNobNuaStxMg5SMeOSi3/IpWaiUrVl6rUIQtTLCiNuWzzD6pUBCntqNTRGpXK8eBrnyNc3nKuku0hrLus1mnX5L+jXfVfpF1ZmoSrCnbCZRuWhcai1ywLoQc0OGUWQkMqGOyo01OOWyam\
-fhtDah9I82UO7VW50dF4KNdOX6Ali6p2D+I6RTMGaxTwmifCADNTGdBXqithkYEjJakY44UYq7Ov7XYylTua/EAMG8brA02d8GrpxnUlZGKMY0gcp+C05bZg1vKE1BFsDC7jixXasA9ZBoY2Ey4vL/f8DpkCh0yB\
-aknD0imyGxkoocrNDxzK7tk3WEhi9uLCEg61D8jR8j3uzdUN+kSMHqHPSOjz2slcXkIort805WSbfWcDdF0+XYtPFGyDzU/H53QFn+e0F5vyvn+pMwKPFdYltF7W14zZJncwm5q4iSrvfXCsuxQXfSY6HEvOztCL\
-fO/TQywXKA2+3xub0hqWPgZ5KlQlaMlBzq7BEhe/nTS86yjouIPlcQ/LUi9RPn1tycVpeRlJ3Xg6eyEEpA3eSPYDEgOFIBlDnUPI5cHYJD8aStJzkfemxHjLVyU8Skowl1QCdmoCG7M6ZDgksxDgZs8uk9wbqAU4\
-iV2wTs8jKIlrqo9ZhWFPaNuId9gX2sbcucmJsb6JyEKWRHjQMQ+LjkkYdaxBkc1OiNc169ZYfRIpcu0GIlosZsZez2jQyRDNgiMhCHpMRqliKUEjcUjN9X1KnY5ZsgMTBur0FzEO4hdsHNjzE10rQaWnWA16z+7h\
-DOm7zjgw6xjC8r4HGF1nmxTDKTLuESwMuC+IXx1iwM0EWfJYBM+hmAX6RpTelhxT0rcKVnjMVa1XslnGbFZgDo79RcNh+X+Aw/q8FawzEhB3zhmCavRRI6F0jYSHlxoJ8ZjL4QssiV0vNc85HHkpQ01dhupam3T2\
-oJWaEtCzpkKuhjQo8kZinG9BT2LZgQxFZodLDcUDIXa8xk64RDBOuOa5lE2p9g4xtzItNieUiIV3IAT2Yjwvgxljlby0hw/KavrpLLZSMtblspKjR2XyH2e08mo59gKEmF6sSLC08wEFGhw5JslAq/EEz2eOAkLE\
-5XI6rCjRgYZeUInVOnJQ2g9GWFOcoi90hmOjXxAWw+Bg8L2IwOO7AzLNhof3srtckCo1frgxit0nFBPHM537TzwumADlpTfzcvbzesI4yfw6X0CJvnH0dzFKjzlvRVWXMBoZYMFww3HvVXnho05eFENUtrLPy1IK\
-jloXw5yFnIqRVHKooJredZ8rbCpphrcifBDeegrbJpH4ooi9VDxFDvejW4LjE1ANEG8kDxU+VK+esrWurOjGQ3B1/wAfROvRoE65LiTk7C5wq63H+gpdMcwkfXKIc5dgIn9s9ncOtFwW8Rn9JQ6ZNkncP1yaJQXZ\
-UitzG1Gx9enp7F3OCREeTlbxcJVT+mfr03SvPo1K2NfUZM2sgv+87O8uWQPW9cawzH/K71b/ps2pyuaIJ2K1hNNjtggNzZTD2aWstQO190+UJBt5ac+qZpdzMyiw2INAbYFlQGQ4tgsfQlnLArYLWF7xb/DrF3IS\
-MnyEISD4MfrAJWPAeRylAmdFjziclLL5gzhDAj4Dwii2s4tjIk2DEkEfH4MzRhWzbq4fpC7gxwbBfmfTTdLR+jcqmeUI4HYvKe+kFPHMWeE8Uz/8RLIDtpF5CnnZ4umaF9FlL+LLXowue5Fc9iLtvcBGhmZoEV2g\
-DX22MQFU+4RvPFoenHaKwNwDP6W/Z0Ya7omJfAFradBkgIx3ULeYx7glZe1bLfYlUeExmdmv+1RoEa4wpM7n+OAoBB9U/qXfd+FRnpcL9s9IBdNhGe/L8++gf0vDH5mw+uVt4tUSzvdqOckVCePjsSnIEOLcxdPn\
-tN9rlmQVxw8gyVSEH0j0oxAQzuS0Pwgu/CjjHRr1osciyoJe4bOcSYP0W1Wre2Qi3NjGKt9GTgr6cg6Bz9koCEUXOxvZfIFRaUAR/EVn+zaRqkalnKvAGpkKBcLpNbZOy5+Ofxoc81E/nc8Xxz7IQr1gyNKbxELZ\
-KDIHyrFYw7tBB8dUxDPrI4oNZLUcLMEvtvdBLUwdvVzLFq7JvNQmxCsHhNIdYATtYBCrmmoYSxupCXKrkE8yxqzhWOjLSuRnt2Pejg1ni9EaCuBsNveC3Ebhse6Cl+pmn+34RFL/oU5OzHgdCL9z+iJgsyfSce34\
-A7qyQIJyBc9V0wHDfWC0mwPI50GOLjPnXJkIjEo8C19s70L/VnTOHXc07F/H4RwOAvKPeqe57BkCczBQjDl2Xkg44Pc+3wRQ8VkjKgz8kotAYKs0ebsnxWrAA0wavagboCI2Bn+jlWdSjIxrOHrwbD5/+eu7DwgJ\
-H40SEnWO/1ZO1J73ZxVakLH0uXDuVMlXyr0W3DO13IFIdG47cA4O8iGSQLztQszs/Gg+z3bxJgcPT1K3j3IbfyLXHALPNQfScGs+c86h6QyqByDcCfu5yY9D3q14Kg/f8eoEYbXAHHoH3XssdOjhTRUe3lTh4U0V\
-3h2quVRUPu3cfkIscspWXeheDBOuuyUGskKN7lytgDcuDAabJ1O+lQKLyJuJzeO4Vy141mjnx1937mPASydOlp0ezs0NKiT/drARmKVkzpU2av39NuBXm8thsti9D2ZsrqV5QNU0eJmJ6nya0acO7LjfFdsuudwc\
-MpDjr7ikJR5gw4Rd1L+MQs6zUUnxEkTmB/ygUZ2ueLjNnB5sBmCaZqNvpa5VTl/BbRdBxP5tk0/kR9t/fECr5QGfMaPVeD/E/UiiGYiHBoPmFYQemth8UmLI+/5dC9Qhz09fenTXStMgU8WUP9v3wLpDzwHhQUPN\
-vagDz8E+ImXbLliK8znI0zQrrGMBek7nWY18cx7HXW5TcnRgz7eRPO6AZ6v5Xhw8IYKnDjmBi0HvRrZzw5xvKSxVRZlH5MaKOeYJFbi7zL3uqCuMx3aZNnDjbkmHx3RY8IzqVwnHF3j6cZfz36w/Arjno2YTX0lC\
-Vo/IbqWHXN8Myysy2bRxB+F5Z1MiP59AnW+z/YBLOqL59Q2b7VXh5HuGy2jx7d3BIJaTN/XEgYAE4G7BleDN+GlnB4UYUg2CzRO5RAe1SYN2m1EuTZcfFJfO2MdT3WEPrP0jyZI9GCAf5A+y3T1/Z1fIC9S8jIoP\
-5Goi6VCjdQFaSd2lpVf5oyNQ2i2/L8+R+62aQvUBWWUstwHvuoKbdRTerRBzNFDL8Riu09WTrv2Ibk8kZKgpEPSGnldNn7x9C4ntn+skN2p2BxvjDoI7rsFwrh+aM8l69d6NTEs1v45b2wq/Gt4ER1eDNVSxpkLL\
-NYfrIbJzQC3cdJE94qMnTWb2y0DQjECYM8VwHg5LQu0mYHkqZu5jlELBfD55vvlIlA18Ee/EdO/ZD77Z9hrv0tD5dzvwFRSUr9gDmbrNlZG4tlGwy5bZx7jCBVCuQykR0kDd6U8iHTBUvb8WhE+bqZ3A3Bcgh9tH\
-d5lx5IzsSJQEwiTd8Cx5dBlkWBmhPhuyHnREJVaLSDXcBHvMGB+LWFECjf2dlA+uxe7+vFrarm7QyiVsi73zsLAXTKkV4zBjYx2A0wag3m0GqlyHJmH1Hm9Th2euXfHSbZy5jaXbeOc2PnTv48t69/Pl/bZ7CRtW\
-cmfmKrVv8FdsnlW3nCv68lzuUTPmnItWvhQHBQPgFwQeSjuQeq0QdC9Tg2s78LY6OAIjsUZ0A9heVYWPykZuQGjYrVAYuHIcE/LOHzPDNOGvfCPIWjEFhbglR+86FbwPJEOgnUsV+p/imUGwYClkMHwEUx2KfYF3\
-3mDXQi7BwlW+tCcsqkQu+SHfBoPo6EDIqa/Gmj6wVLm2rHj6m2T2lJHC1cryCls30078jgPi2l4S8yvHZhMx0iZiCd1k9i0OYab49hxO75F1iWjpTR32p37Et180NjDRQv2MgxpF/Yj3DD3/BZ4XfBuGA63Hl0vg\
-I8qgYygdyvvAk0FJ0px9KSwUZaI+Q1u3XdU2K1gLUuVcazv5tHaukQvX4LA0C2g4ggPyhy57ecQV0o3NDrVDHtE6S8zGmuNwWB8/GjwNMLAS861DAUYKLX/cT3xzou3QPRcNEaaIBXSZbx2Cy1CgAXqbJ8day7V3\
-tckBPTGrEExIc5CN5NzWV7KV0bvGDfOTeDFFYU52XMg1OGaBEy6LaazD3XLQFLMF91JHvAbBYIOlUFo6pIr5Wpa6Mid56SbNxrimn2wp4LeqL5U+SRjVogpE/Gg5SOiM6WKoUf8why05lStZas1Re7O5cQPV3Q2U\
-rbGgGsSgAeI2DxE8HPA3+eo3FUdzKwmOBSd4QMt7z5fwOfKURxmt8MrFCqPQZiVZcrMfsESSQs2JWv4xQln74LEoT7TCv2djpLTclMPRTHOQKYgo6orjbPFpmdHWJp+AMqUWUzFv4BhOOMScy454h51ze9JTY8/5\
-UmbG3hR47gAt/at1/a2lZ76hOihsXue7f+GGX9+9lRaFwsjJ8Dkhe6oJ4T9cG2cT4VLduf1JSUtq/MwVIXi7qZIM6Jgrk+UN4gFvGR7/ZH51Png0X/LDlrvkZ9aAZ7E6ttO4QaCu9sEF1jJm4zRUKuexPjIuMeX6\
-bpqPGrWNv7MhiJMw8xGKIpbXwfgDV/1/fLrLG0VJV/v035yZX0+YM4LxjoP0JjITXxiUouVL+H9jHuINMDTD0efD96cbdWNguiYwLZ019y8BW4kpR71270hr96yjW71DNWCdVu/GZNWbG89yuZovcO+EtY3OPX9F\
-LwzTG1OrNfdgq17//t3YYa8d9dpxr5302lmvrbtt1YOncwJZDdxGp6d7wbY6Xb2K+y/7U1e0w8/koat46ioe67eTK9rpFe3so+3lR1pvPtLq3si9rq0/2l58bO9c+fe5+zb5LBwtP2PdfcibK6RAD3LVg0T1sKg6\
-4224jRtuozPsLbdx4DaeuI0OQd72JE0PzqLX1r12Ha3ZJeq/uIv/ainwZ6XEn5Uif1bK/FkpdFX7M/9UYANhZgemuPPo5OeId1psUh8LxhpHJMxOU5f//x9WV+q35m39Zrn4zf3/XcS//y+/HArg\
+eNrNPWtj00a2f8VSQkhMaDWSrEcIxXaCSSlsA5QUet020kiCsoVNjHdDWfrfr85rZiQ7BNrt3vsh1CONZs6cc+a8Z/rv68v63fL63qC8Pn9XZPN3Kpi/C4Jx+4+av2sa+JsdwqPuX9b+NfWdb48mX7ffxe1fCV3v\
+tG81N+o71C1zPivbniqHWcbUk16c9iZQ638rpw+B5gCkuzPRDD2o7UfjtcuZv8v1DV5HEcivdtrrbvd/0hqCqLfyXkM+LzvY6SBksOPA1iI/qxCMZw5AQBPzdQ6N2mnkBtGx8wY+VqUdugjmix4yMgPCfCk/j9t/\
+aqehQmcI7YBRBk5DNWYR++3jnAEKXFCBOEXlQBc40AWdl5rmMvOokYMi1aV5EDishg2ZvQTWEkJnmdMobOMZfjXefYD/CW7hf94dGfa4z7/K+Gv+pfUX/Eu1E9QhN6osx18vzbN2kEpmzFvAauTi8YMtAYmH9NrR\
+K1pU3n5ZKGJy+ES1v3XgFxs+EpAWHBYH7dOwmLbjh8UE5iva4ZqwuENbpU5pNG1QBFNE8FARKyICAT3t7yBxNxiAFH7jpyEwI8+a6aEH/Q/uEjkC1TYL3kZaCY2VPBzuwtwDGlIDWsKpwC8LGdGkVbEG1AIfMioC\
+ZQYDqoRBPDAPcOhd+IdHi/ujXfYcYEWETOTHI9q7TXMuPxhFYcmA8GC6WTcYcmULew7c1+yFBsZtEhIqWchngpiM3tAk5sWOfaqicAJsEnIn5T86wCcjv/CBW2BcIBK+jUI7VgZ4VirwB810vtze7UATtl8zGTSv\
+qSz7axLSg6yGRgbDFiw1spZ6BeO8kWkj352fxlNqAD8GHm1AFL0tc5ZtF5XeBUmLy6KR65qBUZcAI9AWzSqZdcvFVcV8Q9ii/1YhCG5AFSI5IeiDIA0fNQJt+zBnodckbzca7Dz7UZ4czN80G9L1Ac8J31SuGGoO\
+8Ktz/P3EmS6yEOZZV+TlHeCC5D1BBlhu3jpDiIZKuHPQyFezd3a00hlt9hqez9pvWFYq3UNETnNtNyQbaHVj6QwPWkDe0MhND84vLBKy1H6iXACm8tx3Hj4XqEKHrpWCHirabSdcyrOAngGHA7S/93ihS9Ysuea+\
+i7rvGAkjF1eqAkkOmgtGf84SKTF6sOGPwtkP8u7cFSq/rbJg3YqtuiKmVjjxa6Ngdyfw0b/6H52QyFcFLogYGBf/BfXK9MMBsGB88gSUGsvLEHTJVyyiEpbi1p6ALYfi9c3KdI8JnXVAc2mc60v+kX5Fa4A5UIWt\
+Dk3LaC5bRrJ2GSes2mvA9PeWBGBnVKFs7S2D8GfC7D8z5oUgZSMU/VFocmvl1T690snfXGJvSZfZQ3icPfCGjoh3AQmF75ztPst4Phgr5ulU2I6y+WmjzEQEpDQQYCiIZxMXuR4xox0u5N0WOOMmpN3tLkbzJdsF\
+++MxsQbqJ2AaUCPayk4eJgc9gZwv6r1uZnamujiYWrKDAVnXYx+GS7+A8R8zdKNSLIgp/0A59RRkvkjg9PQpKp1DeHh8OIAOALgaRwOAS4tO0UrWPMDd2wI5u+HgBcYGvFg0OLhRSTRfgjwxb7MTFmlZyEIIkaOT\
+gRVVGckP4gkSB0JhtH+Ra2YDw33fYkdP+I72bIf1gsQX1ut5L/w1MILXncayP8kplXY+M0xLrGGmxsEnTObaJfs7op3WaZdpGv0PRRq2cafNX5K10aTJLnw+AP7ugpUbdiHDPGeRGiCo7S4Cuxet6+wbn1rBaPj9\
+gHpp5BwQWM1zAg07RDP0OEZGyvLylbPPKoumVYyShBKTWOBFHgkGy7sLNoTb3zDiwrEytONPrkgxsMN1KYaMkinAZlFhyzER7v+pELztjBu5Ke0TgCWIt0Ki23X0nS1hld5ICYdIVSBTEIei0nCa26xLo5S9LxzY\
+Y2hXmMQjS7KprTmGktZ0yHY9mqipg8lkuMmoafr9bsNUN+eCuqr/3idLuc64Q97vwMwZu/6Zj9Y52ujRFP6Nn83nYIL9E0aZkRtG3dfbkREakdEAuBAYFeUGsuPdH5iQCfBS1yX8uE3so4Cm3WOFYXGDGa92DK3Y\
+Y1cUnDfNSy5Dn/lOie9ZMqdEPhqKC+9GWVwjb4kV7fWUxarspRA7hAXw++gBm76hNzpnj6QGPvFunH3D6rk4JJcZTPKq+HtZ7OAgu+Nn7C8WZBnDJlUohn6FGS/Iuidt8SvBAGZorRe79GEG5FGj7V9hwmJrUWzi\
+wMP9JyA4P8BWgw7xSxAjwNFlZNkdgyCxInS1HIa7bJveI0ZCZtJMmNSVsBHxEewH+G8W5rANcvIuivROjs7t5mv6pP25xcYLKIoWO2D16Y0Ag0ntHCkzNVhguThR8dflj4Q53KwNUvcNIaJIScTW6GMhC3m/0Rig\
++nSTk6mKAmjELic+4KGsjWQG6H26Aj/q/hrm3t+ZOQ4MjrigJV07TnFJr+16VPSc1jH7wgl8CPwjC//LHvx5aNS77IbAq51OGjt5mh/BfyOIPoUvWdoH12DjvPKnRfC4iMviS6AP8ChzryKmW5EGCPXUCx57cenh\
+R15EPE6bribffdAQH2r9r+NBLJszG6DvdPwdOLzlUx4uPH/ObIRhIXRX0D9/kVr8B6PxGGIuYlUkY9g2UdAA0+gZD5WsIN+7B2PvHuSMaLJFgsiVLMxKTXJ7TCRk5nBfGj5jBvUH27xFNS0u0JG3D3PlpTApDaMl\
+pCh0DYWQviyP57BRG98GUYmc/Lsai9QGJ7yGHZOVzH4JKwAc8ZxVRqstN9vllOnAm+yQyoC9VkcT0mqwrKY6ASpsoJ7dRGFQ3UJEbH4EEblBxA4HcPWTE9JuTcHmRNzj6Gz9ymeuJfAHlp51ls7L4LjamBcMlFIf\
+gH4D+kgF1sZVyUOSBQ3wZ5Xj4jcuXfxCVo4OAY6jT1hNx7NPX/efpDgsG/UdxKiCjBUa2FtN/crf84HVpqSYDKnZUayziay8F3VN9yefzv0wVUV/uZaw0WJH0whlTSSxAhkMHtC31YRN1NqIuFf+fV+wRFDz1NYu\
+nbBhXL2K7kf+AfQxyPYYFTAysF9TGbkIIwseBLUK4GmSWdfEw2itAmsJlP8y91sfBEQlBb2a1sZY3grnyz3X7oBIJAIV+BjdyBN2mxKOuHRRuPt2JrFkiUQBx+0j5q99KsftRyekTuuEP4n7ZGSUJ3+ZrGkCu+Fq\
+TH4s0cTYcjjMsp3jjQbB/sGMFh6Eq0KllSY5QA+7MVh4EFgvm8VdAfCpNf5IFz2kRhUcgH1wuoFWwnUyqSCOhYSoeiG6CKhQrgEgQwAyAwAjiq1zI/N2wWZaosH/3hrxawi3C0qqnazM1uwmpBKEM1v67hwD0Bqd\
+mffwzwWFVAMFUbIQWom0kpsgrcC217D6lBT4Au2rng6vctqeVocvvFB0N2lt0OAwo37/9Kzh2A4Qp8k4NoHobvf2Ytb32HrrwYRPxFFRZI0t6+6Qn8z85L+A7bMrxjiIgmr6ghwyziV8ZFE6XrMoCXxkwwtFhjN0\
+sUtsV9yuGzCXSuIimx4IW0UXbO2CX6vDM0rZSdA+j6cS+Sx99vWa1JccgiR4gMZ62Xdtp0fmU9phWSZDgIUHeZY622N/G6IYqYzXDI8Wh/ZjttIxDohhSOXE3QC7EARvpSMkAnizObr82ucYNRh5FiGj9f+ZkMHg\
+RuO9JWLShnfWNznnFzBUiEOBoaXGM6Yw4KtGfzMY2PDoGsvgiFhxDuPdjwZb8D0kiUCborIokwTx9MKC0nq/CPdjzA/3jeekz6NCqJYLXbN5xozjZrOT2/tX0myN/QV23QmpFx3+P1AM3reokb/qc2WL82BzuDl5\
+QCiydqhV1MZIbZHvpajPfYyfJKRilY6QPBHOCVl8dX7okuZsAeTCnT4+ewfqaQHm7zNwRdShuDytvlIu7RYFjfU/qwJmfn2yB09p3cP5dSdWFaiT/gce078lEw6JQA13ppSIxOSPerTKIi2HqZZBtiEAhDIaCy14\
+qiyE7an84iZC/oVVha4XliVuiF2AH2IGKnJFEe6VYLohXH441fSzBeILUoLoxMcyDzCaglymeuhqYNb/GNVZIHrbVkFqPM9ATUIrQ6nsc7iHZox2iNp5ccgZq3pkl4vmZbLJ6sOgm/PHTOrlni9wDEiEwx9gLccI\
+wgcyS8HObXL2SS9R1REYkeAHanDhMEeXyeRIxLzIOMsleEx486K3C4URmM+WBHA6LXCbHUICPloU2Vk64Bi+UmGRhl4y9VIEJV54SVhsj6PB1MvOzpHxDxdFMi2yexTbqRJWsGDTpGlwdkRYzINDG5Afj9W02Lb+\
+JwKZcQIQS0kwPofgT9s1jd/CAFNvG2gUTb+H1kKy5yAqUrKT0Ihq5KvgDFTi+AK/ZTqjr1/5OAJyh/j8dZBPBB+Me6wRCduVn8HKzw5hCwCd0vE95FV4giNX8XzZrgfmiCWeABuoBdj/DoX61AT+6oWHyL5osdb+\
+DNSkxTDsfG30WcqmZbnwUpgvO0PUY3A9CLKAN2eOQIyRjc4iWlsePrGSMM/dPYLRMha3tubDu7m1Y4PgRWqTvVlltQGI6oqT59RXEssQhQfIi8SXVzsSGh5h0A6kKCDmnJPnerhx5jPiTLqG2QI2TC7xTzX+Wsme\
+uUcwS2LdrV3ADumY0q4pP0Nv6ZpdjKn30WQr0GJ2KFADRm+jP5Ap6ShdjOPAdtEBxHSC+D5guYgI2aGN8wHP1xF7quX0RmsDgdWLVlzMOjYRJxOiFd26l4877eidRScw3ei/57RbqoeO85k6ToTJBBgaTm31Q1be\
+7MwR2ToWNoA2cdaNAU18g6ASFYsRVdhLLv/87jJP6DIPCqpgIMyD2jvIFYydUZXRG6tncgkZamaHmCmvSjFCYkt+sDQN+X1UDQSAzxMh+SEzieKEvYomFdvCB0ez3YRbppiBpog6Zp2TE0ezWik04LQ6g38pSIJW\
+gpKggKb0M27hrb6vOeV8QYA+GQjPLDoNZX+kJHORr7LXojmKravcJqWNITNHc/cfhESCIMfCHsptGBPKLzhOd+eKON0art/gKF0Wr5qIhvnTKyJ1DudrdhECshw2V/eA5b8gM/shvQ1Tef9DayVK5vS5pnxYVnBK\
+RuU41gWMtYoLgOsCCH4BKxxeeHdhSDTW9HDrPo2x7LAFyXTiDB5QaZGADQquJdg4LYsc7h2GhCN1hbP9M63EWnOt/UbO9vumZ/B3HYLzLfhyihRS6OapcEj0TaTsp2le8L7g+BKtfYWTnoBU9LFyD4UvRDMavRrh\
+X1Cp1/0+zC3AHphBXOygpgxO9B6sI0ijNZrTdogxddAfYdXn9jCiBglNjJOXUU6/wCLEuLvepnwniHuAq0Qr9ondNkYb1smUJaQmzYD6JuKiymRktu7OcS76c0Pk7Lc2odlwiaLRrjrZxrA517OVGDkH6dhRqeVf\
+pFIzUan6UpU6ZGGK1aQx12z+QZWKIKUdlTpao1I5Hnztc4TLW85Vsj2ERZfVOu2a/He0q/6LtCtLk3BVwU64bMOy0Fj0mmUh9IAGp8xCaEgFgx11espxy8QUb2NI7QNpvsyhvSo3OhoP5drpC7RkUdXuQVynaMZg\
+jQJe80QYYGYqA/pKdSUsMnCkJBVjvBBjdfa13U6mbEeTH4hhw3h9oKkTXi3duK6ETIxxDInjFJy23FbLWp6QOoKNwWV8sUIb9iHLwNBmwrXl5Z7fIVPgkClQLWlYOkV2IwMlVLn5gUPZPfsGC0nMXlxYwqH2ATla\
+vse9ubpBn4jRI/QZCX1eO5nLSwjFxZumlmyz72yArsuna/GJgm2w+en4nK7g85z2YlPe9y91RuCxwrqE1sv6mjHb5A5mUxM3UeW9D451l+Kiz0SHY73ZGXqR7316iOUCpcH3e2NTWsPSxyBPhaoELTnI2TVY4uK3\
+k4Z3HQUdd7A87mFZ6iXKp68tuTgtLyOpG09nL4SAtMEbyX5AYqAQJGOocwi5PBib5EdDSXqu8N6UGG/5qoRHSQnmkkrATk1gY1aHDIdkFgLc7NllknsDtQAnsQvW6XkEJXFN9TGrMOwJbRvxDvtC25g7Nzkx1jcR\
+WciSCA865mHRMQmjjjUostkJ8bpm3RqrTyJFrt1ARIvFzNjrGQ06GaJZcCQEQY/JKFUsJWgkDqm5vk+p0zFLdmDCQJ3+IsZB/IKNA3t4omslqPQUS0Hv2T2cIX3XGQdmHUNY3vcAo+tsk2I4RcY9goUB9wXxq0MM\
+uJkgSx6L4DkUs0DfiNLbkmNK+lbBCo+5qvVKNsuYzQrMwbG/aDgs/w9wWJ+3gnVGAuLOOUBQjT5qJJSukfDwUiMhHnMtfIH1sOul5jmHIy9lqKnLUF1rkw4etFJTAnrWVMjVkAZF3kiM8y3oSSw7kKHI7HCpoXgg\
+xI7X2AmXCMYJFzyXsinV3iHmVqbF5oQSsfAOhMBejIdlMGOskpf25EFZTT+dxVZKxrpcVnL0qEz+44xWXi3HXoAQ04sVCZZ2PqBAgyPHJBloNZ7g+cxRQIi4XI6GFSU60NALKrFaRw7q+sEIa4pT9IXOcGz0C8Ji\
+GBwMvhcReHx3QKbZ8PBedpcLUqXGDzdGsfuEYuJ4oHP/iccFE6C89GZezn5eTxgnmV/nC6jPN47+LkbpMeetqOoSRiMDLBhuOO69Ki981MmLYojKVvZ5WUrBUetimIOQUzGSSg4VVNO77nOFTSXN8FaED8JbT2Hb\
+JBJfFLGXiqfI4X50S3B8AqoB4o3kocKH6tVTttaVFd14Aq7un96DaD0a1CnXhYSc3QVutfVYX6ErhpmkTw5x7hJM5I/N/s6BlssiPqO/xCHTJon7h0uzpCBbamVuIyq2Pj2dvcs5IcLDySoernJK/2x9mu7Vp1EJ\
++5qarJlV8J+X/d0la8C63hiW+U/53erftDlV2RzxRKyWcHrMFqGhmXI4u5S1dqD2/omSZCMv7UHV7HJuBgUWexCoLbAMiAzHduFDKGtZwHYByyv+DX79Qk5Cho8wBAQ/Rh+4ZAw4j6NU4KzoEYeTUjZ/EGdIwGdA\
+GMV2dnFMpGlQIujjY3DGqGLWzfWD1AX82CDY72y6STpa/0YlsxwB3O4l5Z2UIh44K5xn6oefSHbANjJPIS9bPF3zIrrsRXzZi9FlL5LLXqS9F9jI0Awtogu0oc82JoBqn/CN58qD004RmHvap/T3zEjDPTGRL2At\
+DZoMkPEO6hbzGLekrH2rxb4kKjwmM/t1nwotwhWG1PkQHxyF4FPKv/T7LjzK83LB/hmpYDos4315/h30b2n4IxNWv7xNvFrC4V4tx7giYXw8MwUZQpy7ePqc9nvNkqzi+AEkmYrwA4l+FALCmZz2B8GFH2W8Q6Ne\
+9FhEWdArfJYDaZB+q2p1j0yEG9tY5dvIMUFfziHwORsFoehiZyObLzAqDSiCv+hs3yZS1aiUcxVYI1OhQDi9xtZp+dPxT4NjPuen8/ni2AdZqBcMWXqTWCgbReY0ORZreDfo1JiKeGZ9RLGBrJaDJfjF9j6ohamj\
+l2vZwjWZl9qEeOWAULoDjKAdDGJVUw1jaSM1QW4V8knGmDUcC31ZifzsdszbseFgMVpDARzM5l6Q2yg81l3wUt3ssx2fSOo/1MmJGa8D4XdOXwRs9kQ6rh1/QPcVSFCu4LlqOl24D4x2cwD5PMjRZeaQKxOBUYkH\
+4YvtXejfis65446G/bs4nMNBQP5R7zSXPUNgTgWKMcfOCwkH/N7nawAqPmtEhYFfchEIbJUmb/ekWA14gEmjF3UDVMTG4G+08kyKkXENRw+ezecvf333ASHho1FCos7Z38qJ2vP+rEILMpY+F86FKvlKudeCe6aW\
+OxCJzlUHzsFBPkQSiLddiJmdH83n2S5e4+DhMer2UW7jT+SaQ+C55kAabs1nzjk0nUH1AIQ7YT83+XHIuxVP5eE7Xp0grBaYQ++ge4mFDj28psLDayo8vKbCu0M1l4rKp52rT4hFTtmqC91bYcJ1V8RAVqjRnXsV\
+8LqFwWDzZMpXUmAReTOxeRz3ngXPGu38+OvOZQx448TJstPDubZBheTfDjYCs5TMuc9Grb/cBvxqczNMFruXwYzNnTQPqJoGbzJRnU8z+tSBHfe7Ytsll2tDBnL2FZe0xANsmLCL+jdRyHk2Kilegsj8gB80qtMV\
+D7eZ04PNAEzTbPSt1LXK6Su46iKI2L9t8on8aPuPD2i1POAzZrQaL4e4H0k0A/HQYNC8gtBDE5tPSgx5379rgTrk+elLjy5aaRpkqpjyZ/seWHfoOSA8aKi5t3TgOdhHpGzbBUtxPgd5mmaFdSxAz+k8q5FvzuO4\
+y21Kjg7s+TaSxx3wYDVfioMnRPDUISdwMejdyHZumPMthaWqKPOI3FgxxzyhAneXuXcddYXx2C7TBm7cLenwmA4LnlH9KuH4Ak8/7nL+m/VHAJd81GziK0nI6hHZrfSQ65theUUmmzbuIDzvbErk5xOo8222H3BJ\
+RzS/vmGzvSqcfM9wGS2+vTsYxHLypp44EJAA3C24ErwZP+3soBBDqkGweSI36KA2adBuM8ql6fKD4tIZ+3iqO+yBtX8kWbIHA+SD/EG2u+fv7Ap5gZqXUfGB3EskHWq0LkArqbu09Cp/dARKu+X35Tlyv1VTqD4g\
+q4zlNuBdV3CtjsKLFWKOBmo5HsN1unrStR/R7YmEDDUFgt7Q86rpk7dvIbH9c53kRs3uYGPcQXDHNRjO9UNzJlmvXrqRaanm13FrW+FXw5vg6GqwhirWVGi55nA3RHYOqIVrLrJHfPSkycx+GQiaEQhzphjOw2FJ\
+qN0ELE/FzH2MUiiYzyfPNx+JsoEv4p2YLj37wTfbXuNFGjr/bge+goLyFXsgU7e5MhLXNgp22TL7GFe4AMpdKCVCGqg7/UmkA4aq99eC8GkztROY+wLkcPvoLjOOnJEdiZJAmKQbniWPLoMMKyPUZ0PWg46oxGoR\
+qYabYI8Z42MRK0qgsb+T8sG12N2fV0vb1Q1auYRtsXceFvZ2KbViHGZsrANw2gDUu81AlevQJKze423q8My1K166jTO3sXQb79zGh+5lfFnvcr6833ZvYMNK7szco/YN/orNs+qWcz9fnsslasacc9HKN+KgYAD8\
+gsBDaQdSrxWC7k1qcG0HXlUHR2Ak1ohuANurqvBR2cgNCA27FQoDV45jQt75Y2aYJvyVbwRZK6agELfk6F2ngveBZAi0c6lC/1M8MwgWLIUMho9gqkOxL/DCG+xayA1YuMqX9oRFlcgNP+TbYBAdHQg59dVY0weW\
+KneWFU9/k8yeMlK4WlleYetm2onfcUBc2xtifuXYbCJG2kQsoZvMvsUhzBTfnsPpPbIuES29qcP+1I/49ovGBiZaqJ9xUKOoH/Geoee/wPOCb8NwoPX4cgl8RBl0DKVDeR94MihJmrMvhYWiTNRnaOu2q9pmBWtB\
+qpxrbSef1s4dcuEaHJZmAQ1HcED+0GUvj7hCurHZoXbII1pnidlYcxwO6+NHg6cBBlZivnIowEih5Y/7iW9OtB2656IhwhSxgC7zrUNwGQo0QG/z5FhrufaiNjmgJ2YVgglpDrKRnKv6SrYyene4YX4SL6YozMmO\
+C7kGxyxwwmUxjXW4Ww6aYrbgXuqI1yAYbLAUSkuHVDFfy1JX5iQvXaPZGNf0ky0F/Fb1pdInCaNaVIGIHy0HCZ0xXQw16h/msCWnciVLrTlqbzY3bqC6u4GyNRZUgxg0QNzmIYKHA/4mX/2m4mhuJcGx4AQPaHnv\
++QY+R57yKKMVXrlYYRTarCRLbvYDlkhSqDlRyz9GKGsfPBbliVb492yMlJabcjiaaQ4yBRFFXXGcLT4tM9ra5BNQptRiKuYNHMMJh5hz2RHvsHNuT3pq7DlfyszYmwLPHaClf7Wuv7X0zDdUB4XN67sDvN7357fL\
+YgGX/KogjdM8aK3S9k39Zrn4zX0Ytw+rYlnAbcC+e4MtypCRkxB0IvxUQsJ/iApOPsIFvHP7k3Kc1PiZC0jwJlQlCdMxFzLLG0Qb3kg8/sn86nzwaL7khy0zys+sAUdkdWyncYNAXe2DC6xlzMZpqFSOb31kXOLh\
+9d00n0xqG39nuxEnYV4lFEUs3oPxBz4k8PHpLm8UJd0E1H9zZn49YUYKxjsO0pvITHxhUIqGMuH/jXmIF8bQDEefD9+fbtSNgemawLR01ty/M2wlBB312r0TsN2jkW6xD5WMdVq925VVb248+uUqysC9P9Y2OncC\
+Fr2oTW9Mrdbcma16/fv3aIe9dtRrx7120mtnvbbutlUPns6BZTVwG52e7mXc6nT12u6/7E9d0Q4/k4eu4qmreKzfTq5op1e0s4+2lx9pvflIq3t797q2/mh78bG9c+Xf5+7b5LNwtPyMdfchb66QAj3IVQ8S1cOi\
+6oy34TZuuI3OsLfcxoHbeOI2OgR525M0PTiLXlv32nW0Zpeo/+Iu/qulwJ+VEn9WivxZKfNnpdBV7c/8U4GNm5kdmOLOo4OiI95pscmULBhrHMAwO01d/v+KWF2pz+ataw1Hadj6ltnv/wsZwgm9\
 """)))
 ESP32ROM.STUB_CODE = eval(zlib.decompress(base64.b64decode(b"""
-eNqNWmlz3DYS/SsjyrpseQOQMySoTVZH4rF8pNanLLsmtQFBMnIqmbWVSUnyKvvbF30RIIdy7QdKJIij0eh+/bo5/9lZNderf/2xspernYOJVsU0y3Q+NfuTndqubPwmm83yzMAbGOPbqp3FdWsm/s/0EO4U3uXH\
-i2vlb0vtH2t/tYtrpybUaMxi5f/Cnbp3dkpvsaf9f3pqmE9RB7m0EglUdBddRiRqZv61i9as6F75NpV2a+/hwp1MG2vCJRc0Hz/uwhpnl70uuzAHzKvNBBqmsI1Eje9AqSMSsQny6dzLyMuCLE0dye0GuipLECFu\
-MCjTzd1a6y4d7k2nMfrfukOaQC58OZ1Ex7wh0qQJ7RLkNpm/n8FmjGzmPrQsru1MtC79QUfttPCv4CE3yVEGR+oncY41mPmVWs0S5CJy1KihZ3aebPnHLKgMtty2R299B02bK2c8Nyi0vUOJ8LLWvZcn/QM/ReWu\
-oMvpifoB2p+cnCZPszIZKFsUCTaJUqqBgeJD6R6Aq0AfrwRbseZNfCRwP42fj47k7o3fjIzR8bxW0bzhqKYg83E4GN7QOdg/vIfjaZ+e2KBb7gEbyZVawVm6xcp3aBrqUI3p0ho6Kgv3MMry4aOi/YvKslNoFp5N\
-u2HT7gaCD5SxaVeIC9i35HEW0eK6TMHdeA2+YMfaz+9KmIIuaOumc+l5NKIiDYd9pE/4bTQ3ypzy2tE6pgAjOhyqQXapwy5r0tcOya5B/pwgSKlb39XQZPACNulfrtY9t0OrgeuDGU/nMt3dKLEXZKvTDggB+kCe\
-NB4oOlJVduZPAHwsJ5nrnCGyVj0TeE/r95Fnn/TYwR0tY/lYbE1jUI0pOa3l93XFLs2m0kTO1fVxc4aUgaJMPAlPLo7e5l+ZsOY+0/U+tDHaxkHKuJSGNWEOedZVwrEHpWcJ0DJ76hGl2EgpaDl2REZUFrhDNmlC\
-nF0bmt8lehw/5f48fvB2WIOTzjzO1OZvsMUjgKqoGRANlOof8o0NWh2QUyC2HRFcbPll0D3t5cX3fraqJnh3dTDOsSPyMWfZX49GeqEcxCcclw3HPcXg4tTZa9KYjQCniuYCv7OWNdiMKD8CH0T1SsZsibgPISKJ\
-rhM4FDfU/EWs7U/xwyp+uB4cio6OrnW/oDtR9GTfAjkv2Ms2bMB61IkEZNsy7pgnbLywj6ISJewvluDC5lL63XEQAT0eIzSTB+ffRlaa9zEmjPbm7hAIXwq9eUpdtfUx25REGUz+TQS7KL9XVpmRkWvGfmNo1g5E\
-1JM7zMmVI7tw5GUuwmnCwjJF+vIT3DvugeqqIl/nVSpeBeKc0DXRwLp5OrVunk+vPDhU/qqnx+B10OOFF6KQzf4A1GP62G/BOpq4I0ZyGLmcMCnFxawmHzkCoTp+cvCCe9C8Rf27OVXgybqK5malV/kjZmXoDLfs\
-XQihioZDxAPd+M1dLpYf/I0D/30mCPl2fTfgkWCmbUM6gVBZ1duPEnJAi6j8M6w+Ia9Al2WRbT7utlaPuS2fGbKffUAWPCB9F3a+2qaBqA/7jsTj/S+5uSxmXduKeYJl7y0+gpHOCUkxaOaBQwWQePEQQZfCwjHJ\
-jI5MRDBzRMa8XgG4px9ev1gsjmmyEP4aaqBxP1BE8ERm6Y+4akdSjUEco0zsHgVOVFLBJ1WFkwKaA8y1YudDd8tiEj50t4OE49R0780uDL6/uQf/dqeUh5XD4Gj6md0RYybSMHt4eo/DE2It6Mzy3uFkOj/ULJIb\
-ivRdd2wpRYSGWScOSTmcMx0HYNL8X+ktMuUOYNMoTcvGWLERY5j0GNZFFFpaCUkbwQfH9GjVJiVbw5COB9MOeUUXzhqKFZbTvzIFVEEx3LHIksZpObboPYNuCZHGJgfJZP+YPT7bOy3P5UTjvO9OAVUviB3+8/T4\
-CXg0pSuk99URzz5MmSRj7SWlDOKmx2uOein26MqBMUr6tBMBOws0iXtgmzu8veBJG47Bv91HyzMpm6Jz+3j3nP6By854CAYseYA0tyQJFZ29p1PnXTR/TgaIXfWU5so5DkFK12QdNi8TsHpzwic7yHOD4QBbR1YT\
-MpEor4YLOEH6LClSOkqwfqdBC+4ZoQAFUb9cDTfNBkNZQ+lgXUZ1FXd/G/5+6Kz9I0doHYTvy4YwnJIvYPQOWXfq0RkLENyWVrLRR+vuQWgMuqgsB916JH+oJFw0pFbHfZAIsWu3UTtN24iA6iuxFRTXNq8gnj/Y\
-gFwTHrUg8sFlr4QECV8+rCJhMzlZ11qGVl1cQmBQl4zaOn25WGGTLl+2xBx0IblIJt2QIIFb6k/ZpP0eJDZJL9fPypcj2URBWhomS455M0hkKrKQDhTHFycn0JDjVYo5nQGQhzgDCaYu+utDcO7AnNsBzOxIu8hb\
-u6G8c7H4TmEkdZ0VpCwMP7n43FX2sv1FOC0FSQSC/GqzLaT9gzQ+Xiwxp8eJ86ecfeccSTrcAaZMI5f4+C4sULRdknRdxpksYERfxCuSDzbWXknjLe/R4Dyt9J//Gaap4mlM/iu/yenkEDdd6DIvaJndlklOOv+H\
-9IIz9QJw5GyjQfth6yYN3XV/6UN5s9lrPhOJ/osOzjxSoyE/9OutpAkdpqCyjMlvRFvyOu3NmsSvhocNnBYtIV8FRWkwwvyiYO6QIUcw+b9Zs8bIQTO5xQ3/xk4xk3znyx+YMy/nv0rIBup+DPZ5OwSMM0JRDchf\
-AzLiAOb+xn1Po6nKfnZOpm0hD0DGl0Vxiy8o5xn9513rFJ8QUz4jrikCQaeKAhz94AtzwWxN7t/X51uCqtal9gvZjOQ0+dugWlX0FPhOTvy7QRfKJ+dv0KoPWPFVpHiHPjL/MT617dDF5c+kHH4Ckr+KwlIhWMEV\
-J13KtM+D9VZt3wd1yQIAT7Q06fOvTWpFkEfBsauGKOcqcgKgWpqpGc2EaLaKrBZdvrQD77EmMe+5XGeIYxlOhZwKNA/raxA4IG9GyOZ6pnRo1rj/FyrSQhYmya6urgiuSyAsfoM7RHi7YteM+6ecbqfhqEQqrQV6\
-C5rL2vDBh2p+SkKBumIGrq4mn6h+6eKioQ7KKpFXgz3jpwb1maRpm057LE7BW8mpmICpsenOzZxdcFv6GEPhO1KLbgOMGYQPE1DbTmO7Deih8klsmJ3NzzkTYNxFy1Njps+pFuJP93L7tO4OdS5F6TYuvnBxAN9G\
-X3eAregyRGWxF/9/CTT020hVrbtgoyyEjClifVR+N8Xf9+FcoGw1jWysjkwL+DigLJpVwSYFdRHUe/PsiopoKvvy7Sf6CICHi/jTlsixysXKb6Jse5jbtUSaZs27YfYaO2WX3lLBrZjIJwagFsYxCem+Vhg3RirU\
-kFGcEeo5FzEKMVCUGaOUvsIUmUL//DXu5xdxDii0qe0uHkF+0c5J9WMB8sdhlNPFd1GA1V3HrVBckLnEDrDO0kRV2t6edhN+U67zPdf58eTz8Rem1lVFx27jxH82ThYhIjRSfdfrfQwVKHqpncWvhSmgS8JUWL4f\
-1ubVFpGlbq9Zv4ZE7DPts0+QWGPduJr0ERGGINVn0mmnnelc9qVSHe3OIqxLGbg0A1c3NbD9gtNgR66I4qJ3Qyo15VQKHVP8JL/5DPpBdr5nd7dgcLnYCQUnnAigseaqtNNbH7kIYaAVZuTQAjM6roI5JscVnxl+\
-HdIkrOPUp+aCTittUkjM1s+trMFlK7MF6PaZggYAhmVtg+FUJbwF7TjFiAVoBSZhDYcsV07IwmBQVTKMygyA5zV/pYuqbTWPbQn2G67KQumBmMuE8ciGEnGnsxl9+Asa22N24R5TXkeVnrmwoV38zH3C8JDH3IFU\
-JpZIxRMpjBR7b+aYFJx9BAKxyx/LYUdVIZ3MMBXH3xsI/O694a9uFVMFYgBn9M2u4kp7NR3xPM0f39npbTPieZqS4WE7bgvn3E1JZvARWAV7pZJYCaaUZCy4TD2yjBihogNCSlLz+5x5ELrZdWJSyAuzSfgYXk3P\
-SE0NBAJdD4AC0tgKfLGZXYeDGFY0RzAFylZlHQW7Lr4AFUOKkTGTSaWcmnYLvpoE/iL7L1MLiGE789I/kV+LAsjYbhwS5wcwcJOWxqiJXEYS225bDkinxzzwZZgUUEXKA6Bwk4+cH/4M5S8qhjBNMvmf0dQSPzu4\
-dL8zB6XME5gay0Rw8TMY/kSymKZfS8WRJkcQuk6jwsINe5DrdYE3esm2Y15dJ+xwmf4NGuNBeAI2/uDxa58z0+9ebuSTRxszQCy84i74PemFmKxvBcHN/D3MLr4JuoAiAxx7yd4Tf/n1wxBMkkARUIIMP+0bZs5c\
-V8ZPp6X82ggwJrsl96cptxlIzDaUwmfz/kcmucr4Y7ba3SRrKc0mTJzssSXkDCPxACddCSNp96Lr3qdKRDHZgSiKJE7C6jTglqIDPezwr8b4t2FSK4XmZrm6vOl+YZapfPrX/wBWdMOo\
+eNqNWnt31LgV/yqOgbxItpbtseW0WxKgQwjblkAJgc7pjiXbCbSkkM4h4Szbz17dlyTPTNr+MWDL0tXVffzuQ/lla9HfLrYOErM1ux104v4pH8FThk/V0ew2c4+Ncq+d+w2zW5slNKj1bOH+hafs/tkxfcWZ7f8z\
+UwG9jCbIT2XCQRY9RT8tHPUT99kSJQ17GnrO3FiW+713YE3M1cYKe+kHosiv27PF2fUq/0gGiKtcTuLey2Q7W3+SLDskVvvAp6ocJ23gue8imdmlPZuG9gwDyMTZt7ul538qPOssWg1K7R4RAflldI5I3RvCTZ7C\
+J+D7iXuYwEl0OEnf0td2ItI/f0wiGkRUxRGQhU9v3TwYNecp8PQGVO3OZicwI2eioLoCpJ0enrtX9cCNF5GKM36GY02AwmkYDLoCuU1oRZePPj6+HGn6GOW5YKL68XHKqrbZQQmEHjfpkqBFiGCXyG62ZKT40mSR\
+rGENepN9FBmOaKeM3w8P5ekYmOA1akS69KSDslDCIKAaHo7kwR/0HFzi5AlYnhp92Hb/VEmyYIXm4KW2ugef3OS+p8lGhWcv5jbf5Af8LcgOWmavceQs2wdYdx9bvYnImkilDf1v4MfPfjvLHtg4jSqztHPDUgVB\
+wEewdRhreCy4UP5XlrvjR9vRcY75S7QBcq4iDpleU8Mev4+Xazorni8LXt2hh9fk9qqZEjZl2Xc3DezCfVEgafdlMfZhJr0CAjBQejp340UTGOqUh8YFH70YCeWctzXpJhMGAHUq7BrWOjyXghfO5OzYHN7RkjEm\
+vdwH62IUPCLbcBhRZhPL9laAv4Onl+9fv5zN3BxdyeqeJESu+dStdl+USFnfJ9kh9OQUDETsMciCWlQJUioSx6jJE0YSxoU+8mltD1KyKVvu/AW5OnjzDv4DluGo4HtjNBiHKPTez+hHLsY8Or6P54f5KUmiDaFL\
+JNt2BNc6CgGBqx9nVyHo9Jb8CJFckaW2eUB58B8lAKhIOF0fRZg8gtJi2Z1DhG6TGE1zjo4m3+CZYOLDKirHsmyze2Rky1EKDUiCTiaxvFW3EZscFPF4mRz1BGbmH+EVdXWUwnOBnIFHthBWmt1d2lbTnJAN6OZk\
+5z3bC1rV/uyK6dsJ89uM+N0jrPFhPDAEwIxqy8kIcVpPuoDvnRlnJCPByBzLtl6MaeNaoamZTv1f6HQ8p1yds5oh0EkOgHYVEEToybsyKadXRsArZ2xdm7HJ83n84gCuA3OfOPvv9A/sCY2NhiF+wnndS7WxQTwA\
+VKGCoyxy5KRVwEkI/hWHEvSil08A0TvOSkRDKkyLKYE3wQ4y37AjrnBRLK89SQ8RPs8sGSs6BLuuiVYDsLctx4R+jQ5hvIlSHyNrHgQrRQshuSM62WUteB+KrBN2tN3/sojLWF+f45dF/HIbvwBIXTDWAZ6zi8AW\
+l+wsG6C2JsIHOWI70Pm0fg7mcB0khV5a7c2uII5oc8Hz7tAcng4B6JkTOAzmUw4bqPQ6nhIv/SPsciroBbo3wtqbj7RIkses2o+SNK+oQ0sCpmOEuoCMZ34p9lcloBAONgAwq8GGsTzKMFAKk1dw+uoTsdG0p9PZ\
+tXDyQOQxdzviFmyzGP7YAhHieEfihWRsVOJ03NbMlFlxro/px6c1oam1nDjgbi+79YfWtfvcFrRFH1cTLLOuXK88yUcUp9uY9OXbEhy/sKHVKCIoxarp7ArOPKG5bf5CkGqg3Qkiv1M+aTjd6urN6WyL/AylMnyG\
+j8nYM9sVdO3DaXBpts5FWeiTIHRy8T2I2Kj14i7/ewVMKdgXDtSptyR03VOe5auhOwo8VxP8+fjoOfjfQ6wDSjSCxSFbEFUK+lAq+SXFLNeIYIl6hOeHoyJ2LQMEmVlUoWxFsYT5isolmGRCUfT9kkn3DCbnkvkd\
+/mMXQ4XOOWJYu4dPP9F/JVV+uBhNR17AZKnsOsxIfy6snHuA+olCLE5VJdGCEkVxPhv54FUKAUo/5uwjuwvANyiKY+HVMdhiWEWaj7GEeJHWOVknWkgum7wgvLYq6UMqiAaluILDh14466la6iYRUthdyC/te5+s\
+PQ8BT44TuPVul5JVw0BUHRbObpMHyahtUjAkTu7w4naNROy4taK5lLAEOOBCNk/ugcWk8Bi3ChICE0jfMnY13GaNHw2Rf3XqNW8ZDYKwoGAAwYHUW2mIWO+e/RoJIUr0r2DThxtMrT8ieB+GEzOumwGnx42iW7aA\
+1RYUj6rKHMHhDYWpTKWnswUOqZ3TgcpmVaf8tZBp2HGCVoSap8kATRa9DR4XcZPvnHJhEdmINmJnBLZwPmvZCmgL9ovxLpxA58kGlVAYymvKbpQa5xqwp2UMlXFwltaP96LEqbiAPz6x2eVwmEZS0orCYpZd5H/C\
+k3Ax6gGk+poMlYz3Mgg1sR42ZRxDhBtrEfsGqZirX/D1jM/ryOjBp5a3rfF2AsixxBVB1AWm5sPXwJi2EQWcM8jCKbV4hKaJaE6/CYeSd9vRjrZqaLttMGg/+EQmw4DjhQvEYYnbH3hTLoZliRpN05UEUptGjFlm\
+rEFw5aLYoQeErWrf7bmQsYzGqDIHUTQ+TsiUpQ0fxN+KaFMKeJmaktmKxKDwpQ1+Jzn9Pvqw18cmZySiThY3htJR5GIQdenTNJmnZOOq2uUK002vozCJvSWoILX6uowUZ5QEKPBEzHEwG87JH6y9T9SGJqY2h3B8\
+RmcZ+nbOThWVgC3/BuxdXq3ZtEMInT+FjfyOz7gTu0KKmL9YofMe8qZVzs+4QdNPubPr83LpigRJT/8eDN7PzdjwTaSMXosZPlvztStEVW1kFZnaDNOyai5NKkwxsKN1whjSxoZmuRpXjXjK37hxoan3vEVY1ZrQ\
+0rJmTV4ERlcip3uw7hnseBTF3Wp5wxZFciY3BXW0ZUISU1xZWAXA2PA1BCZ4PXec1Qeourv8IczEHcARin0+c3USOpLga7COuEH9LWJBVBfs8yjm51TqbW2/I6iHRuqAHaOBDLbxYD7fgSaIIdyGXRquH4zgOstN\
+ckfZmbuuDc0yBqwdjom1aL1LAdvHmQlDHjyXEgoqjjksrRZvLBI2GhjBHm+VyPw6YlzxaTJ6SOYEIbh7tkONHRLWtBxXKJgcd0GU0nZZEqY3qd/IXYqW7/oimBwXjQY7yduQVlUPA/RqQkLNaNeY2McE7KYhkR6O\
+ZabAUrWx5ESofRXwLr73EQIclrK1Hk0fVb/WhWHrPoQRxb6MOXMZOwS3v210PxYZmhiRZlsDbbSAJQ2kfE3DyWAk7VcM1JCi9Z/AxDq8OpJZcDdQ//gHIgnIpsqVkwGh/sDb8j616Kxve+1S4HHqWLxIkY2rF1TX\
+4RmahG7nyIJzelHYEd8g24Zp0BTAPLWSSiQS4igoNeOIJnJbVdoyrA1DwpccAF5NzeW/v3BpJMVqMcU6YzjXSynWIJcNlboAF5tQQjQ9RWYxyZq+xWjqo7EJJY2qo/pwlCq8WAn1qvptnGqoKuRJqgzQq6rQBOtq\
+BkLFCWIfB6xLIOOLmn5cCWAvtsXMGIzmiN6MgTdDGB03ArtulQQmrQXfxygux5bmoIPqUEjTUfFWwMclyu0gBAPy9+Q8cZCXxUbAr0jjzJs4VgruKUxC07BBxTySIfeUpmAyPfBpMl9PrKTzg6TzQ5IKCRMlR5bR\
+y6MAVDtgL/0X7hF1oJP7uElLlPvsBgR/Da/VLSR0trmpgq0BQXDrjttmFisruYjQ8OELtTwGvuTBGdCUKrjWZZU1fJMxSA2jSYXAhZUx7lWB8JbV5qDnCtDsAejki0QnshrTwKgEQcM3Sy3cI7S6FTsi/245srUA\
+C4Zv1nAA+wyfA1VsQ7TEHfbyRchduDfAe5GKwSZqWpLM+q+xoL5x/IfaoboF9dobioX1gEHxhoN4dUN9hs6jjUBhvfMaFC6WDImeS02vt5kLgCNT+nAWX8F5vCUKXDv2ZOBnlPoZ9iw09n61wa274NuNXp2D42tU\
+B1xg4xStcrsOSGL4ilWuK3BmLjMl0WLK1RrKYnB87YLxCFSgp6TtYXDF9WU9xwo4XPyaknnQ1BnAyq/3bX/xfXrKCZ11Li2XOLusfACc0nUspiH6BpzhAoLdW9AENrdrSV19ZFW/Lh/pE9eAV3O+/ZJalW9At+KG\
+ys0acLMhm6h9txBl4FsMH3iKlSwHBFH9GzPZC0lj3xJUYza0gfbwIVCWTn6jbJS+6ktfTFo93wb+P+Hyn5log9eSTdhe5TQNqP4TlYWG/IpQAo7d1MEY1t+VNBISfOq7zeDJboi5gs2D2DFQV7G8sEP2nQIW7bLJ\
+sX2ymfJTFVqyowu+bOee7AVkbMrtNgkzIaRajLVN/NdHOHefRuLj+R267ywLOYwZLU0DI2E5LxmLa2svwb8O+/lfi/Ya/kZMZXVZFKoqtfvSXy2uv/nBIstLN9i1i5b/mCxq/m7xl5hQMZlUhda//gfTQr5T\
 """)))
 
 
-if __name__ == '__main__':
+def _main():
     try:
         main()
     except FatalError as e:
         print('\nA fatal error occurred: %s' % e)
         sys.exit(2)
+
+
+if __name__ == '__main__':
+    _main()
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index 34c15826621..648aae770c1 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -73,6 +73,7 @@
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "tcpip_adapter"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "ulp"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "vfs"),
+        join(FRAMEWORK_DIR, "tools", "sdk", "include", "wear_levelling"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "xtensa-debug-module"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "newlib"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "coap"),
@@ -83,14 +84,12 @@
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "lwip"),
         join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
     ],
-
     LIBPATH=[
         join(FRAMEWORK_DIR, "tools", "sdk", "lib"),
         join(FRAMEWORK_DIR, "tools", "sdk", "ld")
     ],
-
     LIBS=[
-        "gcc", "stdc++", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "core", "cxx", "driver", "esp32", "ethernet", "expat", "fatfs", "freertos", "hal", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "tcpip_adapter", "ulp", "vfs", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module"
+        "gcc", "stdc++", "app_update", "bootloader_support", "bt", "btdm_app", "c", "c_nano", "coap", "coexist", "core", "cxx", "driver", "esp32", "ethernet", "expat", "fatfs", "freertos", "hal", "jsmn", "json", "log", "lwip", "m", "mbedtls", "mdns", "micro-ecc", "net80211", "newlib", "nghttp", "nvs_flash", "openssl", "phy", "pp", "rtc", "sdmmc", "smartconfig", "soc", "spi_flash", "tcpip_adapter", "ulp", "vfs", "wear_levelling", "wpa", "wpa2", "wpa_supplicant", "wps", "xtensa-debug-module"
     ],
 
     UPLOADERFLAGS=[
diff --git a/tools/sdk/bin/bootloader.bin b/tools/sdk/bin/bootloader.bin
index ebede6778eb..39de6fcef55 100644
Binary files a/tools/sdk/bin/bootloader.bin and b/tools/sdk/bin/bootloader.bin differ
diff --git a/tools/sdk/include/bluedroid/a2d_api.h b/tools/sdk/include/bluedroid/a2d_api.h
new file mode 100644
index 00000000000..1b999d5c4fe
--- /dev/null
+++ b/tools/sdk/include/bluedroid/a2d_api.h
@@ -0,0 +1,255 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2000-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  nterface to A2DP Application Programming Interface
+ *
+ ******************************************************************************/
+#ifndef A2D_API_H
+#define A2D_API_H
+#include "sdp_api.h"
+#if (A2D_INCLUDED == TRUE)
+/*****************************************************************************
+**  constants
+*****************************************************************************/
+
+/* Profile supported features */
+#define A2D_SUPF_PLAYER     0x0001
+#define A2D_SUPF_MIC        0x0002
+#define A2D_SUPF_TUNER      0x0004
+#define A2D_SUPF_MIXER      0x0008
+
+#define A2D_SUPF_HEADPHONE  0x0001
+#define A2D_SUPF_SPEAKER    0x0002
+#define A2D_SUPF_RECORDER   0x0004
+#define A2D_SUPF_AMP        0x0008
+
+/* AV Media Types */
+#define A2D_MEDIA_TYPE_AUDIO    0x00    /* audio media type + RFA */
+#define A2D_MEDIA_TYPE_VIDEO    0x10    /* video media type + RFA */
+#define A2D_MEDIA_TYPE_MULTI    0x20    /* multimedia media type + RFA */
+
+/* AV Media Codec Type (Audio Codec ID) */
+#define A2D_MEDIA_CT_SBC        0x00    /* SBC media codec type */
+#define A2D_MEDIA_CT_M12        0x01    /* MPEG-1, 2 Audio media codec type */
+#define A2D_MEDIA_CT_M24        0x02    /* MPEG-2, 4 AAC media codec type */
+#define A2D_MEDIA_CT_ATRAC      0x04    /* ATRAC family media codec type */
+
+#define A2D_SUCCESS           0     /* Success */
+#define A2D_FAIL              0x0A  /* Failed */
+#define A2D_BUSY              0x0B  /* A2D_FindService is already in progress */
+#define A2D_INVALID_PARAMS    0x0C  /* bad parameters */
+#define A2D_WRONG_CODEC       0x0D  /* wrong codec info */
+#define A2D_BAD_CODEC_TYPE    0xC1  /* Media Codec Type is not valid  */
+#define A2D_NS_CODEC_TYPE     0xC2  /* Media Codec Type is not supported */
+#define A2D_BAD_SAMP_FREQ     0xC3  /* Sampling Frequency is not valid or multiple values have been selected  */
+#define A2D_NS_SAMP_FREQ      0xC4  /* Sampling Frequency is not supported  */
+#define A2D_BAD_CH_MODE       0xC5  /* Channel Mode is not valid or multiple values have been selected  */
+#define A2D_NS_CH_MODE        0xC6  /* Channel Mode is not supported */
+#define A2D_BAD_SUBBANDS      0xC7  /* None or multiple values have been selected for Number of Subbands */
+#define A2D_NS_SUBBANDS       0xC8  /* Number of Subbands is not supported */
+#define A2D_BAD_ALLOC_MTHD    0xC9  /* None or multiple values have been selected for Allocation Method */
+#define A2D_NS_ALLOC_MTHD     0xCA  /* Allocation Method is not supported */
+#define A2D_BAD_MIN_BITPOOL   0xCB  /* Minimum Bitpool Value is not valid */
+#define A2D_NS_MIN_BITPOOL    0xCC  /* Minimum Bitpool Value is not supported */
+#define A2D_BAD_MAX_BITPOOL   0xCD  /* Maximum Bitpool Value is not valid */
+#define A2D_NS_MAX_BITPOOL    0xCE  /* Maximum Bitpool Value is not supported */
+#define A2D_BAD_LAYER         0xCF  /* None or multiple values have been selected for Layer */
+#define A2D_NS_LAYER          0xD0  /* Layer is not supported */
+#define A2D_NS_CRC            0xD1  /* CRC is not supported */
+#define A2D_NS_MPF            0xD2  /* MPF-2 is not supported */
+#define A2D_NS_VBR            0xD3  /* VBR is not supported */
+#define A2D_BAD_BIT_RATE      0xD4  /* None or multiple values have been selected for Bit Rate */
+#define A2D_NS_BIT_RATE       0xD5  /* Bit Rate is not supported */
+#define A2D_BAD_OBJ_TYPE      0xD6  /* Either 1) Object type is not valid (b3-b0) or 2) None or multiple values have been selected for Object Type */
+#define A2D_NS_OBJ_TYPE       0xD7  /* Object type is not supported */
+#define A2D_BAD_CHANNEL       0xD8  /* None or multiple values have been selected for Channels */
+#define A2D_NS_CHANNEL        0xD9  /* Channels is not supported */
+#define A2D_BAD_BLOCK_LEN     0xDD  /* None or multiple values have been selected for Block Length */
+#define A2D_BAD_CP_TYPE       0xE0  /* The requested CP Type is not supported. */
+#define A2D_BAD_CP_FORMAT     0xE1  /* The format of Content Protection Service Capability/Content Protection Scheme Dependent Data is not correct. */
+
+typedef UINT8 tA2D_STATUS;
+
+/* the return values from A2D_BitsSet() */
+#define A2D_SET_ONE_BIT         1   /* one and only one bit is set */
+#define A2D_SET_ZERO_BIT        0   /* all bits clear */
+#define A2D_SET_MULTL_BIT       2   /* multiple bits are set */
+
+/*****************************************************************************
+**  type definitions
+*****************************************************************************/
+
+/* This data type is used in A2D_FindService() to initialize the SDP database
+ * to hold the result service search. */
+typedef struct {
+    UINT32              db_len;  /* Length, in bytes, of the discovery database */
+    UINT16              num_attr;/* The number of attributes in p_attrs */
+    tSDP_DISCOVERY_DB  *p_db;    /* Pointer to the discovery database */
+    UINT16             *p_attrs; /* The attributes filter. If NULL, A2DP API sets the attribute filter
+                                  * to be ATTR_ID_SERVICE_CLASS_ID_LIST, ATTR_ID_BT_PROFILE_DESC_LIST,
+                                  * ATTR_ID_SUPPORTED_FEATURES, ATTR_ID_SERVICE_NAME and ATTR_ID_PROVIDER_NAME.
+                                  * If not NULL, the input is taken as the filter. */
+} tA2D_SDP_DB_PARAMS;
+
+/* This data type is used in tA2D_FIND_CBACK to report the result of the SDP discovery process. */
+typedef struct {
+    UINT16  service_len;    /* Length, in bytes, of the service name */
+    UINT16  provider_len;   /* Length, in bytes, of the provider name */
+    char   *p_service_name; /* Pointer the service name.  This character string may not be null terminated.
+                             * Use the service_len parameter to safely copy this string */
+    char   *p_provider_name;/* Pointer the provider name.  This character string may not be null terminated.
+                             * Use the provider_len parameter to safely copy this string */
+    UINT16  features;       /* Profile supported features */
+    UINT16  avdt_version;   /* AVDTP protocol version */
+} tA2D_Service;
+
+/* This is the callback to notify the result of the SDP discovery process. */
+typedef void (tA2D_FIND_CBACK)(BOOLEAN found, tA2D_Service *p_service);
+
+
+/*****************************************************************************
+**  external function declarations
+*****************************************************************************/
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/******************************************************************************
+**
+** Function         A2D_AddRecord
+**
+** Description      This function is called by a server application to add
+**                  SRC or SNK information to an SDP record.  Prior to
+**                  calling this function the application must call
+**                  SDP_CreateRecord() to create an SDP record.
+**
+**                  Input Parameters:
+**                      service_uuid:  Indicates SRC or SNK.
+**
+**                      p_service_name:  Pointer to a null-terminated character
+**                      string containing the service name.
+**
+**                      p_provider_name:  Pointer to a null-terminated character
+**                      string containing the provider name.
+**
+**                      features:  Profile supported features.
+**
+**                      sdp_handle:  SDP handle returned by SDP_CreateRecord().
+**
+**                  Output Parameters:
+**                      None.
+**
+** Returns          A2D_SUCCESS if function execution succeeded,
+**                  A2D_INVALID_PARAMS if bad parameters are given.
+**                  A2D_FAIL if function execution failed.
+**
+******************************************************************************/
+extern tA2D_STATUS A2D_AddRecord(UINT16 service_uuid, char *p_service_name, char *p_provider_name,
+                                 UINT16 features, UINT32 sdp_handle);
+
+/******************************************************************************
+**
+** Function         A2D_FindService
+**
+** Description      This function is called by a client application to
+**                  perform service discovery and retrieve SRC or SNK SDP
+**                  record information from a server.  Information is
+**                  returned for the first service record found on the
+**                  server that matches the service UUID.  The callback
+**                  function will be executed when service discovery is
+**                  complete.  There can only be one outstanding call to
+**                  A2D_FindService() at a time; the application must wait
+**                  for the callback before it makes another call to
+**                  the function.
+**
+**                  Input Parameters:
+**                      service_uuid:  Indicates SRC or SNK.
+**
+**                      bd_addr:  BD address of the peer device.
+**
+**                      p_db:  Pointer to the information to initialize
+**                             the discovery database.
+**
+**                      p_cback:  Pointer to the A2D_FindService()
+**                      callback function.
+**
+**                  Output Parameters:
+**                      None.
+**
+** Returns          A2D_SUCCESS if function execution succeeded,
+**                  A2D_INVALID_PARAMS if bad parameters are given.
+**                  A2D_BUSY if discovery is already in progress.
+**                  A2D_FAIL if function execution failed.
+**
+******************************************************************************/
+extern tA2D_STATUS A2D_FindService(UINT16 service_uuid, BD_ADDR bd_addr,
+                                   tA2D_SDP_DB_PARAMS *p_db, tA2D_FIND_CBACK *p_cback);
+
+/******************************************************************************
+**
+** Function         A2D_SetTraceLevel
+**
+** Description      Sets the trace level for A2D. If 0xff is passed, the
+**                  current trace level is returned.
+**
+**                  Input Parameters:
+**                      new_level:  The level to set the A2D tracing to:
+**                      0xff-returns the current setting.
+**                      0-turns off tracing.
+**                      >= 1-Errors.
+**                      >= 2-Warnings.
+**                      >= 3-APIs.
+**                      >= 4-Events.
+**                      >= 5-Debug.
+**
+** Returns          The new trace level or current trace level if
+**                  the input parameter is 0xff.
+**
+******************************************************************************/
+extern UINT8 A2D_SetTraceLevel (UINT8 new_level);
+
+/******************************************************************************
+** Function         A2D_BitsSet
+**
+** Description      Check the given num for the number of bits set
+** Returns          A2D_SET_ONE_BIT, if one and only one bit is set
+**                  A2D_SET_ZERO_BIT, if all bits clear
+**                  A2D_SET_MULTL_BIT, if multiple bits are set
+******************************************************************************/
+extern UINT8 A2D_BitsSet(UINT8 num);
+
+#ifdef __cplusplus
+}
+#endif
+
+/*******************************************************************************
+**
+** Function         A2D_Init
+**
+** Description      This function is called at stack startup to allocate the
+**                  control block (if using dynamic memory), and initializes the
+**                  control block and tracing level.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void A2D_Init(void);
+#endif  ///A2D_INCLUDED
+#endif /* A2D_API_H */
diff --git a/tools/sdk/include/bluedroid/a2d_int.h b/tools/sdk/include/bluedroid/a2d_int.h
new file mode 100644
index 00000000000..89055bce991
--- /dev/null
+++ b/tools/sdk/include/bluedroid/a2d_int.h
@@ -0,0 +1,81 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2002-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  2DP internal header file
+ *
+ ******************************************************************************/
+#ifndef A2D_INT_H
+#define A2D_INT_H
+
+#include "a2d_api.h"
+#if (A2D_INCLUDED == TRUE)
+/*****************************************************************************
+**  Constants
+*****************************************************************************/
+#define A2D_VERSION             0x0102
+
+/* Number of attributes in A2D SDP record. */
+#define A2D_NUM_ATTR            6
+
+/* Number of protocol elements in protocol element list. */
+#define A2D_NUM_PROTO_ELEMS     2
+
+/*****************************************************************************
+**  Type definitions
+*****************************************************************************/
+
+/* Control block used by A2D_FindService(). */
+typedef struct {
+    tA2D_FIND_CBACK     *p_cback;       /* pointer to application callback */
+    tSDP_DISCOVERY_DB   *p_db;          /* pointer to discovery database */
+    UINT16              service_uuid;   /* service UUID of search */
+} tA2D_FIND_CB;
+
+typedef struct {
+    tA2D_FIND_CB    find;   /* find service control block */
+    UINT8           trace_level;
+    BOOLEAN         use_desc;
+    UINT16          avdt_sdp_ver;   /* AVDTP version */
+} tA2D_CB;
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/******************************************************************************
+** Main Control Block
+*******************************************************************************/
+#if A2D_DYNAMIC_MEMORY == FALSE
+extern tA2D_CB  a2d_cb;
+#else
+extern tA2D_CB *a2d_cb_ptr;
+#define a2d_cb (*a2d_cb_ptr)
+#endif
+
+/* Used only for conformance testing */
+extern void a2d_set_avdt_sdp_ver (UINT16 avdt_sdp_ver);
+
+#ifdef __cplusplus
+}
+#endif
+#endif  ///A2D_INCLUDED == TRUE
+#endif /* A2D_INT_H */
diff --git a/tools/sdk/include/bluedroid/a2d_sbc.h b/tools/sdk/include/bluedroid/a2d_sbc.h
new file mode 100644
index 00000000000..98b63e46ca9
--- /dev/null
+++ b/tools/sdk/include/bluedroid/a2d_sbc.h
@@ -0,0 +1,213 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2000-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  nterface to low complexity subband codec (SBC)
+ *
+ ******************************************************************************/
+#ifndef A2D_SBC_H
+#define A2D_SBC_H
+#if (A2D_INCLUDED == TRUE)
+/*****************************************************************************
+**  Constants
+*****************************************************************************/
+/* the length of the SBC Media Payload header. */
+#define A2D_SBC_MPL_HDR_LEN         1
+
+/* the LOSC of SBC media codec capabilitiy */
+#define A2D_SBC_INFO_LEN            6
+
+/* for Codec Specific Information Element */
+#define A2D_SBC_IE_SAMP_FREQ_MSK    0xF0    /* b7-b4 sampling frequency */
+#define A2D_SBC_IE_SAMP_FREQ_16     0x80    /* b7:16  kHz */
+#define A2D_SBC_IE_SAMP_FREQ_32     0x40    /* b6:32  kHz */
+#define A2D_SBC_IE_SAMP_FREQ_44     0x20    /* b5:44.1kHz */
+#define A2D_SBC_IE_SAMP_FREQ_48     0x10    /* b4:48  kHz */
+
+#define A2D_SBC_IE_CH_MD_MSK        0x0F    /* b3-b0 channel mode */
+#define A2D_SBC_IE_CH_MD_MONO       0x08    /* b3: mono */
+#define A2D_SBC_IE_CH_MD_DUAL       0x04    /* b2: dual */
+#define A2D_SBC_IE_CH_MD_STEREO     0x02    /* b1: stereo */
+#define A2D_SBC_IE_CH_MD_JOINT      0x01    /* b0: joint stereo */
+
+#define A2D_SBC_IE_BLOCKS_MSK       0xF0    /* b7-b4 number of blocks */
+#define A2D_SBC_IE_BLOCKS_4         0x80    /* 4 blocks */
+#define A2D_SBC_IE_BLOCKS_8         0x40    /* 8 blocks */
+#define A2D_SBC_IE_BLOCKS_12        0x20    /* 12blocks */
+#define A2D_SBC_IE_BLOCKS_16        0x10    /* 16blocks */
+
+#define A2D_SBC_IE_SUBBAND_MSK      0x0C    /* b3-b2 number of subbands */
+#define A2D_SBC_IE_SUBBAND_4        0x08    /* b3: 4 */
+#define A2D_SBC_IE_SUBBAND_8        0x04    /* b2: 8 */
+
+#define A2D_SBC_IE_ALLOC_MD_MSK     0x03    /* b1-b0 allocation mode */
+#define A2D_SBC_IE_ALLOC_MD_S       0x02    /* b1: SNR */
+#define A2D_SBC_IE_ALLOC_MD_L       0x01    /* b0: loundess */
+
+#define A2D_SBC_IE_MIN_BITPOOL      2
+#define A2D_SBC_IE_MAX_BITPOOL      250
+
+/* for media payload header */
+#define A2D_SBC_HDR_F_MSK           0x80
+#define A2D_SBC_HDR_S_MSK           0x40
+#define A2D_SBC_HDR_L_MSK           0x20
+#define A2D_SBC_HDR_NUM_MSK         0x0F
+
+/*****************************************************************************
+**  Type Definitions
+*****************************************************************************/
+
+/* data type for the SBC Codec Information Element*/
+typedef struct {
+    UINT8   samp_freq;      /* Sampling frequency */
+    UINT8   ch_mode;        /* Channel mode */
+    UINT8   block_len;      /* Block length */
+    UINT8   num_subbands;   /* Number of subbands */
+    UINT8   alloc_mthd;     /* Allocation method */
+    UINT8   max_bitpool;    /* Maximum bitpool */
+    UINT8   min_bitpool;    /* Minimum bitpool */
+} tA2D_SBC_CIE;
+
+
+/*****************************************************************************
+**  External Function Declarations
+*****************************************************************************/
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/******************************************************************************
+**
+** Function         A2D_SbcChkFrInit
+**
+** Description      check if need to init the descramble control block.
+**
+** Returns          nothing.
+******************************************************************************/
+extern void A2D_SbcChkFrInit(UINT8 *p_pkt);
+
+/******************************************************************************
+**
+** Function         A2D_SbcDescramble
+**
+** Description      descramble the packet.
+**
+** Returns          nothing.
+******************************************************************************/
+extern void A2D_SbcDescramble(UINT8 *p_pkt, UINT16 len);
+
+/******************************************************************************
+**
+** Function         A2D_BldSbcInfo
+**
+** Description      This function is called by an application to build
+**                  the SBC Media Codec Capabilities byte sequence
+**                  beginning from the LOSC octet.
+**                  Input Parameters:
+**                      media_type:  Indicates Audio, or Multimedia.
+**
+**                      p_ie:  The SBC Codec Information Element information.
+**
+**                  Output Parameters:
+**                      p_result:  the resulting codec info byte sequence.
+**
+** Returns          A2D_SUCCESS if function execution succeeded.
+**                  Error status code, otherwise.
+******************************************************************************/
+extern tA2D_STATUS A2D_BldSbcInfo(UINT8 media_type, tA2D_SBC_CIE *p_ie,
+                                  UINT8 *p_result);
+
+/******************************************************************************
+**
+** Function         A2D_ParsSbcInfo
+**
+** Description      This function is called by an application to parse
+**                  the SBC Media Codec Capabilities byte sequence
+**                  beginning from the LOSC octet.
+**                  Input Parameters:
+**                      p_info:  the byte sequence to parse.
+**
+**                      for_caps:  TRUE, if the byte sequence is for get capabilities response.
+**
+**                  Output Parameters:
+**                      p_ie:  The SBC Codec Information Element information.
+**
+** Returns          A2D_SUCCESS if function execution succeeded.
+**                  Error status code, otherwise.
+******************************************************************************/
+extern tA2D_STATUS A2D_ParsSbcInfo(tA2D_SBC_CIE *p_ie, UINT8 *p_info,
+                                   BOOLEAN for_caps);
+
+/******************************************************************************
+**
+** Function         A2D_BldSbcMplHdr
+**
+** Description      This function is called by an application to parse
+**                  the SBC Media Payload header.
+**                  Input Parameters:
+**                      frag:  1, if fragmented. 0, otherwise.
+**
+**                      start:  1, if the starting packet of a fragmented frame.
+**
+**                      last:  1, if the last packet of a fragmented frame.
+**
+**                      num:  If frag is 1, this is the number of remaining fragments
+**                            (including this fragment) of this frame.
+**                            If frag is 0, this is the number of frames in this packet.
+**
+**                  Output Parameters:
+**                      p_dst:  the resulting media payload header byte sequence.
+**
+** Returns          void.
+******************************************************************************/
+extern void A2D_BldSbcMplHdr(UINT8 *p_dst, BOOLEAN frag, BOOLEAN start,
+                             BOOLEAN last, UINT8 num);
+
+/******************************************************************************
+**
+** Function         A2D_ParsSbcMplHdr
+**
+** Description      This function is called by an application to parse
+**                  the SBC Media Payload header.
+**                  Input Parameters:
+**                      p_src:  the byte sequence to parse..
+**
+**                  Output Parameters:
+**                      frag:  1, if fragmented. 0, otherwise.
+**
+**                      start:  1, if the starting packet of a fragmented frame.
+**
+**                      last:  1, if the last packet of a fragmented frame.
+**
+**                      num:  If frag is 1, this is the number of remaining fragments
+**                            (including this fragment) of this frame.
+**                            If frag is 0, this is the number of frames in this packet.
+**
+** Returns          void.
+******************************************************************************/
+extern void A2D_ParsSbcMplHdr(UINT8 *p_src, BOOLEAN *p_frag,
+                              BOOLEAN *p_start, BOOLEAN *p_last,
+                              UINT8 *p_num);
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///A2D_INCLUDED == TRUE
+
+#endif /* A2D_SBC_H */
diff --git a/tools/sdk/include/bluedroid/alarm.h b/tools/sdk/include/bluedroid/alarm.h
index 35c0f4666b2..937874f2195 100644
--- a/tools/sdk/include/bluedroid/alarm.h
+++ b/tools/sdk/include/bluedroid/alarm.h
@@ -26,7 +26,7 @@
 typedef uint32_t period_ms_t;
 typedef void (*osi_alarm_callback_t)(void *data);
 
-#define ALARM_CBS_NUM   20
+#define ALARM_CBS_NUM   30
 #define ALARM_ID_BASE   1000
 typedef struct alarm_t {
     /* timer id point to here */
diff --git a/tools/sdk/include/bluedroid/avct_api.h b/tools/sdk/include/bluedroid/avct_api.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/avct_defs.h b/tools/sdk/include/bluedroid/avct_defs.h
new file mode 100644
index 00000000000..30b8859fe03
--- /dev/null
+++ b/tools/sdk/include/bluedroid/avct_defs.h
@@ -0,0 +1,62 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2003-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This contains constants definitions and other information from the AVCTP
+ *  specification.  This file is intended for use internal to AVCT only.
+ *
+ ******************************************************************************/
+#ifndef AVCT_DEFS_H
+#define AVCT_DEFS_H
+
+/*****************************************************************************
+** constants
+*****************************************************************************/
+
+/* packet type */
+#define AVCT_PKT_TYPE_SINGLE        0       /* single packet */
+#define AVCT_PKT_TYPE_START         1       /* start packet */
+#define AVCT_PKT_TYPE_CONT          2       /* continue packet */
+#define AVCT_PKT_TYPE_END           3       /* end packet */
+
+/* header lengths for different packet types */
+#define AVCT_HDR_LEN_SINGLE         3
+#define AVCT_HDR_LEN_START          4
+#define AVCT_HDR_LEN_CONT           1
+#define AVCT_HDR_LEN_END            1
+
+/* invalid cr+ipid value */
+#define AVCT_CR_IPID_INVALID        1
+
+/*****************************************************************************
+** message parsing and building macros
+*****************************************************************************/
+
+#define AVCT_BLD_HDR(p, label, type, cr_ipid) \
+    *(p)++ = ((label) << 4) | ((type) << 2) | (cr_ipid);
+
+#define AVCT_PRS_HDR(p, label, type, cr_ipid) \
+    label = *(p) >> 4; \
+    type = (*(p) >> 2) & 3; \
+    cr_ipid = *(p)++ & 3;
+
+#define AVCT_PRS_PKT_TYPE(p, type) \
+    type = (*(p) >> 2) & 3;
+
+#endif /* AVCT_DEFS_H */
diff --git a/tools/sdk/include/bluedroid/avct_int.h b/tools/sdk/include/bluedroid/avct_int.h
new file mode 100644
index 00000000000..c922fe11663
--- /dev/null
+++ b/tools/sdk/include/bluedroid/avct_int.h
@@ -0,0 +1,237 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2003-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This file contains interfaces which are internal to AVCTP.
+ *
+ ******************************************************************************/
+#ifndef AVCT_INT_H
+#define AVCT_INT_H
+
+#include "gki.h"
+#include "avct_api.h"
+#include "avct_defs.h"
+#include "l2c_api.h"
+
+/*****************************************************************************
+** constants
+*****************************************************************************/
+
+/* lcb state machine events */
+enum {
+    AVCT_LCB_UL_BIND_EVT,
+    AVCT_LCB_UL_UNBIND_EVT,
+    AVCT_LCB_UL_MSG_EVT,
+    AVCT_LCB_INT_CLOSE_EVT,
+    AVCT_LCB_LL_OPEN_EVT,
+    AVCT_LCB_LL_CLOSE_EVT,
+    AVCT_LCB_LL_MSG_EVT,
+    AVCT_LCB_LL_CONG_EVT
+};
+
+
+/* "states" used for L2CAP channel */
+#define AVCT_CH_IDLE    0       /* No connection */
+#define AVCT_CH_CONN    1       /* Waiting for connection confirm */
+#define AVCT_CH_CFG     2       /* Waiting for configuration complete */
+#define AVCT_CH_OPEN    3       /* Channel opened */
+
+/* "no event" indicator used by ccb dealloc */
+#define AVCT_NO_EVT     0xFF
+
+/*****************************************************************************
+** data types
+*****************************************************************************/
+/* sub control block type - common data members for tAVCT_LCB and tAVCT_BCB */
+typedef struct {
+    UINT16              peer_mtu;       /* peer l2c mtu */
+    UINT16              ch_result;      /* L2CAP connection result value */
+    UINT16              ch_lcid;        /* L2CAP channel LCID */
+    UINT8               allocated;      /* 0, not allocated. index+1, otherwise. */
+    UINT8               state;          /* The state machine state */
+    UINT8               ch_state;       /* L2CAP channel state */
+    UINT8               ch_flags;       /* L2CAP configuration flags */
+} tAVCT_SCB;
+
+/* link control block type */
+typedef struct {
+    UINT16              peer_mtu;       /* peer l2c mtu */
+    UINT16              ch_result;      /* L2CAP connection result value */
+    UINT16              ch_lcid;        /* L2CAP channel LCID */
+    UINT8               allocated;      /* 0, not allocated. index+1, otherwise. */
+    UINT8               state;          /* The state machine state */
+    UINT8               ch_state;       /* L2CAP channel state */
+    UINT8               ch_flags;       /* L2CAP configuration flags */
+    BT_HDR              *p_rx_msg;      /* Message being reassembled */
+    UINT16              conflict_lcid;  /* L2CAP channel LCID */
+    BD_ADDR             peer_addr;      /* BD address of peer */
+    BUFFER_Q            tx_q;           /* Transmit data buffer queue       */
+    BOOLEAN             cong;           /* TRUE, if congested */
+} tAVCT_LCB;
+
+/* browse control block type */
+typedef struct {
+    UINT16              peer_mtu;       /* peer l2c mtu */
+    UINT16              ch_result;      /* L2CAP connection result value */
+    UINT16              ch_lcid;        /* L2CAP channel LCID */
+    UINT8               allocated;      /* 0, not allocated. index+1, otherwise. */
+    UINT8               state;          /* The state machine state */
+    UINT8               ch_state;       /* L2CAP channel state */
+    UINT8               ch_flags;       /* L2CAP configuration flags */
+    BT_HDR              *p_tx_msg;      /* Message to be sent - in case the browsing channel is not open when MsgReg is called */
+    UINT8               ch_close;       /* CCB index+1, if CCB initiated channel close */
+} tAVCT_BCB;
+
+#define AVCT_ALOC_LCB       0x01
+#define AVCT_ALOC_BCB       0x02
+/* connection control block */
+typedef struct {
+    tAVCT_CC            cc;                 /* parameters from connection creation */
+    tAVCT_LCB           *p_lcb;             /* Associated LCB */
+    tAVCT_BCB           *p_bcb;             /* associated BCB */
+    BOOLEAN             ch_close;           /* Whether CCB initiated channel close */
+    UINT8               allocated;          /* Whether LCB/BCB is allocated */
+} tAVCT_CCB;
+
+/* data type associated with UL_MSG_EVT */
+typedef struct {
+    BT_HDR                  *p_buf;
+    tAVCT_CCB               *p_ccb;
+    UINT8                   label;
+    UINT8                   cr;
+} tAVCT_UL_MSG;
+
+/* union associated with lcb state machine events */
+typedef union {
+    tAVCT_UL_MSG            ul_msg;
+    BT_HDR                  *p_buf;
+    tAVCT_CCB               *p_ccb;
+    UINT16                  result;
+    BOOLEAN                 cong;
+    UINT8                   err_code;
+} tAVCT_LCB_EVT;
+
+/* Control block for AVCT */
+typedef struct {
+    tAVCT_LCB       lcb[AVCT_NUM_LINKS];    /* link control blocks */
+    tAVCT_BCB       bcb[AVCT_NUM_LINKS];    /* browse control blocks */
+    tAVCT_CCB       ccb[AVCT_NUM_CONN];     /* connection control blocks */
+    UINT16          mtu;                    /* our L2CAP MTU */
+    UINT16          mtu_br;                 /* our L2CAP MTU for the Browsing channel */
+    UINT8           trace_level;            /* trace level */
+} tAVCT_CB;
+
+/*****************************************************************************
+** function declarations
+*****************************************************************************/
+
+/* LCB function declarations */
+extern void avct_lcb_event(tAVCT_LCB *p_lcb, UINT8 event, tAVCT_LCB_EVT *p_data);
+#if (AVCT_BROWSE_INCLUDED == TRUE)
+extern void avct_bcb_event(tAVCT_BCB *p_bcb, UINT8 event, tAVCT_LCB_EVT *p_data);
+extern void avct_close_bcb(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern tAVCT_LCB *avct_lcb_by_bcb(tAVCT_BCB *p_bcb);
+extern tAVCT_BCB *avct_bcb_by_lcb(tAVCT_LCB *p_lcb);
+extern BOOLEAN avct_bcb_last_ccb(tAVCT_BCB *p_bcb, tAVCT_CCB *p_ccb_last);
+extern tAVCT_BCB *avct_bcb_by_lcid(UINT16 lcid);
+#endif
+extern tAVCT_LCB *avct_lcb_by_bd(BD_ADDR bd_addr);
+extern tAVCT_LCB *avct_lcb_alloc(BD_ADDR bd_addr);
+extern void avct_lcb_dealloc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern tAVCT_LCB *avct_lcb_by_lcid(UINT16 lcid);
+extern tAVCT_CCB *avct_lcb_has_pid(tAVCT_LCB *p_lcb, UINT16 pid);
+extern BOOLEAN avct_lcb_last_ccb(tAVCT_LCB *p_lcb, tAVCT_CCB *p_ccb_last);
+
+/* LCB action functions */
+extern void avct_lcb_chnl_open(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_unbind_disc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_open_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_open_fail(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_close_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_close_cfm(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_bind_conn(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_chk_disc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_chnl_disc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_bind_fail(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_cong_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_discard_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_send_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_msg_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+extern void avct_lcb_free_msg_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data);
+
+/* BCB action functions */
+#if (AVCT_BROWSE_INCLUDED == TRUE)
+typedef void (*tAVCT_BCB_ACTION)(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_chnl_open(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_unbind_disc(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_open_ind(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_open_fail(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_close_ind(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_close_cfm(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_bind_conn(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_chk_disc(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_chnl_disc(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_bind_fail(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_cong_ind(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_discard_msg(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_send_msg(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_msg_ind(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+extern void avct_bcb_free_msg_ind(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+
+extern void avct_bcb_dealloc(tAVCT_BCB *p_bcb, tAVCT_LCB_EVT *p_data);
+
+extern const tAVCT_BCB_ACTION avct_bcb_action[];
+extern const UINT8 avct_lcb_pkt_type_len[];
+extern const tL2CAP_FCR_OPTS avct_l2c_br_fcr_opts_def;
+#endif
+
+/* CCB function declarations */
+extern tAVCT_CCB *avct_ccb_alloc(tAVCT_CC *p_cc);
+extern void avct_ccb_dealloc(tAVCT_CCB *p_ccb, UINT8 event, UINT16 result, BD_ADDR bd_addr);
+extern UINT8 avct_ccb_to_idx(tAVCT_CCB *p_ccb);
+extern tAVCT_CCB *avct_ccb_by_idx(UINT8 idx);
+
+
+/*****************************************************************************
+** global data
+*****************************************************************************/
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* Main control block */
+#if AVCT_DYNAMIC_MEMORY == FALSE
+extern tAVCT_CB avct_cb;
+#else
+extern tAVCT_CB *avct_cb_ptr;
+#define avct_cb (*avct_cb_ptr)
+#endif
+
+/* L2CAP callback registration structure */
+extern const tL2CAP_APPL_INFO avct_l2c_appl;
+#if (AVCT_BROWSE_INCLUDED == TRUE)
+extern const tL2CAP_APPL_INFO avct_l2c_br_appl;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* AVCT_INT_H */
diff --git a/tools/sdk/include/bluedroid/avdt_api.h b/tools/sdk/include/bluedroid/avdt_api.h
index 59a9db778c6..a1e856b6fd6 100644
--- a/tools/sdk/include/bluedroid/avdt_api.h
+++ b/tools/sdk/include/bluedroid/avdt_api.h
@@ -203,6 +203,9 @@ typedef UINT8 AVDT_REPORT_TYPE;
 #define AVDT_NSC_RECONFIG           0x02    /* Reconfigure command not supported */
 #define AVDT_NSC_SECURITY           0x04    /* Security command not supported */
 
+/* AVDT disconnection reason */
+#define AVDT_DISC_RSN_NORMAL        0
+#define AVDT_DISC_RSN_ABNORMAL      (0xce)  /* unintentional disconnection */
 /*****************************************************************************
 **  Type Definitions
 *****************************************************************************/
diff --git a/tools/sdk/include/bluedroid/avdt_defs.h b/tools/sdk/include/bluedroid/avdt_defs.h
old mode 100755
new mode 100644
index b6dbbc4f55f..ad1d9d1efab
--- a/tools/sdk/include/bluedroid/avdt_defs.h
+++ b/tools/sdk/include/bluedroid/avdt_defs.h
@@ -24,6 +24,9 @@
  ******************************************************************************/
 #ifndef AVDT_DEFS_H
 #define AVDT_DEFS_H
+#include "bt_target.h"
+
+#if (AVDT_INCLUDED == TRUE)
 
 /*****************************************************************************
 ** constants
@@ -199,5 +202,7 @@
 #define AVDT_MSG_BLD_NOSP(p, nosp) \
     *(p)++ = (UINT8) (nosp);
 
+#endif  ///AVRC_INCLUDED == TRUE
+
 #endif /* AVDT_DEFS_H */
 
diff --git a/tools/sdk/include/bluedroid/avdt_int.h b/tools/sdk/include/bluedroid/avdt_int.h
new file mode 100644
index 00000000000..5050f0668f3
--- /dev/null
+++ b/tools/sdk/include/bluedroid/avdt_int.h
@@ -0,0 +1,748 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2002-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This file contains interfaces which are internal to AVDTP.
+ *
+ ******************************************************************************/
+#ifndef AVDT_INT_H
+#define AVDT_INT_H
+
+#include "gki.h"
+#include "avdt_api.h"
+#include "avdtc_api.h"
+#include "avdt_defs.h"
+#include "l2c_api.h"
+#include "btm_api.h"
+
+#if (AVRC_INCLUDED == TRUE)
+
+#ifndef AVDT_DEBUG
+#define AVDT_DEBUG  FALSE
+#endif
+
+/*****************************************************************************
+** constants
+*****************************************************************************/
+
+/* channel types */
+enum {
+    AVDT_CHAN_SIG,                  /* signaling channel */
+    AVDT_CHAN_MEDIA,                /* media channel */
+#if AVDT_REPORTING == TRUE
+    AVDT_CHAN_REPORT,               /* reporting channel */
+#endif
+    AVDT_CHAN_NUM_TYPES
+};
+
+/* protocol service capabilities of this AVDTP implementation */
+/* for now multiplexing will be used only for fragmentation */
+#if ((AVDT_MULTIPLEXING == TRUE) && (AVDT_REPORTING == TRUE))
+#define AVDT_PSC                (AVDT_PSC_TRANS | AVDT_PSC_MUX | AVDT_PSC_REPORT | AVDT_PSC_DELAY_RPT)
+#define AVDT_LEG_PSC            (AVDT_PSC_TRANS | AVDT_PSC_MUX | AVDT_PSC_REPORT)
+#else /* AVDT_MULTIPLEXING && AVDT_REPORTING  */
+
+#if (AVDT_MULTIPLEXING == TRUE)
+#define AVDT_PSC                (AVDT_PSC_TRANS | AVDT_PSC_MUX | AVDT_PSC_DELAY_RPT)
+#define AVDT_LEG_PSC            (AVDT_PSC_TRANS | AVDT_PSC_MUX)
+#else /* AVDT_MULTIPLEXING */
+
+#if (AVDT_REPORTING == TRUE)
+#define AVDT_PSC                (AVDT_PSC_TRANS | AVDT_PSC_REPORT | AVDT_PSC_DELAY_RPT)
+#define AVDT_LEG_PSC            (AVDT_PSC_TRANS | AVDT_PSC_REPORT)
+#else /* AVDT_REPORTING  */
+#define AVDT_PSC                (AVDT_PSC_TRANS | AVDT_PSC_DELAY_RPT)
+#define AVDT_LEG_PSC            (AVDT_PSC_TRANS)
+#endif /* AVDT_REPORTING  */
+
+#endif /* AVDT_MULTIPLEXING */
+
+#endif /* AVDT_MULTIPLEXING && AVDT_REPORTING  */
+
+/* initiator/acceptor signaling roles */
+#define AVDT_CLOSE_ACP          0
+#define AVDT_CLOSE_INT          1
+#define AVDT_OPEN_ACP           2
+#define AVDT_OPEN_INT           3
+
+/* states for avdt_scb_verify */
+#define AVDT_VERIFY_OPEN        0
+#define AVDT_VERIFY_STREAMING   1
+#define AVDT_VERIFY_SUSPEND     2
+#define AVDT_VERIFY_START       3
+
+/* to distinguish CCB events from SCB events */
+#define AVDT_CCB_MKR            0x80
+
+/* offset where AVDTP signaling message header starts in message  */
+#define AVDT_HDR_OFFSET         (L2CAP_MIN_OFFSET + AVDT_NUM_SEPS)
+
+/* offset where AVDTP signaling message content starts;
+** use the size of a start header since it's the largest possible
+** layout of signaling message in a buffer is:
+**
+** |  BT_HDR  | SCB handles | L2CAP + HCI header | AVDTP header | data ... |
+**
+** Note that we "hide" the scb handles at the top of the message buffer.
+*/
+#define AVDT_MSG_OFFSET         (L2CAP_MIN_OFFSET + AVDT_NUM_SEPS + AVDT_LEN_TYPE_START)
+
+/* scb transport channel connect timeout value */
+#define AVDT_SCB_TC_CONN_TOUT   10
+
+/* scb transport channel disconnect timeout value */
+#define AVDT_SCB_TC_DISC_TOUT   10
+
+/* maximum number of command retransmissions */
+#ifndef AVDT_RET_MAX
+#define AVDT_RET_MAX            1
+#endif
+
+
+/* ccb state machine states */
+enum {
+    AVDT_CCB_IDLE_ST,
+    AVDT_CCB_OPENING_ST,
+    AVDT_CCB_OPEN_ST,
+    AVDT_CCB_CLOSING_ST
+};
+
+/* state machine action enumeration list */
+enum {
+    AVDT_CCB_CHAN_OPEN,
+    AVDT_CCB_CHAN_CLOSE,
+    AVDT_CCB_CHK_CLOSE,
+    AVDT_CCB_HDL_DISCOVER_CMD,
+    AVDT_CCB_HDL_DISCOVER_RSP,
+    AVDT_CCB_HDL_GETCAP_CMD,
+    AVDT_CCB_HDL_GETCAP_RSP,
+    AVDT_CCB_HDL_START_CMD,
+    AVDT_CCB_HDL_START_RSP,
+    AVDT_CCB_HDL_SUSPEND_CMD,
+    AVDT_CCB_HDL_SUSPEND_RSP,
+    AVDT_CCB_SND_DISCOVER_CMD,
+    AVDT_CCB_SND_DISCOVER_RSP,
+    AVDT_CCB_SND_GETCAP_CMD,
+    AVDT_CCB_SND_GETCAP_RSP,
+    AVDT_CCB_SND_START_CMD,
+    AVDT_CCB_SND_START_RSP,
+    AVDT_CCB_SND_SUSPEND_CMD,
+    AVDT_CCB_SND_SUSPEND_RSP,
+    AVDT_CCB_CLEAR_CMDS,
+    AVDT_CCB_CMD_FAIL,
+    AVDT_CCB_FREE_CMD,
+    AVDT_CCB_CONG_STATE,
+    AVDT_CCB_RET_CMD,
+    AVDT_CCB_SND_CMD,
+    AVDT_CCB_SND_MSG,
+    AVDT_CCB_SET_RECONN,
+    AVDT_CCB_CLR_RECONN,
+    AVDT_CCB_CHK_RECONN,
+    AVDT_CCB_CHK_TIMER,
+    AVDT_CCB_SET_CONN,
+    AVDT_CCB_SET_DISCONN,
+    AVDT_CCB_DO_DISCONN,
+    AVDT_CCB_LL_CLOSED,
+    AVDT_CCB_LL_OPENED,
+    AVDT_CCB_DEALLOC,
+    AVDT_CCB_NUM_ACTIONS
+};
+
+#define AVDT_CCB_IGNORE     AVDT_CCB_NUM_ACTIONS
+
+/* ccb state machine events */
+enum {
+    AVDT_CCB_API_DISCOVER_REQ_EVT,
+    AVDT_CCB_API_GETCAP_REQ_EVT,
+    AVDT_CCB_API_START_REQ_EVT,
+    AVDT_CCB_API_SUSPEND_REQ_EVT,
+    AVDT_CCB_API_DISCOVER_RSP_EVT,
+    AVDT_CCB_API_GETCAP_RSP_EVT,
+    AVDT_CCB_API_START_RSP_EVT,
+    AVDT_CCB_API_SUSPEND_RSP_EVT,
+    AVDT_CCB_API_CONNECT_REQ_EVT,
+    AVDT_CCB_API_DISCONNECT_REQ_EVT,
+    AVDT_CCB_MSG_DISCOVER_CMD_EVT,
+    AVDT_CCB_MSG_GETCAP_CMD_EVT,
+    AVDT_CCB_MSG_START_CMD_EVT,
+    AVDT_CCB_MSG_SUSPEND_CMD_EVT,
+    AVDT_CCB_MSG_DISCOVER_RSP_EVT,
+    AVDT_CCB_MSG_GETCAP_RSP_EVT,
+    AVDT_CCB_MSG_START_RSP_EVT,
+    AVDT_CCB_MSG_SUSPEND_RSP_EVT,
+    AVDT_CCB_RCVRSP_EVT,
+    AVDT_CCB_SENDMSG_EVT,
+    AVDT_CCB_RET_TOUT_EVT,
+    AVDT_CCB_RSP_TOUT_EVT,
+    AVDT_CCB_IDLE_TOUT_EVT,
+    AVDT_CCB_UL_OPEN_EVT,
+    AVDT_CCB_UL_CLOSE_EVT,
+    AVDT_CCB_LL_OPEN_EVT,
+    AVDT_CCB_LL_CLOSE_EVT,
+    AVDT_CCB_LL_CONG_EVT
+};
+
+
+/* scb state machine states; these state values are private to this module so
+** the scb state cannot be read or set by actions functions
+*/
+enum {
+    AVDT_SCB_IDLE_ST,
+    AVDT_SCB_CONF_ST,
+    AVDT_SCB_OPENING_ST,
+    AVDT_SCB_OPEN_ST,
+    AVDT_SCB_STREAM_ST,
+    AVDT_SCB_CLOSING_ST
+};
+
+/* state machine action enumeration list */
+enum {
+    AVDT_SCB_HDL_ABORT_CMD,
+    AVDT_SCB_HDL_ABORT_RSP,
+    AVDT_SCB_HDL_CLOSE_CMD,
+    AVDT_SCB_HDL_CLOSE_RSP,
+    AVDT_SCB_HDL_GETCONFIG_CMD,
+    AVDT_SCB_HDL_GETCONFIG_RSP,
+    AVDT_SCB_HDL_OPEN_CMD,
+    AVDT_SCB_HDL_OPEN_REJ,
+    AVDT_SCB_HDL_OPEN_RSP,
+    AVDT_SCB_HDL_PKT,
+    AVDT_SCB_DROP_PKT,
+    AVDT_SCB_HDL_RECONFIG_CMD,
+    AVDT_SCB_HDL_RECONFIG_RSP,
+    AVDT_SCB_HDL_SECURITY_CMD,
+    AVDT_SCB_HDL_SECURITY_RSP,
+    AVDT_SCB_HDL_SETCONFIG_CMD,
+    AVDT_SCB_HDL_SETCONFIG_REJ,
+    AVDT_SCB_HDL_SETCONFIG_RSP,
+    AVDT_SCB_HDL_START_CMD,
+    AVDT_SCB_HDL_START_RSP,
+    AVDT_SCB_HDL_SUSPEND_CMD,
+    AVDT_SCB_HDL_SUSPEND_RSP,
+    AVDT_SCB_HDL_TC_CLOSE,
+#if AVDT_REPORTING == TRUE
+    AVDT_SCB_HDL_TC_CLOSE_STO,
+#endif
+    AVDT_SCB_HDL_TC_OPEN,
+#if AVDT_REPORTING == TRUE
+    AVDT_SCB_HDL_TC_OPEN_STO,
+#endif
+    AVDT_SCB_SND_DELAY_RPT_REQ,
+    AVDT_SCB_HDL_DELAY_RPT_CMD,
+    AVDT_SCB_HDL_DELAY_RPT_RSP,
+    AVDT_SCB_HDL_WRITE_REQ,
+    AVDT_SCB_SND_ABORT_REQ,
+    AVDT_SCB_SND_ABORT_RSP,
+    AVDT_SCB_SND_CLOSE_REQ,
+    AVDT_SCB_SND_STREAM_CLOSE,
+    AVDT_SCB_SND_CLOSE_RSP,
+    AVDT_SCB_SND_GETCONFIG_REQ,
+    AVDT_SCB_SND_GETCONFIG_RSP,
+    AVDT_SCB_SND_OPEN_REQ,
+    AVDT_SCB_SND_OPEN_RSP,
+    AVDT_SCB_SND_RECONFIG_REQ,
+    AVDT_SCB_SND_RECONFIG_RSP,
+    AVDT_SCB_SND_SECURITY_REQ,
+    AVDT_SCB_SND_SECURITY_RSP,
+    AVDT_SCB_SND_SETCONFIG_REQ,
+    AVDT_SCB_SND_SETCONFIG_REJ,
+    AVDT_SCB_SND_SETCONFIG_RSP,
+    AVDT_SCB_SND_TC_CLOSE,
+    AVDT_SCB_CB_ERR,
+    AVDT_SCB_CONG_STATE,
+    AVDT_SCB_REJ_STATE,
+    AVDT_SCB_REJ_IN_USE,
+    AVDT_SCB_REJ_NOT_IN_USE,
+    AVDT_SCB_SET_REMOVE,
+    AVDT_SCB_FREE_PKT,
+    AVDT_SCB_CLR_PKT,
+    AVDT_SCB_CHK_SND_PKT,
+    AVDT_SCB_TC_TIMER,
+    AVDT_SCB_CLR_VARS,
+    AVDT_SCB_DEALLOC,
+    AVDT_SCB_NUM_ACTIONS
+};
+
+#define AVDT_SCB_IGNORE     AVDT_SCB_NUM_ACTIONS
+
+/* scb state machine events */
+enum {
+    AVDT_SCB_API_REMOVE_EVT,
+    AVDT_SCB_API_WRITE_REQ_EVT,
+    AVDT_SCB_API_GETCONFIG_REQ_EVT,
+    AVDT_SCB_API_DELAY_RPT_REQ_EVT,
+    AVDT_SCB_API_SETCONFIG_REQ_EVT,
+    AVDT_SCB_API_OPEN_REQ_EVT,
+    AVDT_SCB_API_CLOSE_REQ_EVT,
+    AVDT_SCB_API_RECONFIG_REQ_EVT,
+    AVDT_SCB_API_SECURITY_REQ_EVT,
+    AVDT_SCB_API_ABORT_REQ_EVT,
+    AVDT_SCB_API_GETCONFIG_RSP_EVT,
+    AVDT_SCB_API_SETCONFIG_RSP_EVT,
+    AVDT_SCB_API_SETCONFIG_REJ_EVT,
+    AVDT_SCB_API_OPEN_RSP_EVT,
+    AVDT_SCB_API_CLOSE_RSP_EVT,
+    AVDT_SCB_API_RECONFIG_RSP_EVT,
+    AVDT_SCB_API_SECURITY_RSP_EVT,
+    AVDT_SCB_API_ABORT_RSP_EVT,
+    AVDT_SCB_MSG_SETCONFIG_CMD_EVT,
+    AVDT_SCB_MSG_GETCONFIG_CMD_EVT,
+    AVDT_SCB_MSG_OPEN_CMD_EVT,
+    AVDT_SCB_MSG_START_CMD_EVT,
+    AVDT_SCB_MSG_SUSPEND_CMD_EVT,
+    AVDT_SCB_MSG_CLOSE_CMD_EVT,
+    AVDT_SCB_MSG_ABORT_CMD_EVT,
+    AVDT_SCB_MSG_RECONFIG_CMD_EVT,
+    AVDT_SCB_MSG_SECURITY_CMD_EVT,
+    AVDT_SCB_MSG_DELAY_RPT_CMD_EVT,
+    AVDT_SCB_MSG_DELAY_RPT_RSP_EVT,
+    AVDT_SCB_MSG_SETCONFIG_RSP_EVT,
+    AVDT_SCB_MSG_GETCONFIG_RSP_EVT,
+    AVDT_SCB_MSG_OPEN_RSP_EVT,
+    AVDT_SCB_MSG_START_RSP_EVT,
+    AVDT_SCB_MSG_SUSPEND_RSP_EVT,
+    AVDT_SCB_MSG_CLOSE_RSP_EVT,
+    AVDT_SCB_MSG_ABORT_RSP_EVT,
+    AVDT_SCB_MSG_RECONFIG_RSP_EVT,
+    AVDT_SCB_MSG_SECURITY_RSP_EVT,
+    AVDT_SCB_MSG_SETCONFIG_REJ_EVT,
+    AVDT_SCB_MSG_OPEN_REJ_EVT,
+    AVDT_SCB_MSG_START_REJ_EVT,
+    AVDT_SCB_MSG_SUSPEND_REJ_EVT,
+    AVDT_SCB_TC_TOUT_EVT,
+    AVDT_SCB_TC_OPEN_EVT,
+    AVDT_SCB_TC_CLOSE_EVT,
+    AVDT_SCB_TC_CONG_EVT,
+    AVDT_SCB_TC_DATA_EVT,
+    AVDT_SCB_CC_CLOSE_EVT
+};
+
+/* adaption layer number of stream routing table entries */
+#if AVDT_REPORTING == TRUE
+/* 2 channels(1 media, 1 report) for each SEP and one for signalling */
+#define AVDT_NUM_RT_TBL     ((AVDT_NUM_SEPS<<1) + 1)
+#else
+#define AVDT_NUM_RT_TBL     (AVDT_NUM_SEPS + 1)
+#endif
+
+/* adaption layer number of transport channel table entries - moved to target.h
+#define AVDT_NUM_TC_TBL     (AVDT_NUM_SEPS + AVDT_NUM_LINKS) */
+
+/* "states" used in transport channel table */
+#define AVDT_AD_ST_UNUSED   0       /* Unused - unallocated */
+#define AVDT_AD_ST_IDLE     1       /* No connection */
+#define AVDT_AD_ST_ACP      2       /* Waiting to accept a connection */
+#define AVDT_AD_ST_INT      3       /* Initiating a connection */
+#define AVDT_AD_ST_CONN     4       /* Waiting for connection confirm */
+#define AVDT_AD_ST_CFG      5       /* Waiting for configuration complete */
+#define AVDT_AD_ST_OPEN     6       /* Channel opened */
+#define AVDT_AD_ST_SEC_INT  7       /* Security process as INT */
+#define AVDT_AD_ST_SEC_ACP  8       /* Security process as ACP */
+
+/* Configuration flags. tAVDT_TC_TBL.cfg_flags */
+#define AVDT_L2C_CFG_IND_DONE   (1<<0)
+#define AVDT_L2C_CFG_CFM_DONE   (1<<1)
+#define AVDT_L2C_CFG_CONN_INT   (1<<2)
+#define AVDT_L2C_CFG_CONN_ACP   (1<<3)
+
+
+/* result code for avdt_ad_write_req() (L2CA_DataWrite()) */
+#define AVDT_AD_FAILED       L2CAP_DW_FAILED        /* FALSE */
+#define AVDT_AD_SUCCESS      L2CAP_DW_SUCCESS       /* TRUE */
+#define AVDT_AD_CONGESTED    L2CAP_DW_CONGESTED     /* 2 */
+
+/*****************************************************************************
+** data types
+*****************************************************************************/
+
+/* msg union of all message parameter types */
+typedef union {
+    tAVDT_EVT_HDR           hdr;
+    tAVDT_EVT_HDR           single;
+    tAVDT_SETCONFIG         config_cmd;
+    tAVDT_CONFIG            reconfig_cmd;
+    tAVDT_MULTI             multi;
+    tAVDT_SECURITY          security_cmd;
+    tAVDT_DISCOVER          discover_rsp;
+    tAVDT_CONFIG            svccap;
+    tAVDT_SECURITY          security_rsp;
+    tAVDT_DELAY_RPT         delay_rpt_cmd;
+} tAVDT_MSG;
+
+/* data type for AVDT_CCB_API_DISCOVER_REQ_EVT */
+typedef struct {
+    tAVDT_CTRL_CBACK    *p_cback;
+    tAVDT_SEP_INFO      *p_sep_info;
+    UINT8               num_seps;
+} tAVDT_CCB_API_DISCOVER;
+
+/* data type for AVDT_CCB_API_GETCAP_REQ_EVT */
+typedef struct {
+    tAVDT_EVT_HDR       single;
+    tAVDT_CTRL_CBACK    *p_cback;
+    tAVDT_CFG           *p_cfg;
+} tAVDT_CCB_API_GETCAP;
+
+/* data type for AVDT_CCB_API_CONNECT_REQ_EVT */
+typedef struct {
+    tAVDT_CTRL_CBACK    *p_cback;
+    UINT8               sec_mask;
+} tAVDT_CCB_API_CONNECT;
+
+/* data type for AVDT_CCB_API_DISCONNECT_REQ_EVT */
+typedef struct {
+    tAVDT_CTRL_CBACK    *p_cback;
+} tAVDT_CCB_API_DISCONNECT;
+
+/* union associated with ccb state machine events */
+typedef union {
+    tAVDT_CCB_API_DISCOVER      discover;
+    tAVDT_CCB_API_GETCAP        getcap;
+    tAVDT_CCB_API_CONNECT       connect;
+    tAVDT_CCB_API_DISCONNECT    disconnect;
+    tAVDT_MSG                   msg;
+    BOOLEAN                     llcong;
+    UINT8                       err_code;
+} tAVDT_CCB_EVT;
+
+/* channel control block type */
+typedef struct {
+    BD_ADDR             peer_addr;      /* BD address of peer */
+    TIMER_LIST_ENT      timer_entry;    /* CCB timer list entry */
+    BUFFER_Q            cmd_q;          /* Queue for outgoing command messages */
+    BUFFER_Q            rsp_q;          /* Queue for outgoing response and reject messages */
+    tAVDT_CTRL_CBACK    *proc_cback;    /* Procedure callback function */
+    tAVDT_CTRL_CBACK    *p_conn_cback;  /* Connection/disconnection callback function */
+    void                *p_proc_data;   /* Pointer to data storage for procedure */
+    BT_HDR              *p_curr_cmd;    /* Current command being sent awaiting response */
+    BT_HDR              *p_curr_msg;    /* Current message being sent */
+    BT_HDR              *p_rx_msg;      /* Current message being received */
+    BOOLEAN             allocated;      /* Whether ccb is allocated */
+    UINT8               state;          /* The CCB state machine state */
+    BOOLEAN             ll_opened;      /* TRUE if LL is opened */
+    BOOLEAN             proc_busy;      /* TRUE when a discover or get capabilities procedure in progress */
+    UINT8               proc_param;     /* Procedure parameter; either SEID for get capabilities or number of SEPS for discover */
+    BOOLEAN             cong;           /* Whether signaling channel is congested */
+    UINT8               label;          /* Message header "label" (sequence number) */
+    BOOLEAN             reconn;         /* If TRUE, reinitiate connection after transitioning from CLOSING to IDLE state */
+    UINT8               ret_count;      /* Command retransmission count */
+    UINT8               disc_rsn;       /* disconnection reason */
+} tAVDT_CCB;
+
+/* type for action functions */
+typedef void (*tAVDT_CCB_ACTION)(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+
+/* type for AVDT_SCB_API_WRITE_REQ_EVT */
+typedef struct {
+    BT_HDR      *p_buf;
+    UINT32      time_stamp;
+#if AVDT_MULTIPLEXING == TRUE
+    BUFFER_Q    frag_q;          /* Queue for outgoing media fragments. p_buf should be 0 */
+    UINT8       *p_data;
+    UINT32      data_len;
+#endif
+    UINT8       m_pt;
+    tAVDT_DATA_OPT_MASK     opt;
+} tAVDT_SCB_APIWRITE;
+
+/* type for AVDT_SCB_TC_CLOSE_EVT */
+typedef struct {
+    UINT8           old_tc_state;       /* channel state before closed */
+    UINT8           tcid;               /* TCID  */
+    UINT8           type;               /* channel type */
+    UINT8           disc_rsn;           /* disconnection reason */
+} tAVDT_SCB_TC_CLOSE;
+
+/* type for scb event data */
+typedef union {
+    tAVDT_MSG           msg;
+    tAVDT_SCB_APIWRITE  apiwrite;
+    tAVDT_DELAY_RPT     apidelay;
+    tAVDT_OPEN          open;
+    tAVDT_SCB_TC_CLOSE  close;
+    BOOLEAN             llcong;
+    BT_HDR              *p_pkt;
+} tAVDT_SCB_EVT;
+
+/* stream control block type */
+typedef struct {
+    tAVDT_CS        cs;             /* stream creation struct */
+    tAVDT_CFG       curr_cfg;       /* current configuration */
+    tAVDT_CFG       req_cfg;        /* requested configuration */
+    TIMER_LIST_ENT  timer_entry;    /* timer entry */
+    BT_HDR          *p_pkt;         /* packet waiting to be sent */
+    tAVDT_CCB       *p_ccb;         /* ccb associated with this scb */
+    UINT16          media_seq;      /* media packet sequence number */
+    BOOLEAN         allocated;      /* whether scb is allocated or unused */
+    BOOLEAN         in_use;         /* whether stream being used by peer */
+    BOOLEAN         sink_activated; /* A2DP Sink activated/de-activated from Application */
+    UINT8           role;           /* initiator/acceptor role in current procedure */
+    BOOLEAN         remove;         /* whether CB is marked for removal */
+    UINT8           state;          /* state machine state */
+    UINT8           peer_seid;      /* SEID of peer stream */
+    UINT8           curr_evt;       /* current event; set only by state machine */
+    BOOLEAN         cong;           /* Whether media transport channel is congested */
+    UINT8           close_code;     /* Error code received in close response */
+#if AVDT_MULTIPLEXING == TRUE
+    BUFFER_Q        frag_q;         /* Queue for outgoing media fragments */
+    UINT32          frag_off;       /* length of already received media fragments */
+    UINT32          frag_org_len;   /* original length before fragmentation of receiving media packet */
+    UINT8           *p_next_frag;   /* next fragment to send */
+    UINT8           *p_media_buf;   /* buffer for media packet assigned by AVDT_SetMediaBuf */
+    UINT32          media_buf_len;  /* length of buffer for media packet assigned by AVDT_SetMediaBuf */
+#endif
+} tAVDT_SCB;
+
+/* type for action functions */
+typedef void (*tAVDT_SCB_ACTION)(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+
+/* adaption layer type for transport channel table */
+typedef struct {
+    UINT16  peer_mtu;       /* L2CAP mtu of the peer device */
+    UINT16  my_mtu;         /* Our MTU for this channel */
+    UINT16  my_flush_to;    /* Our flush timeout for this channel */
+    UINT16  lcid;
+    UINT8   tcid;           /* transport channel id */
+    UINT8   ccb_idx;        /* channel control block associated with this tc */
+    UINT8   state;          /* transport channel state */
+    UINT8   cfg_flags;      /* L2CAP configuration flags */
+    UINT8   id;
+} tAVDT_TC_TBL;
+
+/* adaption layer type for stream routing table */
+typedef struct {
+    UINT16  lcid;           /* L2CAP LCID of the associated transport channel */
+    UINT8   scb_hdl;        /* stream control block associated with this tc */
+} tAVDT_RT_TBL;
+
+
+/* adaption layer control block */
+typedef struct {
+    tAVDT_RT_TBL    rt_tbl[AVDT_NUM_LINKS][AVDT_NUM_RT_TBL];
+    tAVDT_TC_TBL    tc_tbl[AVDT_NUM_TC_TBL];
+    UINT8           lcid_tbl[MAX_L2CAP_CHANNELS];   /* map LCID to tc_tbl index */
+} tAVDT_AD;
+
+/* Control block for AVDT */
+typedef struct {
+    tAVDT_REG           rcb;                    /* registration control block */
+    tAVDT_CCB           ccb[AVDT_NUM_LINKS];    /* channel control blocks */
+    tAVDT_SCB           scb[AVDT_NUM_SEPS];     /* stream control blocks */
+    tAVDT_AD            ad;                     /* adaption layer control block */
+    tAVDTC_CTRL_CBACK   *p_conf_cback;          /* conformance callback function */
+    tAVDT_CCB_ACTION    *p_ccb_act;             /* pointer to CCB action functions */
+    tAVDT_SCB_ACTION    *p_scb_act;             /* pointer to SCB action functions */
+    tAVDT_CTRL_CBACK    *p_conn_cback;          /* connection callback function */
+    UINT8               trace_level;            /* trace level */
+} tAVDT_CB;
+
+
+/*****************************************************************************
+** function declarations
+*****************************************************************************/
+
+/* CCB function declarations */
+extern void avdt_ccb_init(void);
+extern void avdt_ccb_event(tAVDT_CCB *p_ccb, UINT8 event, tAVDT_CCB_EVT *p_data);
+extern tAVDT_CCB *avdt_ccb_by_bd(BD_ADDR bd_addr);
+extern tAVDT_CCB *avdt_ccb_alloc(BD_ADDR bd_addr);
+extern void avdt_ccb_dealloc(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern UINT8 avdt_ccb_to_idx(tAVDT_CCB *p_ccb);
+extern tAVDT_CCB *avdt_ccb_by_idx(UINT8 idx);
+
+/* CCB action functions */
+extern void avdt_ccb_chan_open(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_chan_close(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_chk_close(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_discover_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_discover_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_getcap_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_getcap_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_start_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_start_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_suspend_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_hdl_suspend_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_discover_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_discover_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_getcap_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_getcap_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_start_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_start_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_suspend_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_suspend_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_clear_cmds(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_cmd_fail(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_free_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_cong_state(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_ret_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_snd_msg(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_set_reconn(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_clr_reconn(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_chk_reconn(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_chk_timer(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_set_conn(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_set_disconn(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_do_disconn(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_ll_closed(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+extern void avdt_ccb_ll_opened(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data);
+
+/* SCB function prototypes */
+extern void avdt_scb_event(tAVDT_SCB *p_scb, UINT8 event, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_init(void);
+extern tAVDT_SCB *avdt_scb_alloc(tAVDT_CS *p_cs);
+extern void avdt_scb_dealloc(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern UINT8 avdt_scb_to_hdl(tAVDT_SCB *p_scb);
+extern tAVDT_SCB *avdt_scb_by_hdl(UINT8 hdl);
+extern UINT8 avdt_scb_verify(tAVDT_CCB *p_ccb, UINT8 state, UINT8 *p_seid, UINT16 num_seid, UINT8 *p_err_code);
+extern void avdt_scb_peer_seid_list(tAVDT_MULTI *p_multi);
+extern UINT32 avdt_scb_gen_ssrc(tAVDT_SCB *p_scb);
+
+/* SCB action functions */
+extern void avdt_scb_hdl_abort_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_abort_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_close_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_close_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_getconfig_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_getconfig_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_open_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_open_rej(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_open_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_drop_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_reconfig_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_reconfig_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_security_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_security_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_setconfig_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_setconfig_rej(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_setconfig_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_start_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_start_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_suspend_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_suspend_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_delay_rpt_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_delay_rpt_cmd(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_delay_rpt_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_tc_close(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_tc_open(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_tc_close_sto(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_tc_open_sto(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_hdl_write_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_abort_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_abort_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_close_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_stream_close(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_close_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_getconfig_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_getconfig_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_open_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_open_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_reconfig_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_reconfig_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_security_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_security_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_setconfig_req(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_setconfig_rej(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_setconfig_rsp(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_snd_tc_close(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_cb_err(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_cong_state(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_rej_state(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_rej_in_use(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_rej_not_in_use(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_set_remove(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_free_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_chk_snd_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_clr_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_tc_timer(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_clr_vars(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data);
+extern void avdt_scb_queue_frags(tAVDT_SCB *p_scb, UINT8 **pp_data, UINT32 *p_data_len, BUFFER_Q *pq);
+
+/* msg function declarations */
+extern BOOLEAN avdt_msg_send(tAVDT_CCB *p_ccb, BT_HDR *p_msg);
+extern void avdt_msg_send_cmd(tAVDT_CCB *p_ccb, void *p_scb, UINT8 sig_id, tAVDT_MSG *p_params);
+extern void avdt_msg_send_rsp(tAVDT_CCB *p_ccb, UINT8 sig_id, tAVDT_MSG *p_params);
+extern void avdt_msg_send_rej(tAVDT_CCB *p_ccb, UINT8 sig_id, tAVDT_MSG *p_params);
+extern void avdt_msg_send_grej(tAVDT_CCB *p_ccb, UINT8 sig_id, tAVDT_MSG *p_params);
+extern void avdt_msg_ind(tAVDT_CCB *p_ccb, BT_HDR *p_buf);
+
+/* adaption layer function declarations */
+extern void avdt_ad_init(void);
+extern UINT8 avdt_ad_type_to_tcid(UINT8 type, tAVDT_SCB *p_scb);
+extern tAVDT_TC_TBL *avdt_ad_tc_tbl_by_st(UINT8 type, tAVDT_CCB *p_ccb, UINT8 state);
+extern tAVDT_TC_TBL *avdt_ad_tc_tbl_by_lcid(UINT16 lcid);
+extern tAVDT_TC_TBL *avdt_ad_tc_tbl_alloc(tAVDT_CCB *p_ccb);
+extern UINT8 avdt_ad_tc_tbl_to_idx(tAVDT_TC_TBL *p_tbl);
+extern void avdt_ad_tc_close_ind(tAVDT_TC_TBL *p_tbl, UINT16 reason);
+extern void avdt_ad_tc_open_ind(tAVDT_TC_TBL *p_tbl);
+extern void avdt_ad_tc_cong_ind(tAVDT_TC_TBL *p_tbl, BOOLEAN is_congested);
+extern void avdt_ad_tc_data_ind(tAVDT_TC_TBL *p_tbl, BT_HDR *p_buf);
+extern tAVDT_TC_TBL *avdt_ad_tc_tbl_by_type(UINT8 type, tAVDT_CCB *p_ccb, tAVDT_SCB *p_scb);
+extern UINT8 avdt_ad_write_req(UINT8 type, tAVDT_CCB *p_ccb, tAVDT_SCB *p_scb, BT_HDR *p_buf);
+extern void avdt_ad_open_req(UINT8 type, tAVDT_CCB *p_ccb, tAVDT_SCB *p_scb, UINT8 role);
+extern void avdt_ad_close_req(UINT8 type, tAVDT_CCB *p_ccb, tAVDT_SCB *p_scb);
+
+extern void avdt_process_timeout(TIMER_LIST_ENT *p_tle);
+
+/*****************************************************************************
+** macros
+*****************************************************************************/
+
+/* we store the scb and the label in the layer_specific field of the
+** current cmd
+*/
+#define AVDT_BLD_LAYERSPEC(ls, msg, label) \
+            ls = (((label) << 4) | (msg))
+
+#define AVDT_LAYERSPEC_LABEL(ls)    ((UINT8)((ls) >> 4))
+
+#define AVDT_LAYERSPEC_MSG(ls)      ((UINT8)((ls) & 0x000F))
+
+/*****************************************************************************
+** global data
+*****************************************************************************/
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/******************************************************************************
+** Main Control Block
+*******************************************************************************/
+#if AVDT_DYNAMIC_MEMORY == FALSE
+extern tAVDT_CB  avdt_cb;
+#else
+extern tAVDT_CB *avdt_cb_ptr;
+#define avdt_cb (*avdt_cb_ptr)
+#endif
+
+
+/* L2CAP callback registration structure */
+extern const tL2CAP_APPL_INFO avdt_l2c_appl;
+
+/* reject message event lookup table */
+extern const UINT8 avdt_msg_rej_2_evt[];
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///AVRC_INCLUDED == TRUE
+
+#endif /* AVDT_INT_H */
diff --git a/tools/sdk/include/bluedroid/avdtc_api.h b/tools/sdk/include/bluedroid/avdtc_api.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/avrc_api.h b/tools/sdk/include/bluedroid/avrc_api.h
index dad8b3bd20c..3ca3e2d76f9 100644
--- a/tools/sdk/include/bluedroid/avrc_api.h
+++ b/tools/sdk/include/bluedroid/avrc_api.h
@@ -27,7 +27,7 @@
 #include "avct_api.h"
 #include "sdp_api.h"
 #include "avrc_defs.h"
-
+#if (AVRC_INCLUDED == TRUE)
 /*****************************************************************************
 **  constants
 *****************************************************************************/
@@ -634,4 +634,7 @@ extern BOOLEAN AVRC_IsValidPlayerAttr(UINT8 attr);
 }
 #endif
 
+#endif  ///AVRC_INCLUDED == TRUE
+
+
 #endif /* AVRC_API_H */
diff --git a/tools/sdk/include/bluedroid/avrc_defs.h b/tools/sdk/include/bluedroid/avrc_defs.h
index fe261a74fd3..8a6254ef858 100644
--- a/tools/sdk/include/bluedroid/avrc_defs.h
+++ b/tools/sdk/include/bluedroid/avrc_defs.h
@@ -23,7 +23,9 @@
  ******************************************************************************/
 #ifndef _AVRC_DEFS_H
 #define _AVRC_DEFS_H
+#include "bt_target.h"
 
+#if (AVRC_INCLUDED == TRUE)
 /*****************************************************************************
 **  constants
 *****************************************************************************/
@@ -1356,5 +1358,5 @@ typedef union {
     tAVRC_RSP                       add_to_play;            /* AddToNowPlaying */
 } tAVRC_RESPONSE;
 
-
+#endif  ///AVRC_INCLUDED == TRUE
 #endif
diff --git a/tools/sdk/include/bluedroid/avrc_int.h b/tools/sdk/include/bluedroid/avrc_int.h
new file mode 100644
index 00000000000..ed0be01b213
--- /dev/null
+++ b/tools/sdk/include/bluedroid/avrc_int.h
@@ -0,0 +1,158 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2003-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  VRCP internal header file.
+ *
+ ******************************************************************************/
+
+
+#ifndef AVRC_INT_H
+#define AVRC_INT_H
+
+#include "avct_defs.h"
+#include "avrc_api.h"
+
+#if (AVRC_INCLUDED == TRUE)
+/*      DEBUG FLAGS
+ *
+ * #define META_DEBUG_ENABLED
+ */
+/*****************************************************************************
+**  Constants
+*****************************************************************************/
+
+/* Number of attributes in AVRC SDP record. */
+#define AVRC_NUM_ATTR            6
+
+/* Number of protocol elements in protocol element list. */
+#define AVRC_NUM_PROTO_ELEMS     2
+
+#ifndef AVRC_MIN_CMD_LEN
+#define AVRC_MIN_CMD_LEN    20
+#endif
+
+#define AVRC_UNIT_OPRND_BYTES   5
+#define AVRC_SUB_OPRND_BYTES    4
+#define AVRC_SUBRSP_OPRND_BYTES 3
+#define AVRC_SUB_PAGE_MASK      7
+#define AVRC_SUB_PAGE_SHIFT     4
+#define AVRC_SUB_EXT_CODE       7
+#define AVRC_PASS_OP_ID_MASK    0x7F
+#define AVRC_PASS_STATE_MASK    0x80
+#define AVRC_CMD_OPRND_PAD      0xFF
+
+#define AVRC_CTYPE_MASK         0x0F
+#define AVRC_SUBTYPE_MASK       0xF8
+#define AVRC_SUBTYPE_SHIFT      3
+#define AVRC_SUBID_MASK         0x07
+#define AVRC_SUBID_IGNORE       0x07
+
+#define AVRC_SINGLE_PARAM_SIZE      1
+#define AVRC_METADATA_PKT_TYPE_MASK 0x03
+#define AVRC_PASS_THOUGH_MSG_MASK   0x80           /* MSB of msg_type indicates the PAS THROUGH msg */
+#define AVRC_VENDOR_UNIQUE_MASK     0x70           /* vendor unique id */
+
+
+/* Company ID is 24-bit integer We can not use the macros in bt_types.h */
+#define AVRC_CO_ID_TO_BE_STREAM(p, u32) {*(p)++ = (UINT8)((u32) >> 16); *(p)++ = (UINT8)((u32) >> 8); *(p)++ = (UINT8)(u32); }
+#define AVRC_BE_STREAM_TO_CO_ID(u32, p) {u32 = (((UINT32)(*((p) + 2))) + (((UINT32)(*((p) + 1))) << 8) + (((UINT32)(*(p))) << 16)); (p) += 3;}
+
+#define AVRC_AVC_HDR_SIZE           3   /* ctype, subunit*, opcode */
+
+#define AVRC_MIN_META_HDR_SIZE      4   /* pdu id(1), packet type(1), param len(2) */
+#define AVRC_MIN_BROWSE_HDR_SIZE    3   /* pdu id(1), param len(2) */
+
+#define AVRC_VENDOR_HDR_SIZE        6   /* ctype, subunit*, opcode, CO_ID */
+#define AVRC_MSG_VENDOR_OFFSET      23
+#define AVRC_MIN_VENDOR_SIZE        (AVRC_MSG_VENDOR_OFFSET + BT_HDR_SIZE + AVRC_MIN_META_HDR_SIZE)
+
+#define AVRC_PASS_THRU_SIZE         8
+#define AVRC_MSG_PASS_THRU_OFFSET   25
+#define AVRC_MIN_PASS_THRU_SIZE     (AVRC_MSG_PASS_THRU_OFFSET + BT_HDR_SIZE + 4)
+
+#define AVRC_MIN_BROWSE_SIZE        (AVCT_BROWSE_OFFSET + BT_HDR_SIZE + AVRC_MIN_BROWSE_HDR_SIZE)
+
+#define AVRC_CTRL_PKT_LEN(pf, pk)   {pf = (UINT8 *)((pk) + 1) + (pk)->offset + 2;}
+
+#define AVRC_MAX_CTRL_DATA_LEN      (AVRC_PACKET_LEN)
+
+/*****************************************************************************
+**  Type definitions
+*****************************************************************************/
+
+#if (AVRC_METADATA_INCLUDED == TRUE)
+/* type for Metadata fragmentation control block */
+typedef struct {
+    BT_HDR              *p_fmsg;        /* the fragmented message */
+    UINT8               frag_pdu;       /* the PDU ID for fragmentation */
+    BOOLEAN             frag_enabled;   /* fragmentation flag */
+} tAVRC_FRAG_CB;
+
+/* type for Metadata re-assembly control block */
+typedef struct {
+    BT_HDR              *p_rmsg;        /* the received message */
+    UINT16              rasm_offset;    /* re-assembly flag, the offset of the start fragment */
+    UINT8               rasm_pdu;       /* the PDU ID for re-assembly */
+} tAVRC_RASM_CB;
+#endif
+
+typedef struct {
+    tAVRC_CONN_CB       ccb[AVCT_NUM_CONN];
+#if (AVRC_METADATA_INCLUDED == TRUE)
+    tAVRC_FRAG_CB       fcb[AVCT_NUM_CONN];
+    tAVRC_RASM_CB       rcb[AVCT_NUM_CONN];
+#endif
+    tAVRC_FIND_CBACK    *p_cback;       /* pointer to application callback */
+    tSDP_DISCOVERY_DB   *p_db;          /* pointer to discovery database */
+    UINT16              service_uuid;   /* service UUID to search */
+    UINT8               trace_level;
+} tAVRC_CB;
+
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/******************************************************************************
+** Main Control Block
+*******************************************************************************/
+#if AVRC_DYNAMIC_MEMORY == FALSE
+extern tAVRC_CB  avrc_cb;
+#else
+extern tAVRC_CB *avrc_cb_ptr;
+#define avrc_cb (*avrc_cb_ptr)
+#endif
+
+extern BOOLEAN avrc_is_valid_pdu_id(UINT8 pdu_id);
+extern BOOLEAN avrc_is_valid_player_attrib_value(UINT8 attrib, UINT8 value);
+extern BT_HDR *avrc_alloc_ctrl_pkt (UINT8 pdu);
+extern tAVRC_STS avrc_pars_pass_thru(tAVRC_MSG_PASS *p_msg, UINT16 *p_vendor_unique_id);
+extern UINT8 avrc_opcode_from_pdu(UINT8 pdu);
+extern BOOLEAN avrc_is_valid_opcode(UINT8 opcode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///AVRC_INCLUDED == TRUE
+
+#endif /* AVRC_INT_H */
diff --git a/tools/sdk/include/bluedroid/bdaddr.h b/tools/sdk/include/bluedroid/bdaddr.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/blufi_int.h b/tools/sdk/include/bluedroid/blufi_int.h
index c8b002348db..bfac5294229 100644
--- a/tools/sdk/include/bluedroid/blufi_int.h
+++ b/tools/sdk/include/bluedroid/blufi_int.h
@@ -92,6 +92,7 @@ typedef struct blufi_frag_hdr blufi_frag_hdr_t;
 #define BLUFI_TYPE_CTRL_SUBTYPE_GET_WIFI_STATUS         0x05
 #define BLUFI_TYPE_CTRL_SUBTYPE_DEAUTHENTICATE_STA      0x06
 #define BLUFI_TYPE_CTRL_SUBTYPE_GET_VERSION             0x07
+#define BLUFI_TYPE_CTRL_SUBTYPE_DISCONNECT_BLE          0x08
 
 #define BLUFI_TYPE_DATA                                 0x1
 #define BLUFI_TYPE_DATA_SUBTYPE_NEG                     0x00
diff --git a/tools/sdk/include/bluedroid/bt_common_types.h b/tools/sdk/include/bluedroid/bt_common_types.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/bt_sdp.h b/tools/sdk/include/bluedroid/bt_sdp.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/bt_target.h b/tools/sdk/include/bluedroid/bt_target.h
index 9d042a2b4c9..02c0486a82e 100644
--- a/tools/sdk/include/bluedroid/bt_target.h
+++ b/tools/sdk/include/bluedroid/bt_target.h
@@ -34,16 +34,87 @@
 #include "bdroid_buildcfg.h"
 #endif
 
+#include "sdkconfig.h"
 #include "bt_types.h"   /* This must be defined AFTER buildcfg.h */
 
 /* Include common GKI definitions used by this platform */
 #include "gki_target.h"
 #include "dyn_mem.h"    /* defines static and/or dynamic memory for components */
 
+#if CONFIG_CLASSIC_BT_ENABLED
+#define CLASSIC_BT_INCLUDED         TRUE
+#define BTA_SDP_INCLUDED            TRUE
+#define BTA_PAN_INCLUDED            FALSE
+#define BTA_HH_INCLUDED             FALSE
+#define BTA_AR_INCLUDED             TRUE
+#define BTA_AV_INCLUDED             TRUE
+#define BTA_AV_SINK_INCLUDED        TRUE
+#define SDP_INCLUDED                TRUE
+#define RFCOMM_INCLUDED             FALSE
+#define PAN_INCLUDED                FALSE
+#define HID_HOST_INCLUDED           FALSE
+#define AVDT_INCLUDED               TRUE
+#define A2D_INCLUDED                TRUE
+#define AVCT_INCLUDED               TRUE
+#define AVRC_INCLUDED               TRUE
+#define SBC_DEC_INCLUDED            TRUE
+#define SBC_ENC_INCLUDED            FALSE
+#define MCA_INCLUDED                FALSE
+#define BTC_SM_INCLUDED             TRUE
+#define BTC_PRF_QUEUE_INCLUDED      TRUE
+#define BTC_GAP_BT_INCLUDED         TRUE
+#define BTC_AV_INCLUDED             TRUE
+
+#else /* #if CONFIG_CLASSIC_BT_ENABLED */
+#define CLASSIC_BT_INCLUDED         FALSE
+#define BTA_SDP_INCLUDED            FALSE
+#define BTA_PAN_INCLUDED            FALSE
+#define BTA_HH_INCLUDED             FALSE
+#define BTA_AR_INCLUDED             FALSE
+#define BTA_AV_INCLUDED             FALSE
+#define BTA_AV_SINK_INCLUDED        FALSE
+#define SDP_INCLUDED                FALSE
+#define RFCOMM_INCLUDED             FALSE
+#define PAN_INCLUDED                FALSE
+#define HID_HOST_INCLUDED           FALSE
+#define AVDT_INCLUDED               FALSE
+#define A2D_INCLUDED                FALSE
+#define AVCT_INCLUDED               FALSE
+#define AVRC_INCLUDED               FALSE
+#define SBC_DEC_INCLUDED            FALSE
+#define SBC_ENC_INCLUDED            FALSE
+#define MCA_INCLUDED                FALSE
+#define BTC_SM_INCLUDED             FALSE
+#define BTC_PRF_QUEUE_INCLUDED      FALSE
+#define BTC_GAP_BT_INCLUDED         FALSE
+#define BTC_AV_INCLUDED             FALSE
+
+#endif /* #if CONFIG_CLASSIC_BT_ENABLED */
 
-#ifndef CLASSIC_BT_INCLUDED
-#define CLASSIC_BT_INCLUDED TRUE
-#endif  ///CLASSIC_BT_INCLUDED
+#if (CONFIG_GATTS_ENABLE)
+#define GATTS_INCLUDED              TRUE
+#else
+#define GATTS_INCLUDED              FALSE
+#endif /* CONFIG_GATTS_ENABLE */
+
+#if (CONFIG_GATTC_ENABLE)
+#define GATTC_INCLUDED              TRUE
+#else
+#define GATTC_INCLUDED              FALSE
+#endif  /* CONFIG_GATTC_ENABLE */
+
+#if (CONFIG_SMP_ENABLE)
+#define SMP_INCLUDED              TRUE
+#define BLE_PRIVACY_SPT           TRUE
+#else
+#define SMP_INCLUDED              FALSE
+#define BLE_PRIVACY_SPT           FALSE
+#endif  /* CONFIG_GATTC_ENABLE */
+
+#if (CONFIG_BT_ACL_CONNECTIONS)
+#define MAX_ACL_CONNECTIONS  CONFIG_BT_ACL_CONNECTIONS
+#define GATT_MAX_PHY_CHANNEL CONFIG_BT_ACL_CONNECTIONS
+#endif  /* CONFIG_BT_ACL_CONNECTIONS */
 
 //------------------Added from bdroid_buildcfg.h---------------------
 #ifndef L2CAP_EXTFEA_SUPPORTED_MASK
@@ -91,15 +162,15 @@
 #endif
 
 #ifndef BTA_AR_INCLUDED
-#define BTA_AR_INCLUDED FALSE//TRUE
+#define BTA_AR_INCLUDED TRUE//TRUE
 #endif
 
 #ifndef BTA_AV_INCLUDED
-#define BTA_AV_INCLUDED FALSE//TRUE
+#define BTA_AV_INCLUDED TRUE//TRUE
 #endif
 
 #ifndef BTA_AV_SINK_INCLUDED
-#define BTA_AV_SINK_INCLUDED FALSE//FALSE
+#define BTA_AV_SINK_INCLUDED TRUE//FALSE
 #endif
 
 #ifndef BTA_DISABLE_DELAY
@@ -157,7 +228,7 @@
 #endif
 
 #ifndef BT_USE_TRACES
-#define BT_USE_TRACES  TRUE
+#define BT_USE_TRACES  FALSE
 #endif
 
 #ifndef BT_TRACE_BTIF
@@ -431,9 +502,9 @@
 #define BTM_SCO_DATA_SIZE_MAX       240
 #endif
 
-/* The size in bytes of the BTM inquiry database. 40 As Default */
+/* The size in bytes of the BTM inquiry database. 5 As Default */
 #ifndef BTM_INQ_DB_SIZE
-#define BTM_INQ_DB_SIZE             32
+#define BTM_INQ_DB_SIZE             5
 #endif
 
 /* The default scan mode */
@@ -466,7 +537,7 @@
 #define BTM_DEFAULT_DISC_INTERVAL   0x0800
 #endif
 
-/* Default class of device
+/* 
 * {SERVICE_CLASS, MAJOR_CLASS, MINOR_CLASS}
 *
 * SERVICE_CLASS:0x5A (Bit17 -Networking,Bit19 - Capturing,Bit20 -Object Transfer,Bit22 -Telephony)
@@ -474,13 +545,29 @@
 * MINOR_CLASS:0x0C - SMART_PHONE
 *
 */
+#define BTA_DM_COD_SMARTPHONE {0x5A, 0x02, 0x0C}
+
+/*
+* {SERVICE_CLASS, MAJOR_CLASS, MINOR_CLASS}
+*
+* SERVICE_CLASS:0x2C (Bit21 - Audio, Bit19 - Capturing)
+* MAJOR_CLASS:0x04 - Audio/Video
+* MINOR_CLASS:0x05 - LoudSpeaker
+*/
+#define BTA_DM_COD_LOUDSPEAKER {0x2C, 0x04, 0x14}
+
+/* Default class of device */
 #ifndef BTA_DM_COD
-#define BTA_DM_COD {0x5A, 0x02, 0x0C}
+#define BTA_DM_COD BTA_DM_COD_LOUDSPEAKER
 #endif
 
 /* The number of SCO links. */
 #ifndef BTM_MAX_SCO_LINKS
+#if (CLASSIC_BT_INCLUDED == TRUE)
 #define BTM_MAX_SCO_LINKS           1	//3
+#else   ///CLASSIC_BT_INCLUDED == TRUE
+#define BTM_MAX_SCO_LINKS           0
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
 #endif
 
 /* The preferred type of SCO links (2-eSCO, 0-SCO). */
@@ -573,11 +660,15 @@
 
 /* The IO capability of the local device (for Simple Pairing) */
 #ifndef BTM_LOCAL_IO_CAPS
-#define BTM_LOCAL_IO_CAPS               BTM_IO_CAP_IO
+#define BTM_LOCAL_IO_CAPS               BTM_IO_CAP_NONE
 #endif
 
 #ifndef BTM_LOCAL_IO_CAPS_BLE
+#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
 #define BTM_LOCAL_IO_CAPS_BLE           BTM_IO_CAP_KBDISP
+#else
+#define BTM_LOCAL_IO_CAPS_BLE           4
+#endif  ///BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE
 #endif
 
 /* The default MITM Protection Requirement (for Simple Pairing)
@@ -599,7 +690,7 @@
 
 /* TRUE to include Sniff Subrating */
 #ifndef BTM_SSR_INCLUDED
-#define BTM_SSR_INCLUDED                TRUE
+#define BTM_SSR_INCLUDED                FALSE
 #endif
 
 /*************************
@@ -626,22 +717,29 @@
 #define L2CAP_CLIENT_INCLUDED FALSE
 #endif
 
-
 /* The maximum number of simultaneous links that L2CAP can support. Up to 7*/
 #ifndef MAX_ACL_CONNECTIONS
-#define MAX_L2CAP_LINKS             3
+#define MAX_L2CAP_LINKS             5
 #else
 #define MAX_L2CAP_LINKS             MAX_ACL_CONNECTIONS
 #endif
 
 /* The maximum number of simultaneous channels that L2CAP can support. Up to 16*/
 #ifndef MAX_L2CAP_CHANNELS
+#if (CLASSIC_BT_INCLUDED == TRUE)
 #define MAX_L2CAP_CHANNELS          8
+#else
+#define MAX_L2CAP_CHANNELS          2  //Not support to create l2cap channels in the BLE only mode in this bluedroid version(6.0)
+#endif   ///CLASSIC_BT_INCLUDED == TRUE
 #endif
 
 /* The maximum number of simultaneous applications that can register with L2CAP. */
 #ifndef MAX_L2CAP_CLIENTS
+#if (CLASSIC_BT_INCLUDED == TRUE)
 #define MAX_L2CAP_CLIENTS           8
+#else
+#define MAX_L2CAP_CLIENTS           1  //Not support to allocate a channel control block in BLE only mode
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
 #endif
 
 /* The number of seconds of link inactivity before a link is disconnected. */
@@ -727,7 +825,11 @@
 /* Used for features using fixed channels; set to zero if no fixed channels supported (BLE, etc.) */
 /* Excluding L2CAP signaling channel and UCD */
 #ifndef L2CAP_NUM_FIXED_CHNLS
+#if (CLASSIC_BT_INCLUDED == TRUE)
 #define L2CAP_NUM_FIXED_CHNLS               32
+#else
+#define L2CAP_NUM_FIXED_CHNLS               3   //There are just three fix channel in the BLE only mode(gatt,signal,smp)
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
 #endif
 
 /* First fixed channel supported */
@@ -795,7 +897,7 @@
  * resolution, local address rotation etc.
  */
 #ifndef BLE_PRIVACY_SPT
-#define BLE_PRIVACY_SPT         TRUE
+#define BLE_PRIVACY_SPT         FALSE
 #endif
 
 /*
@@ -907,7 +1009,7 @@
 ******************************************************************************/
 #ifndef GATTC_INCLUDED
 #if BLE_INCLUDED == TRUE
-#define GATTC_INCLUDED         TRUE
+#define GATTC_INCLUDED         FALSE
 #else
 #define GATTC_INCLUDED         FALSE
 #endif
@@ -934,7 +1036,7 @@
 ******************************************************************************/
 #ifndef SMP_INCLUDED
 #if BLE_INCLUDED == TRUE
-#define SMP_INCLUDED         TRUE
+#define SMP_INCLUDED         FALSE
 #else
 #define SMP_INCLUDED         FALSE
 #endif
@@ -1001,16 +1103,16 @@
 
 /* The maximum number of SDP records the server can support. */
 #ifndef SDP_MAX_RECORDS
-#define SDP_MAX_RECORDS             15  /*max is 30*/
+#define SDP_MAX_RECORDS             6  /*max is 30*/
 #endif
 
 /* The maximum number of attributes in each record. */
 #ifndef SDP_MAX_REC_ATTR
-#define SDP_MAX_REC_ATTR            25
+#define SDP_MAX_REC_ATTR            8
 #endif
 
 #ifndef SDP_MAX_PAD_LEN
-#define SDP_MAX_PAD_LEN             600
+#define SDP_MAX_PAD_LEN             300
 #endif
 
 /* The maximum length, in bytes, of an attribute. */
@@ -1326,17 +1428,17 @@ Range: 2 octets
 ******************************************************************************/
 
 #ifndef AVDT_INCLUDED
-#define AVDT_INCLUDED               FALSE//TRUE
+#define AVDT_INCLUDED               TRUE
 #endif
 
 /* Include reporting capability in AVDTP */
 #ifndef AVDT_REPORTING
-#define AVDT_REPORTING              FALSE//TRUE
+#define AVDT_REPORTING              TRUE
 #endif
 
 /* Include multiplexing capability in AVDTP */
 #ifndef AVDT_MULTIPLEXING
-#define AVDT_MULTIPLEXING           FALSE//TRUE
+#define AVDT_MULTIPLEXING           TRUE
 #endif
 
 /* Number of simultaneous links to different peer devices. */
@@ -1477,7 +1579,7 @@ Range: 2 octets
 
 /* This is set to enable use of GAP L2CAP connections. */
 #ifndef GAP_CONN_INCLUDED
-#if GAP_INCLUDED == TRUE
+#if (GAP_INCLUDED == TRUE && CLASSIC_BT_INCLUDED == TRUE)
 #define GAP_CONN_INCLUDED           TRUE
 #else
 #define GAP_CONN_INCLUDED           FALSE
@@ -1593,7 +1695,7 @@ Range: 2 octets
 **
 ******************************************************************************/
 #ifndef AVRC_INCLUDED
-#define AVRC_INCLUDED               FALSE
+#define AVRC_INCLUDED               TRUE
 #endif
 
 #ifndef AVRC_METADATA_INCLUDED
diff --git a/tools/sdk/include/bluedroid/bt_trace.h b/tools/sdk/include/bluedroid/bt_trace.h
index 787c4c8aec4..6324adf95fa 100644
--- a/tools/sdk/include/bluedroid/bt_trace.h
+++ b/tools/sdk/include/bluedroid/bt_trace.h
@@ -18,6 +18,7 @@
 
 #ifndef _BT_TRACE_H_
 #define _BT_TRACE_H_
+#include "sdkconfig.h"
 
 #include <stdio.h>
 #include "bt_types.h"
@@ -170,7 +171,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 
 /* Enables or disables all trace messages. */
 #ifndef BT_USE_TRACES
-#define BT_USE_TRACES       TRUE
+#define BT_USE_TRACES       FALSE
 #endif
 
 /******************************************************************************
@@ -270,11 +271,13 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 #ifndef LOG_LEVEL
 #define LOG_LEVEL   LOG_LEVEL_INFO
 #endif
-#define LOG_ERROR(fmt, args...)         do {if (LOG_LEVEL >= LOG_LEVEL_ERROR) BT_PRINTF(fmt,## args);} while(0)
-#define LOG_WARN(fmt, args...)          do {if (LOG_LEVEL >= LOG_LEVEL_WARN) BT_PRINTF(fmt,## args);} while(0)
-#define LOG_INFO(fmt, args...)          do {if (LOG_LEVEL >= LOG_LEVEL_INFO) BT_PRINTF(fmt,## args);} while(0)
-#define LOG_DEBUG(fmt, args...)         do {if (LOG_LEVEL >= LOG_LEVEL_DEBUG) BT_PRINTF(fmt,## args);} while(0)
-#define LOG_VERBOSE(fmt, args...)       do {if (LOG_LEVEL >= LOG_LEVEL_VERBOSE) BT_PRINTF(fmt,## args);} while(0)
+
+#if !CONFIG_BT_STACK_NO_LOG
+#define LOG_ERROR(fmt, args...)             do {if (LOG_LEVEL >= LOG_LEVEL_ERROR) BT_PRINTF(fmt,## args);} while(0)
+#define LOG_WARN(fmt, args...)              do {if (LOG_LEVEL >= LOG_LEVEL_WARN) BT_PRINTF(fmt,## args);} while(0)
+#define LOG_INFO(fmt, args...)              do {if (LOG_LEVEL >= LOG_LEVEL_INFO) BT_PRINTF(fmt,## args);} while(0)
+#define LOG_DEBUG(fmt, args...)             do {if (LOG_LEVEL >= LOG_LEVEL_DEBUG) BT_PRINTF(fmt,## args);} while(0)
+#define LOG_VERBOSE(fmt, args...)           do {if (LOG_LEVEL >= LOG_LEVEL_VERBOSE) BT_PRINTF(fmt,## args);} while(0)
 
 /* Define tracing for the HCI unit
 */
@@ -287,7 +290,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 */
 #define BTM_TRACE_ERROR(fmt, args...)       {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
 #define BTM_TRACE_WARNING(fmt, args...)     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
-#define BTM_TRACE_API(fmt, args...)     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define BTM_TRACE_API(fmt, args...)         {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 #define BTM_TRACE_EVENT(fmt, args...)       {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
 #define BTM_TRACE_DEBUG(fmt, args...)       {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
@@ -303,7 +306,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 */
 #define SDP_TRACE_ERROR(fmt, args...)       {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
 #define SDP_TRACE_WARNING(fmt, args...)     {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
-#define SDP_TRACE_API(fmt, args...)     {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define SDP_TRACE_API(fmt, args...)         {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 #define SDP_TRACE_EVENT(fmt, args...)       {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
 #define SDP_TRACE_DEBUG(fmt, args...)       {if (sdp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
@@ -318,7 +321,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 /* Generic Access Profile traces */
 #define GAP_TRACE_ERROR(fmt, args...)       {if (gap_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
 #define GAP_TRACE_EVENT(fmt, args...)       {if (gap_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
-#define GAP_TRACE_API(fmt, args...)     {if (gap_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define GAP_TRACE_API(fmt, args...)         {if (gap_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 #define GAP_TRACE_WARNING(fmt, args...)     {if (gap_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
 
 /* define traces for HID Host */
@@ -340,7 +343,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 
 #define PAN_TRACE_ERROR(fmt, args...)       {if (pan_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
 #define PAN_TRACE_WARNING(fmt, args...)     {if (pan_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
-#define PAN_TRACE_API(fmt, args...)     {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define PAN_TRACE_API(fmt, args...)         {if (pan_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 #define PAN_TRACE_EVENT(fmt, args...)       {if (pan_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
 #define PAN_TRACE_DEBUG(fmt, args...)       {if (pan_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
@@ -350,7 +353,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 #define A2D_TRACE_WARNING(fmt, args...)     {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
 #define A2D_TRACE_EVENT(fmt, args...)       {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
 #define A2D_TRACE_DEBUG(fmt, args...)       {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
-#define A2D_TRACE_API(fmt, args...)     {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define A2D_TRACE_API(fmt, args...)         {if (a2d_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 
 /* AVDTP
 */
@@ -382,7 +385,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 #define MCA_TRACE_WARNING(fmt, args...)     {if (mca_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
 #define MCA_TRACE_EVENT(fmt, args...)       {if (mca_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
 #define MCA_TRACE_DEBUG(fmt, args...)       {if (mca_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
-#define MCA_TRACE_API(fmt, args...)     {if (mca_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define MCA_TRACE_API(fmt, args...)         {if (mca_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 
 /* Define tracing for the ATT/GATT unit
 */
@@ -396,7 +399,7 @@ inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t len)
 */
 #define SMP_TRACE_ERROR(fmt, args...)       {if (smp_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_PRINTF(fmt, ## args);}
 #define SMP_TRACE_WARNING(fmt, args...)     {if (smp_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_PRINTF(fmt, ## args);}
-#define SMP_TRACE_API(fmt, args...)     {if (smp_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
+#define SMP_TRACE_API(fmt, args...)         {if (smp_cb.trace_level >= BT_TRACE_LEVEL_API) BT_PRINTF(fmt, ## args);}
 #define SMP_TRACE_EVENT(fmt, args...)       {if (smp_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_PRINTF(fmt, ## args);}
 #define SMP_TRACE_DEBUG(fmt, args...)       {if (smp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 
@@ -419,6 +422,158 @@ extern UINT8 btif_trace_level;
 #define APPL_TRACE_DEBUG(fmt, args...)      {if (appl_trace_level >= BT_TRACE_LEVEL_DEBUG) BT_PRINTF(fmt, ## args);}
 #define APPL_TRACE_VERBOSE(fmt, args...)    {if (appl_trace_level >= BT_TRACE_LEVEL_VERBOSE) BT_PRINTF(fmt, ## args);}
 
+#else
+#define LOG_ERROR(fmt, args...)            
+#define LOG_WARN(fmt, args...)             
+#define LOG_INFO(fmt, args...)             
+#define LOG_DEBUG(fmt, args...)            
+#define LOG_VERBOSE(fmt, args...)          
+
+/* Define tracing for the HCI unit
+*/
+#define HCI_TRACE_ERROR(fmt, args...)      
+#define HCI_TRACE_WARNING(fmt, args...)    
+#define HCI_TRACE_EVENT(fmt, args...)      
+#define HCI_TRACE_DEBUG(fmt, args...)      
+
+/* Define tracing for BTM
+*/
+#define BTM_TRACE_ERROR(fmt, args...)      
+#define BTM_TRACE_WARNING(fmt, args...)    
+#define BTM_TRACE_API(fmt, args...)        
+#define BTM_TRACE_EVENT(fmt, args...)      
+#define BTM_TRACE_DEBUG(fmt, args...)      
+
+/* Define tracing for the L2CAP unit
+*/
+#define L2CAP_TRACE_ERROR(fmt, args...)    
+#define L2CAP_TRACE_WARNING(fmt, args...)  
+#define L2CAP_TRACE_API(fmt, args...)      
+#define L2CAP_TRACE_EVENT(fmt, args...)    
+#define L2CAP_TRACE_DEBUG(fmt, args...)    
+
+/* Define tracing for the SDP unit
+*/
+#define SDP_TRACE_ERROR(fmt, args...)      
+#define SDP_TRACE_WARNING(fmt, args...)    
+#define SDP_TRACE_API(fmt, args...)        
+#define SDP_TRACE_EVENT(fmt, args...)      
+#define SDP_TRACE_DEBUG(fmt, args...)      
+
+/* Define tracing for the RFCOMM unit
+*/
+#define RFCOMM_TRACE_ERROR(fmt, args...)   
+#define RFCOMM_TRACE_WARNING(fmt, args...) 
+#define RFCOMM_TRACE_API(fmt, args...)     
+#define RFCOMM_TRACE_EVENT(fmt, args...)   
+#define RFCOMM_TRACE_DEBUG(fmt, args...)   
+
+/* Generic Access Profile traces */
+#define GAP_TRACE_ERROR(fmt, args...)      
+#define GAP_TRACE_EVENT(fmt, args...)      
+#define GAP_TRACE_API(fmt, args...)        
+#define GAP_TRACE_WARNING(fmt, args...)    
+
+/* define traces for HID Host */
+#define HIDH_TRACE_ERROR(fmt, args...)     
+#define HIDH_TRACE_WARNING(fmt, args...)   
+#define HIDH_TRACE_API(fmt, args...)       
+#define HIDH_TRACE_EVENT(fmt, args...)     
+#define HIDH_TRACE_DEBUG(fmt, args...)     
+
+/* define traces for BNEP */
+
+#define BNEP_TRACE_ERROR(fmt, args...)     
+#define BNEP_TRACE_WARNING(fmt, args...)   
+#define BNEP_TRACE_API(fmt, args...)       
+#define BNEP_TRACE_EVENT(fmt, args...)     
+#define BNEP_TRACE_DEBUG(fmt, args...)     
+
+/* define traces for PAN */
+
+#define PAN_TRACE_ERROR(fmt, args...)      
+#define PAN_TRACE_WARNING(fmt, args...)    
+#define PAN_TRACE_API(fmt, args...)        
+#define PAN_TRACE_EVENT(fmt, args...)      
+#define PAN_TRACE_DEBUG(fmt, args...)      
+
+/* Define tracing for the A2DP profile
+*/
+#define A2D_TRACE_ERROR(fmt, args...)      
+#define A2D_TRACE_WARNING(fmt, args...)    
+#define A2D_TRACE_EVENT(fmt, args...)      
+#define A2D_TRACE_DEBUG(fmt, args...)      
+#define A2D_TRACE_API(fmt, args...)        
+
+/* AVDTP
+*/
+#define AVDT_TRACE_ERROR(fmt, args...)     
+#define AVDT_TRACE_WARNING(fmt, args...)   
+#define AVDT_TRACE_EVENT(fmt, args...)     
+#define AVDT_TRACE_DEBUG(fmt, args...)     
+#define AVDT_TRACE_API(fmt, args...)       
+
+/* Define tracing for the AVCTP protocol
+*/
+#define AVCT_TRACE_ERROR(fmt, args...)     
+#define AVCT_TRACE_WARNING(fmt, args...)   
+#define AVCT_TRACE_EVENT(fmt, args...)     
+#define AVCT_TRACE_DEBUG(fmt, args...)     
+#define AVCT_TRACE_API(fmt, args...)       
+
+/* Define tracing for the AVRCP profile
+*/
+#define AVRC_TRACE_ERROR(fmt, args...)     
+#define AVRC_TRACE_WARNING(fmt, args...)   
+#define AVRC_TRACE_EVENT(fmt, args...)     
+#define AVRC_TRACE_DEBUG(fmt, args...)     
+#define AVRC_TRACE_API(fmt, args...)       
+
+/* MCAP
+*/
+#define MCA_TRACE_ERROR(fmt, args...)      
+#define MCA_TRACE_WARNING(fmt, args...)    
+#define MCA_TRACE_EVENT(fmt, args...)      
+#define MCA_TRACE_DEBUG(fmt, args...)      
+#define MCA_TRACE_API(fmt, args...)        
+
+/* Define tracing for the ATT/GATT unit
+*/
+#define GATT_TRACE_ERROR(fmt, args...)     
+#define GATT_TRACE_WARNING(fmt, args...)   
+#define GATT_TRACE_API(fmt, args...)       
+#define GATT_TRACE_EVENT(fmt, args...)     
+#define GATT_TRACE_DEBUG(fmt, args...)     
+
+/* Define tracing for the SMP unit
+*/
+#define SMP_TRACE_ERROR(fmt, args...)      
+#define SMP_TRACE_WARNING(fmt, args...)    
+#define SMP_TRACE_API(fmt, args...)        
+#define SMP_TRACE_EVENT(fmt, args...)      
+#define SMP_TRACE_DEBUG(fmt, args...)      
+
+extern UINT8 btif_trace_level;
+
+// define traces for application
+#define BTIF_TRACE_ERROR(fmt, args...)     
+#define BTIF_TRACE_WARNING(fmt, args...)   
+#define BTIF_TRACE_API(fmt, args...)       
+#define BTIF_TRACE_EVENT(fmt, args...)     
+#define BTIF_TRACE_DEBUG(fmt, args...)     
+#define BTIF_TRACE_VERBOSE(fmt, args...)   
+
+/* define traces for application */
+
+#define APPL_TRACE_ERROR(fmt, args...)     
+#define APPL_TRACE_WARNING(fmt, args...)   
+#define APPL_TRACE_API(fmt, args...)       
+#define APPL_TRACE_EVENT(fmt, args...)     
+#define APPL_TRACE_DEBUG(fmt, args...)     
+#define APPL_TRACE_VERBOSE(fmt, args...)   
+#endif  ///CONFIG_BT_STACK_NO_LOG
+
+
 /* Simplified Trace Helper Macro
 */
 #define bdld(fmt, args...) \
diff --git a/tools/sdk/include/bluedroid/bt_types.h b/tools/sdk/include/bluedroid/bt_types.h
index f2110150917..fdcd15629ec 100644
--- a/tools/sdk/include/bluedroid/bt_types.h
+++ b/tools/sdk/include/bluedroid/bt_types.h
@@ -41,7 +41,7 @@ typedef int32_t INT32;
 typedef bool BOOLEAN;
 
 #define PACKED  __packed
-#define INLINE  __inline
+// #define INLINE  __inline
 
 #define BCM_STRCPY_S(x1,x2,x3)      strcpy((x1),(x3))
 #define BCM_STRNCPY_S(x1,x2,x3,x4)  strncpy((x1),(x3),(x4))
diff --git a/tools/sdk/include/bluedroid/bt_utils.h b/tools/sdk/include/bluedroid/bt_utils.h
new file mode 100644
index 00000000000..39e2535513c
--- /dev/null
+++ b/tools/sdk/include/bluedroid/bt_utils.h
@@ -0,0 +1,46 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2009-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+#ifndef BT_UTILS_H
+#define BT_UTILS_H
+
+// static const char BT_UTILS_MODULE[] = "bt_utils_module";
+
+/*******************************************************************************
+**  Type definitions
+********************************************************************************/
+
+typedef enum {
+    TASK_HIGH_MEDIA = 0,
+    TASK_HIGH_GKI_TIMER,
+    TASK_HIGH_BTU,
+    TASK_HIGH_HCI_WORKER,
+    TASK_HIGH_USERIAL_READ,
+    TASK_UIPC_READ,
+    TASK_JAVA_ALARM,
+    TASK_HIGH_MAX
+} tHIGH_PRIORITY_TASK;
+
+/*******************************************************************************
+**  Functions
+********************************************************************************/
+
+void raise_priority_a2dp(tHIGH_PRIORITY_TASK high_task);
+void adjust_priority_a2dp(int start);
+#define UNUSED(x) (void)(x)
+#endif /* BT_UTILS_H */
diff --git a/tools/sdk/include/bluedroid/bta_api.h b/tools/sdk/include/bluedroid/bta_api.h
index 241b32eebd3..501b8a5ad27 100644
--- a/tools/sdk/include/bluedroid/bta_api.h
+++ b/tools/sdk/include/bluedroid/bta_api.h
@@ -635,7 +635,7 @@ typedef struct {
 } tBTA_DM_PIN_REQ;
 
 /* BLE related definition */
-
+#if (SMP_INCLUDED == TRUE)
 #define BTA_DM_AUTH_FAIL_BASE                   (HCI_ERR_MAX_ERR + 10)
 #define BTA_DM_AUTH_CONVERT_SMP_CODE(x)        (BTA_DM_AUTH_FAIL_BASE + (x))
 #define BTA_DM_AUTH_SMP_PASSKEY_FAIL             BTA_DM_AUTH_CONVERT_SMP_CODE (SMP_PASSKEY_ENTRY_FAIL)
@@ -655,7 +655,7 @@ typedef struct {
 #define BTA_DM_AUTH_SMP_BUSY                    (BTA_DM_AUTH_FAIL_BASE + SMP_BUSY)
 #define BTA_DM_AUTH_SMP_ENC_FAIL                (BTA_DM_AUTH_FAIL_BASE + SMP_ENC_FAIL)
 #define BTA_DM_AUTH_SMP_RSP_TIMEOUT             (BTA_DM_AUTH_FAIL_BASE + SMP_RSP_TIMEOUT)
-
+#endif  ///SMP_INCLUDED == TRUE
 /* connection parameter boundary value and dummy value */
 #define BTA_DM_BLE_SCAN_INT_MIN          BTM_BLE_SCAN_INT_MIN
 #define BTA_DM_BLE_SCAN_INT_MAX          BTM_BLE_SCAN_INT_MAX
@@ -668,13 +668,14 @@ typedef struct {
 #define BTA_DM_BLE_CONN_SUP_TOUT_MAX     BTM_BLE_CONN_SUP_TOUT_MAX
 #define BTA_DM_BLE_CONN_PARAM_UNDEF      BTM_BLE_CONN_PARAM_UNDEF  /* use this value when a specific value not to be overwritten */
 
-
+#if (SMP_INCLUDED == TRUE)
 #define BTA_LE_KEY_PENC      BTM_LE_KEY_PENC  /* encryption information of peer device */
 #define BTA_LE_KEY_PID       BTM_LE_KEY_PID   /* identity key of the peer device */
 #define BTA_LE_KEY_PCSRK     BTM_LE_KEY_PCSRK   /* peer SRK */
 #define BTA_LE_KEY_LENC      BTM_LE_KEY_LENC        /* master role security information:div */
 #define BTA_LE_KEY_LID       BTM_LE_KEY_LID         /* master device ID key */
 #define BTA_LE_KEY_LCSRK     BTM_LE_KEY_LCSRK        /* local CSRK has been deliver to peer */
+#endif  ///SMP_INCLUDED == TRUE
 typedef UINT8 tBTA_LE_KEY_TYPE; /* can be used as a bit mask */
 
 
@@ -702,10 +703,11 @@ typedef struct {
     BT_OCTET16       irk;
     BT_OCTET16       dhk;
 } tBTA_BLE_LOCAL_ID_KEYS;
-
+#if (SMP_INCLUDED == TRUE)
 #define BTA_DM_SEC_GRANTED              BTA_SUCCESS
 #define BTA_DM_SEC_PAIR_NOT_SPT         BTA_DM_AUTH_SMP_PAIR_NOT_SUPPORT
 #define BTA_DM_SEC_REP_ATTEMPTS         BTA_DM_AUTH_SMP_REPEATED_ATTEMPT
+#endif  ///SMP_INCLUDED == TRUE
 typedef UINT8 tBTA_DM_BLE_SEC_GRANT;
 
 
@@ -810,6 +812,7 @@ typedef tBTM_AUTH_REQ   tBTA_AUTH_REQ;
 #define BTA_AUTH_GEN_BOND   BTM_AUTH_SPGB_NO  /* 4 this bit is set for general bonding */
 #define BTA_AUTH_BONDS      BTM_AUTH_BONDS    /* 6 the general/dedicated bonding bits  */
 
+#if (SMP_INCLUDED == TRUE)
 #define BTA_LE_AUTH_NO_BOND    BTM_LE_AUTH_REQ_NO_BOND  /* 0*/
 #define BTA_LE_AUTH_BOND       BTM_LE_AUTH_REQ_BOND     /* 1 << 0 */
 #define BTA_LE_AUTH_REQ_MITM   BTM_LE_AUTH_REQ_MITM    /* 1 << 2 */
@@ -818,6 +821,7 @@ typedef tBTM_AUTH_REQ   tBTA_AUTH_REQ;
 #define BTA_LE_AUTH_REQ_SC_BOND         BTM_LE_AUTH_REQ_SC_BOND      /* 1001 */
 #define BTA_LE_AUTH_REQ_SC_MITM         BTM_LE_AUTH_REQ_SC_MITM      /* 1100 */
 #define BTA_LE_AUTH_REQ_SC_MITM_BOND    BTM_LE_AUTH_REQ_SC_MITM_BOND /* 1101 */
+#endif  ///SMP_INCLUDED == TRUE
 typedef tBTM_LE_AUTH_REQ       tBTA_LE_AUTH_REQ;       /* combination of the above bit pattern */
 
 #define BTA_OOB_NONE        BTM_OOB_NONE
@@ -1099,7 +1103,9 @@ typedef void (tBTA_BLE_SCAN_SETUP_CBACK) (tBTA_BLE_BATCH_SCAN_EVT evt,
         tBTA_DM_BLE_REF_VALUE ref_value,
         tBTA_STATUS status);
 
-typedef void (tBTA_START_SCAN_CMPL_CBACK) (tBTA_STATUS status); 
+typedef void (tBTA_START_STOP_SCAN_CMPL_CBACK) (tBTA_STATUS status);
+
+typedef void (tBTA_START_STOP_ADV_CMPL_CBACK) (tBTA_STATUS status);
 
 typedef void (tBTA_BLE_TRACK_ADV_CMPL_CBACK)(int action, tBTA_STATUS status,
         tBTA_DM_BLE_PF_AVBL_SPACE avbl_space,
@@ -1283,7 +1289,7 @@ typedef void (tBTA_DM_SWITCH_CBACK)(tBTA_DM_SWITCH_EVT event, tBTA_STATUS status
 
 typedef UINT8 tBTA_DM_ROUTE_PATH;
 
-
+#if (SDP_INCLUDED == TRUE)
 /* Device Identification (DI) data structure
 */
 /* Used to set the DI record */
@@ -1292,6 +1298,7 @@ typedef tSDP_DI_RECORD          tBTA_DI_RECORD;
 typedef tSDP_DI_GET_RECORD      tBTA_DI_GET_RECORD;
 /* SDP discovery database */
 typedef tSDP_DISCOVERY_DB       tBTA_DISCOVERY_DB;
+#endif  ///SDP_INCLUDED == TRUE
 
 #ifndef         BTA_DI_NUM_MAX
 #define         BTA_DI_NUM_MAX       3
@@ -1444,9 +1451,9 @@ extern void BTA_DmSearchCancel(void);
 ** Returns          void
 **
 *******************************************************************************/
+#if (SDP_INCLUDED == TRUE)
 extern void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services,
                            tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search);
-
 // btla-specific ++
 /*******************************************************************************
 **
@@ -1461,7 +1468,7 @@ extern void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services,
 *******************************************************************************/
 extern void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid,
                                tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search);
-
+#endif  ///SDP_INCLUDED == TRUE
 /*******************************************************************************
 **
 ** Function         BTA_DmGetCachedRemoteName
@@ -1617,7 +1624,7 @@ extern void BTA_GetEirService( UINT8 *p_eir, tBTA_SERVICE_MASK *p_services );
 *******************************************************************************/
 extern UINT16 BTA_DmGetConnectionState( BD_ADDR bd_addr );
 
-
+#if (SDP_INCLUDED == TRUE)
 /*******************************************************************************
 **
 ** Function         BTA_DmSetLocalDiRecord
@@ -1629,7 +1636,7 @@ extern UINT16 BTA_DmGetConnectionState( BD_ADDR bd_addr );
 *******************************************************************************/
 extern tBTA_STATUS BTA_DmSetLocalDiRecord( tBTA_DI_RECORD *p_device_info,
         UINT32 *p_handle );
-
+#endif  ///SDP_INCLUDED == TRUE
 /*******************************************************************************
 **
 **
@@ -2004,7 +2011,7 @@ extern void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport,
 *******************************************************************************/
 extern void BTA_DmBleObserve(BOOLEAN start, UINT8 duration,
                              tBTA_DM_SEARCH_CBACK *p_results_cb,
-                             tBTA_START_SCAN_CMPL_CBACK *p_start_scan_cb);
+                             tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb);
 
 extern void BTA_DmBleStopAdvertising(void);
 
@@ -2111,11 +2118,12 @@ extern void BTA_DmBleSetScanRspRaw (UINT8 *p_raw_scan_rsp, UINT32 raw_scan_rsp_l
 ** Description      This function starts or stops LE broadcasting.
 **
 ** Parameters       start: start or stop broadcast.
+**                  p_start_stop_adv_cb: stop broadcast completed event
 **
 ** Returns          None
 **
 *******************************************************************************/
-extern void BTA_DmBleBroadcast (BOOLEAN start);
+extern void BTA_DmBleBroadcast (BOOLEAN start, tBTA_START_STOP_ADV_CMPL_CBACK *p_start_stop_adv_cb);
 
 
 /*******************************************************************************
diff --git a/tools/sdk/include/bluedroid/bta_ar_api.h b/tools/sdk/include/bluedroid/bta_ar_api.h
new file mode 100644
index 00000000000..acfac9df44b
--- /dev/null
+++ b/tools/sdk/include/bluedroid/bta_ar_api.h
@@ -0,0 +1,144 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2004-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This is the public interface file for the simulatenous advanced
+ *  audio/video streaming (AV) source and sink of BTA, Broadcom's Bluetooth
+ *  application layer for mobile phones.
+ *
+ ******************************************************************************/
+#ifndef BTA_AR_API_H
+#define BTA_AR_API_H
+
+#include "avdt_api.h"
+#include "avct_api.h"
+#include "avrc_api.h"
+#include "sdp_api.h"
+#include "bta_av_api.h"
+#include "bta_sys.h"
+
+#if (BTA_AR_INCLUDED == TRUE)
+
+/*****************************************************************************
+**  Constants and data types
+*****************************************************************************/
+/* This event signal to AR user that other profile is connected */
+#define BTA_AR_AVDT_CONN_EVT    (AVDT_MAX_EVT + 1)
+
+/*******************************************************************************
+**
+** Function         bta_ar_init
+**
+** Description      This function is called from bta_sys_init().
+**                  to initialize the control block
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_ar_init(void);
+
+/*******************************************************************************
+**
+** Function         bta_ar_reg_avdt
+**
+** Description      This function is called to register to AVDTP.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_ar_reg_avdt(tAVDT_REG *p_reg, tAVDT_CTRL_CBACK *p_cback, tBTA_SYS_ID sys_id);
+
+/*******************************************************************************
+**
+** Function         bta_ar_dereg_avdt
+**
+** Description      This function is called to de-register from AVDTP.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id);
+
+/*******************************************************************************
+**
+** Function         bta_ar_avdt_conn
+**
+** Description      This function is called to let ar know that some AVDTP profile
+**                  is connected for this sys_id.
+**                  If the other sys modules started a timer for PENDING_EVT,
+**                  the timer can be stopped now.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, BD_ADDR bd_addr);
+
+/*******************************************************************************
+**
+** Function         bta_ar_reg_avct
+**
+** Description      This function is called to register to AVCTP.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_ar_reg_avct(UINT16 mtu, UINT16 mtu_br, UINT8 sec_mask, tBTA_SYS_ID sys_id);
+
+/*******************************************************************************
+**
+** Function         bta_ar_dereg_avct
+**
+** Description      This function is called to deregister from AVCTP.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_ar_dereg_avct(tBTA_SYS_ID sys_id);
+
+/******************************************************************************
+**
+** Function         bta_ar_reg_avrc
+**
+** Description      This function is called to register an SDP record for AVRCP.
+**
+** Returns          void
+**
+******************************************************************************/
+extern void bta_ar_reg_avrc(UINT16 service_uuid, char *p_service_name,
+                            char *p_provider_name, UINT16 categories, tBTA_SYS_ID sys_id);
+
+/******************************************************************************
+**
+** Function         bta_ar_dereg_avrc
+**
+** Description      This function is called to de-register/delete an SDP record for AVRCP.
+**
+** Returns          void
+**
+******************************************************************************/
+extern void bta_ar_dereg_avrc(UINT16 service_uuid, tBTA_SYS_ID sys_id);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///BTA_AR_INCLUDED == TRUE
+
+#endif /* BTA_AR_API_H */
diff --git a/tools/sdk/include/bluedroid/bta_av_api.h b/tools/sdk/include/bluedroid/bta_av_api.h
new file mode 100644
index 00000000000..24c359910ca
--- /dev/null
+++ b/tools/sdk/include/bluedroid/bta_av_api.h
@@ -0,0 +1,812 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2004-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This is the public interface file for the advanced audio/video streaming
+ *  (AV) subsystem of BTA, Broadcom's Bluetooth application layer for mobile
+ *  phones.
+ *
+ ******************************************************************************/
+#ifndef BTA_AV_API_H
+#define BTA_AV_API_H
+
+#include "avrc_api.h"
+#include "avdt_api.h"
+#include "a2d_api.h"
+#include "bta_api.h"
+
+#if (BTA_AV_INCLUDED == TRUE)
+
+/*****************************************************************************
+**  Constants and data types
+*****************************************************************************/
+/* Set to TRUE if seperate authorization prompt desired for AVCTP besides A2DP authorization */
+/* Typically FALSE when AVRCP is used in conjunction with A2DP */
+#ifndef BTA_AV_WITH_AVCTP_AUTHORIZATION
+#define BTA_AV_WITH_AVCTP_AUTHORIZATION     FALSE
+#endif
+
+/* AV status values */
+#define BTA_AV_SUCCESS          0       /* successful operation */
+#define BTA_AV_FAIL             1       /* generic failure */
+#define BTA_AV_FAIL_SDP         2       /* service not found */
+#define BTA_AV_FAIL_STREAM      3       /* stream connection failed */
+#define BTA_AV_FAIL_RESOURCES   4       /* no resources */
+#define BTA_AV_FAIL_ROLE        5       /* failed due to role management related issues */
+#define BTA_AV_FAIL_GET_CAP     6       /* get capability failed due to no SEP availale on the peer  */
+
+typedef UINT8 tBTA_AV_STATUS;
+
+/* AV features masks */
+#define BTA_AV_FEAT_RCTG        0x0001  /* remote control target */
+#define BTA_AV_FEAT_RCCT        0x0002  /* remote control controller */
+#define BTA_AV_FEAT_PROTECT     0x0004  /* streaming media contect protection */
+#define BTA_AV_FEAT_VENDOR      0x0008  /* remote control vendor dependent commands */
+#define BTA_AV_FEAT_REPORT      0x0020  /* use reporting service for VDP */
+#define BTA_AV_FEAT_METADATA    0x0040  /* remote control Metadata Transfer command/response */
+#define BTA_AV_FEAT_MULTI_AV    0x0080  /* use multi-av, if controller supports it */
+#define BTA_AV_FEAT_BROWSE      0x0010  /* use browsing channel */
+#define BTA_AV_FEAT_MASTER      0x0100  /* stream only as master role */
+#define BTA_AV_FEAT_ADV_CTRL    0x0200  /* remote control Advanced Control command/response */
+#define BTA_AV_FEAT_DELAY_RPT   0x0400  /* allow delay reporting */
+#define BTA_AV_FEAT_ACP_START   0x0800  /* start stream when 2nd SNK was accepted   */
+
+/* Internal features */
+#define BTA_AV_FEAT_NO_SCO_SSPD 0x8000  /* Do not suspend av streaming as to AG events(SCO or Call) */
+
+typedef UINT16 tBTA_AV_FEAT;
+
+/* AV channel values */
+#define BTA_AV_CHNL_MSK             0xC0
+#define BTA_AV_CHNL_AUDIO           0x40  /* audio channel */
+#define BTA_AV_CHNL_VIDEO           0x80  /* video channel */
+typedef UINT8 tBTA_AV_CHNL;
+
+
+#define BTA_AV_HNDL_MSK             0x3F
+typedef UINT8 tBTA_AV_HNDL;
+/* handle index to mask */
+#define BTA_AV_HNDL_TO_MSK(h)       ((UINT8)(1 << (h)))
+
+/* tBTA_AV_HNDL to mask */
+#define BTA_AV_HNDL_TYPE_TO_MSK(h)  ((UINT8)(1 << (h&BTA_AV_HNDL_MSK)))
+
+/* offset of codec type in codec info byte array */
+#define BTA_AV_CODEC_TYPE_IDX       AVDT_CODEC_TYPE_INDEX   /* 2 */
+
+
+
+/* maximum number of streams created: 1 for audio, 1 for video */
+#ifndef BTA_AV_NUM_STRS
+#define BTA_AV_NUM_STRS         2
+#endif
+
+#ifndef BTA_AV_MAX_SEPS
+#define BTA_AV_MAX_SEPS         2
+#endif
+
+#ifndef BTA_AV_MAX_A2DP_MTU
+/*#define BTA_AV_MAX_A2DP_MTU     668 //224 (DM5) * 3 - 4(L2CAP header) */
+#define BTA_AV_MAX_A2DP_MTU     1008
+#endif
+
+#ifndef BTA_AV_MAX_VDP_MTU
+#define BTA_AV_MAX_VDP_MTU      1008
+#endif
+
+
+/* codec type */
+#define BTA_AV_CODEC_SBC        A2D_MEDIA_CT_SBC        /* SBC media codec type */
+#define BTA_AV_CODEC_M12        A2D_MEDIA_CT_M12        /* MPEG-1, 2 Audio media codec type */
+#define BTA_AV_CODEC_M24        A2D_MEDIA_CT_M24        /* MPEG-2, 4 AAC media codec type */
+#define BTA_AV_CODEC_ATRAC      A2D_MEDIA_CT_ATRAC      /* ATRAC family media codec type */
+#define BTA_AV_CODEC_H263_P0    VDP_MEDIA_CT_H263_P0    /* H.263 baseline (profile 0) */
+#define BTA_AV_CODEC_MPEG4      VDP_MEDIA_CT_MPEG4      /* MPEG-4 Visual Simple Profile */
+#define BTA_AV_CODEC_H263_P3    VDP_MEDIA_CT_H263_P3    /* H.263 profile 3 */
+#define BTA_AV_CODEC_H263_P8    VDP_MEDIA_CT_H263_P8    /* H.263 profile 8 */
+#define BTA_AV_CODEC_VEND       VDP_MEDIA_CT_VEND       /* Non-VDP */
+
+typedef UINT8 tBTA_AV_CODEC;
+
+/* Company ID in BT assigned numbers */
+#define BTA_AV_BT_VENDOR_ID     VDP_BT_VENDOR_ID        /* Broadcom Corporation */
+
+/* vendor specific codec ID */
+#define BTA_AV_CODEC_ID_H264    VDP_CODEC_ID_H264       /* Non-VDP codec ID - H.264 */
+#define BTA_AV_CODEC_ID_IMG     VDP_CODEC_ID_IMG        /* Non-VDP codec ID - images/slideshow */
+
+/* operation id list for BTA_AvRemoteCmd */
+#define BTA_AV_RC_SELECT        AVRC_ID_SELECT      /* select */
+#define BTA_AV_RC_UP            AVRC_ID_UP          /* up */
+#define BTA_AV_RC_DOWN          AVRC_ID_DOWN        /* down */
+#define BTA_AV_RC_LEFT          AVRC_ID_LEFT        /* left */
+#define BTA_AV_RC_RIGHT         AVRC_ID_RIGHT       /* right */
+#define BTA_AV_RC_RIGHT_UP      AVRC_ID_RIGHT_UP    /* right-up */
+#define BTA_AV_RC_RIGHT_DOWN    AVRC_ID_RIGHT_DOWN  /* right-down */
+#define BTA_AV_RC_LEFT_UP       AVRC_ID_LEFT_UP     /* left-up */
+#define BTA_AV_RC_LEFT_DOWN     AVRC_ID_LEFT_DOWN   /* left-down */
+#define BTA_AV_RC_ROOT_MENU     AVRC_ID_ROOT_MENU   /* root menu */
+#define BTA_AV_RC_SETUP_MENU    AVRC_ID_SETUP_MENU  /* setup menu */
+#define BTA_AV_RC_CONT_MENU     AVRC_ID_CONT_MENU   /* contents menu */
+#define BTA_AV_RC_FAV_MENU      AVRC_ID_FAV_MENU    /* favorite menu */
+#define BTA_AV_RC_EXIT          AVRC_ID_EXIT        /* exit */
+#define BTA_AV_RC_0             AVRC_ID_0           /* 0 */
+#define BTA_AV_RC_1             AVRC_ID_1           /* 1 */
+#define BTA_AV_RC_2             AVRC_ID_2           /* 2 */
+#define BTA_AV_RC_3             AVRC_ID_3           /* 3 */
+#define BTA_AV_RC_4             AVRC_ID_4           /* 4 */
+#define BTA_AV_RC_5             AVRC_ID_5           /* 5 */
+#define BTA_AV_RC_6             AVRC_ID_6           /* 6 */
+#define BTA_AV_RC_7             AVRC_ID_7           /* 7 */
+#define BTA_AV_RC_8             AVRC_ID_8           /* 8 */
+#define BTA_AV_RC_9             AVRC_ID_9           /* 9 */
+#define BTA_AV_RC_DOT           AVRC_ID_DOT         /* dot */
+#define BTA_AV_RC_ENTER         AVRC_ID_ENTER       /* enter */
+#define BTA_AV_RC_CLEAR         AVRC_ID_CLEAR       /* clear */
+#define BTA_AV_RC_CHAN_UP       AVRC_ID_CHAN_UP     /* channel up */
+#define BTA_AV_RC_CHAN_DOWN     AVRC_ID_CHAN_DOWN   /* channel down */
+#define BTA_AV_RC_PREV_CHAN     AVRC_ID_PREV_CHAN   /* previous channel */
+#define BTA_AV_RC_SOUND_SEL     AVRC_ID_SOUND_SEL   /* sound select */
+#define BTA_AV_RC_INPUT_SEL     AVRC_ID_INPUT_SEL   /* input select */
+#define BTA_AV_RC_DISP_INFO     AVRC_ID_DISP_INFO   /* display information */
+#define BTA_AV_RC_HELP          AVRC_ID_HELP        /* help */
+#define BTA_AV_RC_PAGE_UP       AVRC_ID_PAGE_UP     /* page up */
+#define BTA_AV_RC_PAGE_DOWN     AVRC_ID_PAGE_DOWN   /* page down */
+#define BTA_AV_RC_POWER         AVRC_ID_POWER       /* power */
+#define BTA_AV_RC_VOL_UP        AVRC_ID_VOL_UP      /* volume up */
+#define BTA_AV_RC_VOL_DOWN      AVRC_ID_VOL_DOWN    /* volume down */
+#define BTA_AV_RC_MUTE          AVRC_ID_MUTE        /* mute */
+#define BTA_AV_RC_PLAY          AVRC_ID_PLAY        /* play */
+#define BTA_AV_RC_STOP          AVRC_ID_STOP        /* stop */
+#define BTA_AV_RC_PAUSE         AVRC_ID_PAUSE       /* pause */
+#define BTA_AV_RC_RECORD        AVRC_ID_RECORD      /* record */
+#define BTA_AV_RC_REWIND        AVRC_ID_REWIND      /* rewind */
+#define BTA_AV_RC_FAST_FOR      AVRC_ID_FAST_FOR    /* fast forward */
+#define BTA_AV_RC_EJECT         AVRC_ID_EJECT       /* eject */
+#define BTA_AV_RC_FORWARD       AVRC_ID_FORWARD     /* forward */
+#define BTA_AV_RC_BACKWARD      AVRC_ID_BACKWARD    /* backward */
+#define BTA_AV_RC_ANGLE         AVRC_ID_ANGLE       /* angle */
+#define BTA_AV_RC_SUBPICT       AVRC_ID_SUBPICT     /* subpicture */
+#define BTA_AV_RC_F1            AVRC_ID_F1          /* F1 */
+#define BTA_AV_RC_F2            AVRC_ID_F2          /* F2 */
+#define BTA_AV_RC_F3            AVRC_ID_F3          /* F3 */
+#define BTA_AV_RC_F4            AVRC_ID_F4          /* F4 */
+#define BTA_AV_RC_F5            AVRC_ID_F5          /* F5 */
+#define BTA_AV_VENDOR           AVRC_ID_VENDOR      /* vendor unique */
+
+typedef UINT8 tBTA_AV_RC;
+
+/* state flag for pass through command */
+#define BTA_AV_STATE_PRESS      AVRC_STATE_PRESS    /* key pressed */
+#define BTA_AV_STATE_RELEASE    AVRC_STATE_RELEASE  /* key released */
+
+typedef UINT8 tBTA_AV_STATE;
+
+/* command codes for BTA_AvVendorCmd */
+#define BTA_AV_CMD_CTRL         AVRC_CMD_CTRL
+#define BTA_AV_CMD_STATUS       AVRC_CMD_STATUS
+#define BTA_AV_CMD_SPEC_INQ     AVRC_CMD_SPEC_INQ
+#define BTA_AV_CMD_NOTIF        AVRC_CMD_NOTIF
+#define BTA_AV_CMD_GEN_INQ      AVRC_CMD_GEN_INQ
+
+typedef UINT8 tBTA_AV_CMD;
+
+/* response codes for BTA_AvVendorRsp */
+#define BTA_AV_RSP_NOT_IMPL     AVRC_RSP_NOT_IMPL
+#define BTA_AV_RSP_ACCEPT       AVRC_RSP_ACCEPT
+#define BTA_AV_RSP_REJ          AVRC_RSP_REJ
+#define BTA_AV_RSP_IN_TRANS     AVRC_RSP_IN_TRANS
+#define BTA_AV_RSP_IMPL_STBL    AVRC_RSP_IMPL_STBL
+#define BTA_AV_RSP_CHANGED      AVRC_RSP_CHANGED
+#define BTA_AV_RSP_INTERIM      AVRC_RSP_INTERIM
+
+typedef UINT8 tBTA_AV_CODE;
+
+/* error codes for BTA_AvProtectRsp */
+#define BTA_AV_ERR_NONE             A2D_SUCCESS         /* Success, no error */
+#define BTA_AV_ERR_BAD_STATE        AVDT_ERR_BAD_STATE  /* Message cannot be processed in this state */
+#define BTA_AV_ERR_RESOURCE         AVDT_ERR_RESOURCE   /* Insufficient resources */
+#define BTA_AV_ERR_BAD_CP_TYPE      A2D_BAD_CP_TYPE     /* The requested Content Protection Type is not supported */
+#define BTA_AV_ERR_BAD_CP_FORMAT    A2D_BAD_CP_FORMAT   /* The format of Content Protection Data is not correct */
+
+typedef UINT8 tBTA_AV_ERR;
+
+
+/* AV callback events */
+#define BTA_AV_ENABLE_EVT       0       /* AV enabled */
+#define BTA_AV_REGISTER_EVT     1       /* registered to AVDT */
+#define BTA_AV_OPEN_EVT         2       /* connection opened */
+#define BTA_AV_CLOSE_EVT        3       /* connection closed */
+#define BTA_AV_START_EVT        4       /* stream data transfer started */
+#define BTA_AV_STOP_EVT         5       /* stream data transfer stopped */
+#define BTA_AV_PROTECT_REQ_EVT  6       /* content protection request */
+#define BTA_AV_PROTECT_RSP_EVT  7       /* content protection response */
+#define BTA_AV_RC_OPEN_EVT      8       /* remote control channel open */
+#define BTA_AV_RC_CLOSE_EVT     9       /* remote control channel closed */
+#define BTA_AV_REMOTE_CMD_EVT   10      /* remote control command */
+#define BTA_AV_REMOTE_RSP_EVT   11      /* remote control response */
+#define BTA_AV_VENDOR_CMD_EVT   12      /* vendor dependent remote control command */
+#define BTA_AV_VENDOR_RSP_EVT   13      /* vendor dependent remote control response */
+#define BTA_AV_RECONFIG_EVT     14      /* reconfigure response */
+#define BTA_AV_SUSPEND_EVT      15      /* suspend response */
+#define BTA_AV_PENDING_EVT      16      /* incoming connection pending:
+                                         * signal channel is open and stream is not open
+                                         * after BTA_AV_SIG_TIME_VAL ms */
+#define BTA_AV_META_MSG_EVT     17      /* metadata messages */
+#define BTA_AV_REJECT_EVT       18      /* incoming connection rejected */
+#define BTA_AV_RC_FEAT_EVT      19      /* remote control channel peer supported features update */
+#define BTA_AV_MEDIA_SINK_CFG_EVT    20      /* command to configure codec */
+#define BTA_AV_MEDIA_DATA_EVT   21      /* sending data to Media Task */
+/* Max BTA event */
+#define BTA_AV_MAX_EVT          22
+
+
+/* function types for call-out functions */
+typedef BOOLEAN (*tBTA_AV_CO_INIT) (UINT8 *p_codec_type, UINT8 *p_codec_info,
+                                    UINT8 *p_num_protect, UINT8 *p_protect_info, UINT8 index);
+typedef void (*tBTA_AV_CO_DISC_RES) (tBTA_AV_HNDL hndl, UINT8 num_seps,
+                                     UINT8 num_snk, UINT8 num_src, BD_ADDR addr, UINT16 uuid_local);
+typedef UINT8 (*tBTA_AV_CO_GETCFG) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                    UINT8 *p_codec_info, UINT8 *p_sep_info_idx, UINT8 seid,
+                                    UINT8 *p_num_protect, UINT8 *p_protect_info);
+typedef void (*tBTA_AV_CO_SETCFG) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                   UINT8 *p_codec_info, UINT8 seid, BD_ADDR addr,
+                                   UINT8 num_protect, UINT8 *p_protect_info,
+                                   UINT8 t_local_sep, UINT8 avdt_handle);
+typedef void (*tBTA_AV_CO_OPEN) (tBTA_AV_HNDL hndl,
+                                 tBTA_AV_CODEC codec_type, UINT8 *p_codec_info,
+                                 UINT16 mtu);
+typedef void (*tBTA_AV_CO_CLOSE) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type, UINT16 mtu);
+typedef void (*tBTA_AV_CO_START) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, BOOLEAN *p_no_rtp_hdr);
+typedef void (*tBTA_AV_CO_STOP) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type);
+typedef void *(*tBTA_AV_CO_DATAPATH) (tBTA_AV_CODEC codec_type,
+                                      UINT32 *p_len, UINT32 *p_timestamp);
+typedef void (*tBTA_AV_CO_DELAY) (tBTA_AV_HNDL hndl, UINT16 delay);
+
+/* the call-out functions for one stream */
+typedef struct {
+    tBTA_AV_CO_INIT     init;
+    tBTA_AV_CO_DISC_RES disc_res;
+    tBTA_AV_CO_GETCFG   getcfg;
+    tBTA_AV_CO_SETCFG   setcfg;
+    tBTA_AV_CO_OPEN     open;
+    tBTA_AV_CO_CLOSE    close;
+    tBTA_AV_CO_START    start;
+    tBTA_AV_CO_STOP     stop;
+    tBTA_AV_CO_DATAPATH data;
+    tBTA_AV_CO_DELAY    delay;
+} tBTA_AV_CO_FUNCTS;
+
+typedef UINT8 tBTA_AV_EVT;
+
+/* Event associated with BTA_AV_ENABLE_EVT */
+typedef struct {
+    tBTA_AV_FEAT    features;
+} tBTA_AV_ENABLE;
+
+/* Event associated with BTA_AV_REGISTER_EVT */
+typedef struct {
+    tBTA_AV_CHNL    chnl;       /* audio/video */
+    tBTA_AV_HNDL    hndl;       /* Handle associated with the stream. */
+    UINT8           app_id;     /* ID associated with call to BTA_AvRegister() */
+    tBTA_AV_STATUS  status;
+    tBTA_AV_CO_FUNCTS *p_bta_av_cos;
+} tBTA_AV_REGISTER;
+
+/* data associated with BTA_AV_OPEN_EVT */
+#define BTA_AV_EDR_2MBPS        0x01
+#define BTA_AV_EDR_3MBPS        0x02
+typedef UINT8 tBTA_AV_EDR;
+
+typedef struct {
+    tBTA_AV_CHNL    chnl;
+    tBTA_AV_HNDL    hndl;
+    BD_ADDR         bd_addr;
+    tBTA_AV_STATUS  status;
+    BOOLEAN         starting;
+    tBTA_AV_EDR     edr;        /* 0, if peer device does not support EDR */
+    UINT8           sep;        /*  sep type of peer device */
+} tBTA_AV_OPEN;
+
+/* data associated with BTA_AV_CLOSE_EVT */
+typedef struct {
+    tBTA_AV_CHNL    chnl;
+    tBTA_AV_HNDL    hndl;
+    UINT8           disc_rsn;    /* disconnection reason */
+} tBTA_AV_CLOSE;
+
+/* data associated with BTA_AV_START_EVT */
+typedef struct {
+    tBTA_AV_CHNL    chnl;
+    tBTA_AV_HNDL    hndl;
+    tBTA_AV_STATUS  status;
+    BOOLEAN         initiator; /* TRUE, if local device initiates the START */
+    BOOLEAN         suspending;
+} tBTA_AV_START;
+
+/* data associated with BTA_AV_SUSPEND_EVT */
+typedef struct {
+    tBTA_AV_CHNL    chnl;
+    tBTA_AV_HNDL    hndl;
+    BOOLEAN         initiator; /* TRUE, if local device initiates the SUSPEND */
+    tBTA_AV_STATUS  status;
+} tBTA_AV_SUSPEND;
+
+/* data associated with BTA_AV_RECONFIG_EVT */
+typedef struct {
+    tBTA_AV_CHNL    chnl;
+    tBTA_AV_HNDL    hndl;
+    tBTA_AV_STATUS  status;
+} tBTA_AV_RECONFIG;
+
+/* data associated with BTA_AV_PROTECT_REQ_EVT */
+typedef struct {
+    tBTA_AV_CHNL    chnl;
+    tBTA_AV_HNDL    hndl;
+    UINT8           *p_data;
+    UINT16          len;
+} tBTA_AV_PROTECT_REQ;
+
+/* data associated with BTA_AV_PROTECT_RSP_EVT */
+typedef struct {
+    tBTA_AV_CHNL    chnl;
+    tBTA_AV_HNDL    hndl;
+    UINT8           *p_data;
+    UINT16          len;
+    tBTA_AV_ERR     err_code;
+} tBTA_AV_PROTECT_RSP;
+
+/* data associated with BTA_AV_RC_OPEN_EVT */
+typedef struct {
+    UINT8           rc_handle;
+    tBTA_AV_FEAT    peer_features;
+    BD_ADDR         peer_addr;
+    tBTA_AV_STATUS  status;
+} tBTA_AV_RC_OPEN;
+
+/* data associated with BTA_AV_RC_CLOSE_EVT */
+typedef struct {
+    UINT8           rc_handle;
+    BD_ADDR         peer_addr;
+} tBTA_AV_RC_CLOSE;
+
+/* data associated with BTA_AV_RC_FEAT_EVT */
+typedef struct {
+    UINT8           rc_handle;
+    tBTA_AV_FEAT    peer_features;
+} tBTA_AV_RC_FEAT;
+
+/* data associated with BTA_AV_REMOTE_CMD_EVT */
+typedef struct {
+    UINT8           rc_handle;
+    tBTA_AV_RC      rc_id;
+    tBTA_AV_STATE   key_state;
+    UINT8           len;
+    UINT8           *p_data;
+    tAVRC_HDR       hdr;    /* Message header. */
+    UINT8           label;
+} tBTA_AV_REMOTE_CMD;
+
+/* data associated with BTA_AV_REMOTE_RSP_EVT */
+typedef struct {
+    UINT8           rc_handle;
+    tBTA_AV_RC      rc_id;
+    tBTA_AV_STATE   key_state;
+    UINT8           len;
+    UINT8           *p_data;
+    tBTA_AV_CODE    rsp_code;
+    UINT8           label;
+} tBTA_AV_REMOTE_RSP;
+
+/* data associated with BTA_AV_VENDOR_CMD_EVT, BTA_AV_VENDOR_RSP_EVT */
+typedef struct {
+    UINT8           rc_handle;
+    UINT16          len;            /* Max vendor dependent message is 512 */
+    UINT8           label;
+    tBTA_AV_CODE    code;
+    UINT32          company_id;
+    UINT8           *p_data;
+} tBTA_AV_VENDOR;
+
+/* data associated with BTA_AV_META_MSG_EVT */
+typedef struct {
+    UINT8           rc_handle;
+    UINT16          len;
+    UINT8           label;
+    tBTA_AV_CODE    code;
+    UINT32          company_id;
+    UINT8           *p_data;
+    tAVRC_MSG       *p_msg;
+} tBTA_AV_META_MSG;
+
+/* data associated with BTA_AV_PENDING_EVT */
+typedef struct {
+    BD_ADDR         bd_addr;
+} tBTA_AV_PEND;
+
+/* data associated with BTA_AV_REJECT_EVT */
+typedef struct {
+    BD_ADDR         bd_addr;
+    tBTA_AV_HNDL    hndl;       /* Handle associated with the stream that rejected the connection. */
+} tBTA_AV_REJECT;
+
+
+/* union of data associated with AV callback */
+typedef union {
+    tBTA_AV_CHNL        chnl;
+    tBTA_AV_ENABLE      enable;
+    tBTA_AV_REGISTER    registr;
+    tBTA_AV_OPEN        open;
+    tBTA_AV_CLOSE       close;
+    tBTA_AV_START       start;
+    tBTA_AV_PROTECT_REQ protect_req;
+    tBTA_AV_PROTECT_RSP protect_rsp;
+    tBTA_AV_RC_OPEN     rc_open;
+    tBTA_AV_RC_CLOSE    rc_close;
+    tBTA_AV_REMOTE_CMD  remote_cmd;
+    tBTA_AV_REMOTE_RSP  remote_rsp;
+    tBTA_AV_VENDOR      vendor_cmd;
+    tBTA_AV_VENDOR      vendor_rsp;
+    tBTA_AV_RECONFIG    reconfig;
+    tBTA_AV_SUSPEND     suspend;
+    tBTA_AV_PEND        pend;
+    tBTA_AV_META_MSG    meta_msg;
+    tBTA_AV_REJECT      reject;
+    tBTA_AV_RC_FEAT     rc_feat;
+} tBTA_AV;
+
+/* union of data associated with AV Media callback */
+typedef union {
+    BT_HDR     *p_data;
+    UINT8      *codec_info;
+} tBTA_AV_MEDIA;
+
+
+#define BTA_AVC_PACKET_LEN                  AVRC_PACKET_LEN
+#define BTA_VENDOR_DATA_OFFSET              6
+#define BTA_VENDOR_HEADER_LEN               4
+#define BTA_MAX_VENDOR_DEPENDENT_DATA_LEN   (BTA_AVC_PACKET_LEN-BTA_VENDOR_DATA_OFFSET-BTA_VENDOR_HEADER_LEN)
+#define BTA_GROUP_NAVI_MSG_OP_DATA_LEN      5
+
+#define BTA_ERROR_INVALID_CMD           AVRC_STS_BAD_CMD
+#define BTA_ERROR_INVALID_PARAM         AVRC_STS_BAD_PARAM
+#define BTA_ERROR_BAD_CONTENTS          AVRC_STS_NOT_FOUND
+#define BTA_ERROR_INTERNAL              AVRC_STS_INTERNAL_ERR
+
+#define BTA_AV_META_SINGLE_PACKET       AVRC_PKT_SINGLE
+
+#define BTA_AV_CO_METADATA              AVRC_CO_METADATA
+
+/* AV callback */
+typedef void (tBTA_AV_CBACK)(tBTA_AV_EVT event, tBTA_AV *p_data);
+typedef void (tBTA_AV_DATA_CBACK)(tBTA_AV_EVT event, tBTA_AV_MEDIA *p_data);
+
+/* type for stream state machine action functions */
+typedef void (*tBTA_AV_ACT)(void *p_cb, void *p_data);
+
+/* type for registering VDP */
+typedef void (tBTA_AV_REG) (tAVDT_CS *p_cs, char *p_service_name, void *p_data);
+
+/* AV configuration structure */
+typedef struct {
+    UINT32  company_id;         /* AVRCP Company ID */
+    UINT16  avrc_mtu;           /* AVRCP MTU at L2CAP for control channel */
+    UINT16  avrc_br_mtu;        /* AVRCP MTU at L2CAP for browsing channel */
+    UINT16  avrc_ct_cat;        /* AVRCP controller categories */
+    UINT16  avrc_tg_cat;        /* AVRCP target categories */
+    UINT16  sig_mtu;            /* AVDTP signaling channel MTU at L2CAP */
+    UINT16  audio_mtu;          /* AVDTP audio transport channel MTU at L2CAP */
+    const UINT16 *p_audio_flush_to;/* AVDTP audio transport channel flush timeout */
+    UINT16  audio_mqs;          /* AVDTP audio channel max data queue size */
+    UINT16  video_mtu;          /* AVDTP video transport channel MTU at L2CAP */
+    UINT16  video_flush_to;     /* AVDTP video transport channel flush timeout */
+    BOOLEAN avrc_group;         /* TRUE, to accept AVRC 1.3 group nevigation command */
+    UINT8   num_co_ids;         /* company id count in p_meta_co_ids */
+    UINT8   num_evt_ids;        /* event id count in p_meta_evt_ids */
+    tBTA_AV_CODE  rc_pass_rsp;  /* the default response code for pass through commands */
+    const UINT32 *p_meta_co_ids;/* the metadata Get Capabilities response for company id */
+    const UINT8 *p_meta_evt_ids;/* the the metadata Get Capabilities response for event id */
+    const tBTA_AV_ACT *p_act_tbl;/* the action function table for VDP stream */
+    tBTA_AV_REG       *p_reg;   /* action function to register VDP */
+    char              avrc_controller_name[BTA_SERVICE_NAME_LEN]; /* Default AVRCP controller name */
+    char              avrc_target_name[BTA_SERVICE_NAME_LEN];     /* Default AVRCP target name*/
+} tBTA_AV_CFG;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+**  External Function Declarations
+*****************************************************************************/
+
+/*******************************************************************************
+**
+** Function         BTA_AvEnable
+**
+** Description      Enable the advanced audio/video service. When the enable
+**                  operation is complete the callback function will be
+**                  called with a BTA_AV_ENABLE_EVT. This function must
+**                  be called before other function in the AV API are
+**                  called.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvEnable(tBTA_SEC sec_mask, tBTA_AV_FEAT features,
+                  tBTA_AV_CBACK *p_cback);
+
+/*******************************************************************************
+**
+** Function         BTA_AvDisable
+**
+** Description      Disable the advanced audio/video service.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvDisable(void);
+
+/*******************************************************************************
+**
+** Function         BTA_AvRegister
+**
+** Description      Register the audio or video service to stack. When the
+**                  operation is complete the callback function will be
+**                  called with a BTA_AV_REGISTER_EVT. This function must
+**                  be called before AVDT stream is open.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvRegister(tBTA_AV_CHNL chnl, const char *p_service_name,
+                    UINT8 app_id, tBTA_AV_DATA_CBACK  *p_data_cback, tBTA_AV_CO_FUNCTS *bta_av_cos);
+
+/*******************************************************************************
+**
+** Function         BTA_AvDeregister
+**
+** Description      Deregister the audio or video service
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvDeregister(tBTA_AV_HNDL hndl);
+
+/*******************************************************************************
+**
+** Function         BTA_AvOpen
+**
+** Description      Opens an advanced audio/video connection to a peer device.
+**                  When connection is open callback function is called
+**                  with a BTA_AV_OPEN_EVT.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvOpen(BD_ADDR bd_addr, tBTA_AV_HNDL handle,
+                BOOLEAN use_rc, tBTA_SEC sec_mask, UINT16 uuid);
+
+/*******************************************************************************
+**
+** Function         BTA_AvClose
+**
+** Description      Close the current streams.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvClose(tBTA_AV_HNDL handle);
+
+/*******************************************************************************
+**
+** Function         BTA_AvDisconnect
+**
+** Description      Close the connection to the address.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvDisconnect(BD_ADDR bd_addr);
+
+/*******************************************************************************
+**
+** Function         BTA_AvEnable_Sink
+**
+** Description      Enable/Disable A2DP Sink.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvEnable_Sink(int enable);
+
+/*******************************************************************************
+**
+** Function         BTA_AvStart
+**
+** Description      Start audio/video stream data transfer.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvStart(void);
+
+/*******************************************************************************
+**
+** Function         BTA_AvStop
+**
+** Description      Stop audio/video stream data transfer.
+**                  If suspend is TRUE, this function sends AVDT suspend signal
+**                  to the connected peer(s).
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvStop(BOOLEAN suspend);
+
+/*******************************************************************************
+**
+** Function         BTA_AvReconfig
+**
+** Description      Reconfigure the audio/video stream.
+**                  If suspend is TRUE, this function tries the suspend/reconfigure
+**                  procedure first.
+**                  If suspend is FALSE or when suspend/reconfigure fails,
+**                  this function closes and re-opens the AVDT connection.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvReconfig(tBTA_AV_HNDL hndl, BOOLEAN suspend, UINT8 sep_info_idx,
+                    UINT8 *p_codec_info, UINT8 num_protect, UINT8 *p_protect_info);
+
+/*******************************************************************************
+**
+** Function         BTA_AvProtectReq
+**
+** Description      Send a content protection request.  This function can only
+**                  be used if AV is enabled with feature BTA_AV_FEAT_PROTECT.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvProtectReq(tBTA_AV_HNDL hndl, UINT8 *p_data, UINT16 len);
+
+/*******************************************************************************
+**
+** Function         BTA_AvProtectRsp
+**
+** Description      Send a content protection response.  This function must
+**                  be called if a BTA_AV_PROTECT_REQ_EVT is received.
+**                  This function can only be used if AV is enabled with
+**                  feature BTA_AV_FEAT_PROTECT.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvProtectRsp(tBTA_AV_HNDL hndl, UINT8 error_code, UINT8 *p_data,
+                      UINT16 len);
+
+/*******************************************************************************
+**
+** Function         BTA_AvRemoteCmd
+**
+** Description      Send a remote control command.  This function can only
+**                  be used if AV is enabled with feature BTA_AV_FEAT_RCCT.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvRemoteCmd(UINT8 rc_handle, UINT8 label, tBTA_AV_RC rc_id,
+                     tBTA_AV_STATE key_state);
+
+/*******************************************************************************
+**
+** Function         BTA_AvVendorCmd
+**
+** Description      Send a vendor dependent remote control command.  This
+**                  function can only be used if AV is enabled with feature
+**                  BTA_AV_FEAT_VENDOR.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvVendorCmd(UINT8 rc_handle, UINT8 label, tBTA_AV_CODE cmd_code,
+                     UINT8 *p_data, UINT16 len);
+
+/*******************************************************************************
+**
+** Function         BTA_AvVendorRsp
+**
+** Description      Send a vendor dependent remote control response.
+**                  This function must be called if a BTA_AV_VENDOR_CMD_EVT
+**                  is received. This function can only be used if AV is
+**                  enabled with feature BTA_AV_FEAT_VENDOR.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvVendorRsp(UINT8 rc_handle, UINT8 label, tBTA_AV_CODE rsp_code,
+                     UINT8 *p_data, UINT16 len, UINT32 company_id);
+
+
+/*******************************************************************************
+**
+** Function         BTA_AvOpenRc
+**
+** Description      Open an AVRCP connection toward the device with the
+**                  specified handle
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvOpenRc(tBTA_AV_HNDL handle);
+
+/*******************************************************************************
+**
+** Function         BTA_AvCloseRc
+**
+** Description      Close an AVRCP connection
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvCloseRc(UINT8 rc_handle);
+
+/*******************************************************************************
+**
+** Function         BTA_AvMetaRsp
+**
+** Description      Send a Metadata command/response. The message contained
+**                  in p_pkt can be composed with AVRC utility functions.
+**                  This function can only be used if AV is enabled with feature
+**                  BTA_AV_FEAT_METADATA.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvMetaRsp(UINT8 rc_handle, UINT8 label, tBTA_AV_CODE rsp_code,
+                   BT_HDR *p_pkt);
+
+/*******************************************************************************
+**
+** Function         BTA_AvMetaCmd
+**
+** Description      Send a Metadata/Advanced Control command. The message contained
+**                  in p_pkt can be composed with AVRC utility functions.
+**                  This function can only be used if AV is enabled with feature
+**                  BTA_AV_FEAT_METADATA.
+**                  This message is sent only when the peer supports the TG role.
+*8                  The only command makes sense right now is the absolute volume command.
+**
+** Returns          void
+**
+*******************************************************************************/
+void BTA_AvMetaCmd(UINT8 rc_handle, UINT8 label, tBTA_AV_CMD cmd_code, BT_HDR *p_pkt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///BTA_AV_INCLUDED == TRUE
+
+#endif /* BTA_AV_API_H */
diff --git a/tools/sdk/include/bluedroid/bta_av_ci.h b/tools/sdk/include/bluedroid/bta_av_ci.h
new file mode 100644
index 00000000000..a537b8a4caf
--- /dev/null
+++ b/tools/sdk/include/bluedroid/bta_av_ci.h
@@ -0,0 +1,77 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2005-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This is the interface file for advanced audio/video call-in functions.
+ *
+ ******************************************************************************/
+#ifndef BTA_AV_CI_H
+#define BTA_AV_CI_H
+
+#include "bta_av_api.h"
+
+#if (BTA_AV_INCLUDED == TRUE)
+
+/*****************************************************************************
+**  Function Declarations
+*****************************************************************************/
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*******************************************************************************
+**
+** Function         bta_av_ci_src_data_ready
+**
+** Description      This function sends an event to the AV indicating that
+**                  the phone has audio stream data ready to send and AV
+**                  should call bta_av_co_audio_src_data_path() or
+**                  bta_av_co_video_src_data_path().
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl);
+
+/*******************************************************************************
+**
+** Function         bta_av_ci_setconfig
+**
+** Description      This function must be called in response to function
+**                  bta_av_co_audio_setconfig() or bta_av_co_video_setconfig.
+**                  Parameter err_code is set to an AVDTP status value;
+**                  AVDT_SUCCESS if the codec configuration is ok,
+**                  otherwise error.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_ci_setconfig(tBTA_AV_HNDL hndl, UINT8 err_code,
+                                UINT8 category, UINT8 num_seid, UINT8 *p_seid,
+                                BOOLEAN recfg_needed, UINT8 avdt_handle);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///BTA_AV_INCLUDED == TRUE
+
+#endif /* BTA_AV_CI_H */
diff --git a/tools/sdk/include/bluedroid/bta_av_co.h b/tools/sdk/include/bluedroid/bta_av_co.h
new file mode 100644
index 00000000000..c2f94b63521
--- /dev/null
+++ b/tools/sdk/include/bluedroid/bta_av_co.h
@@ -0,0 +1,393 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2003-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This is the interface file for advanced audio/video call-out functions.
+ *
+ ******************************************************************************/
+#ifndef BTA_AV_CO_H
+#define BTA_AV_CO_H
+
+#include "l2c_api.h"
+#include "bta_av_api.h"
+
+#if (BTA_AV_INCLUDED == TRUE)
+
+/*****************************************************************************
+**  Constants and data types
+*****************************************************************************/
+
+/* TRUE to use SCMS-T content protection */
+#ifndef BTA_AV_CO_CP_SCMS_T
+#define BTA_AV_CO_CP_SCMS_T     FALSE
+#endif
+
+/* the content protection IDs assigned by BT SIG */
+#define BTA_AV_CP_SCMS_T_ID     0x0002
+#define BTA_AV_CP_DTCP_ID       0x0001
+
+#define BTA_AV_CP_LOSC                  2
+#define BTA_AV_CP_INFO_LEN              3
+
+#define BTA_AV_CP_SCMS_COPY_MASK        3
+#define BTA_AV_CP_SCMS_COPY_FREE        2
+#define BTA_AV_CP_SCMS_COPY_ONCE        1
+#define BTA_AV_CP_SCMS_COPY_NEVER       0
+
+#define BTA_AV_CO_DEFAULT_AUDIO_OFFSET      AVDT_MEDIA_OFFSET
+
+enum {
+    BTA_AV_CO_ST_INIT,
+    BTA_AV_CO_ST_IN,
+    BTA_AV_CO_ST_OUT,
+    BTA_AV_CO_ST_OPEN,
+    BTA_AV_CO_ST_STREAM
+};
+
+
+/* data type for the Audio Codec Information*/
+typedef struct {
+    UINT16  bit_rate;       /* SBC encoder bit rate in kbps */
+    UINT16  bit_rate_busy;  /* SBC encoder bit rate in kbps */
+    UINT16  bit_rate_swampd;/* SBC encoder bit rate in kbps */
+    UINT8   busy_level;     /* Busy level indicating the bit-rate to be used */
+    UINT8   codec_info[AVDT_CODEC_SIZE];
+    UINT8   codec_type;     /* Codec type */
+} tBTA_AV_AUDIO_CODEC_INFO;
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_init
+**
+** Description      This callout function is executed by AV when it is
+**                  started by calling BTA_AvEnable().  This function can be
+**                  used by the phone to initialize audio paths or for other
+**                  initialization purposes.
+**
+**
+** Returns          Stream codec and content protection capabilities info.
+**
+*******************************************************************************/
+extern BOOLEAN bta_av_co_audio_init(UINT8 *p_codec_type, UINT8 *p_codec_info,
+                                    UINT8 *p_num_protect, UINT8 *p_protect_info, UINT8 index);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_disc_res
+**
+** Description      This callout function is executed by AV to report the
+**                  number of stream end points (SEP) were found during the
+**                  AVDT stream discovery process.
+**
+**
+** Returns          void.
+**
+*******************************************************************************/
+extern void bta_av_co_audio_disc_res(tBTA_AV_HNDL hndl, UINT8 num_seps,
+                                     UINT8 num_snk, UINT8 num_src, BD_ADDR addr, UINT16 uuid_local);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_disc_res
+**
+** Description      This callout function is executed by AV to report the
+**                  number of stream end points (SEP) were found during the
+**                  AVDT stream discovery process.
+**
+**
+** Returns          void.
+**
+*******************************************************************************/
+extern void bta_av_co_video_disc_res(tBTA_AV_HNDL hndl, UINT8 num_seps,
+                                     UINT8 num_snk, BD_ADDR addr);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_getconfig
+**
+** Description      This callout function is executed by AV to retrieve the
+**                  desired codec and content protection configuration for the
+**                  audio stream.
+**
+**
+** Returns          Stream codec and content protection configuration info.
+**
+*******************************************************************************/
+extern UINT8 bta_av_co_audio_getconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                       UINT8 *p_codec_info, UINT8 *p_sep_info_idx, UINT8 seid,
+                                       UINT8 *p_num_protect, UINT8 *p_protect_info);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_getconfig
+**
+** Description      This callout function is executed by AV to retrieve the
+**                  desired codec and content protection configuration for the
+**                  video stream.
+**
+**
+** Returns          Stream codec and content protection configuration info.
+**
+*******************************************************************************/
+extern UINT8 bta_av_co_video_getconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                       UINT8 *p_codec_info, UINT8 *p_sep_info_idx, UINT8 seid,
+                                       UINT8 *p_num_protect, UINT8 *p_protect_info);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_setconfig
+**
+** Description      This callout function is executed by AV to set the
+**                  codec and content protection configuration of the audio stream.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                      UINT8 *p_codec_info, UINT8 seid, BD_ADDR addr,
+                                      UINT8 num_protect, UINT8 *p_protect_info, UINT8 t_local_sep, UINT8 avdt_handle);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_setconfig
+**
+** Description      This callout function is executed by AV to set the
+**                  codec and content protection configuration of the video stream.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                      UINT8 *p_codec_info, UINT8 seid, BD_ADDR addr,
+                                      UINT8 num_protect, UINT8 *p_protect_info);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_open
+**
+** Description      This function is called by AV when the audio stream connection
+**                  is opened.
+**                  BTA-AV maintains the MTU of A2DP streams.
+**                  If this is the 2nd audio stream, mtu is the smaller of the 2
+**                  streams.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_audio_open(tBTA_AV_HNDL hndl,
+                                 tBTA_AV_CODEC codec_type, UINT8 *p_codec_info,
+                                 UINT16 mtu);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_open
+**
+** Description      This function is called by AV when the video stream connection
+**                  is opened.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_open(tBTA_AV_HNDL hndl,
+                                 tBTA_AV_CODEC codec_type, UINT8 *p_codec_info,
+                                 UINT16 mtu);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_close
+**
+** Description      This function is called by AV when the audio stream connection
+**                  is closed.
+**                  BTA-AV maintains the MTU of A2DP streams.
+**                  When one stream is closed and no other audio stream is open,
+**                  mtu is reported as 0.
+**                  Otherwise, the MTU remains open is reported.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_audio_close(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                  UINT16 mtu);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_close
+**
+** Description      This function is called by AV when the video stream connection
+**                  is closed.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_close(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                  UINT16 mtu);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_start
+**
+** Description      This function is called by AV when the audio streaming data
+**                  transfer is started.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_audio_start(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                  UINT8 *p_codec_info, BOOLEAN *p_no_rtp_hdr);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_start
+**
+** Description      This function is called by AV when the video streaming data
+**                  transfer is started.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_start(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
+                                  UINT8 *p_codec_info, BOOLEAN *p_no_rtp_hdr);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_stop
+**
+** Description      This function is called by AV when the audio streaming data
+**                  transfer is stopped.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_audio_stop(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_stop
+**
+** Description      This function is called by AV when the video streaming data
+**                  transfer is stopped.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_stop(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_src_data_path
+**
+** Description      This function is called to get the next data buffer from
+**                  the audio codec
+**
+** Returns          NULL if data is not ready.
+**                  Otherwise, a GKI buffer (BT_HDR*) containing the audio data.
+**
+*******************************************************************************/
+extern void *bta_av_co_audio_src_data_path(tBTA_AV_CODEC codec_type,
+        UINT32 *p_len, UINT32 *p_timestamp);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_src_data_path
+**
+** Description      This function is called to get the next data buffer from
+**                  the video codec.
+**
+** Returns          NULL if data is not ready.
+**                  Otherwise, a video data buffer (UINT8*).
+**
+*******************************************************************************/
+extern void *bta_av_co_video_src_data_path(tBTA_AV_CODEC codec_type,
+        UINT32 *p_len, UINT32 *p_timestamp);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_drop
+**
+** Description      An Audio packet is dropped. .
+**                  It's very likely that the connected headset with this handle
+**                  is moved far away. The implementation may want to reduce
+**                  the encoder bit rate setting to reduce the packet size.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_audio_drop(tBTA_AV_HNDL hndl);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_report_conn
+**
+** Description      This function is called by AV when the reporting channel is
+**                  opened (open=TRUE) or closed (open=FALSE).
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_report_conn (BOOLEAN open, UINT8 avdt_handle);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_report_rr
+**
+** Description      This function is called by AV when a Receiver Report is
+**                  received
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_report_rr (UINT32 packet_lost);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_audio_delay
+**
+** Description      This function is called by AV when the audio stream connection
+**                  needs to send the initial delay report to the connected SRC.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_audio_delay(tBTA_AV_HNDL hndl, UINT16 delay);
+
+/*******************************************************************************
+**
+** Function         bta_av_co_video_delay
+**
+** Description      This function is called by AV when the video stream connection
+**                  needs to send the initial delay report to the connected SRC.
+**
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_co_video_delay(tBTA_AV_HNDL hndl, UINT16 delay);
+
+#endif  ///BTA_AV_INCLUDED == TRUE
+
+#endif /* BTA_AV_CO_H */
diff --git a/tools/sdk/include/bluedroid/bta_av_sbc.h b/tools/sdk/include/bluedroid/bta_av_sbc.h
new file mode 100644
index 00000000000..966ee61bbac
--- /dev/null
+++ b/tools/sdk/include/bluedroid/bta_av_sbc.h
@@ -0,0 +1,223 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2004-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This is the interface to utility functions for dealing with SBC data
+ *  frames and codec capabilities.
+ *
+ ******************************************************************************/
+#ifndef BTA_AV_SBC_H
+#define BTA_AV_SBC_H
+
+#if (BTA_AV_INCLUDED == TRUE)
+
+/*****************************************************************************
+**  constants
+*****************************************************************************/
+
+/* SBC packet header size */
+#define BTA_AV_SBC_HDR_SIZE         A2D_SBC_MPL_HDR_LEN
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_init_up_sample
+**
+** Description      initialize the up sample
+**
+**                  src_sps: samples per second (source audio data)
+**                  dst_sps: samples per second (converted audio data)
+**                  bits: number of bits per pcm sample
+**                  n_channels: number of channels (i.e. mono(1), stereo(2)...)
+**
+** Returns          none
+**
+*******************************************************************************/
+extern void bta_av_sbc_init_up_sample (UINT32 src_sps, UINT32 dst_sps,
+                                       UINT16 bits, UINT16 n_channels);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_up_sample
+**
+** Description      Given the source (p_src) audio data and
+**                  source speed (src_sps, samples per second),
+**                  This function converts it to audio data in the desired format
+**
+**                  p_src: the data buffer that holds the source audio data
+**                  p_dst: the data buffer to hold the converted audio data
+**                  src_samples: The number of source samples (number of bytes)
+**                  dst_samples: The size of p_dst (number of bytes)
+**
+** Note:            An AE reported an issue with this function.
+**                  When called with bta_av_sbc_up_sample(src, uint8_array_dst..)
+**                  the byte before uint8_array_dst may get overwritten.
+**                  Using uint16_array_dst avoids the problem.
+**                  This issue is related to endian-ness and is hard to resolve
+**                  in a generic manner.
+** **************** Please use uint16 array as dst.
+**
+** Returns          The number of bytes used in p_dst
+**                  The number of bytes used in p_src (in *p_ret)
+**
+*******************************************************************************/
+extern int bta_av_sbc_up_sample (void *p_src, void *p_dst,
+                                 UINT32 src_samples, UINT32 dst_samples,
+                                 UINT32 *p_ret);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_up_sample_16s (16bits-stereo)
+**
+** Description      Given the source (p_src) audio data and
+**                  source speed (src_sps, samples per second),
+**                  This function converts it to audio data in the desired format
+**
+**                  p_src: the data buffer that holds the source audio data
+**                  p_dst: the data buffer to hold the converted audio data
+**                  src_samples: The number of source samples (in uint of 4 bytes)
+**                  dst_samples: The size of p_dst (in uint of 4 bytes)
+**
+** Returns          The number of bytes used in p_dst
+**                  The number of bytes used in p_src (in *p_ret)
+**
+*******************************************************************************/
+extern int bta_av_sbc_up_sample_16s (void *p_src, void *p_dst,
+                                     UINT32 src_samples, UINT32 dst_samples,
+                                     UINT32 *p_ret);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_up_sample_16m (16bits-mono)
+**
+** Description      Given the source (p_src) audio data and
+**                  source speed (src_sps, samples per second),
+**                  This function converts it to audio data in the desired format
+**
+**                  p_src: the data buffer that holds the source audio data
+**                  p_dst: the data buffer to hold the converted audio data
+**                  src_samples: The number of source samples (in uint of 2 bytes)
+**                  dst_samples: The size of p_dst (in uint of 2 bytes)
+**
+** Returns          The number of bytes used in p_dst
+**                  The number of bytes used in p_src (in *p_ret)
+**
+*******************************************************************************/
+extern int bta_av_sbc_up_sample_16m (void *p_src, void *p_dst,
+                                     UINT32 src_samples, UINT32 dst_samples,
+                                     UINT32 *p_ret);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_up_sample_8s (8bits-stereo)
+**
+** Description      Given the source (p_src) audio data and
+**                  source speed (src_sps, samples per second),
+**                  This function converts it to audio data in the desired format
+**
+**                  p_src: the data buffer that holds the source audio data
+**                  p_dst: the data buffer to hold the converted audio data
+**                  src_samples: The number of source samples (in uint of 2 bytes)
+**                  dst_samples: The size of p_dst (in uint of 2 bytes)
+**
+** Returns          The number of bytes used in p_dst
+**                  The number of bytes used in p_src (in *p_ret)
+**
+*******************************************************************************/
+extern int bta_av_sbc_up_sample_8s (void *p_src, void *p_dst,
+                                    UINT32 src_samples, UINT32 dst_samples,
+                                    UINT32 *p_ret);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_up_sample_8m (8bits-mono)
+**
+** Description      Given the source (p_src) audio data and
+**                  source speed (src_sps, samples per second),
+**                  This function converts it to audio data in the desired format
+**
+**                  p_src: the data buffer that holds the source audio data
+**                  p_dst: the data buffer to hold the converted audio data
+**                  src_samples: The number of source samples (number of bytes)
+**                  dst_samples: The size of p_dst (number of bytes)
+**
+** Returns          The number of bytes used in p_dst
+**                  The number of bytes used in p_src (in *p_ret)
+**
+*******************************************************************************/
+extern int bta_av_sbc_up_sample_8m (void *p_src, void *p_dst,
+                                    UINT32 src_samples, UINT32 dst_samples,
+                                    UINT32 *p_ret);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_cfg_for_cap
+**
+** Description      Determine the preferred SBC codec configuration for the
+**                  given codec capabilities.  The function is passed the
+**                  preferred codec configuration and the peer codec
+**                  capabilities for the stream.  The function attempts to
+**                  match the preferred capabilities with the configuration
+**                  as best it can.  The resulting codec configuration is
+**                  returned in the same memory used for the capabilities.
+**
+** Returns          0 if ok, nonzero if error.
+**                  Codec configuration in p_cap.
+**
+*******************************************************************************/
+extern UINT8 bta_av_sbc_cfg_for_cap(UINT8 *p_peer, tA2D_SBC_CIE *p_cap, tA2D_SBC_CIE *p_pref);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_cfg_in_cap
+**
+** Description      This function checks whether an SBC codec configuration
+**                  is allowable for the given codec capabilities.
+**
+** Returns          0 if ok, nonzero if error.
+**
+*******************************************************************************/
+extern UINT8 bta_av_sbc_cfg_in_cap(UINT8 *p_cfg, tA2D_SBC_CIE *p_cap);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_cfg_matches_cap
+**
+** Description      This function checks whether an SBC codec configuration
+**                  matched with capabilities. Here we check subset.
+**
+** Returns          0 if ok, nonzero if error.
+**
+*******************************************************************************/
+extern UINT8 bta_av_sbc_cfg_matches_cap(UINT8 *p_cfg, tA2D_SBC_CIE *p_cap);
+
+/*******************************************************************************
+**
+** Function         bta_av_sbc_bld_hdr
+**
+** Description      This function builds the packet header for MPF1.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void bta_av_sbc_bld_hdr(BT_HDR *p_buf, UINT16 fr_per_pkt);
+
+#endif  ///BTA_AV_INCLUDED == TRUE
+
+#endif /* BTA_AV_SBC_H */
+
diff --git a/tools/sdk/include/bluedroid/bta_dm_co.h b/tools/sdk/include/bluedroid/bta_dm_co.h
index c3202496766..2a80aefe86a 100644
--- a/tools/sdk/include/bluedroid/bta_dm_co.h
+++ b/tools/sdk/include/bluedroid/bta_dm_co.h
@@ -270,4 +270,13 @@ extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr,  tBTA_IO_CAP *p_io_cap,
                                  tBTA_LE_KEY_TYPE  *p_resp_key );
 // btla-specific --
 
+extern void bta_dm_co_ble_set_io_cap(UINT8 ble_io_cap);
+
+extern void bta_dm_co_ble_set_auth_req(UINT8 ble_auth_req);
+
+extern void bta_dm_co_ble_set_init_key_req(UINT8 init_key);
+
+extern void bta_dm_co_ble_set_rsp_key_req(UINT8 rsp_key);
+
+extern void bta_dm_co_ble_set_max_key_size(UINT8 ble_key_size);
 #endif
diff --git a/tools/sdk/include/bluedroid/bta_gatt_api.h b/tools/sdk/include/bluedroid/bta_gatt_api.h
index f4c0e06f078..c4e9ace6586 100644
--- a/tools/sdk/include/bluedroid/bta_gatt_api.h
+++ b/tools/sdk/include/bluedroid/bta_gatt_api.h
@@ -984,7 +984,7 @@ extern tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF
 ** Description      This function is called to prepare write a characteristic value.
 **
 ** Parameters       conn_id - connection ID.
-**                    p_char_id - GATT characteritic ID of the service.
+**                  p_char_id - GATT characteritic ID of the service.
 **                  offset - offset of the write value.
 **                  len: length of the data to be written.
 **                  p_value - the value to be written.
@@ -1001,6 +1001,26 @@ extern void BTA_GATTC_PrepareWrite  (UINT16 conn_id,
 
 /*******************************************************************************
 **
+** Function         BTA_GATTC_PrepareWriteCharDescr
+**
+** Description      This function is called to prepare write a characteristic descriptor value.
+**
+** Parameters       conn_id - connection ID.
+**                  p_char_descr_id - GATT characteritic descriptor ID of the service.
+**                  offset - offset of the write value.
+**                  len: length of the data to be written.
+**                  p_value - the value to be written.
+**
+** Returns          None
+**
+*******************************************************************************/
+extern void BTA_GATTC_PrepareWriteCharDescr  (UINT16 conn_id,
+                                              tBTA_GATTC_CHAR_DESCR_ID *p_char_descr_id,
+                                              UINT16 offset,
+                                              tBTA_GATT_UNFMT   *p_data,
+                                              tBTA_GATT_AUTH_REQ auth_req);
+/*******************************************************************************
+**
 ** Function         BTA_GATTC_ExecuteWrite
 **
 ** Description      This function is called to execute write a prepare write sequence.
diff --git a/tools/sdk/include/bluedroid/bta_gattc_int.h b/tools/sdk/include/bluedroid/bta_gattc_int.h
index d50c66226ef..d04097b71e5 100644
--- a/tools/sdk/include/bluedroid/bta_gattc_int.h
+++ b/tools/sdk/include/bluedroid/bta_gattc_int.h
@@ -320,7 +320,7 @@ typedef struct {
 } tBTA_GATTC_SERV;
 
 #ifndef BTA_GATTC_NOTIF_REG_MAX
-#define BTA_GATTC_NOTIF_REG_MAX     15
+#define BTA_GATTC_NOTIF_REG_MAX     7//15
 #endif
 
 typedef struct {
@@ -398,8 +398,9 @@ typedef struct {
 
     tBTA_GATTC_CLCB     clcb[BTA_GATTC_CLCB_MAX];
     tBTA_GATTC_SERV     known_server[BTA_GATTC_KNOWN_SR_MAX];
-
+#if (SDP_INCLUDED == TRUE)
     tSDP_DISCOVERY_DB   *p_sdp_db;
+#endif  ///SDP_INCLUDED == TRUE
     UINT16              sdp_conn_id;
 } tBTA_GATTC_CB;
 
diff --git a/tools/sdk/include/bluedroid/bta_hh_api.h b/tools/sdk/include/bluedroid/bta_hh_api.h
index d6b31740427..aa9fd0a236f 100644
--- a/tools/sdk/include/bluedroid/bta_hh_api.h
+++ b/tools/sdk/include/bluedroid/bta_hh_api.h
@@ -20,6 +20,7 @@
 
 #include "bta_api.h"
 #include "hidh_api.h"
+#if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
 
 #if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)
 #include "gatt_api.h"
@@ -538,4 +539,7 @@ extern void bta_hh_le_hid_read_rpt_clt_cfg(BD_ADDR bd_addr, UINT8 rpt_id);
 }
 #endif
 
+#endif ///defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
+
+
 #endif  /* BTA_HH_API_H */
diff --git a/tools/sdk/include/bluedroid/bta_sdp_api.h b/tools/sdk/include/bluedroid/bta_sdp_api.h
index c2df4bb9571..6f27f5ccb0a 100644
--- a/tools/sdk/include/bluedroid/bta_sdp_api.h
+++ b/tools/sdk/include/bluedroid/bta_sdp_api.h
@@ -30,6 +30,7 @@
 #include "bta_api.h"
 #include "btm_api.h"
 
+#if (SDP_INCLUDED == TRUE)
 /* status values */
 #define BTA_SDP_SUCCESS                  0            /* Successful operation. */
 #define BTA_SDP_FAILURE                  1            /* Generic failure. */
@@ -70,7 +71,9 @@ typedef void (tBTA_SDP_DM_CBACK)(tBTA_SDP_EVT event, tBTA_SDP *p_data, void *use
 /* MCE configuration structure */
 typedef struct {
     UINT16  sdp_db_size;            /* The size of p_sdp_db */
+#if (SDP_INCLUDED == TRUE)
     tSDP_DISCOVERY_DB   *p_sdp_db;  /* The data buffer to keep SDP database */
+#endif  ///SDP_INCLUDED == TRUE
 } tBTA_SDP_CFG;
 
 #ifdef __cplusplus
@@ -139,4 +142,6 @@ extern tBTA_SDP_STATUS BTA_SdpRemoveRecordByUser(void *user_data);
 }
 #endif
 
+#endif  ///SDP_INCLUDED == TRUE
+
 #endif /* BTA_SDP_API_H */
diff --git a/tools/sdk/include/bluedroid/btc_alarm.h b/tools/sdk/include/bluedroid/btc_alarm.h
new file mode 100644
index 00000000000..ca9640a3f41
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_alarm.h
@@ -0,0 +1,30 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+#ifndef __BTC_ALARM_H__
+#define __BTC_ALARM_H__
+
+#include <stdint.h>
+#include "alarm.h"
+
+/* btc_alarm_args_t */
+typedef struct {
+    osi_alarm_callback_t cb;
+    void *cb_data;
+} btc_alarm_args_t;
+
+void btc_alarm_handler(btc_msg_t *msg);
+
+#endif /* __BTC_ALARM_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_av.h b/tools/sdk/include/bluedroid/btc_av.h
new file mode 100644
index 00000000000..8a8664cd219
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_av.h
@@ -0,0 +1,176 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+/*******************************************************************************
+ *
+ *  Filename:      btc_av.h
+ *
+ *  Description:   Main API header file for all BTC AV functions accessed
+ *                 from internal stack.
+ *
+ *******************************************************************************/
+
+#ifndef __BTC_AV_H__
+#define __BTC_AV_H__
+
+#include "esp_a2dp_api.h"
+#include "btc_task.h"
+#include "btc_common.h"
+#include "btc_sm.h"
+#include "bta_av_api.h"
+
+#if (BTA_AV_INCLUDED == TRUE)
+/*******************************************************************************
+**  Type definitions for callback functions
+********************************************************************************/
+
+typedef enum {
+    BTC_AV_CONNECT_REQ_EVT = BTA_AV_MAX_EVT,
+    BTC_AV_DISCONNECT_REQ_EVT,
+    BTC_AV_START_STREAM_REQ_EVT,
+    BTC_AV_STOP_STREAM_REQ_EVT,
+    BTC_AV_SUSPEND_STREAM_REQ_EVT,
+    BTC_AV_SINK_CONFIG_REQ_EVT,
+} btc_av_sm_event_t;
+
+typedef enum {
+    BTC_AV_SINK_API_INIT_EVT = 0,
+    BTC_AV_SINK_API_DEINIT_EVT,
+    BTC_AV_SINK_API_CONNECT_EVT,
+    BTC_AV_SINK_API_DISCONNECT_EVT,
+    BTC_AV_SINK_API_REG_DATA_CB_EVT,
+} btc_av_act_t;
+
+/* btc_av_args_t */
+typedef union {
+    // BTC_AV_SINK_CONFIG_REQ_EVT -- internal event
+    esp_a2d_mcc_t mcc;
+    // BTC_AV_SINK_API_CONNECT_EVT
+    bt_bdaddr_t connect;
+    // BTC_AV_SINK_API_REG_DATA_CB_EVT
+    esp_a2d_data_cb_t data_cb;
+} btc_av_args_t;
+
+/*******************************************************************************
+**  BTC AV API
+********************************************************************************/
+
+void btc_a2dp_call_handler(btc_msg_t *msg);
+
+void btc_a2dp_cb_handler(btc_msg_t *msg);
+
+void btc_a2dp_sink_reg_data_cb(esp_a2d_data_cb_t callback);
+/*******************************************************************************
+**
+** Function         btc_av_get_sm_handle
+**
+** Description      Fetches current av SM handle
+**
+** Returns          None
+**
+*******************************************************************************/
+
+btc_sm_handle_t btc_av_get_sm_handle(void);
+
+/*******************************************************************************
+**
+** Function         btc_av_stream_ready
+**
+** Description      Checks whether AV is ready for starting a stream
+**
+** Returns          None
+**
+*******************************************************************************/
+
+BOOLEAN btc_av_stream_ready(void);
+
+/*******************************************************************************
+**
+** Function         btc_av_stream_started_ready
+**
+** Description      Checks whether AV ready for media start in streaming state
+**
+** Returns          None
+**
+*******************************************************************************/
+
+BOOLEAN btc_av_stream_started_ready(void);
+
+/*******************************************************************************
+**
+** Function         btc_dispatch_sm_event
+**
+** Description      Send event to AV statemachine
+**
+** Returns          None
+**
+*******************************************************************************/
+
+/* used to pass events to AV statemachine from other tasks */
+void btc_dispatch_sm_event(btc_av_sm_event_t event, void *p_data, int len);
+
+/*******************************************************************************
+**
+** Function         btc_av_init
+**
+** Description      Initializes btc AV if not already done
+**
+** Returns          bt_status_t
+**
+*******************************************************************************/
+
+bt_status_t btc_av_init(void);
+
+/*******************************************************************************
+**
+** Function         btc_av_is_connected
+**
+** Description      Checks if av has a connected sink
+**
+** Returns          BOOLEAN
+**
+*******************************************************************************/
+
+BOOLEAN btc_av_is_connected(void);
+
+
+/*******************************************************************************
+**
+** Function         btc_av_is_peer_edr
+**
+** Description      Check if the connected a2dp device supports
+**                  EDR or not. Only when connected this function
+**                  will accurately provide a true capability of
+**                  remote peer. If not connected it will always be false.
+**
+** Returns          TRUE if remote device is capable of EDR
+**
+*******************************************************************************/
+
+BOOLEAN btc_av_is_peer_edr(void);
+
+/******************************************************************************
+**
+** Function         btc_av_clear_remote_suspend_flag
+**
+** Description      Clears remote suspended flag
+**
+** Returns          Void
+********************************************************************************/
+void btc_av_clear_remote_suspend_flag(void);
+
+#endif  ///BTA_AV_INCLUDED == TRUE
+
+#endif /* __BTC_AV_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_av_api.h b/tools/sdk/include/bluedroid/btc_av_api.h
new file mode 100644
index 00000000000..c7672a07534
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_av_api.h
@@ -0,0 +1,203 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+/*****************************************************************************
+ **
+ **  Name:           btc_av_api.h
+ **
+ **  Description:    This is the public interface file for the advanced
+ **                  audio/video streaming (AV) subsystem of BTC.
+ **
+ *****************************************************************************/
+
+#ifndef __BTC_AV_API_H__
+#define __BTC_AV_API_H__
+
+#include "bt_target.h"
+#include "bta_av_api.h"
+
+#include "btc_media.h"
+#include "a2d_api.h"
+#include "a2d_sbc.h"
+
+#if (BTC_AV_INCLUDED == TRUE)
+/*****************************************************************************
+ **  Constants and data types
+ *****************************************************************************/
+
+/* Codec type */
+#define BTC_AV_CODEC_NONE       0xFF
+#define BTC_AV_CODEC_SBC        A2D_MEDIA_CT_SBC        /* SBC media codec type */
+
+#define BTC_AV_CODEC_PCM        0x5                     /* Raw PCM */
+
+typedef UINT8 tBTC_AV_CODEC_ID;
+
+/* AV features masks */
+#define BTC_AV_FEAT_RCTG        BTA_AV_FEAT_RCTG      /* remote control target */
+#define BTC_AV_FEAT_RCCT        BTA_AV_FEAT_RCCT      /* remote control controller */
+#define BTC_AV_FEAT_METADATA    BTA_AV_FEAT_METADATA  /* remote control Metadata Transfer command/response */
+
+typedef UINT16 tBTC_AV_FEAT;
+
+/* AV channel values */
+#define BTC_AV_CHNL_MSK         BTA_AV_CHNL_MSK
+#define BTC_AV_CHNL_AUDIO       BTA_AV_CHNL_AUDIO       /* audio channel */
+#define BTC_AV_CHNL_VIDEO       BTA_AV_CHNL_VIDEO       /* video channel */
+typedef UINT8 tBTC_AV_CHNL;
+
+typedef UINT8 tBTC_AV_HNDL;
+
+/* Operation id list for BTC_AvRemoteCmd */
+#define BTC_AV_ID_SELECT      0x00    /* select */
+#define BTC_AV_ID_UP          0x01    /* up */
+#define BTC_AV_ID_DOWN        0x02    /* down */
+#define BTC_AV_ID_LEFT        0x03    /* left */
+#define BTC_AV_ID_RIGHT       0x04    /* right */
+#define BTC_AV_ID_RIGHT_UP    0x05    /* right-up */
+#define BTC_AV_ID_RIGHT_DOWN  0x06    /* right-down */
+#define BTC_AV_ID_LEFT_UP     0x07    /* left-up */
+#define BTC_AV_ID_LEFT_DOWN   0x08    /* left-down */
+#define BTC_AV_ID_ROOT_MENU   0x09    /* root menu */
+#define BTC_AV_ID_SETUP_MENU  0x0A    /* setup menu */
+#define BTC_AV_ID_CONT_MENU   0x0B    /* contents menu */
+#define BTC_AV_ID_FAV_MENU    0x0C    /* favorite menu */
+#define BTC_AV_ID_EXIT        0x0D    /* exit */
+#define BTC_AV_ID_0           0x20    /* 0 */
+#define BTC_AV_ID_1           0x21    /* 1 */
+#define BTC_AV_ID_2           0x22    /* 2 */
+#define BTC_AV_ID_3           0x23    /* 3 */
+#define BTC_AV_ID_4           0x24    /* 4 */
+#define BTC_AV_ID_5           0x25    /* 5 */
+#define BTC_AV_ID_6           0x26    /* 6 */
+#define BTC_AV_ID_7           0x27    /* 7 */
+#define BTC_AV_ID_8           0x28    /* 8 */
+#define BTC_AV_ID_9           0x29    /* 9 */
+#define BTC_AV_ID_DOT         0x2A    /* dot */
+#define BTC_AV_ID_ENTER       0x2B    /* enter */
+#define BTC_AV_ID_CLEAR       0x2C    /* clear */
+#define BTC_AV_ID_CHAN_UP     0x30    /* channel up */
+#define BTC_AV_ID_CHAN_DOWN   0x31    /* channel down */
+#define BTC_AV_ID_PREV_CHAN   0x32    /* previous channel */
+#define BTC_AV_ID_SOUND_SEL   0x33    /* sound select */
+#define BTC_AV_ID_INPUT_SEL   0x34    /* input select */
+#define BTC_AV_ID_DISP_INFO   0x35    /* display information */
+#define BTC_AV_ID_HELP        0x36    /* help */
+#define BTC_AV_ID_PAGE_UP     0x37    /* page up */
+#define BTC_AV_ID_PAGE_DOWN   0x38    /* page down */
+#define BTC_AV_ID_POWER       0x40    /* power */
+#define BTC_AV_ID_VOL_UP      0x41    /* volume up */
+#define BTC_AV_ID_VOL_DOWN    0x42    /* volume down */
+#define BTC_AV_ID_MUTE        0x43    /* mute */
+#define BTC_AV_ID_PLAY        0x44    /* play */
+#define BTC_AV_ID_STOP        0x45    /* stop */
+#define BTC_AV_ID_PAUSE       0x46    /* pause */
+#define BTC_AV_ID_RECORD      0x47    /* record */
+#define BTC_AV_ID_REWIND      0x48    /* rewind */
+#define BTC_AV_ID_FAST_FOR    0x49    /* fast forward */
+#define BTC_AV_ID_EJECT       0x4A    /* eject */
+#define BTC_AV_ID_FORWARD     0x4B    /* forward */
+#define BTC_AV_ID_BACKWARD    0x4C    /* backward */
+#define BTC_AV_ID_ANGLE       0x50    /* angle */
+#define BTC_AV_ID_SUBPICT     0x51    /* subpicture */
+#define BTC_AV_ID_F1          0x71    /* F1 */
+#define BTC_AV_ID_F2          0x72    /* F2 */
+#define BTC_AV_ID_F3          0x73    /* F3 */
+#define BTC_AV_ID_F4          0x74    /* F4 */
+#define BTC_AV_ID_F5          0x75    /* F5 */
+#define BTC_AV_ID_VENDOR      0x7E    /* vendor unique */
+#define BTC_AV_KEYPRESSED_RELEASE 0x80
+
+typedef UINT8 tBTC_AV_RC;
+
+/* State flag for pass through command */
+#define BTC_AV_STATE_PRESS      0    /* key pressed */
+#define BTC_AV_STATE_RELEASE    1  /* key released */
+
+typedef UINT8 tBTC_AV_STATE;
+
+typedef UINT8 tBTC_AV_RC_HNDL;
+
+/* Command codes for BTC_AvVendorCmd */
+#define BTC_AV_CMD_CTRL         0
+#define BTC_AV_CMD_STATUS       1
+#define BTC_AV_CMD_SPEC_INQ     2
+#define BTC_AV_CMD_NOTIF        3
+#define BTC_AV_CMD_GEN_INQ      4
+
+typedef UINT8 tBTC_AV_CMD;
+
+/* AV callback events */
+#define BTC_AV_OPEN_EVT         0       /* connection opened */
+#define BTC_AV_CLOSE_EVT        1       /* connection closed */
+#define BTC_AV_START_EVT        2       /* stream data transfer started */
+#define BTC_AV_STOP_EVT         3       /* stream data transfer stopped */
+#define BTC_AV_RC_OPEN_EVT      4       /* remote control channel open */
+#define BTC_AV_RC_CLOSE_EVT     5       /* remote control channel closed */
+#define BTC_AV_REMOTE_CMD_EVT   6      /* remote control command */
+#define BTC_AV_REMOTE_RSP_EVT   7      /* remote control response */
+#define BTC_AV_META_MSG_EVT     8      /* metadata messages */
+
+typedef UINT8 tBTC_AV_EVT;
+
+#define BTC_AV_FEEDING_ASYNCHRONOUS 0   /* asynchronous feeding, use tx av timer */
+#define BTC_AV_FEEDING_SYNCHRONOUS  1   /* synchronous feeding, no av tx timer */
+
+#define BTC_AV_MAX_SYNCHRONOUS_LATENCY 80 /* max latency in ms for BTC_AV_FEEDING_SYNCHRONOUS */
+#define BTC_AV_MIN_SYNCHRONOUS_LATENCY 4 /* min latency in ms for BTC_AV_FEEDING_SYNCHRONOUS */
+
+typedef UINT8 tBTC_AV_FEEDING_MODE;
+
+#define BTC_AV_CHANNEL_MODE_MONO    A2D_SBC_IE_CH_MD_MONO
+#define BTC_AV_CHANNEL_MODE_STEREO  A2D_SBC_IE_CH_MD_STEREO
+#define BTC_AV_CHANNEL_MODE_JOINT   A2D_SBC_IE_CH_MD_JOINT
+#define BTC_AV_CHANNEL_MODE_DUAL    A2D_SBC_IE_CH_MD_DUAL
+
+typedef UINT8 tBTC_AV_CHANNEL_MODE;
+
+/**
+ * Structure used to configure the AV codec capabilities/config
+ */
+typedef struct {
+    tBTC_AV_CODEC_ID id;             /* Codec ID (in terms of BTC) */
+    UINT8 info[AVDT_CODEC_SIZE];     /* Codec info (can be config or capabilities) */
+} tBTC_AV_CODEC_INFO;
+
+/**
+ * Structure used to configure the AV media feeding
+ */
+typedef struct {
+    UINT16 sampling_freq;   /* 44100, 48000 etc */
+    UINT16 num_channel;     /* 1 for mono or 2 stereo */
+    UINT8  bit_per_sample;  /* Number of bits per sample (8, 16) */
+} tBTC_AV_MEDIA_FEED_CFG_PCM;
+
+typedef union {
+    tBTC_AV_MEDIA_FEED_CFG_PCM pcm;     /* Raw PCM feeding format */
+} tBTC_AV_MEDIA_FEED_CFG;
+
+typedef struct {
+    tBTC_AV_CODEC_ID format;        /* Media codec identifier */
+    tBTC_AV_MEDIA_FEED_CFG cfg;     /* Media codec configuration */
+} tBTC_AV_MEDIA_FEEDINGS;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///BTC_AV_INCLUDED == TRUE
+
+#endif /* __BTC_AV_API_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_av_co.h b/tools/sdk/include/bluedroid/btc_av_co.h
new file mode 100644
index 00000000000..9ec9b5d4488
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_av_co.h
@@ -0,0 +1,172 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __BTC_AV_CO_H__
+#define __BTC_AV_CO_H__
+
+#include "btc_media.h"
+
+#if (BTA_AV_INCLUDED == TRUE)
+/*******************************************************************************
+**  Constants & Macros
+********************************************************************************/
+
+enum {
+    BTC_SV_AV_AA_SBC_INDEX = 0,
+    BTC_SV_AV_AA_SBC_SINK_INDEX,
+    BTC_SV_AV_AA_SEP_INDEX  /* Last index */
+};
+
+
+/*******************************************************************************
+**  Functions
+********************************************************************************/
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_cp_is_active
+ **
+ ** Description      Get the current configuration of content protection
+ **
+ ** Returns          TRUE if the current streaming has CP, FALSE otherwise
+ **
+ *******************************************************************************/
+BOOLEAN bta_av_co_cp_is_active(void);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_cp_get_flag
+ **
+ ** Description      Get content protection flag
+ **                  BTA_AV_CP_SCMS_COPY_NEVER
+ **                  BTA_AV_CP_SCMS_COPY_ONCE
+ **                  BTA_AV_CP_SCMS_COPY_FREE
+ **
+ ** Returns          The current flag value
+ **
+ *******************************************************************************/
+UINT8 bta_av_co_cp_get_flag(void);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_cp_set_flag
+ **
+ ** Description      Set content protection flag
+ **                  BTA_AV_CP_SCMS_COPY_NEVER
+ **                  BTA_AV_CP_SCMS_COPY_ONCE
+ **                  BTA_AV_CP_SCMS_COPY_FREE
+ **
+ ** Returns          TRUE if setting the SCMS flag is supported else FALSE
+ **
+ *******************************************************************************/
+BOOLEAN bta_av_co_cp_set_flag(UINT8 cp_flag);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_audio_codec_reset
+ **
+ ** Description      Reset the current codec configuration
+ **
+ ** Returns          void
+ **
+ *******************************************************************************/
+void bta_av_co_audio_codec_reset(void);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_audio_codec_supported
+ **
+ ** Description      Check if all opened connections are compatible with a codec
+ **                  configuration
+ **
+ ** Returns          TRUE if all opened devices support this codec, FALSE otherwise
+ **
+ *******************************************************************************/
+BOOLEAN bta_av_co_audio_codec_supported(tBTC_STATUS *p_status);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_audio_set_codec
+ **
+ ** Description      Set the current codec configuration from the feeding type.
+ **                  This function is starting to modify the configuration, it
+ **                  should be protected.
+ **
+ ** Returns          TRUE if successful, FALSE otherwise
+ **
+ *******************************************************************************/
+BOOLEAN bta_av_co_audio_set_codec(const tBTC_AV_MEDIA_FEEDINGS *p_feeding, tBTC_STATUS *p_status);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_audio_get_sbc_config
+ **
+ ** Description      Retrieves the SBC codec configuration.  If the codec in use
+ **                  is not SBC, return the default SBC codec configuration.
+ **
+ ** Returns          TRUE if codec is SBC, FALSE otherwise
+ **
+ *******************************************************************************/
+BOOLEAN bta_av_co_audio_get_sbc_config(tA2D_SBC_CIE *p_sbc_config, UINT16 *p_minmtu);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_audio_discard_config
+ **
+ ** Description      Discard the codec configuration of a connection
+ **
+ ** Returns          Nothing
+ **
+ *******************************************************************************/
+void bta_av_co_audio_discard_config(tBTA_AV_HNDL hndl);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_init
+ **
+ ** Description      Initialization
+ **
+ ** Returns          Nothing
+ **
+ *******************************************************************************/
+void bta_av_co_init(void);
+
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_peer_cp_supported
+ **
+ ** Description      Checks if the peer supports CP
+ **
+ ** Returns          TRUE if the peer supports CP
+ **
+ *******************************************************************************/
+BOOLEAN bta_av_co_peer_cp_supported(tBTA_AV_HNDL hndl);
+
+/*******************************************************************************
+ **
+ ** Function         bta_av_co_get_remote_bitpool_pref
+ **
+ ** Description      Check if remote side did a setconfig within the limits
+ **                  of our exported bitpool range. If set we will set the
+ **                  remote preference.
+ **
+ ** Returns          TRUE if config set, FALSE otherwize
+ **
+ *******************************************************************************/
+BOOLEAN bta_av_co_get_remote_bitpool_pref(UINT8 *min, UINT8 *max);
+
+#endif  ///BTA_AV_INCLUDED == TRUE
+
+#endif
diff --git a/tools/sdk/include/bluedroid/btc_avrc.h b/tools/sdk/include/bluedroid/btc_avrc.h
new file mode 100644
index 00000000000..3f16d10f3cc
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_avrc.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __BTC_AVRC_H__
+#define __BTC_AVRC_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "bt_defs.h"
+#include "bt_types.h"
+#include "bta_av_api.h"
+
+#if (BTC_AV_INCLUDED == TRUE)
+#ifndef BTC_AVRC_TGT_INCLUDED
+#define BTC_AVRC_TGT_INCLUDED      FALSE
+#endif
+
+/* Macros */
+typedef enum {
+    BTRC_FEAT_NONE = 0x00,    /* AVRCP 1.0 */
+    BTRC_FEAT_METADATA = 0x01,    /* AVRCP 1.3 */
+    BTRC_FEAT_ABSOLUTE_VOLUME = 0x02,    /* Supports TG role and volume sync */
+    BTRC_FEAT_BROWSE = 0x04,    /* AVRCP 1.4 and up, with Browsing support */
+} btrc_remote_features_t;
+
+typedef enum {
+    BTC_AVRC_CTRL_API_INIT_EVT = 0,
+    BTC_AVRC_CTRL_API_DEINIT_EVT,
+    BTC_AVRC_CTRL_API_SND_PTCMD_EVT
+} btc_avrc_act_t;
+
+typedef struct {
+    uint8_t tl; /* transaction label */
+    uint8_t key_code;
+    uint8_t key_state;
+} pt_cmd_t;
+
+/* btc_avrc_args_t */
+typedef union {
+    // BTC_AVRC_CTRL_API_SND_PT_CMD_EVT
+    struct {
+        uint8_t tl;
+        uint8_t key_code;
+        uint8_t key_state;
+    } pt_cmd;
+} btc_avrc_args_t;
+
+/** BT-RC Controller callback structure. */
+typedef void (* btrc_passthrough_rsp_callback) (int id, int key_state);
+
+typedef void (* btrc_connection_state_callback) (bool state, bt_bdaddr_t *bd_addr);
+
+void btc_rc_handler(tBTA_AV_EVT event, tBTA_AV *p_data);
+
+BOOLEAN btc_rc_get_connected_peer(BD_ADDR peer_addr);
+
+/*******************************************************************************
+**  BTC AVRC API
+********************************************************************************/
+void btc_avrc_call_handler(btc_msg_t *msg);
+
+#endif  ///BTC_AV_INCLUDED == TRUE
+
+#endif /* __BTC_AVRC_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_ble_storage.h b/tools/sdk/include/bluedroid/btc_ble_storage.h
new file mode 100644
index 00000000000..2884d6acf3b
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_ble_storage.h
@@ -0,0 +1,124 @@
+// Copyright (C) 2014 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "bt_types.h"
+#include "bt_target.h"
+
+#if (SMP_INCLUDED == TRUE)
+#define BTC_LE_LOCAL_KEY_IR       (1<<0)
+#define BTC_LE_LOCAL_KEY_IRK      (1<<1)
+#define BTC_LE_LOCAL_KEY_DHK      (1<<2)
+#define BTC_LE_LOCAL_KEY_ER       (1<<3)
+
+/************************************************************************************
+**  Local type definitions
+************************************************************************************/
+typedef struct
+{
+    uint32_t num_devices;
+    bt_bdaddr_t devices[BTM_SEC_MAX_DEVICE_RECORDS];
+} btc_bonded_devices_t;
+
+typedef struct
+{
+    bool                   is_penc_key_rcvd;
+    tBTM_LE_PENC_KEYS         penc_key;       /* received peer encryption key */
+    bool                   is_pcsrk_key_rcvd;
+    tBTM_LE_PCSRK_KEYS        pcsrk_key;       /* received peer device SRK */
+    bool                   is_pid_key_rcvd;
+    tBTM_LE_PID_KEYS          pid_key;        /* peer device ID key */
+    bool                   is_lenc_key_rcvd;
+    tBTM_LE_LENC_KEYS         lenc_key;       /* local encryption reproduction keys LTK = = d1(ER,DIV,0)*/
+    bool                   is_lcsrk_key_rcvd;
+    tBTM_LE_LCSRK_KEYS        lcsrk_key;      /* local device CSRK = d1(ER,DIV,1)*/
+    bool                   is_lidk_key_rcvd;   /* local identity key received */
+} btc_dm_ble_cb_t;
+
+typedef struct
+{
+    bt_bdaddr_t static_bdaddr;
+    BD_ADDR bd_addr;
+    btc_dm_ble_cb_t ble;
+} btc_dm_pairing_cb_t;
+
+typedef struct
+{
+    uint8_t       ir[BT_OCTET16_LEN];
+    uint8_t       irk[BT_OCTET16_LEN];
+    uint8_t       dhk[BT_OCTET16_LEN];
+}btc_dm_local_key_id_t;
+
+typedef struct
+{
+    bool                 is_er_rcvd;
+    uint8_t             er[BT_OCTET16_LEN];
+    bool                 is_id_keys_rcvd;
+    btc_dm_local_key_id_t  id_keys;  /* ID kyes */
+}btc_dm_local_key_cb_t;
+
+typedef struct
+{
+    BT_OCTET16 sp_c;
+    BT_OCTET16 sp_r;
+    BD_ADDR  oob_bdaddr;  /* peer bdaddr*/
+} btc_dm_oob_cb_t;
+
+
+extern btc_dm_pairing_cb_t pairing_cb;
+extern btc_dm_local_key_cb_t ble_local_key_cb;
+
+bt_status_t btc_storage_load_bonded_ble_devices(void);
+
+bt_status_t btc_in_fetch_bonded_ble_devices(int add);
+
+void btc_dm_remove_ble_bonding_keys(void);
+
+bt_status_t btc_storage_add_ble_bonding_key( bt_bdaddr_t *remote_bd_addr,
+                                                                                      char *key,
+                                                                                      uint8_t key_type,
+                                                                                      uint8_t key_length);
+
+void btc_save_ble_bonding_keys(void);
+
+bt_status_t btc_in_fetch_bonded_ble_device(const char *remote_bd_addr, int add, 
+                                           btc_bonded_devices_t *p_bonded_devices);
+
+bt_status_t btc_storage_get_ble_bonding_key(bt_bdaddr_t *remote_bd_addr,
+                                                                uint8_t key_type,
+                                                                char *key_value,
+                                                                int key_length);
+
+bt_status_t btc_storage_add_ble_local_key(char *key,
+                                                                              uint8_t key_type,
+                                                                              uint8_t key_length);
+
+bt_status_t btc_storage_remove_ble_bonding_keys(bt_bdaddr_t *remote_bd_addr);
+
+bt_status_t btc_storage_remove_ble_local_keys(void);
+
+bt_status_t btc_storage_get_ble_local_key(uint8_t key_type,
+                                                                             char *key_value,
+                                                                             int key_len);
+
+bt_status_t btc_storage_get_remote_addr_type(bt_bdaddr_t *remote_bd_addr,
+                                                                                     int *addr_type);
+
+bt_status_t btc_storage_set_remote_addr_type(bt_bdaddr_t *remote_bd_addr,
+                                                                                     uint8_t addr_type);
+
+void btc_dm_load_ble_local_keys(void);
+
+void btc_dm_get_ble_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK *p_key_mask, BT_OCTET16 er,
+                                                            tBTA_BLE_LOCAL_ID_KEYS *p_id_keys);
+#endif  ///SMP_INCLUDED == TRUE
\ No newline at end of file
diff --git a/tools/sdk/include/bluedroid/btc_common.h b/tools/sdk/include/bluedroid/btc_common.h
new file mode 100644
index 00000000000..62246289716
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_common.h
@@ -0,0 +1,35 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+#ifndef __BTC_COMMON_H__
+#define __BTC_COMMON_H__
+
+#include "bt_trace.h"
+#include "bt_types.h"
+#include "osi.h"
+
+#define BTC_ASSERTC(cond, msg, val) if (!(cond)) { LOG_ERROR( \
+    "### ASSERT : %s line %d %s (%d) ###", __FILE__, __LINE__, msg, val);}
+
+#define BTC_HAL_CBACK(P_CB, P_CBACK, ...)\
+    if (P_CB && P_CB->P_CBACK) {            \
+        LOG_INFO("HAL %s->%s", #P_CB, #P_CBACK); \
+        P_CB->P_CBACK(__VA_ARGS__);         \
+    }                                       \
+    else {                                  \
+        BTC_ASSERTC(0, "Callback is NULL", 0);  \
+    }
+
+#endif /* __BTC_COMMON_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_config.h b/tools/sdk/include/bluedroid/btc_config.h
new file mode 100644
index 00000000000..1472cc83c45
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_config.h
@@ -0,0 +1,54 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __BTC_CONFIG_H__
+#define __BTC_CONFIG_H__
+
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "bt_types.h"
+
+typedef struct btc_config_section_iter_t btc_config_section_iter_t;
+
+bool btc_config_init(void);
+bool btc_config_shut_down(void);
+bool btc_config_clean_up(void);
+
+bool btc_config_has_section(const char *section);
+bool btc_config_exist(const char *section, const char *key);
+bool btc_config_get_int(const char *section, const char *key, int *value);
+bool btc_config_set_int(const char *section, const char *key, int value);
+bool btc_config_get_str(const char *section, const char *key, char *value, int *size_bytes);
+bool btc_config_set_str(const char *section, const char *key, const char *value);
+bool btc_config_get_bin(const char *section, const char *key, uint8_t *value, size_t *length);
+bool btc_config_set_bin(const char *section, const char *key, const uint8_t *value, size_t length);
+bool btc_config_remove(const char *section, const char *key);
+
+size_t btc_config_get_bin_length(const char *section, const char *key);
+
+const btc_config_section_iter_t *btc_config_section_begin(void);
+const btc_config_section_iter_t *btc_config_section_end(void);
+const btc_config_section_iter_t *btc_config_section_next(const btc_config_section_iter_t *section);
+const char *btc_config_section_name(const btc_config_section_iter_t *section);
+
+void btc_config_save(void);
+void btc_config_flush(void);
+int btc_config_clear(void);
+
+// TODO(zachoverflow): Eww...we need to move these out. These are peer specific, not config general.
+bool btc_get_address_type(const BD_ADDR bd_addr, int *p_addr_type);
+bool btc_get_device_type(const BD_ADDR bd_addr, int *p_device_type);
+
+#endif
diff --git a/tools/sdk/include/bluedroid/btc_dev.h b/tools/sdk/include/bluedroid/btc_dev.h
new file mode 100644
index 00000000000..dd2e8663a95
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_dev.h
@@ -0,0 +1,38 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __BTC_DEV_H__
+#define __BTC_DEV_H__
+
+#include "esp_bt_defs.h"
+#include "esp_bt_device.h"
+#include "btc_task.h"
+
+typedef enum {
+    BTC_DEV_ACT_SET_DEVICE_NAME
+} btc_dev_act_t;
+
+/* btc_dev_args_t */
+typedef union {
+    // BTC_BT_GAP_ACT_SET_DEV_NAME
+    struct set_bt_dev_name_args {
+#define ESP_DEV_DEVICE_NAME_MAX (32)
+        char device_name[ESP_DEV_DEVICE_NAME_MAX + 1];
+    } set_dev_name;
+} btc_dev_args_t;
+
+void btc_dev_call_handler(btc_msg_t *msg);
+
+#endif /* __BTC_DEV_H__ */
+
diff --git a/tools/sdk/include/bluedroid/btc_dm.h b/tools/sdk/include/bluedroid/btc_dm.h
new file mode 100644
index 00000000000..e397d82b4f7
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_dm.h
@@ -0,0 +1,40 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __BTC_DM_H__
+#define __BTC_DM_H__
+
+#include "btc_task.h"
+#include "esp_bt_defs.h"
+#include "bta_api.h"
+
+typedef enum {
+    BTC_DM_SEC_ACT
+} btc_dm_sec_act_t;
+
+/* btc_dm_args_t */
+typedef union {
+    //BTC_DM_SEC_ACT
+    tBTA_DM_SEC sec;
+} btc_dm_sec_args_t;
+
+// void btc_dm_call_handler(btc_msg_t *msg);
+void btc_dm_sec_evt(tBTA_DM_SEC_EVT event, tBTA_DM_SEC *data);
+void btc_dm_sec_cb_handler(btc_msg_t *msg);
+void btc_dm_sec_arg_deep_copy(btc_msg_t *msg, void *dst, void *src);
+
+bt_status_t btc_dm_enable_service(tBTA_SERVICE_ID service_id);
+bt_status_t btc_dm_disable_service(tBTA_SERVICE_ID service_id);
+
+#endif /* __BTC_DM_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_gap_ble.h b/tools/sdk/include/bluedroid/btc_gap_ble.h
index ea639bcde91..b26c2b800f2 100644
--- a/tools/sdk/include/bluedroid/btc_gap_ble.h
+++ b/tools/sdk/include/bluedroid/btc_gap_ble.h
@@ -34,6 +34,11 @@ typedef enum {
     BTC_GAP_BLE_ACT_SET_DEV_NAME,
     BTC_GAP_BLE_ACT_CFG_ADV_DATA_RAW,
     BTC_GAP_BLE_ACT_CFG_SCAN_RSP_DATA_RAW,
+    BTC_GAP_BLE_SET_ENCRYPTION_EVT,
+    BTC_GAP_BLE_SET_SECURITY_PARAM_EVT,
+    BTC_GAP_BLE_SECURITY_RSP_EVT,
+    BTC_GAP_BLE_PASSKEY_REPLY_EVT,
+    BTC_GAP_BLE_CONFIRM_REPLY_EVT,
 } btc_gap_ble_act_t;
 
 /* btc_ble_gap_args_t */
@@ -72,12 +77,7 @@ typedef union {
     //BTC_GAP_BLE_ACT_CONFIG_LOCAL_PRIVACY,
     struct cfg_local_privacy_args {
         bool privacy_enable;
-    } cfg_local_privacy;
-    //BTC_GAP_BLE_ACT_SET_DEV_NAME,
-    struct set_dev_name_args {
-#define ESP_GAP_DEVICE_NAME_MAX (32)
-        char device_name[ESP_GAP_DEVICE_NAME_MAX + 1];
-    } set_dev_name;
+    } cfg_local_privacy;    
     //BTC_GAP_BLE_ACT_CFG_ADV_DATA_RAW,
     struct config_adv_data_raw_args {
         uint8_t *raw_adv;
@@ -88,6 +88,33 @@ typedef union {
         uint8_t *raw_scan_rsp;
         uint32_t raw_scan_rsp_len;
     } cfg_scan_rsp_data_raw;
+
+    struct set_encryption_args {
+        esp_bd_addr_t bd_addr;
+        esp_ble_sec_act_t sec_act;
+    } set_encryption;
+
+    struct set_security_param_args {
+        esp_ble_sm_param_t param_type;
+        uint8_t len;
+        uint8_t *value;
+    } set_security_param;
+
+    struct enc_rsp_args {
+        esp_bd_addr_t bd_addr;
+        bool accept;
+    } sec_rsp;
+
+    struct enc_passkey_reply_args {
+        esp_bd_addr_t bd_addr;
+        bool accept;
+        uint32_t passkey;
+    } enc_passkey_replay;
+
+    struct enc_comfirm_reply_args {
+        esp_bd_addr_t bd_addr;
+        bool accept;
+    } enc_comfirm_replay;
 } btc_ble_gap_args_t;
 
 void btc_gap_ble_call_handler(btc_msg_t *msg);
diff --git a/tools/sdk/include/bluedroid/btc_gap_bt.h b/tools/sdk/include/bluedroid/btc_gap_bt.h
index d6f2e5b535c..d77a4b9f65d 100644
--- a/tools/sdk/include/bluedroid/btc_gap_bt.h
+++ b/tools/sdk/include/bluedroid/btc_gap_bt.h
@@ -15,8 +15,24 @@
 #ifndef __BTC_GAP_BT_H__
 #define __BTC_GAP_BT_H__
 
+#include "esp_bt_defs.h"
+#include "esp_gap_bt_api.h"
+#include "btc_task.h"
 
+typedef enum {
+    BTC_GAP_BT_ACT_SET_SCAN_MODE = 0,
+} btc_gap_bt_act_t;
 
+/* btc_bt_gap_args_t */
+typedef union {
+    // BTC_BT_GAP_ACT_SET_SCAN_MODE,
+    struct set_bt_scan_mode_args {
+        esp_bt_scan_mode_t mode;
+    } set_scan_mode;
+} btc_gap_bt_args_t;
 
+void btc_gap_bt_call_handler(btc_msg_t *msg);
 
-#define /* __BTC_GAP_BT_H__ */
+void btc_gap_bt_arg_deep_copy(btc_msg_t *msg, void *p_dest, void *p_src);
+
+#endif /* __BTC_GAP_BT_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_gattc.h b/tools/sdk/include/bluedroid/btc_gattc.h
index aef84189570..2528668381c 100644
--- a/tools/sdk/include/bluedroid/btc_gattc.h
+++ b/tools/sdk/include/bluedroid/btc_gattc.h
@@ -38,6 +38,7 @@ typedef enum {
     BTC_GATTC_ACT_WRITE_CHAR,
     BTC_GATTC_ACT_WRITE_CHAR_DESCR,
     BTC_GATTC_ACT_PREPARE_WRITE,
+    BTC_GATTC_ACT_PREPARE_WRITE_CHAR_DESCR,
     BTC_GATTC_ACT_EXECUTE_WRITE,
     BTC_GATTC_ACT_REG_FOR_NOTIFY,
     BTC_GATTC_ACT_UNREG_FOR_NOTIFY
@@ -155,6 +156,17 @@ typedef union {
         uint8_t *value;
         esp_gatt_auth_req_t auth_req;
     } prep_write;
+    //BTC_GATTC_ACT_PREPARE_WRITE_CHAR_DESCR,
+    struct prep_write_descr_arg {
+        uint16_t conn_id;
+        esp_gatt_srvc_id_t service_id;
+        esp_gatt_id_t char_id;
+        esp_gatt_id_t descr_id;
+        uint16_t offset;
+        uint16_t value_len;
+        uint8_t *value;
+        esp_gatt_auth_req_t auth_req;
+    } prep_write_descr;
     //BTC_GATTC_ACT_EXECUTE_WRITE,
     struct exec_write_arg {
         uint16_t conn_id;
diff --git a/tools/sdk/include/bluedroid/btc_gatts.h b/tools/sdk/include/bluedroid/btc_gatts.h
index caae44de44c..35cf84c5b16 100644
--- a/tools/sdk/include/bluedroid/btc_gatts.h
+++ b/tools/sdk/include/bluedroid/btc_gatts.h
@@ -123,7 +123,8 @@ typedef union {
     } send_rsp;
 
     //BTC_GATTS_SET_ATTR_VALUE
-    struct set_attr_val_args{
+    struct set_attr_val_args {
+        uint16_t handle;
         uint16_t length;
         uint8_t *value;
     } set_attr_val;
diff --git a/tools/sdk/include/bluedroid/btc_media.h b/tools/sdk/include/bluedroid/btc_media.h
new file mode 100644
index 00000000000..a25da98778e
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_media.h
@@ -0,0 +1,268 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*******************************************************************************
+ *
+ *  Filename:      btc_media.h
+ *
+ *  Description:   This is the audio module for the BTC system.
+ *
+ *******************************************************************************/
+
+#ifndef __BTC_MEDIA_H__
+#define __BTC_MEDIA_H__
+
+#include <stdbool.h>
+#include "bta_api.h"
+#include "gki.h"
+#include "btc_av_api.h"
+
+#if (BTA_AV_INCLUDED == TRUE)
+
+/*******************************************************************************
+ **  Constants
+ *******************************************************************************/
+#define BTC_SUCCESS                         (0)
+/**
+ * AV (Audio Video source) Errors
+ */
+#define BTC_ERROR_SRV_AV_NOT_ENABLED        700     /* AV is not enabled */
+#define BTC_ERROR_SRV_AV_FEEDING_NOT_SUPPORTED 701  /* Requested Feeding not supported */
+#define BTC_ERROR_SRV_AV_BUSY               702     /* Another operation ongoing */
+#define BTC_ERROR_SRV_AV_NOT_OPENED         703     /* No AV link opened */
+#define BTC_ERROR_SRV_AV_NOT_STARTED        704     /* AV is not started */
+#define BTC_ERROR_SRV_AV_CP_NOT_SUPPORTED   705     /* Content protection is not supported by all headsets */
+
+/* Transcoding definition for TxTranscoding and RxTranscoding */
+#define BTC_MEDIA_TRSCD_OFF             0
+#define BTC_MEDIA_TRSCD_PCM_2_SBC       1  /* Tx */
+
+
+/*******************************************************************************
+ **  Data types
+ *******************************************************************************/
+
+typedef int tBTC_STATUS;
+
+/* tBTC_MEDIA_INIT_AUDIO msg structure */
+typedef struct {
+    BT_HDR hdr;
+    UINT16 SamplingFreq; /* 16k, 32k, 44.1k or 48k*/
+    UINT8 ChannelMode; /* mono, dual, stereo or joint stereo*/
+    UINT8 NumOfSubBands; /* 4 or 8 */
+    UINT8 NumOfBlocks; /* 4, 8, 12 or 16*/
+    UINT8 AllocationMethod; /* loudness or SNR*/
+    UINT16 MtuSize; /* peer mtu size */
+} tBTC_MEDIA_INIT_AUDIO;
+
+#if (BTA_AV_INCLUDED == TRUE)
+/* tBTC_MEDIA_UPDATE_AUDIO msg structure */
+typedef struct {
+    BT_HDR hdr;
+    UINT16 MinMtuSize; /* Minimum peer mtu size */
+    UINT8 MaxBitPool; /* Maximum peer bitpool */
+    UINT8 MinBitPool; /* Minimum peer bitpool */
+} tBTC_MEDIA_UPDATE_AUDIO;
+
+/* tBTC_MEDIA_INIT_AUDIO_FEEDING msg structure */
+typedef struct {
+    BT_HDR hdr;
+    tBTC_AV_FEEDING_MODE feeding_mode;
+    tBTC_AV_MEDIA_FEEDINGS feeding;
+} tBTC_MEDIA_INIT_AUDIO_FEEDING;
+
+typedef struct {
+    BT_HDR hdr;
+    UINT8 codec_info[AVDT_CODEC_SIZE];
+} tBTC_MEDIA_SINK_CFG_UPDATE;
+#endif
+
+/*******************************************************************************
+ **  Public functions
+ *******************************************************************************/
+
+/*******************************************************************************
+ **
+ ** Function         btc_av_task
+ **
+ ** Description
+ **
+ ** Returns          void
+ **
+ *******************************************************************************/
+extern void btc_media_task(void);
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_task_enc_init_req
+ **
+ ** Description      Request to initialize the media task encoder
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+extern BOOLEAN btc_media_task_enc_init_req(tBTC_MEDIA_INIT_AUDIO *p_msg);
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_task_enc_update_req
+ **
+ ** Description      Request to update the media task encoder
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+#if (BTA_AV_INCLUDED == TRUE)
+extern BOOLEAN btc_media_task_enc_update_req(tBTC_MEDIA_UPDATE_AUDIO *p_msg);
+#endif
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_task_start_aa_req
+ **
+ ** Description      Request to start audio encoding task
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+extern BOOLEAN btc_media_task_start_aa_req(void);
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_task_stop_aa_req
+ **
+ ** Description      Request to stop audio encoding task
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+extern BOOLEAN btc_media_task_stop_aa_req(void);
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_task_aa_rx_flush_req
+ **
+ ** Description      Request to flush audio decoding pipe
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+extern BOOLEAN btc_media_task_aa_rx_flush_req(void);
+/*******************************************************************************
+ **
+ ** Function         btc_media_task_aa_tx_flush_req
+ **
+ ** Description      Request to flush audio encoding pipe
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+extern BOOLEAN btc_media_task_aa_tx_flush_req(void);
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_aa_readbuf
+ **
+ ** Description      Read an audio GKI buffer from the BTC media TX queue
+ **
+ ** Returns          pointer on a GKI aa buffer ready to send
+ **
+ *******************************************************************************/
+extern BT_HDR *btc_media_aa_readbuf(void);
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_sink_enque_buf
+ **
+ ** Description      This function is called by the av_co to fill A2DP Sink Queue
+ **
+ **
+ ** Returns          size of the queue
+ *******************************************************************************/
+UINT8 btc_media_sink_enque_buf(BT_HDR *p_buf);
+
+
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_aa_writebuf
+ **
+ ** Description      Enqueue a Advance Audio media GKI buffer to be processed by btc media task.
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+extern void btc_media_aa_writebuf(BT_HDR *pBuf, UINT32 timestamp, UINT16 seq_num);
+
+/*******************************************************************************
+ **
+ ** Function         btc_media_av_writebuf
+ **
+ ** Description      Enqueue a video media GKI buffer to be processed by btc media task.
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+extern BOOLEAN btc_media_av_writebuf(UINT8 *p_media, UINT32 media_len,
+                                     UINT32 timestamp, UINT16 seq_num);
+
+#if (BTA_AV_INCLUDED == TRUE)
+/*******************************************************************************
+ **
+ ** Function         btc_media_task_audio_feeding_init_req
+ **
+ ** Description      Request to initialize audio feeding
+ **
+ ** Returns          TRUE is success
+ **
+ *******************************************************************************/
+
+extern BOOLEAN btc_media_task_audio_feeding_init_req(tBTC_MEDIA_INIT_AUDIO_FEEDING *p_msg);
+#endif
+
+/*******************************************************************************
+ **
+ ** Function         dump_codec_info
+ **
+ ** Description      Decode and display codec_info (for debug)
+ **
+ ** Returns          void
+ **
+ *******************************************************************************/
+extern void dump_codec_info(unsigned char *p_codec);
+
+/**
+ * Local adaptation helper functions between btc and media task
+ */
+
+bool btc_a2dp_start_media_task(void);
+void btc_a2dp_stop_media_task(void);
+
+void btc_a2dp_on_init(void);
+void btc_a2dp_setup_codec(void);
+void btc_a2dp_on_idle(void);
+BOOLEAN btc_a2dp_on_started(tBTA_AV_START *p_av, BOOLEAN pending_start);
+void btc_a2dp_on_stop_req(void);
+void btc_a2dp_on_stopped(tBTA_AV_SUSPEND *p_av);
+void btc_a2dp_on_suspend(void);
+void btc_a2dp_on_suspended(tBTA_AV_SUSPEND *p_av);
+void btc_a2dp_set_rx_flush(BOOLEAN enable);
+void btc_media_check_iop_exceptions(UINT8 *peer_bda);
+void btc_reset_decoder(UINT8 *p_av);
+
+int btc_a2dp_get_track_frequency(UINT8 frequency);
+int btc_a2dp_get_track_channel_count(UINT8 channeltype);
+void btc_a2dp_set_peer_sep(UINT8 sep);
+#endif  ///BTA_AV_INCLUDED == TRUE
+#endif
diff --git a/tools/sdk/include/bluedroid/btc_profile_queue.h b/tools/sdk/include/bluedroid/btc_profile_queue.h
new file mode 100644
index 00000000000..39b897e96cb
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_profile_queue.h
@@ -0,0 +1,55 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*******************************************************************************
+ *
+ *  Filename:      btc_profile_queue.h
+ *
+ *  Description:   Bluetooth remote device connection queuing
+ *
+ *******************************************************************************/
+
+#ifndef __BTC_PROFILE_QUEUE_H__
+#define __BTC_PROFILE_QUEUE_H__
+
+#include "bt_defs.h"
+#include "btc_task.h"
+
+typedef enum {
+    BTC_PRF_QUE_CONNECT = 0,
+    BTC_PRF_QUE_ADVANCE
+} btc_prf_que_act_t;
+
+typedef bt_status_t (*btc_connect_cb_t) (bt_bdaddr_t *bda, uint16_t uuid);
+
+typedef struct connect_node_t {
+    bt_bdaddr_t bda;
+    uint16_t uuid;
+    bool busy;
+    btc_connect_cb_t connect_cb;
+} connect_node_t;
+
+/* btc_prf_que_args_t */
+typedef union {
+    // BTC_PRF_QUE_CONNECT
+    connect_node_t connect_node;
+} btc_prf_que_args_t;
+
+bt_status_t btc_queue_connect(uint16_t uuid, const bt_bdaddr_t *bda, btc_connect_cb_t connect_cb);
+void btc_queue_advance(void);
+bt_status_t btc_queue_connect_next(void);
+void btc_queue_release(void);
+
+void btc_profile_queue_handler(btc_msg_t *msg);
+#endif /* __BTC_PROFILE_QUEUE_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_sdp.h b/tools/sdk/include/bluedroid/btc_sdp.h
deleted file mode 100644
index db7984b9b97..00000000000
--- a/tools/sdk/include/bluedroid/btc_sdp.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef __ESP_SDP_API_H__
-#define __ESP_SDP_API_H__
-
-#include <stdint.h>
-#include "esp_err.h"
-#include "esp_bt_common.h"
-#include "bta_sdp_api.h"
-#include "bt_sdp.h"
-
-#define BT_SDP_STAT_SUCCESS                      BTA_SDP_SUCCESS
-#define BT_SDP_STAT_FAILURE                      BTA_SDP_FAILURE
-#define BT_SDP_STAT_BUSY                         BTA_SDP_BUSY
-
-#define BT_SDP_ENABLE_EVT                        BTA_SDP_ENABLE_EVT
-#define BT_SDP_SEARCH_EVT                        BTA_SDP_SEARCH_EVT
-#define BT_SDP_SEARCH_COMP_EVT                   BTA_SDP_SEARCH_COMP_EVT
-#define BT_SDP_CREATE_RECORD_USER_EVT            BTA_SDP_CREATE_RECORD_USER_EVT
-#define BT_SDP_REMOVE_RECORD_USER_EVT            BTA_SDP_REMOVE_RECORD_USER_EVT
-#define BT_SDP_MAX_EVT                           BTA_SDP_MAX_EVT
-
-#define BT_SDP_MAX_RECORDS                       BTA_SDP_MAX_RECORDS
-
-typedef tBTA_SDP_STATUS bt_sdp_status_t;
-
-typedef tBTA_SDP_EVT bt_sdp_evt_t;
-
-typedef bluetooth_sdp_record bt_sdp_record_t;
-
-/* tBTA_SEARCH_COMP, bta_sdp_api.h */
-typedef struct {
-    bt_sdp_status_t status;
-    esp_bd_addr_t remote_addr;
-    esp_bt_uuid_t uuid;
-    int record_count;
-    bt_sdp_record_t records[BT_SDP_MAX_RECORDS];
-} bt_sdp_search_comp_t;
-
-/* tBTA_SDP, bta_sdp_api.h */
-typedef union {
-    bt_sdp_status_t status;
-    bt_sdp_search_comp_t sdp_search_comp;
-} bt_sdp_t;
-
-typedef void (bt_sdp_cb_t)(bt_sdp_evt_t event, bt_sdp_t *p_data, void *user_data);
-
-esp_err_t esp_bt_sdp_enable(bt_sdp_cb_t *cback);
-
-esp_err_t esp_bt_sdp_search(esp_bd_addr_t bd_addr, esp_bt_uuid_t *uuid);
-
-esp_err_t esp_bt_sdp_create_record_by_user(void *user_data);
-
-esp_err_t esp_bt_sdp_remove_record_by_user(void *user_data);
-
-
-/**********************************************************************************************/
-/**********************************************************************************************/
-/* API into SDP for local service database updates
- * these APIs are indended to be called in callback function in the context of stack task,
- * to handle BT_SDP_CREATE_RECORD_USER_EVT and BT_SDP_REMOVE_RECORD_USER_EVT
- */
-
-/* This structure is used to add protocol lists and find protocol elements */
-#define  ESP_BT_SDP_MAX_PROTOCOL_PARAMS         SDP_MAX_PROTOCOL_PARAMS     // bt_target.h
-typedef struct {
-    uint16_t      protocol_uuid;
-    uint16_t      num_params;
-    uint16_t      params[ESP_BT_SDP_MAX_PROTOCOL_PARAMS];
-} sdp_proto_elem_t; // tSDP_PROTOCOL_ELEM, sdp_api.h
-
-#define ESP_BT_SDP_MAX_LIST_ELEMS               SDP_MAX_LIST_ELEMS // sdp_api.h
-typedef struct {
-    uint16_t              num_elems;
-    sdp_proto_elem_t      list_elem[ESP_BT_SDP_MAX_LIST_ELEMS];
-} sdp_proto_list_elem_t; // tSDP_PROTO_LIST_ELEM, sdp_api.h
-
-
-uint32_t esp_bt_sdp_create_record(void);
-
-bool esp_bt_sdp_delete_record(uint32_t handle);
-
-int32_t esp_bt_sdp_read_record(uint32_t handle, uint8_t *data, int32_t *data_len);
-
-bool esp_bt_sdp_add_attribute (uint32_t handle, uint16_t attr_id,
-                               uint8_t attr_type, uint32_t attr_len,
-                               uint8_t *p_val);
-
-bool esp_bt_sdp_add_sequence (uint32_t handle,  uint16_t attr_id,
-                              uint16_t num_elem, uint8_t type[],
-                              uint8_t len[], uint8_t *p_val[]);
-
-bool esp_bt_sdp_add_uuid_sequence (uint32_t handle,  uint16_t attr_id,
-                                   uint16_t num_uuids, uint16_t *p_uuids);
-
-
-bool esp_bt_sdp_add_protocol_list (uint32_t handle, uint16_t num_elem,
-                                   sdp_proto_elem_t *p_elem_list);
-
-bool esp_bt_sdp_add_addition_protocol_lists(uint32_t handle, uint16_t num_elem,
-        sdp_proto_list_elem_t *p_proto_list);
-
-bool esp_bt_sdp_add_profile_dscp_list (uint32_t handle,
-                                       uint16_t profile_uuid,
-                                       uint16_t version);
-
-bool esp_bt_sdp_add_lang_base_attr_id_list(uint32_t handle,
-        uint16_t lang, uint16_t char_enc,
-        uint16_t base_id);
-
-bool esp_bt_sdp_add_service_class_id_list(uint32_t handle,
-        uint16_t num_services,
-        uint16_t *p_service_uuids);
-
-bool esp_bt_sdp_delete_attribute(uint32_t handle, uint16_t attr_id);
-
-#endif /* __ESP_SDP_API_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_sm.h b/tools/sdk/include/bluedroid/btc_sm.h
new file mode 100644
index 00000000000..b8e95b99003
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_sm.h
@@ -0,0 +1,115 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+/*****************************************************************************
+ *
+ *  Filename:      btc_sm.h
+ *
+ *  Description:   Generic BTC state machine API
+ *
+ *****************************************************************************/
+
+#ifndef __BTC_SM_H__
+#define __BTC_SM_H__
+
+/*****************************************************************************
+**  Constants & Macros
+******************************************************************************/
+
+/* Generic Enter/Exit state machine events */
+#define BTC_SM_ENTER_EVT 0xFFFF
+#define BTC_SM_EXIT_EVT  0xFFFE
+
+
+/*****************************************************************************
+**  Type definitions and return values
+******************************************************************************/
+typedef UINT32 btc_sm_state_t;
+typedef UINT32 btc_sm_event_t;
+typedef void *btc_sm_handle_t;
+typedef BOOLEAN (* btc_sm_handler_t)(btc_sm_event_t event, void *data);
+
+
+/*****************************************************************************
+**  Functions
+**
+**  NOTE: THESE APIs SHOULD BE INVOKED ONLY IN THE BTC CONTEXT
+**
+******************************************************************************/
+
+/*****************************************************************************
+**
+** Function     btc_sm_init
+**
+** Description  Initializes the state machine with the state handlers
+**              The caller should ensure that the table and the corresponding
+**              states match. The location that 'p_handlers' points to shall
+**              be available until the btc_sm_shutdown API is invoked.
+**
+** Returns      Returns a pointer to the initialized state machine handle.
+**
+******************************************************************************/
+btc_sm_handle_t btc_sm_init(const btc_sm_handler_t *p_handlers,
+                            btc_sm_state_t initial_state);
+
+/*****************************************************************************
+**
+** Function     btc_sm_shutdown
+**
+** Description  Tears down the state machine
+**
+** Returns      None
+**
+******************************************************************************/
+void btc_sm_shutdown(btc_sm_handle_t handle);
+
+/*****************************************************************************
+**
+** Function     btc_sm_get_state
+**
+** Description  Fetches the current state of the state machine
+**
+** Returns      Current state
+**
+******************************************************************************/
+btc_sm_state_t btc_sm_get_state(btc_sm_handle_t handle);
+
+/*****************************************************************************
+**
+** Function     btc_sm_dispatch
+**
+** Description  Dispatches the 'event' along with 'data' to the current state handler
+**
+** Returns      Returns BT_STATUS_OK on success, BT_STATUS_FAIL otherwise
+**
+******************************************************************************/
+bt_status_t btc_sm_dispatch(btc_sm_handle_t handle, btc_sm_event_t event,
+                            void *data);
+
+/*****************************************************************************
+**
+** Function     btc_sm_change_state
+**
+** Description  Make a transition to the new 'state'. The 'BTC_SM_EXIT_EVT'
+**              shall be invoked before exiting the current state. The
+**              'BTC_SM_ENTER_EVT' shall be invoked before entering the new state
+**
+**
+** Returns      Returns BT_STATUS_OK on success, BT_STATUS_FAIL otherwise
+**
+******************************************************************************/
+bt_status_t btc_sm_change_state(btc_sm_handle_t handle, btc_sm_state_t state);
+
+#endif /* __BTC_SM_H__ */
diff --git a/tools/sdk/include/bluedroid/btc_storage.h b/tools/sdk/include/bluedroid/btc_storage.h
new file mode 100644
index 00000000000..c2fb6ccbba5
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_storage.h
@@ -0,0 +1,62 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __BTC_STORAGE_H__
+#define __BTC_STORAGE_H__
+
+#include <stdint.h>
+#include "bt_defs.h"
+#include "bt_types.h"
+
+/*******************************************************************************
+**
+** Function         btc_storage_add_bonded_device
+**
+** Description      BTC storage API - Adds the newly bonded device to NVRAM
+**                  along with the link-key, Key type and Pin key length
+**
+** Returns          BT_STATUS_SUCCESS if the store was successful,
+**                  BT_STATUS_FAIL otherwise
+**
+*******************************************************************************/
+bt_status_t btc_storage_add_bonded_device(bt_bdaddr_t *remote_bd_addr,
+        LINK_KEY link_key,
+        uint8_t key_type,
+        uint8_t pin_length);
+
+/*******************************************************************************
+**
+** Function         btc_storage_remove_bonded_device
+**
+** Description      BTC storage API - Deletes the bonded device from NVRAM
+**
+** Returns          BT_STATUS_SUCCESS if the deletion was successful,
+**                  BT_STATUS_FAIL otherwise
+**
+*******************************************************************************/
+bt_status_t btc_storage_remove_bonded_device(bt_bdaddr_t *remote_bd_addr);
+
+/*******************************************************************************
+**
+** Function         btc_storage_remove_bonded_device
+**
+** Description      BTC storage API - Deletes the bonded device from NVRAM
+**
+** Returns          BT_STATUS_SUCCESS if the deletion was successful,
+**                  BT_STATUS_FAIL otherwise
+**
+*******************************************************************************/
+bt_status_t btc_storage_load_bonded_devices(void);
+
+#endif /* BTC_STORAGE_H */
diff --git a/tools/sdk/include/bluedroid/btc_task.h b/tools/sdk/include/bluedroid/btc_task.h
index 1574dae2f35..c91aaad547f 100644
--- a/tools/sdk/include/bluedroid/btc_task.h
+++ b/tools/sdk/include/bluedroid/btc_task.h
@@ -16,6 +16,7 @@
 #define __BTC_TASK_H__
 
 #include <stdint.h>
+#include "bt_target.h"
 #include "bt_defs.h"
 #include "thread.h"
 
@@ -35,16 +36,23 @@ typedef enum {
 
 typedef enum {
     BTC_PID_MAIN_INIT = 0,
+    BTC_PID_DEV,
     BTC_PID_GATTS,
+#if (GATTC_INCLUDED == TRUE)
     BTC_PID_GATTC,
+#endif  ///GATTC_INCLUDED == TRUE
     BTC_PID_GAP_BLE,
-    BTC_PID_GAP_BT,
-    BTC_PID_SDP,
     BTC_PID_BLE_HID,
-    BTC_PID_BT_HID,
-    BTC_PID_SPP,
     BTC_PID_SPPLIKE,
     BTC_PID_BLUFI,
+    BTC_PID_DM_SEC,
+    BTC_PID_ALARM,
+#if CONFIG_CLASSIC_BT_ENABLED
+    BTC_PID_GAP_BT,
+    BTC_PID_PRF_QUE,
+    BTC_PID_A2DP,
+    BTC_PID_AVRC,
+#endif  /* CONFIG_CLASSIC_BT_ENABLED */
     BTC_PID_NUM,
 } btc_pid_t; //btc profile id
 
diff --git a/tools/sdk/include/bluedroid/btc_util.h b/tools/sdk/include/bluedroid/btc_util.h
new file mode 100644
index 00000000000..23a8fe309dd
--- /dev/null
+++ b/tools/sdk/include/bluedroid/btc_util.h
@@ -0,0 +1,47 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __BTC_UTIL_H__
+#define __BTC_UTIL_H__
+
+#include <stdbool.h>
+#include "bt_types.h"
+#include "bt_defs.h"
+
+/*******************************************************************************
+**  Constants & Macros
+********************************************************************************/
+#define CASE_RETURN_STR(const) case const: return #const;
+
+/*******************************************************************************
+**  Type definitions for callback functions
+********************************************************************************/
+typedef char bdstr_t[18];
+
+
+/*******************************************************************************
+**  Functions
+********************************************************************************/
+const char *dump_rc_event(UINT8 event);
+const char *dump_rc_notification_event_id(UINT8 event_id);
+const char *dump_rc_pdu(UINT8 pdu);
+
+UINT32 devclass2uint(DEV_CLASS dev_class);
+void uint2devclass(UINT32 dev, DEV_CLASS dev_class);
+void uuid16_to_uuid128(uint16_t uuid16, bt_uuid_t *uuid128);
+
+void uuid_to_string_legacy(bt_uuid_t *p_uuid, char *str);
+void string_to_uuid(char *str, bt_uuid_t *p_uuid);
+
+#endif /*  __BTC_UTIL_H__ */
diff --git a/tools/sdk/include/bluedroid/bte_appl.h b/tools/sdk/include/bluedroid/bte_appl.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/btm_api.h b/tools/sdk/include/bluedroid/btm_api.h
index 4406217cbf2..5a0d6fa46bd 100644
--- a/tools/sdk/include/bluedroid/btm_api.h
+++ b/tools/sdk/include/bluedroid/btm_api.h
@@ -1383,6 +1383,11 @@ typedef UINT8 tBTM_IO_CAP;
 #define BTM_AUTH_BONDS      6   /* the general/dedicated bonding bits  */
 #define BTM_AUTH_YN_BIT     1   /* this is the Yes or No bit  */
 
+#define BTM_BLE_ENC_KEY_MASK    (1 << 0)
+#define BTM_BLE_ID_KEY_MASK     (1 << 1)
+#define BTM_BLE_CSR_KEY_MASK    (1 << 2)
+#define BTM_BLE_LINK_KEY_MASK   (1 << 3)
+
 #define BTM_BLE_INITIATOR_KEY_SIZE 15
 #define BTM_BLE_RESPONDER_KEY_SIZE 15
 #define BTM_BLE_MAX_KEY_SIZE       16
@@ -1526,6 +1531,7 @@ typedef void (tBTM_BOND_CANCEL_CMPL_CALLBACK) (tBTM_STATUS result);
 
 /* LE related event and data structure
 */
+#if (SMP_INCLUDED == TRUE)
 #define BTM_LE_IO_REQ_EVT       SMP_IO_CAP_REQ_EVT     /* received IO_CAPABILITY_REQUEST event */
 #define BTM_LE_SEC_REQUEST_EVT  SMP_SEC_REQUEST_EVT    /* security request event */
 #define BTM_LE_KEY_NOTIF_EVT    SMP_PASSKEY_NOTIF_EVT  /* received USER_PASSKEY_NOTIFY event */
@@ -1541,8 +1547,10 @@ typedef void (tBTM_BOND_CANCEL_CMPL_CALLBACK) (tBTM_STATUS result);
 #define BTM_LE_COMPLT_EVT       SMP_COMPLT_EVT         /* SMP complete event */
 #define BTM_LE_LAST_FROM_SMP    BTM_LE_BR_KEYS_REQ_EVT
 #define BTM_LE_KEY_EVT          BTM_LE_LAST_FROM_SMP + 1 /* KEY update event */
+#endif  ///SMP_INCLUDED == TRUE
 typedef UINT8 tBTM_LE_EVT;
 
+#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
 #define BTM_LE_KEY_NONE           0
 #define BTM_LE_KEY_PENC      SMP_SEC_KEY_TYPE_ENC        /* encryption information of peer device */
 #define BTM_LE_KEY_PID       SMP_SEC_KEY_TYPE_ID         /* identity key of the peer device */
@@ -1552,12 +1560,15 @@ typedef UINT8 tBTM_LE_EVT;
 #define BTM_LE_KEY_LENC      (SMP_SEC_KEY_TYPE_ENC << 4)  /* master role security information:div */
 #define BTM_LE_KEY_LID       (SMP_SEC_KEY_TYPE_ID << 4)   /* master device ID key */
 #define BTM_LE_KEY_LCSRK     (SMP_SEC_KEY_TYPE_CSRK << 4) /* local CSRK has been deliver to peer */
+#endif  ///BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE
 typedef UINT8 tBTM_LE_KEY_TYPE;
-
+#if (SMP_INCLUDED == TRUE)
 #define BTM_LE_AUTH_REQ_NO_BOND SMP_AUTH_NO_BOND   /* 0 */
 #define BTM_LE_AUTH_REQ_BOND    SMP_AUTH_GEN_BOND  /* 1 << 0 */
 #define BTM_LE_AUTH_REQ_MITM    SMP_AUTH_YN_BIT    /* 1 << 2 */
+#endif  ///SMP_INCLUDED == TRUE
 typedef UINT8 tBTM_LE_AUTH_REQ;
+#if (SMP_INCLUDED == TRUE)
 #define BTM_LE_SC_SUPPORT_BIT           SMP_SC_SUPPORT_BIT     /* (1 << 3) */
 #define BTM_LE_KP_SUPPORT_BIT           SMP_KP_SUPPORT_BIT     /* (1 << 4) */
 
@@ -1571,6 +1582,7 @@ typedef UINT8 tBTM_LE_AUTH_REQ;
 #define BTM_LE_SEC_NONE             SMP_SEC_NONE
 #define BTM_LE_SEC_UNAUTHENTICATE   SMP_SEC_UNAUTHENTICATE      /* 1 */
 #define BTM_LE_SEC_AUTHENTICATED    SMP_SEC_AUTHENTICATED       /* 4 */
+#endif  ///SMP_INCLUDED == TRUE
 typedef UINT8 tBTM_LE_SEC;
 
 
@@ -2020,6 +2032,7 @@ tBTM_STATUS BTM_VendorSpecificCommand(UINT16 opcode,
 **
 *******************************************************************************/
 //extern
+#if (CLASSIC_BT_INCLUDED == TRUE)
 UINT8 BTM_AllocateSCN(void);
 
 // btla-specific ++
@@ -2048,6 +2061,7 @@ BOOLEAN BTM_TryAllocateSCN(UINT8 scn);
 *******************************************************************************/
 //extern
 BOOLEAN BTM_FreeSCN(UINT8 scn);
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
 
 
 /*******************************************************************************
@@ -3677,6 +3691,17 @@ UINT8 *BTM_ReadOobData(UINT8 *p_data, UINT8 eir_tag, UINT8 *p_len);
 //extern
 char *BTM_SecReadDevName (BD_ADDR bd_addr);
 
+/*******************************************************************************
+**
+** Function         BTM_SecClearSecurityFlags
+**
+** Description      Reset the security flags (mark as not-paired) for a given
+**                  remove device.
+**
+*******************************************************************************/
+extern void BTM_SecClearSecurityFlags (BD_ADDR bd_addr);
+
+
 
 /*****************************************************************************
 **  POWER MANAGEMENT FUNCTIONS
diff --git a/tools/sdk/include/bluedroid/btm_int.h b/tools/sdk/include/bluedroid/btm_int.h
index 827114f0ce6..c732edd1aeb 100644
--- a/tools/sdk/include/bluedroid/btm_int.h
+++ b/tools/sdk/include/bluedroid/btm_int.h
@@ -759,7 +759,9 @@ typedef struct {
     **      ACL Management
     ****************************************************/
     tACL_CONN   acl_db[MAX_L2CAP_LINKS];
+#if (CLASSIC_BT_INCLUDED == TRUE)
     UINT8       btm_scn[BTM_MAX_SCN];        /* current SCNs: TRUE if SCN is in use */
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
     UINT16      btm_def_link_policy;
     UINT16      btm_def_link_super_tout;
 
@@ -815,9 +817,11 @@ typedef struct {
     tBTM_APPL_INFO          api;
 
 #define BTM_SEC_MAX_RMT_NAME_CALLBACKS  2
-    tBTM_RMT_NAME_CALLBACK  *p_rmt_name_callback[BTM_SEC_MAX_RMT_NAME_CALLBACKS];
 
+    tBTM_RMT_NAME_CALLBACK  *p_rmt_name_callback[BTM_SEC_MAX_RMT_NAME_CALLBACKS];
+#if (SMP_INCLUDED == TRUE)
     tBTM_SEC_DEV_REC        *p_collided_dev_rec;
+#endif  ///SMP_INCLUDED == TRUE
     TIMER_LIST_ENT           sec_collision_tle;
     UINT32                   collision_start_time;
     UINT32                   max_collision_delay;
@@ -828,6 +832,7 @@ typedef struct {
     BOOLEAN                  security_mode_changed;  /* mode changed during bonding */
     BOOLEAN                  pin_type_changed;       /* pin type changed during bonding */
     BOOLEAN                  sec_req_pending;       /*   TRUE if a request is pending */
+#if (SMP_INCLUDED == TRUE)
 // btla-specific ++
 #ifdef PORCHE_PAIRING_CONFLICT
     UINT8                    pin_code_len_saved;     /* for legacy devices */
@@ -843,6 +848,7 @@ typedef struct {
     UINT16                   disc_handle;   /* for legacy devices */
     UINT8                    disc_reason;   /* for legacy devices */
     tBTM_SEC_SERV_REC        sec_serv_rec[BTM_SEC_MAX_SERVICE_RECORDS];
+#endif  ///SMP_INCLUDED == TRUE
     tBTM_SEC_DEV_REC         sec_dev_rec[BTM_SEC_MAX_DEVICE_RECORDS];
     tBTM_SEC_SERV_REC       *p_out_serv;
     tBTM_MKEY_CALLBACK      *mkey_cback;
@@ -859,7 +865,6 @@ typedef struct {
     BOOLEAN                 paging;
     BOOLEAN                 discing;
     BUFFER_Q                sec_pending_q;  /* pending sequrity requests in tBTM_SEC_QUEUE_ENTRY format */
-
 #if  (!defined(BT_TRACE_VERBOSE) || (BT_TRACE_VERBOSE == FALSE))
     char state_temp_buffer[BTM_STATE_BUFFER_SIZE];
 #endif
diff --git a/tools/sdk/include/bluedroid/buffer.h b/tools/sdk/include/bluedroid/buffer.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/buffer_allocator.h b/tools/sdk/include/bluedroid/buffer_allocator.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/config.h b/tools/sdk/include/bluedroid/config.h
new file mode 100644
index 00000000000..4f0e2cd8ae3
--- /dev/null
+++ b/tools/sdk/include/bluedroid/config.h
@@ -0,0 +1,144 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+// This module implements a configuration parser. Clients can query the
+// contents of a configuration file through the interface provided here.
+// The current implementation is read-only; mutations are only kept in
+// memory. This parser supports the INI file format.
+
+// Implementation notes:
+// - Key/value pairs that are not within a section are assumed to be under
+//   the |CONFIG_DEFAULT_SECTION| section.
+// - Multiple sections with the same name will be merged as if they were in
+//   a single section.
+// - Empty sections with no key/value pairs will be treated as if they do
+//   not exist. In other words, |config_has_section| will return false for
+//   empty sections.
+// - Duplicate keys in a section will overwrite previous values.
+// - All strings are case sensitive.
+
+#include <stdbool.h>
+
+// The default section name to use if a key/value pair is not defined within
+// a section.
+#define CONFIG_DEFAULT_SECTION "Global"
+
+typedef struct config_t config_t;
+typedef struct config_section_node_t config_section_node_t;
+
+// Creates a new config object with no entries (i.e. not backed by a file).
+// This function returns a config object or NULL on error. Clients must call
+// |config_free| on the returned handle when it is no longer required.
+config_t *config_new_empty(void);
+
+// Loads the specified file and returns a handle to the config file. If there
+// was a problem loading the file or allocating memory, this function returns
+// NULL. Clients must call |config_free| on the returned handle when it is no
+// longer required. |filename| must not be NULL and must point to a readable
+// file on the filesystem.
+config_t *config_new(const char *filename);
+
+// Frees resources associated with the config file. No further operations may
+// be performed on the |config| object after calling this function. |config|
+// may be NULL.
+void config_free(config_t *config);
+
+// Returns true if the config file contains a section named |section|. If
+// the section has no key/value pairs in it, this function will return false.
+// |config| and |section| must not be NULL.
+bool config_has_section(const config_t *config, const char *section);
+
+// Returns true if the config file has a key named |key| under |section|.
+// Returns false otherwise. |config|, |section|, and |key| must not be NULL.
+bool config_has_key(const config_t *config, const char *section, const char *key);
+
+// Returns the integral value for a given |key| in |section|. If |section|
+// or |key| do not exist, or the value cannot be fully converted to an integer,
+// this function returns |def_value|. |config|, |section|, and |key| must not
+// be NULL.
+int config_get_int(const config_t *config, const char *section, const char *key, int def_value);
+
+// Returns the boolean value for a given |key| in |section|. If |section|
+// or |key| do not exist, or the value cannot be converted to a boolean, this
+// function returns |def_value|. |config|, |section|, and |key| must not be NULL.
+bool config_get_bool(const config_t *config, const char *section, const char *key, bool def_value);
+
+// Returns the string value for a given |key| in |section|. If |section| or
+// |key| do not exist, this function returns |def_value|. The returned string
+// is owned by the config module and must not be freed. |config|, |section|,
+// and |key| must not be NULL. |def_value| may be NULL.
+const char *config_get_string(const config_t *config, const char *section, const char *key, const char *def_value);
+
+// Sets an integral value for the |key| in |section|. If |key| or |section| do
+// not already exist, this function creates them. |config|, |section|, and |key|
+// must not be NULL.
+void config_set_int(config_t *config, const char *section, const char *key, int value);
+
+// Sets a boolean value for the |key| in |section|. If |key| or |section| do
+// not already exist, this function creates them. |config|, |section|, and |key|
+// must not be NULL.
+void config_set_bool(config_t *config, const char *section, const char *key, bool value);
+
+// Sets a string value for the |key| in |section|. If |key| or |section| do
+// not already exist, this function creates them. |config|, |section|, |key|, and
+// |value| must not be NULL.
+void config_set_string(config_t *config, const char *section, const char *key, const char *value, bool insert_back);
+
+// Removes |section| from the |config| (and, as a result, all keys in the section).
+// Returns true if |section| was found and removed from |config|, false otherwise.
+// Neither |config| nor |section| may be NULL.
+bool config_remove_section(config_t *config, const char *section);
+
+// Removes one specific |key| residing in |section| of the |config|. Returns true
+// if the section and key were found and the key was removed, false otherwise.
+// None of |config|, |section|, or |key| may be NULL.
+bool config_remove_key(config_t *config, const char *section, const char *key);
+
+// Returns an iterator to the first section in the config file. If there are no
+// sections, the iterator will equal the return value of |config_section_end|.
+// The returned pointer must be treated as an opaque handle and must not be freed.
+// The iterator is invalidated on any config mutating operation. |config| may not
+// be NULL.
+const config_section_node_t *config_section_begin(const config_t *config);
+
+// Returns an iterator to one past the last section in the config file. It does not
+// represent a valid section, but can be used to determine if all sections have been
+// iterated over. The returned pointer must be treated as an opaque handle and must
+// not be freed and must not be iterated on (must not call |config_section_next| on
+// it). |config| may not be NULL.
+const config_section_node_t *config_section_end(const config_t *config);
+
+// Moves |iter| to the next section. If there are no more sections, |iter| will
+// equal the value of |config_section_end|. |iter| may not be NULL and must be
+// a pointer returned by either |config_section_begin| or |config_section_next|.
+const config_section_node_t *config_section_next(const config_section_node_t *iter);
+
+// Returns the name of the section referred to by |iter|. The returned pointer is
+// owned by the config module and must not be freed by the caller. The pointer will
+// remain valid until |config_free| is called. |iter| may not be NULL and must not
+// equal the value returned by |config_section_end|.
+const char *config_section_name(const config_section_node_t *iter);
+
+// Saves |config| to a file given by |filename|. Note that this could be a destructive
+// operation: if |filename| already exists, it will be overwritten. The config
+// module does not preserve comments or formatting so if a config file was opened
+// with |config_new| and subsequently overwritten with |config_save|, all comments
+// and special formatting in the original file will be lost. Neither |config| nor
+// |filename| may be NULL.
+bool config_save(const config_t *config, const char *filename);
+
+#endif /* #ifndef __CONFIG_H__ */
diff --git a/tools/sdk/include/bluedroid/dyn_mem.h b/tools/sdk/include/bluedroid/dyn_mem.h
old mode 100755
new mode 100644
index 9a95fb95654..2654316cba0
--- a/tools/sdk/include/bluedroid/dyn_mem.h
+++ b/tools/sdk/include/bluedroid/dyn_mem.h
@@ -18,6 +18,62 @@
 #ifndef DYN_MEM_H
 #define DYN_MEM_H
 
+#include "sdkconfig.h"
+#if CONFIG_CLASSIC_BT_ENABLED
+
+#define SDP_DYNAMIC_MEMORY         FALSE
+#define RFC_DYNAMIC_MEMORY         FALSE
+#define TCS_DYNAMIC_MEMORY         FALSE
+#define BNEP_DYNAMIC_MEMORY        FALSE
+#define AVDT_DYNAMIC_MEMORY        FALSE
+#define AVCT_DYNAMIC_MEMORY        FALSE
+#define MCA_DYNAMIC_MEMORY         FALSE
+#define A2D_DYNAMIC_MEMORY         FALSE
+#define VDP_DYNAMIC_MEMORY         FALSE
+#define AVRC_DYNAMIC_MEMORY        FALSE
+#define BIP_DYNAMIC_MEMORY         FALSE
+#define BPP_DYNAMIC_MEMORY         FALSE
+#define CTP_DYNAMIC_MEMORY         FALSE
+#define FTP_DYNAMIC_MEMORY         FALSE
+#define HCRP_DYNAMIC_MEMORY        FALSE
+#define HFP_DYNAMIC_MEMORY         FALSE
+#define HID_DYNAMIC_MEMORY         FALSE
+#define HSP2_DYNAMIC_MEMORY        FALSE
+#define ICP_DYNAMIC_MEMORY         FALSE
+#define OPP_DYNAMIC_MEMORY         FALSE
+#define PAN_DYNAMIC_MEMORY         FALSE
+#define SPP_DYNAMIC_MEMORY         FALSE
+#define SLIP_DYNAMIC_MEMORY        FALSE
+#define LLCP_DYNAMIC_MEMORY        FALSE
+
+#else  /* #if CONFIG_CLASSIC_BT_ENABLED */
+
+#define SDP_DYNAMIC_MEMORY         TRUE
+#define RFC_DYNAMIC_MEMORY         TRUE
+#define TCS_DYNAMIC_MEMORY         TRUE
+#define BNEP_DYNAMIC_MEMORY        TRUE
+#define AVDT_DYNAMIC_MEMORY        TRUE
+#define AVCT_DYNAMIC_MEMORY        TRUE
+#define MCA_DYNAMIC_MEMORY         TRUE
+#define A2D_DYNAMIC_MEMORY         TRUE
+#define VDP_DYNAMIC_MEMORY         TRUE
+#define AVRC_DYNAMIC_MEMORY        TRUE
+#define BIP_DYNAMIC_MEMORY         TRUE
+#define BPP_DYNAMIC_MEMORY         TRUE
+#define CTP_DYNAMIC_MEMORY         TRUE
+#define FTP_DYNAMIC_MEMORY         TRUE
+#define HCRP_DYNAMIC_MEMORY        TRUE
+#define HFP_DYNAMIC_MEMORY         TRUE
+#define HID_DYNAMIC_MEMORY         TRUE
+#define HSP2_DYNAMIC_MEMORY        TRUE
+#define ICP_DYNAMIC_MEMORY         TRUE
+#define OPP_DYNAMIC_MEMORY         TRUE
+#define PAN_DYNAMIC_MEMORY         TRUE
+#define SPP_DYNAMIC_MEMORY         TRUE
+#define SLIP_DYNAMIC_MEMORY        TRUE
+#define LLCP_DYNAMIC_MEMORY        TRUE
+
+#endif /* #if CONFIG_CLASSIC_BT_ENABLED */
 /****************************************************************************
 ** Define memory usage for each CORE component (if not defined in bdroid_buildcfg.h)
 **  The default for each component is to use static memory allocations.
@@ -31,8 +87,7 @@
 #endif
 
 #ifndef SDP_DYNAMIC_MEMORY
-//#define SDP_DYNAMIC_MEMORY  FALSE
-#define SDP_DYNAMIC_MEMORY  TRUE
+#define SDP_DYNAMIC_MEMORY  FALSE
 #endif
 
 #ifndef L2C_DYNAMIC_MEMORY
diff --git a/tools/sdk/include/bluedroid/esp_a2dp_api.h b/tools/sdk/include/bluedroid/esp_a2dp_api.h
new file mode 100644
index 00000000000..7f6868dde14
--- /dev/null
+++ b/tools/sdk/include/bluedroid/esp_a2dp_api.h
@@ -0,0 +1,216 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __ESP_A2DP_API_H__
+#define __ESP_A2DP_API_H__
+
+#include "esp_err.h"
+#include "esp_bt_defs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/// Media codec types supported by A2DP
+#define ESP_A2D_MCT_SBC         (0)             /*!< SBC */
+#define ESP_A2D_MCT_M12         (0x01)          /*!< MPEG-1, 2 Audio */
+#define ESP_A2D_MCT_M24         (0x02)          /*!< MPEG-2, 4 AAC */
+#define ESP_A2D_MCT_ATRAC       (0x04)          /*!< ATRAC family */
+#define ESP_A2D_MCT_NON_A2DP    (0xff)
+
+typedef uint8_t esp_a2d_mct_t;
+
+/// A2DP media codec capabilities union
+typedef struct {
+    esp_a2d_mct_t type;                        /*!< A2DP media codec type */
+#define ESP_A2D_CIE_LEN_SBC          (4)
+#define ESP_A2D_CIE_LEN_M12          (4)
+#define ESP_A2D_CIE_LEN_M24          (6)
+#define ESP_A2D_CIE_LEN_ATRAC        (7)
+    union {
+        uint8_t sbc[ESP_A2D_CIE_LEN_SBC];
+        uint8_t m12[ESP_A2D_CIE_LEN_M12];
+        uint8_t m24[ESP_A2D_CIE_LEN_M24];
+        uint8_t atrac[ESP_A2D_CIE_LEN_ATRAC];
+    } cie;                                     /*!< A2DP codec information element */
+} __attribute__((packed)) esp_a2d_mcc_t;
+
+/// Bluetooth A2DP connection states
+typedef enum {
+    ESP_A2D_CONNECTION_STATE_DISCONNECTED = 0, /*!< connection released  */
+    ESP_A2D_CONNECTION_STATE_CONNECTING,       /*!< connecting remote device */
+    ESP_A2D_CONNECTION_STATE_CONNECTED,        /*!< connection established */
+    ESP_A2D_CONNECTION_STATE_DISCONNECTING     /*!< disconnecting remote device */
+} esp_a2d_connection_state_t;
+
+/// Bluetooth A2DP disconnection reason
+typedef enum {
+    ESP_A2D_DISC_RSN_NORMAL = 0,               /*!< Finished disconnection that is initiated by local or remote device */
+    ESP_A2D_DISC_RSN_ABNORMAL                  /*!< Abnormal disconnection caused by signal loss */
+} esp_a2d_disc_rsn_t;
+
+/// Bluetooth A2DP datapath states
+typedef enum {
+    ESP_A2D_AUDIO_STATE_REMOTE_SUSPEND = 0,    /*!< audio stream datapath suspended by remote device */
+    ESP_A2D_AUDIO_STATE_STOPPED,               /*!< audio stream datapath stopped */
+    ESP_A2D_AUDIO_STATE_STARTED,               /*!< audio stream datapath started */
+} esp_a2d_audio_state_t;
+
+/// A2DP callback events
+typedef enum {
+    ESP_A2D_CONNECTION_STATE_EVT = 0,          /*!< connection state changed event */
+    ESP_A2D_AUDIO_STATE_EVT = 1,               /*!< audio stream transmission state changed event */
+    ESP_A2D_AUDIO_CFG_EVT = 2                  /*!< audio codec is configured */
+} esp_a2d_cb_event_t;
+
+/// A2DP state callback parameters
+typedef union {
+    /**
+     * @brief  ESP_A2D_CONNECTION_STATE_EVT
+     */
+    struct a2d_conn_stat_param {
+        esp_a2d_connection_state_t state;      /*!< one of values from esp_a2d_connection_state_t */
+        esp_bd_addr_t remote_bda;              /*!< remote bluetooth device address */
+        esp_a2d_disc_rsn_t disc_rsn;           /*!< reason of disconnection for "DISCONNECTED" */
+    } conn_stat;                               /*!< A2DP connection status */
+    
+    /**
+     * @brief ESP_A2D_AUDIO_STATE_EVT
+     */
+    struct a2d_audio_stat_param {
+        esp_a2d_audio_state_t state;           /*!< one of the values from esp_a2d_audio_state_t */
+        esp_bd_addr_t remote_bda;              /*!< remote bluetooth device address */
+    } audio_stat;                              /*!< audio stream playing state */
+    
+    /**
+     * @brief ESP_A2D_AUDIO_CFG_EVT
+     */
+    struct a2d_audio_cfg_param {
+        esp_bd_addr_t remote_bda;              /*!< remote bluetooth device address */
+        esp_a2d_mcc_t mcc;                     /*!< A2DP media codec capability information */
+    } audio_cfg;                               /*!< media codec configuration infomation */
+} esp_a2d_cb_param_t;
+
+/**
+ * @brief           A2DP profile callback function type
+ * @param           event : Event type
+ * @param           param : Pointer to callback parameter
+ */
+typedef void (* esp_a2d_cb_t)(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param);
+
+/**
+ * @brief           A2DP profile data callback function
+ *
+ * @param[in]       buf : data received from A2DP source device and is PCM format decoder from SBC decoder;
+ *                  buf references to a static memory block and can be overwritten by upcoming data
+ *
+ * @param[in]       len : size(in bytes) in buf
+ *
+ */
+typedef void (* esp_a2d_data_cb_t)(const uint8_t *buf, uint32_t len);
+
+
+/**
+ * @brief           Register application callback function to A2DP module. This function should be called
+ *                  only after esp_bluedroid_enable() completes successfully
+ *                  
+ * @param[in]       callback: A2DP sink event callback function
+ *
+ * @return
+ *                  - ESP_OK: success
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: if callback is a NULL function pointer
+ *
+ */
+esp_err_t esp_a2d_register_callback(esp_a2d_cb_t callback);
+
+
+/**
+ * @brief           Register A2DP sink data output function; For now the output is PCM data stream decoded
+ *                  from SBC format. This function should be called only after esp_bluedroid_enable() 
+ *                  completes successfully
+ *                  
+ * @param[in]       callback: A2DP data callback function
+ *
+ * @return
+ *                  - ESP_OK: success
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: if callback is a NULL function pointer
+ *
+ */
+esp_err_t esp_a2d_register_data_callback(esp_a2d_data_cb_t callback);
+
+
+/**
+ *
+ * @brief           Initialize the bluetooth A2DP sink module. This function should be called
+ *                  after esp_bluedroid_enable() completes successfully
+ *
+ * @return          
+ *                  - ESP_OK: if the initialization request is sent successfully
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ *
+ */
+esp_err_t esp_a2d_sink_init(void);
+
+
+/**
+ *
+ * @brief           De-initialize for A2DP sink module. This function 
+ *                  should be called only after esp_bluedroid_enable() completes successfully
+ *
+ * @return          
+ *                  - ESP_OK: success
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ *
+ */
+esp_err_t esp_a2d_sink_deinit(void);
+
+
+/**
+ *
+ * @brief           Connect the remote bluetooth device bluetooth, must after esp_a2d_sink_init()
+ *
+ * @param[in]       remote_bda: remote bluetooth device address
+ *
+ * @return          
+ *                  - ESP_OK: connect request is sent to lower layer
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ *
+ */
+esp_err_t esp_a2d_sink_connect(esp_bd_addr_t remote_bda);
+
+
+/**
+ *
+ * @brief           Disconnect the remote bluetooth device
+ *
+ * @param[in]       remote_bda: remote bluetooth device address
+ * @return          
+ *                  - ESP_OK: disconnect request is sent to lower layer
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ *
+ */
+esp_err_t esp_a2d_sink_disconnect(esp_bd_addr_t remote_bda);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* __ESP_A2DP_API_H__ */
diff --git a/tools/sdk/include/bluedroid/esp_avrc_api.h b/tools/sdk/include/bluedroid/esp_avrc_api.h
new file mode 100644
index 00000000000..719a19f19c7
--- /dev/null
+++ b/tools/sdk/include/bluedroid/esp_avrc_api.h
@@ -0,0 +1,153 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __ESP_AVRC_API_H__
+#define __ESP_AVRC_API_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "esp_err.h"
+#include "esp_bt_defs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/// AVRC feature bit mask
+typedef enum {
+    ESP_AVRC_FEAT_RCTG = 0x0001,                 /*!< remote control target */
+    ESP_AVRC_FEAT_RCCT = 0x0002,                 /*!< remote control controller */
+    ESP_AVRC_FEAT_VENDOR = 0x0008,               /*!< remote control vendor dependent commands */
+    ESP_AVRC_FEAT_BROWSE = 0x0010,               /*!< use browsing channel */
+    ESP_AVRC_FEAT_META_DATA = 0x0040,            /*!< remote control metadata transfer command/response */
+    ESP_AVRC_FEAT_ADV_CTRL = 0x0200,             /*!< remote control advanced control commmand/response */
+} esp_avrc_features_t;
+
+/// AVRC passthrough command code
+typedef enum {
+    ESP_AVRC_PT_CMD_PLAY = 0x44,                 /*!< play */
+    ESP_AVRC_PT_CMD_STOP = 0x45,                 /*!< stop */
+    ESP_AVRC_PT_CMD_PAUSE = 0x46,                /*!< pause */
+    ESP_AVRC_PT_CMD_FORWARD = 0x4B,              /*!< forward */
+    ESP_AVRC_PT_CMD_BACKWARD = 0x4C              /*!< backward */
+} esp_avrc_pt_cmd_t;
+
+/// AVRC passthrough command state
+typedef enum {
+    ESP_AVRC_PT_CMD_STATE_PRESSED = 0,           /*!< key pressed */
+    ESP_AVRC_PT_CMD_STATE_RELEASED = 1           /*!< key released */
+} esp_avrc_pt_cmd_state_t;
+
+/// AVRC Controller callback events
+typedef enum {
+    ESP_AVRC_CT_CONNECTION_STATE_EVT = 0,        /*!< connection state changed event */
+    ESP_AVRC_CT_PASSTHROUGH_RSP_EVT = 1,         /*!< passthrough response event */
+    ESP_AVRC_CT_MAX_EVT
+} esp_avrc_ct_cb_event_t;
+
+/// AVRC controller callback parameters
+typedef union {
+    /**
+     * @brief ESP_AVRC_CT_CONNECTION_STATE_EVT
+     */
+    struct avrc_ct_conn_stat_param {
+        bool connected;                          /*!< whether AVRC connection is set up */
+	uint32_t feat_mask;                      /*!< AVRC feature mask of remote device */
+        esp_bd_addr_t remote_bda;                /*!< remote bluetooth device address */
+    } conn_stat;                                 /*!< AVRC connection status */
+    
+    /**
+     * @brief ESP_AVRC_CT_PASSTHROUGH_RSP_EVT
+     */
+    struct avrc_ct_psth_rsp_param {
+        uint8_t tl;                              /*!< transaction label, 0 to 15 */
+        uint8_t key_code;                        /*!< passthrough command code */
+        uint8_t key_state;                       /*!< 0 for PRESSED, 1 for RELEASED */
+    } psth_rsp;                                  /*!< passthrough command response */
+} esp_avrc_ct_cb_param_t;
+
+
+/**
+ * @brief           AVRCP controller callback function type
+ * @param           event : Event type
+ * @param           param : Pointer to callback parameter union
+ */
+typedef void (* esp_avrc_ct_cb_t)(esp_avrc_ct_cb_event_t event, esp_avrc_ct_cb_param_t *param);
+
+
+/**
+ * @brief           Register application callbacks to AVRCP module; for now only AVRCP Controller
+ *                  role is supported. This function should be called after esp_bluedroid_enable() 
+ *                  completes successfully
+ *                  
+ * @param[in]       callback: AVRCP controller callback function
+ *
+ * @return
+ *                  - ESP_OK: success
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ *
+ */
+esp_err_t esp_avrc_ct_register_callback(esp_avrc_ct_cb_t callback);
+
+
+/**
+ *
+ * @brief           Initialize the bluetooth AVRCP controller module, This function should be called
+ *                  after esp_bluedroid_enable() completes successfully
+ *
+ * @return          
+ *                  - ESP_OK: success
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ *
+ */
+esp_err_t esp_avrc_ct_init(void);
+
+
+/**
+ *
+ * @brief           De-initialize AVRCP controller module. This function should be called after
+ *                  after esp_bluedroid_enable() completes successfully
+ *
+ * @return          
+ *                  - ESP_OK: success
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ */
+esp_err_t esp_avrc_ct_deinit(void);
+
+
+/**
+ * @brief           Send passthrough command to AVRCP target, This function should be called after
+ *                  ESP_AVRC_CT_CONNECTION_STATE_EVT is received and AVRCP connection is established
+ *
+ * @param[in]       tl : transaction label, 0 to 15, consecutive commands should use different values.
+ * @param[in]       key_code : passthrough command code, e.g. ESP_AVRC_PT_CMD_PLAY, ESP_AVRC_PT_CMD_STOP, etc.
+ * @param[in]       key_state : passthrough command key state, ESP_AVRC_PT_CMD_STATE_PRESSED or
+ *                  ESP_AVRC_PT_CMD_STATE_PRESSED
+ *
+ * @return          
+ *                  - ESP_OK: success
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ */
+esp_err_t esp_avrc_ct_send_passthrough_cmd(uint8_t tl, uint8_t key_code, uint8_t key_state);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ESP_AVRC_API_H__ */
diff --git a/tools/sdk/include/bluedroid/esp_blufi_api.h b/tools/sdk/include/bluedroid/esp_blufi_api.h
index 6da65121631..8ab9ba35042 100644
--- a/tools/sdk/include/bluedroid/esp_blufi_api.h
+++ b/tools/sdk/include/bluedroid/esp_blufi_api.h
@@ -49,6 +49,7 @@ typedef enum {
     ESP_BLUFI_EVENT_RECV_SERVER_CERT,                    /*<! When Phone send Server certificate to ESP32, this event happen */
     ESP_BLUFI_EVENT_RECV_CLIENT_PRIV_KEY,                /*<! When Phone send Client Private key to ESP32, this event happen */
     ESP_BLUFI_EVENT_RECV_SERVER_PRIV_KEY,                /*<! When Phone send Server Private key to ESP32, this event happen */
+    ESP_BLUFI_EVENT_RECV_SLAVE_DISCONNECT_BLE,           /*<! When Phone send Disconnect key to ESP32, this event happen */
 } esp_blufi_cb_event_t;
 
 /// BLUFI config status
@@ -122,6 +123,8 @@ typedef union {
 	 */
     struct blufi_connect_evt_param {
         esp_bd_addr_t remote_bda;                   /*!< Blufi Remote bluetooth device address */
+        uint8_t    server_if;                       /*!< server interface */
+        uint16_t   conn_id;                         /*!< Connection id */
     } connect;									    /*!< Blufi callback param of ESP_BLUFI_EVENT_CONNECT */
 
     /**
@@ -353,6 +356,18 @@ esp_err_t esp_blufi_send_wifi_conn_report(wifi_mode_t opmode, esp_blufi_sta_conn
  */
 uint16_t esp_blufi_get_version(void);
 
+/**
+ * @brief           Close a connection  a remote device.
+ *
+ * @param[in]       gatts_if: GATT server access interface
+ * @param[in]       conn_id: connection ID to be closed.
+ *
+ * @return
+ *                  - ESP_OK : success
+ *                  - other  : failed
+ *
+ */
+esp_err_t esp_blufi_close(esp_gatt_if_t gatts_if, uint16_t conn_id);
 #ifdef __cplusplus
 }
 #endif
diff --git a/tools/sdk/include/bluedroid/esp_bt_defs.h b/tools/sdk/include/bluedroid/esp_bt_defs.h
index cdb56a49b81..85b0aff9968 100644
--- a/tools/sdk/include/bluedroid/esp_bt_defs.h
+++ b/tools/sdk/include/bluedroid/esp_bt_defs.h
@@ -32,6 +32,16 @@ typedef enum {
     ESP_BT_STATUS_WRONG_MODE       =  5,
 } esp_bt_status_t;
 
+
+/*Define the bt octet 16 bit size*/
+#define ESP_BT_OCTET16_LEN    16
+typedef uint8_t esp_bt_octet16_t[ESP_BT_OCTET16_LEN];   /* octet array: size 16 */
+
+#define ESP_BT_OCTET8_LEN    8
+typedef uint8_t esp_bt_octet8_t[ESP_BT_OCTET8_LEN];   /* octet array: size 8 */
+
+typedef uint8_t esp_link_key[ESP_BT_OCTET16_LEN];      /* Link Key */
+
 /// Default GATT interface id
 #define ESP_DEFAULT_GATT_IF             0xff
 
@@ -67,22 +77,6 @@ typedef enum {
 /// Bluetooth device address
 typedef uint8_t esp_bd_addr_t[ESP_BD_ADDR_LEN];
 
-/// Own BD address source of the device
-typedef enum {
-    /// Public Address
-    BD_ADDR_PUBLIC,
-    /// Provided random address
-    BD_ADDR_PROVIDED_RND,
-    /// Provided static random address
-    BD_ADDR_GEN_STATIC_RND,
-    /// Generated resolvable private random address
-    BD_ADDR_GEN_RSLV,
-    /// Generated non-resolvable private random address
-    BD_ADDR_GEN_NON_RSLV,
-    /// Provided Reconnection address
-    BD_ADDR_PROVIDED_RECON,
-} esp_bd_addr_type_t;
-
 /// BLE device address type
 typedef enum {
     BLE_ADDR_TYPE_PUBLIC        = 0x00,
@@ -91,6 +85,15 @@ typedef enum {
     BLE_ADDR_TYPE_RPA_RANDOM    = 0x03,
 } esp_ble_addr_type_t;
 
+/// Used to exchange the encrytyption key in the init key & response key
+#define ESP_BLE_ENC_KEY_MASK    (1 << 0)
+/// Used to exchange the IRK key in the init key & response key
+#define ESP_BLE_ID_KEY_MASK     (1 << 1)
+/// Used to exchange the CSRK key in the init key & response key
+#define ESP_BLE_CSR_KEY_MASK    (1 << 2)
+/// Used to exchange the link key(this key just used in the BLE & BR/EDR coexist mode) in the init key & response key
+#define ESP_BLE_LINK_KEY_MASK   (1 << 3)
+
 /// Minimum of the application id
 #define ESP_APP_ID_MIN  0x0000
 /// Maximum of the application id
diff --git a/tools/sdk/include/bluedroid/esp_bt_device.h b/tools/sdk/include/bluedroid/esp_bt_device.h
index c84d042d664..d3c3f79c55c 100644
--- a/tools/sdk/include/bluedroid/esp_bt_device.h
+++ b/tools/sdk/include/bluedroid/esp_bt_device.h
@@ -17,6 +17,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "esp_err.h"
+#include "esp_bt_defs.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,6 +32,21 @@ extern "C" {
  */
 const uint8_t *esp_bt_dev_get_address(void);
 
+
+/**
+ * @brief           Set bluetooth device name. This function should be called after esp_bluedroid_enable() 
+ *                  completes successfully
+ *
+ * @param[in]       name : device name to be set
+ *
+ * @return
+ *                  - ESP_OK : Succeed
+ *                  - ESP_ERR_INVALID_ARG : if name is NULL pointer or empty, or string length out of limit
+ *                  - ESP_INVALID_STATE : if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL : others
+ */
+esp_err_t esp_bt_dev_set_device_name(const char *name);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tools/sdk/include/bluedroid/esp_gap_ble_api.h b/tools/sdk/include/bluedroid/esp_gap_ble_api.h
index 3456008bb65..45c14b5096f 100644
--- a/tools/sdk/include/bluedroid/esp_gap_ble_api.h
+++ b/tools/sdk/include/bluedroid/esp_gap_ble_api.h
@@ -38,6 +38,34 @@ extern "C" {
  * @}
  */
 
+#define ESP_LE_KEY_NONE                    0
+#define ESP_LE_KEY_PENC                    (1 << 0)                     /*!< encryption key, encryption information of peer device */
+#define ESP_LE_KEY_PID                     (1 << 1)                     /*!< identity key of the peer device */
+#define ESP_LE_KEY_PCSRK                   (1 << 2)                     /*!< peer SRK */
+#define ESP_LE_KEY_PLK                     (1 << 3)                     /*!< Link key*/	
+#define ESP_LE_KEY_LLK                     (ESP_LE_KEY_PLK << 4)
+#define ESP_LE_KEY_LENC                    (ESP_LE_KEY_PENC << 4)                   /*!< master role security information:div */
+#define ESP_LE_KEY_LID                     (ESP_LE_KEY_PID << 4)                    /*!< master device ID key */
+#define ESP_LE_KEY_LCSRK                   (ESP_LE_KEY_PCSRK << 4)                  /*!< local CSRK has been deliver to peer */
+typedef uint8_t	esp_ble_key_type_t;
+
+#define ESP_LE_AUTH_NO_BOND                 0x00                                     /*!< 0*/
+#define ESP_LE_AUTH_BOND                    0x01                                     /*!< 1 << 0 */
+#define ESP_LE_AUTH_REQ_MITM                (1 << 2)                                 /*!< 1 << 2 */
+#define ESP_LE_AUTH_REQ_SC_ONLY             (1 << 3)                                 /*!< 1 << 3 */
+#define ESP_LE_AUTH_REQ_SC_BOND             (ESP_LE_AUTH_BOND | ESP_LE_AUTH_REQ_SC_ONLY)            /*!< 1001 */
+#define ESP_LE_AUTH_REQ_SC_MITM             (ESP_LE_AUTH_REQ_MITM | ESP_LE_AUTH_REQ_SC_ONLY)        /*!< 1100 */
+#define ESP_LE_AUTH_REQ_SC_MITM_BOND        (ESP_LE_AUTH_REQ_MITM | ESP_LE_AUTH_REQ_SC_ONLY | ESP_LE_AUTH_BOND)   /*!< 1101 */
+typedef uint8_t   esp_ble_auth_req_t;         /*!< combination of the above bit pattern */
+
+#define ESP_IO_CAP_OUT                      0   /*!< DisplayOnly */
+#define ESP_IO_CAP_IO                       1   /*!< DisplayYesNo */
+#define ESP_IO_CAP_IN                       2   /*!< KeyboardOnly */
+#define ESP_IO_CAP_NONE                     3   /*!< NoInputNoOutput */
+#define ESP_IO_CAP_KBDISP                   4   /*!< Keyboard display */
+typedef uint8_t esp_ble_io_cap_t;               /*!< combination of the io capability */
+
+
 /// GAP BLE callback event type
 typedef enum {
     ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT        = 0,       /*!< When advertising data set complete, the event comes */
@@ -48,6 +76,17 @@ typedef enum {
     ESP_GAP_BLE_SCAN_RSP_DATA_RAW_SET_COMPLETE_EVT,         /*!< When raw advertising data set complete, the event comes */
     ESP_GAP_BLE_ADV_START_COMPLETE_EVT,                     /*!< When start advertising complete, the event comes */
     ESP_GAP_BLE_SCAN_START_COMPLETE_EVT,                    /*!< When start scan complete, the event comes */
+    ESP_GAP_BLE_AUTH_CMPL_EVT,                              /* Authentication complete indication. */
+    ESP_GAP_BLE_KEY_EVT,                                    /* BLE  key event for peer device keys */
+    ESP_GAP_BLE_SEC_REQ_EVT,                                /* BLE  security request */
+    ESP_GAP_BLE_PASSKEY_NOTIF_EVT,                          /* passkey notification event */
+    ESP_GAP_BLE_PASSKEY_REQ_EVT,                            /* passkey request event */
+    ESP_GAP_BLE_OOB_REQ_EVT,                                /* OOB request event */
+    ESP_GAP_BLE_LOCAL_IR_EVT,                               /* BLE local IR event */
+    ESP_GAP_BLE_LOCAL_ER_EVT,                               /* BLE local ER event */
+    ESP_GAP_BLE_NC_REQ_EVT,                                 /* Numeric Comparison request event */
+    ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT,                      /*!< When stop adv complete, the event comes */
+    ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT,                     /*!< When stop scan complete, the event comes */
 } esp_gap_ble_cb_event_t;
 
 /// Advertising data maximum length
@@ -113,6 +152,23 @@ typedef enum {
     ///Enumeration end value for advertising filter policy value check
 } esp_ble_adv_filter_t;
 
+
+typedef enum {
+    ESP_BLE_SEC_NONE,                
+    ESP_BLE_SEC_ENCRYPT,             
+    ESP_BLE_SEC_ENCRYPT_NO_MITM,     
+    ESP_BLE_SEC_ENCRYPT_MITM,        
+}esp_ble_sec_act_t;
+
+typedef enum {
+    ESP_BLE_SM_PASSKEY,
+    ESP_BLE_SM_AUTHEN_REQ_MODE,
+    ESP_BLE_SM_IOCAP_MODE,
+    ESP_BLE_SM_SET_INIT_KEY,
+    ESP_BLE_SM_SET_RSP_KEK,
+    ESP_BLE_SM_MAX_KEY_SIZE,
+} esp_ble_sm_param_t;
+
 /// Advertising parameters
 typedef struct {
     uint16_t                adv_int_min;        /*!< Minimum advertising interval for
@@ -148,22 +204,6 @@ typedef struct {
     uint8_t                 flag;                   /*!< Advertising flag of discovery mode, see BLE_ADV_DATA_FLAG detail */
 } esp_ble_adv_data_t;
 
-/// Own BD address source of the device
-typedef enum {
-    /// Public Address
-    ESP_PUBLIC_ADDR,
-    /// Provided random address
-    ESP_PROVIDED_RND_ADDR,
-    /// Provided static random address
-    ESP_GEN_STATIC_RND_ADDR,
-    /// Generated resolvable private random address
-    ESP_GEN_RSLV_ADDR,
-    /// Generated non-resolvable private random address
-    ESP_GEN_NON_RSLV_ADDR,
-    /// Provided Reconnection address
-    ESP_PROVIDED_RECON_ADDR,
-} esp_ble_own_addr_src_t;
-
 /// Ble scan type 
 typedef enum {
     BLE_SCAN_TYPE_PASSIVE   =   0x0,            /*!< Passive scan */
@@ -215,6 +255,137 @@ typedef struct {
                                                       Time Range: 100 msec to 32 seconds */
 } esp_ble_conn_update_params_t;
 
+/**
+* @brief BLE encryption keys
+*/
+typedef struct
+{
+    esp_bt_octet16_t     ltk;          /*!< The long term key*/
+    esp_bt_octet8_t      rand;         /*!< The random number*/
+    uint16_t             ediv;         /*!< The ediv value*/
+    uint8_t              sec_level;    /*!< The security level of the security link*/
+    uint8_t              key_size;     /*!< The key size(7~16) of the security link*/
+}esp_ble_penc_keys_t;                  /*!< The key type*/
+
+/**
+* @brief  BLE CSRK keys 
+*/
+typedef struct
+{
+    uint32_t            counter;      /*!< The counter */
+    esp_bt_octet16_t    csrk;         /*!< The csrk key */
+    uint8_t             sec_level;    /*!< The security level */
+}esp_ble_pcsrk_keys_t;                /*!< The pcsrk key type */
+
+/**
+* @brief  BLE pid keys 
+*/
+typedef struct
+{
+    esp_bt_octet16_t          irk;           /*!< The irk value */
+    esp_ble_addr_type_t       addr_type;     /*!< The address type */
+    esp_bd_addr_t             static_addr;   /*!< The static address */
+}esp_ble_pid_keys_t;                         /*!< The pid key type */
+
+/**
+* @brief  BLE Encryption reproduction keys
+*/
+typedef struct
+{
+    esp_bt_octet16_t  ltk;                  /*!< The long term key */
+    uint16_t          div;                  /*!< The div value */
+    uint8_t           key_size;             /*!< The key size of the security link */
+    uint8_t           sec_level;            /*!< The security level of the security link */
+}esp_ble_lenc_keys_t;                       /*!< The  key type */
+
+/**
+* @brief  BLE SRK keys
+*/
+typedef struct
+{
+    uint32_t          counter;              /*!< The counter value */
+    uint16_t          div;                  /*!< The div value */
+    uint8_t           sec_level;            /*!< The security level of the security link */
+    esp_bt_octet16_t            csrk;       /*!< The csrk key value */
+}esp_ble_lcsrk_keys;                        /*!< The csrk key type */
+
+/**
+* @brief  Structure associated with ESP_KEY_NOTIF_EVT 
+*/
+typedef struct
+{
+    esp_bd_addr_t  bd_addr;        /*!< peer address */
+    uint32_t       passkey;        /*!< the numeric value for comparison. If just_works, do not show this number to UI */
+} esp_ble_sec_key_notif_t;         /*!< BLE key notify type*/
+
+/**
+* @brief  Structure of the security request
+*/
+typedef struct
+{
+    esp_bd_addr_t  bd_addr;        /*!< peer address */
+}esp_ble_sec_req_t;                /*!< BLE security request type*/
+
+/**
+* @brief  union type of the security key value
+*/
+typedef union
+{
+    esp_ble_penc_keys_t   penc_key;       /*!< received peer encryption key */
+    esp_ble_pcsrk_keys_t  pcsrk_key;      /*!< received peer device SRK */
+    esp_ble_pid_keys_t    pid_key;        /*!< peer device ID key */
+    esp_ble_lenc_keys_t   lenc_key;       /*!< local encryption reproduction keys LTK = = d1(ER,DIV,0)*/
+    esp_ble_lcsrk_keys    lcsrk_key;      /*!< local device CSRK = d1(ER,DIV,1)*/
+}esp_ble_key_value_t;                     /*!< ble key value type*/
+
+
+/**
+* @brief  union type of the security key value
+*/
+typedef struct
+{
+    esp_bd_addr_t               bd_addr;        /*!< peer address */
+    esp_ble_key_type_t          key_type;       /*!< key type of the security link */
+    esp_ble_key_value_t         p_key_value;    /*!< the pointer to the key value */
+}esp_ble_key_t;                                 /*!< the union to the ble key value type*/
+
+/**
+* @brief  structure type of the ble local id keys value
+*/
+typedef struct {
+    esp_bt_octet16_t       ir;                  /*!< the 16 bits of the ir value */
+    esp_bt_octet16_t       irk;                 /*!< the 16 bits of the ir key value */
+    esp_bt_octet16_t       dhk;                 /*!< the 16 bits of the dh key value */
+}esp_ble_local_id_keys_t;                       /*!< the structure of the ble local id keys value type*/
+
+
+/**
+  * @brief Structure associated with ESP_AUTH_CMPL_EVT
+  */
+typedef struct
+{
+    esp_bd_addr_t         bd_addr;               /*!< BD address peer device. */	
+    bool                  key_present;           /*!< Valid link key value in key element */
+    esp_link_key          key;                   /*!< Link key associated with peer device. */
+    uint8_t               key_type;              /*!< The type of Link Key */
+    bool                  success;               /*!< TRUE of authentication succeeded, FALSE if failed. */
+    uint8_t               fail_reason;           /*!< The HCI reason/error code for when success=FALSE */
+    esp_ble_addr_type_t   addr_type;             /*!< Peer device address type */
+    esp_bt_dev_type_t     dev_type;              /*!< Device type */
+}esp_ble_auth_cmpl_t;                            /*!< The ble authentication complite cb type */
+
+/**
+  * @brief union associated with ble security
+  */
+typedef union
+{
+    esp_ble_sec_key_notif_t    key_notif;      /*!< passkey notification */
+    esp_ble_sec_req_t          ble_req;        /*!< BLE SMP related request */
+    esp_ble_key_t              ble_key;        /*!< BLE SMP keys used when pairing */
+    esp_ble_local_id_keys_t    ble_id_keys;    /*!< BLE IR event */
+    esp_ble_auth_cmpl_t        auth_cmpl;      /*!< Authentication complete indication. */
+}esp_ble_sec_t;                                /*!< Ble  secutity type */
+
 /// Sub Event of ESP_GAP_BLE_SCAN_RESULT_EVT
 typedef enum {
     ESP_GAP_SEARCH_INQ_RES_EVT             = 0,      /*!< Inquiry result for a peer device. */
@@ -300,6 +471,20 @@ typedef union {
     struct ble_scan_start_cmpl_evt_param {
         esp_bt_status_t status;                     /*!< Indicate scan start operation success status */
     } scan_start_cmpl;                              /*!< Event parameter of ESP_GAP_BLE_SCAN_START_COMPLETE_EVT */
+
+    esp_ble_sec_t ble_security;                     /*!< ble gap security union type */
+    /**
+     * @brief ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT
+     */
+    struct ble_scan_stop_cmpl_evt_param {
+        esp_bt_status_t status;                     /*!< Indicate scan stop operation success status */
+    } scan_stop_cmpl;                               /*!< Event parameter of ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT */
+    /**
+     * @brief ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT
+     */
+    struct ble_adv_stop_cmpl_evt_param {
+        esp_bt_status_t status;                     /*!< Indicate adv stop operation success status */
+    } adv_stop_cmpl;                                /*!< Event parameter of ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT */
 } esp_ble_gap_cb_param_t;
 
 /**
@@ -505,6 +690,76 @@ esp_err_t esp_ble_gap_config_adv_data_raw(uint8_t *raw_data, uint32_t raw_data_l
  */
 esp_err_t esp_ble_gap_config_scan_rsp_data_raw(uint8_t *raw_data, uint32_t raw_data_len);
 
+
+/**
+* @brief             Set a GAP security parameter value. Overrides the default value.
+*
+* @param[in]       param_type :L the type of the param which to be set
+* @param[in]       value  : the param value
+* @param[out]     len : the length of the param value
+*
+* @return            - ESP_OK : success
+*                  		- other  : failed
+*
+*/
+esp_err_t esp_ble_gap_set_security_param(esp_ble_sm_param_t param_type,
+                                         void *value, uint8_t len);
+
+/**
+* @brief             Grant security request access.
+*
+* @param[in]       bd_addr : BD address of the peer
+* @param[in]       accept  :  accept the security request or not
+*
+* @return            - ESP_OK : success
+*                    - other  : failed
+*
+*/
+esp_err_t esp_ble_gap_security_rsp(esp_bd_addr_t bd_addr,  bool accept);
+
+
+/**
+* @brief             Set a gap parameter value. Use this function to change
+*                    the default GAP parameter values.
+*
+* @param[in]       bd_addr : the address of the peer device need to encryption
+* @param[in]       sec_act  : This is the security action to indicate
+*                                  	what kind of BLE security level is required for
+*                                  	the BLE link if the BLE is supported
+*
+* @return            - ESP_OK : success
+*                       - other  : failed
+*
+*/
+esp_err_t esp_ble_set_encryption(esp_bd_addr_t bd_addr, esp_ble_sec_act_t sec_act);
+
+/**
+* @brief          Reply the key value to the peer device in the lagecy connection stage.
+*
+* @param[in]      bd_addr : BD address of the peer
+* @param[in]      accept : passkey entry sucessful or declined.
+* @param[in]      passkey : passkey value, must be a 6 digit number,
+*                                     can be lead by 0.
+*
+* @return            - ESP_OK : success
+*                  - other  : failed
+*
+*/
+esp_err_t esp_ble_passkey_reply(esp_bd_addr_t bd_addr, bool accept, uint32_t passkey);
+
+
+/**
+* @brief           Reply the comfirm value to the peer device in the lagecy connection stage.
+*
+* @param[in]       bd_addr : BD address of the peer device
+* @param[in]       accept : numbers to compare are the same or different.
+*
+* @return            - ESP_OK : success
+*                       - other  : failed
+*
+*/
+esp_err_t esp_ble_confirm_reply(esp_bd_addr_t bd_addr, bool accept);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tools/sdk/include/bluedroid/esp_gap_bt_api.h b/tools/sdk/include/bluedroid/esp_gap_bt_api.h
new file mode 100644
index 00000000000..5efdd633266
--- /dev/null
+++ b/tools/sdk/include/bluedroid/esp_gap_bt_api.h
@@ -0,0 +1,52 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __ESP_GAP_BT_API_H__
+#define __ESP_GAP_BT_API_H__
+
+#include <stdint.h>
+#include "esp_err.h"
+#include "esp_bt_defs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/// Discoverability and Connectability mode
+typedef enum {
+    ESP_BT_SCAN_MODE_NONE = 0,                      /*!< Neither discoverable nor connectable */
+    ESP_BT_SCAN_MODE_CONNECTABLE,                   /*!< Connectable but not discoverable */
+    ESP_BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE       /*!< both discoverable and connectaable */
+} esp_bt_scan_mode_t;
+
+/**
+ * @brief           Set discoverability and connectability mode for legacy bluetooth. This function should
+ *                  be called after esp_bluedroid_enable() completes successfully
+ *
+ * @param[in]       mode : one of the enums of bt_scan_mode_t
+ *
+ * @return
+ *                  - ESP_OK : Succeed
+ *                  - ESP_ERR_INVALID_ARG: if argument invalid
+ *                  - ESP_INVALID_STATE: if bluetooth stack is not yet enabled
+ *                  - ESP_FAIL: others
+ */
+esp_err_t esp_bt_gap_set_scan_mode(esp_bt_scan_mode_t mode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ESP_GAP_BT_API_H__ */
diff --git a/tools/sdk/include/bluedroid/esp_gatt_defs.h b/tools/sdk/include/bluedroid/esp_gatt_defs.h
index 153a702735d..b092e2c8c96 100644
--- a/tools/sdk/include/bluedroid/esp_gatt_defs.h
+++ b/tools/sdk/include/bluedroid/esp_gatt_defs.h
@@ -297,13 +297,17 @@ typedef enum {
 
 
 /**
- * @brief attribute auto respose flag
+ * @brief attribute auto response flag
  */
 typedef struct
 {
 #define ESP_GATT_RSP_BY_APP             0
 #define ESP_GATT_AUTO_RSP               1
-    uint8_t auto_rsp;           /*!< need the app response to the client if need_rsp set to 1*/  
+    /**
+     * @brief if auto_rsp set to ESP_GATT_RSP_BY_APP, means the response of Write/Read operation will by replied by application.
+              if auto_rsp set to ESP_GATT_AUTO_RSP, means the response of Write/Read operation will be replied by GATT stack automatically.
+     */  
+    uint8_t auto_rsp;                   
 } esp_attr_control_t;
 
 
@@ -312,8 +316,8 @@ typedef struct
  */
 typedef struct
 {
-    esp_attr_control_t      attr_control;       /*!< The attribue control type*/
-    esp_attr_desc_t         att_desc;           /*!< The attribue type*/
+    esp_attr_control_t      attr_control;       /*!< The attribute control type*/
+    esp_attr_desc_t         att_desc;           /*!< The attribute type*/
 } esp_gatts_attr_db_t;
 
 
diff --git a/tools/sdk/include/bluedroid/esp_gattc_api.h b/tools/sdk/include/bluedroid/esp_gattc_api.h
index b52dabbdaca..ae53bf57510 100644
--- a/tools/sdk/include/bluedroid/esp_gattc_api.h
+++ b/tools/sdk/include/bluedroid/esp_gattc_api.h
@@ -510,15 +510,15 @@ esp_err_t esp_ble_gattc_write_char( esp_gatt_if_t gattc_if,
  *                  - other: failed
  *
  */
-esp_err_t esp_ble_gattc_write_char_descr (esp_gatt_if_t gattc_if, 
-                                        uint16_t conn_id,
-                                        esp_gatt_srvc_id_t *srvc_id,
-                                        esp_gatt_id_t *char_id,
-                                        esp_gatt_id_t *descr_id,
-                                        uint16_t value_len,
-                                        uint8_t *value,
-                                		esp_gatt_write_type_t write_type,
-                                        esp_gatt_auth_req_t auth_req);
+esp_err_t esp_ble_gattc_write_char_descr (esp_gatt_if_t gattc_if,
+                                         uint16_t conn_id,
+                                         esp_gatt_srvc_id_t *srvc_id,
+                                         esp_gatt_id_t *char_id,
+                                         esp_gatt_id_t *descr_id,
+                                         uint16_t value_len,
+                                         uint8_t *value,
+                                         esp_gatt_write_type_t write_type,
+                                         esp_gatt_auth_req_t auth_req);
 
 
 /**
@@ -548,6 +548,35 @@ esp_err_t esp_ble_gattc_prepare_write(esp_gatt_if_t gattc_if,
                                       esp_gatt_auth_req_t auth_req);
 
 
+/**
+ * @brief           This function is called to prepare write a characteristic descriptor value.
+ *
+ * @param[in]       gattc_if: Gatt client access interface.
+ * @param[in]       conn_id : connection ID.
+ * @param[in]       srvc_id : service ID.
+ * @param[in]       char_id : GATT characteristic ID of the service.
+ * @param[in]       descr_id : characteristic descriptor ID to write.
+ * @param[in]       offset : offset of the write value.
+ * @param[in]       value_len: length of the value to be written.
+ * @param[in]       value : the value to be written.
+ * @param[in]       auth_req : authentication request.
+ *
+ * @return
+ *                  - ESP_OK: success
+ *                  - other: failed
+ *
+ */
+esp_err_t esp_ble_gattc_prepare_write_char_descr(esp_gatt_if_t gattc_if,
+                                                 uint16_t conn_id,
+                                                 esp_gatt_srvc_id_t *srvc_id,
+                                                 esp_gatt_id_t *char_id,
+                                                 esp_gatt_id_t *descr_id,
+                                                 uint16_t offset,
+                                                 uint16_t value_len,
+                                                 uint8_t *value,
+                                                 esp_gatt_auth_req_t auth_req);
+
+
 /**
  * @brief           This function is called to execute write a prepare write sequence.
  *
diff --git a/tools/sdk/include/bluedroid/esp_sec_api.h b/tools/sdk/include/bluedroid/esp_sec_api.h
new file mode 100644
index 00000000000..f9b0f9ec141
--- /dev/null
+++ b/tools/sdk/include/bluedroid/esp_sec_api.h
@@ -0,0 +1,79 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef __ESP_SEC_API_H__
+#define __ESP_SEC_API_H__
+
+#include "bt_types.h"
+
+#define APP_SEC_IRK_FLAG        (0)
+#define RAND_NB_LEN         0x08
+#define SEC_KEY_LEN         0x10
+
+/*
+ * STRUCTURES DEFINITIONS
+ ****************************************************************************************
+ */
+
+
+/// Generic Security key structure
+typedef struct {
+    /// Key value MSB -> LSB
+    UINT8 key[SEC_KEY_LEN];
+} smp_sec_key;
+
+///Random number structure
+typedef struct {
+    ///8-byte array for random number
+    UINT8     nb[RAND_NB_LEN];
+} rand_nb;
+
+typedef struct {
+    // LTK
+    smp_sec_key ltk;
+    // Random Number
+    rand_nb rand_nb;
+    // EDIV
+    UINT16 ediv;
+    // LTK key size
+    UINT8 key_size;
+
+    // Last paired peer address type
+    UINT8 peer_addr_type;
+    // Last paired peer address
+    BD_ADDR peer_addr;
+
+    // authentication level
+    UINT8 auth;
+
+} tAPP_SEC_ENV;
+
+extern tAPP_SEC_ENV app_sec_env;
+
+/*
+* GLOBAL FUNCTIONS DECLARATIONS
+****************************************************************************************
+*/
+
+void app_ble_sec_init(void);
+
+void app_ble_sec_pairing_cmp_evt_send(UINT8);
+
+UINT32 app_ble_sec_gen_tk(void);
+
+void app_ble_sec_gen_ltk(UINT8 key_size);
+
+void app_ble_security_start(void);
+
+#endif /* __ESP_SEC_API_H__ */
diff --git a/tools/sdk/include/bluedroid/fixed_queue.h b/tools/sdk/include/bluedroid/fixed_queue.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/future.h b/tools/sdk/include/bluedroid/future.h
index d54f2378518..a89640c27e7 100644
--- a/tools/sdk/include/bluedroid/future.h
+++ b/tools/sdk/include/bluedroid/future.h
@@ -49,4 +49,6 @@ void future_ready(future_t *future, void *value);
 // Frees the future before return. |future| may not be NULL.
 void *future_await(future_t *async_result);
 
+//Free the future if this "future" is not used
+void future_free(future_t *future);
 #endif /* __FUTURE_H__ */
diff --git a/tools/sdk/include/bluedroid/gap_int.h b/tools/sdk/include/bluedroid/gap_int.h
index fbddf67c96c..f05b0ce292a 100644
--- a/tools/sdk/include/bluedroid/gap_int.h
+++ b/tools/sdk/include/bluedroid/gap_int.h
@@ -127,15 +127,15 @@ typedef struct {
     tGAP_INFO        blk[GAP_MAX_BLOCKS];
     tBTM_CMPL_CB    *btm_cback[GAP_MAX_BLOCKS];
     UINT8            trace_level;
-    tGAP_FINDADDR_CB findaddr_cb;   /* Contains the control block for finding a device addr */
-    tBTM_INQ_INFO   *cur_inqptr;
+    //tGAP_FINDADDR_CB findaddr_cb;   /* Contains the control block for finding a device addr */
+    //tBTM_INQ_INFO   *cur_inqptr;
 
 #if GAP_CONN_INCLUDED == TRUE
     tGAP_CONN        conn;
 #endif
 
     /* LE GAP attribute database */
-#if BLE_INCLUDED == TRUE
+#if BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE
     tGAP_ATTR               gatt_attr[GAP_MAX_CHAR_NUM];
     tGAP_CLCB               clcb[GAP_MAX_CL]; /* connection link*/
     tGATT_IF                gatt_if;
@@ -147,7 +147,7 @@ extern tGAP_CB  gap_cb;
 #if (GAP_CONN_INCLUDED == TRUE)
 extern void gap_conn_init(void);
 #endif
-#if (BLE_INCLUDED == TRUE)
+#if (BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE)
 extern void gap_attr_db_init(void);
 #endif
 
diff --git a/tools/sdk/include/bluedroid/gatt_api.h b/tools/sdk/include/bluedroid/gatt_api.h
index 42812a5bee4..0017d0fa08a 100644
--- a/tools/sdk/include/bluedroid/gatt_api.h
+++ b/tools/sdk/include/bluedroid/gatt_api.h
@@ -326,6 +326,10 @@ typedef struct{
     uint8_t auto_rsp;
 }tGATTS_ATTR_CONTROL;
 
+/* Mask for gatt server attribute */
+#define GATT_ATTR_VALUE_ALLOCATED  0x01
+typedef UINT8 tGATT_ATTR_MASK;
+
 /* Union of the event data which is used in the server respond API to carry the server response information
 */
 typedef union {
diff --git a/tools/sdk/include/bluedroid/gatt_int.h b/tools/sdk/include/bluedroid/gatt_int.h
index 9aca0c5dfd5..b538ed8b5c4 100644
--- a/tools/sdk/include/bluedroid/gatt_int.h
+++ b/tools/sdk/include/bluedroid/gatt_int.h
@@ -185,6 +185,7 @@ typedef struct {
     tGATT_ATTR_UUID_TYPE    uuid_type;
     tGATT_PERM              permission;
     tGATTS_ATTR_CONTROL     control;
+    tGATT_ATTR_MASK         mask;
     UINT16                  handle;
     UINT16                  uuid;
 } tGATT_ATTR16;
@@ -197,6 +198,7 @@ typedef struct {
     tGATT_ATTR_UUID_TYPE    uuid_type;
     tGATT_PERM              permission;
     tGATTS_ATTR_CONTROL     control;
+    tGATT_ATTR_MASK         mask;
     UINT16                  handle;
     UINT32                  uuid;
 } tGATT_ATTR32;
@@ -210,6 +212,7 @@ typedef struct {
     tGATT_ATTR_UUID_TYPE    uuid_type;
     tGATT_PERM              permission;
     tGATTS_ATTR_CONTROL     control;
+    tGATT_ATTR_MASK         mask;
     UINT16                  handle;
     UINT8                   uuid[LEN_UUID_128];
 } tGATT_ATTR128;
@@ -382,7 +385,9 @@ typedef struct {
 
     /* server needs */
     /* server response data */
+#if (GATTS_INCLUDED == TRUE)
     tGATT_SR_CMD    sr_cmd;
+#endif  ///GATTS_INCLUDED == TRUE
     UINT16          indicate_handle;
     BUFFER_Q        pending_ind_q;
 
@@ -499,11 +504,12 @@ typedef struct {
     UINT16              next_handle;    /* next available handle */
     tGATT_SVC_CHG       gattp_attr;     /* GATT profile attribute service change */
     tGATT_IF            gatt_if;
+#if (GATTS_INCLUDED == TRUE)    
     tGATT_HDL_LIST_INFO hdl_list_info;
     tGATT_HDL_LIST_ELEM hdl_list[GATT_MAX_SR_PROFILES];
     tGATT_SRV_LIST_INFO srv_list_info;
     tGATT_SRV_LIST_ELEM srv_list[GATT_MAX_SR_PROFILES];
-
+#endif  ///GATTS_INCLUDED == TRUE
     BUFFER_Q            srv_chg_clt_q;   /* service change clients queue */
     BUFFER_Q            pending_new_srv_start_q; /* pending new service start queue */
     tGATT_REG           cl_rcb[GATT_MAX_APPS];
@@ -518,8 +524,9 @@ typedef struct {
     UINT8               err_status;
     UINT16              handle;
 #endif
-
+#if (GATTS_INCLUDED == TRUE)
     tGATT_PROFILE_CLCB  profile_clcb[GATT_MAX_APPS];
+#endif  ///GATTS_INCLUDED == TRUE
     UINT16              handle_of_h_r;          /* Handle of the handles reused characteristic value */
 
     tGATT_APPL_INFO       cb_info;
@@ -586,7 +593,9 @@ extern tGATT_STATUS attp_send_msg_to_l2cap(tGATT_TCB *p_tcb, BT_HDR *p_toL2CAP);
 
 /* utility functions */
 extern UINT8 *gatt_dbg_op_name(UINT8 op_code);
+#if (SDP_INCLUDED == TRUE)
 extern UINT32 gatt_add_sdp_record (tBT_UUID *p_uuid, UINT16 start_hdl, UINT16 end_hdl);
+#endif  ///SDP_INCLUDED == TRUE
 extern BOOLEAN gatt_parse_uuid_from_cmd(tBT_UUID *p_uuid, UINT16 len, UINT8 **p_data);
 extern UINT8 gatt_build_uuid_to_stream(UINT8 **p_dst, tBT_UUID uuid);
 extern BOOLEAN gatt_uuid_compare(tBT_UUID src, tBT_UUID tar);
@@ -621,6 +630,7 @@ extern tGATT_HDL_LIST_ELEM *gatt_find_hdl_buffer_by_handle(UINT16 handle);
 extern tGATT_HDL_LIST_ELEM *gatt_find_hdl_buffer_by_attr_handle(UINT16 attr_handle);
 extern tGATT_HDL_LIST_ELEM *gatt_alloc_hdl_buffer(void);
 extern void gatt_free_hdl_buffer(tGATT_HDL_LIST_ELEM *p);
+extern void gatt_free_attr_value_buffer(tGATT_HDL_LIST_ELEM *p);
 extern BOOLEAN gatt_is_last_attribute(tGATT_SRV_LIST_INFO *p_list, tGATT_SRV_LIST_ELEM *p_start, tBT_UUID value);
 extern void gatt_update_last_pri_srv_info(tGATT_SRV_LIST_INFO *p_list);
 extern BOOLEAN gatt_add_a_srv_to_list(tGATT_SRV_LIST_INFO *p_list, tGATT_SRV_LIST_ELEM *p_new);
diff --git a/tools/sdk/include/bluedroid/gki_target.h b/tools/sdk/include/bluedroid/gki_target.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/hash_functions.h b/tools/sdk/include/bluedroid/hash_functions.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/hci_internals.h b/tools/sdk/include/bluedroid/hci_internals.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/hid_conn.h b/tools/sdk/include/bluedroid/hid_conn.h
new file mode 100644
index 00000000000..320b78fa321
--- /dev/null
+++ b/tools/sdk/include/bluedroid/hid_conn.h
@@ -0,0 +1,69 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2002-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This file contains HID connection internal definitions
+ *
+ ******************************************************************************/
+
+#ifndef HID_CONN_H
+#define HID_CONN_H
+
+#if (HID_HOST_INCLUDED == TRUE)
+/* Define the HID Connection Block
+*/
+typedef struct hid_conn {
+#define HID_CONN_STATE_UNUSED           (0)
+#define HID_CONN_STATE_CONNECTING_CTRL  (1)
+#define HID_CONN_STATE_CONNECTING_INTR  (2)
+#define HID_CONN_STATE_CONFIG           (3)
+#define HID_CONN_STATE_CONNECTED        (4)
+#define HID_CONN_STATE_DISCONNECTING    (5)
+#define HID_CONN_STATE_SECURITY         (6)
+
+    UINT8             conn_state;
+
+#define HID_CONN_FLAGS_IS_ORIG              (0x01)
+#define HID_CONN_FLAGS_HIS_CTRL_CFG_DONE    (0x02)
+#define HID_CONN_FLAGS_MY_CTRL_CFG_DONE     (0x04)
+#define HID_CONN_FLAGS_HIS_INTR_CFG_DONE    (0x08)
+#define HID_CONN_FLAGS_MY_INTR_CFG_DONE     (0x10)
+#define HID_CONN_FLAGS_ALL_CONFIGURED       (0x1E)        /* All the config done */
+#define HID_CONN_FLAGS_CONGESTED            (0x20)
+#define HID_CONN_FLAGS_INACTIVE             (0x40)
+
+    UINT8             conn_flags;
+
+    UINT8             ctrl_id;
+    UINT16            ctrl_cid;
+    UINT16            intr_cid;
+    UINT16            rem_mtu_size;
+    UINT16            disc_reason;                       /* Reason for disconnecting (for HID_HDEV_EVT_CLOSE) */
+    TIMER_LIST_ENT    timer_entry;
+
+} tHID_CONN;
+
+#define HID_SEC_CHN   1
+#define HID_NOSEC_CHN 2
+
+#define HIDD_SEC_CHN    3
+#define HIDD_NOSEC_CHN  4
+
+#endif  ///HID_HOST_INCLUDED == TRUE
+#endif
diff --git a/tools/sdk/include/bluedroid/hiddefs.h b/tools/sdk/include/bluedroid/hiddefs.h
index c8c3d3cbbe4..23777f3adf4 100644
--- a/tools/sdk/include/bluedroid/hiddefs.h
+++ b/tools/sdk/include/bluedroid/hiddefs.h
@@ -24,8 +24,12 @@
 
 #ifndef HIDDEFS_H
 #define HIDDEFS_H
+#include "bt_target.h"
+#if (HID_HOST_INCLUDED == TRUE)
 
+#if (SDP_INCLUDED == TRUE)
 #include "sdp_api.h"
+#endif    ///SDP_INCLUDED == TRUE
 /*
 ** tHID_STATUS: HID result codes, returned by HID and device and host functions.
 */
@@ -149,8 +153,11 @@ typedef struct sdp_info {
 
     tHID_DEV_DSCP_INFO  dscp_info;   /* Descriptor list and Report list to be set in the SDP record.
                                        This parameter is used if HID_DEV_USE_GLB_SDP_REC is set to FALSE.*/
+#if(SDP_INCLUDED == TRUE)
     tSDP_DISC_REC       *p_sdp_layer_rec;
+#endif  ///SDP_INCLUDED == TRUE
 } tHID_DEV_SDP_INFO;
 
+#endif  ///HID_HOST_INCLUDED == TRUE
 #endif
 
diff --git a/tools/sdk/include/bluedroid/hidh_api.h b/tools/sdk/include/bluedroid/hidh_api.h
index 499e6462537..29344df905c 100644
--- a/tools/sdk/include/bluedroid/hidh_api.h
+++ b/tools/sdk/include/bluedroid/hidh_api.h
@@ -21,6 +21,7 @@
 #include "hiddefs.h"
 #include "sdp_api.h"
 
+#if (HID_HOST_INCLUDED == TRUE)
 /*****************************************************************************
 **  Constants
 *****************************************************************************/
@@ -232,4 +233,6 @@ extern UINT8 HID_HostSetTraceLevel (UINT8 new_level);
 }
 #endif
 
+#endif  ///HID_HOST_INCLUDED == TRUE
+
 #endif  /* HIDH_API_H */
diff --git a/tools/sdk/include/bluedroid/hidh_int.h b/tools/sdk/include/bluedroid/hidh_int.h
new file mode 100644
index 00000000000..a1d40781d70
--- /dev/null
+++ b/tools/sdk/include/bluedroid/hidh_int.h
@@ -0,0 +1,95 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2002-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This file contains HID HOST internal definitions
+ *
+ ******************************************************************************/
+
+#ifndef HIDH_INT_H
+#define HIDH_INT_H
+
+#include "hidh_api.h"
+#include "hid_conn.h"
+#include "l2c_api.h"
+
+#if (HID_HOST_INCLUDED == TRUE)
+
+enum {
+    HID_DEV_NO_CONN,
+    HID_DEV_CONNECTED
+};
+
+typedef struct per_device_ctb {
+    BOOLEAN        in_use;
+    BD_ADDR        addr;  /* BD-Addr of the host device */
+    UINT16         attr_mask; /* 0x01- virtual_cable; 0x02- normally_connectable; 0x03- reconn_initiate;
+                                 0x04- sdp_disable; */
+    UINT8          state;  /* Device state if in HOST-KNOWN mode */
+    UINT8          conn_substate;
+    UINT8          conn_tries; /* Remembers to the number of connection attempts while CONNECTING */
+
+    tHID_CONN      conn; /* L2CAP channel info */
+} tHID_HOST_DEV_CTB;
+
+typedef struct host_ctb {
+    tHID_HOST_DEV_CTB       devices[HID_HOST_MAX_DEVICES];
+    tHID_HOST_DEV_CALLBACK  *callback;             /* Application callbacks */
+    tL2CAP_CFG_INFO         l2cap_cfg;
+
+#define MAX_SERVICE_DB_SIZE    4000
+
+    BOOLEAN                 sdp_busy;
+    tHID_HOST_SDP_CALLBACK  *sdp_cback;
+    tSDP_DISCOVERY_DB       *p_sdp_db;
+    tHID_DEV_SDP_INFO       sdp_rec;
+    BOOLEAN                 reg_flag;
+    UINT8                   trace_level;
+} tHID_HOST_CTB;
+
+extern tHID_STATUS hidh_conn_snd_data(UINT8 dhandle, UINT8 trans_type, UINT8 param, \
+                                      UINT16 data, UINT8 rpt_id, BT_HDR *buf);
+extern tHID_STATUS hidh_conn_reg (void);
+extern void hidh_conn_dereg( void );
+extern tHID_STATUS hidh_conn_disconnect (UINT8 dhandle);
+extern tHID_STATUS hidh_conn_initiate (UINT8 dhandle);
+extern void hidh_proc_repage_timeout (TIMER_LIST_ENT *p_tle);
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/******************************************************************************
+** Main Control Block
+*******************************************************************************/
+#if HID_DYNAMIC_MEMORY == FALSE
+extern tHID_HOST_CTB  hh_cb;
+#else
+extern tHID_HOST_CTB *hidh_cb_ptr;
+#define hh_cb (*hidh_cb_ptr)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  ///HID_HOST_INCLUDED == TRUE
+
+#endif
diff --git a/tools/sdk/include/bluedroid/interop.h b/tools/sdk/include/bluedroid/interop.h
index 74394d95d4a..a90c44ad292 100644
--- a/tools/sdk/include/bluedroid/interop.h
+++ b/tools/sdk/include/bluedroid/interop.h
@@ -21,6 +21,7 @@
 
 #include <stdbool.h>
 #include "bt_defs.h"
+#include "bt_target.h"
 
 typedef enum {
     // Disable secure connections
diff --git a/tools/sdk/include/bluedroid/l2c_api.h b/tools/sdk/include/bluedroid/l2c_api.h
index d79c17a1ba0..f2a4d7c4c1a 100644
--- a/tools/sdk/include/bluedroid/l2c_api.h
+++ b/tools/sdk/include/bluedroid/l2c_api.h
@@ -331,6 +331,7 @@ extern "C"
 {
 #endif
 
+#if (CLASSIC_BT_INCLUDED == TRUE)
 /*******************************************************************************
 **
 ** Function         L2CA_Register
@@ -483,6 +484,8 @@ extern BOOLEAN L2CA_DisconnectReq (UINT16 cid);
 **
 *******************************************************************************/
 extern BOOLEAN L2CA_DisconnectRsp (UINT16 cid);
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
+
 
 /*******************************************************************************
 **
@@ -497,6 +500,8 @@ extern BOOLEAN L2CA_DisconnectRsp (UINT16 cid);
 *******************************************************************************/
 extern UINT8 L2CA_DataWrite (UINT16 cid, BT_HDR *p_data);
 
+#if (CLASSIC_BT_INCLUDED == TRUE)
+
 /*******************************************************************************
 **
 ** Function         L2CA_Ping
@@ -519,6 +524,8 @@ extern BOOLEAN L2CA_Ping (BD_ADDR p_bd_addr, tL2CA_ECHO_RSP_CB *p_cb);
 **
 *******************************************************************************/
 extern BOOLEAN  L2CA_Echo (BD_ADDR p_bd_addr, BT_HDR *p_data, tL2CA_ECHO_DATA_CB *p_callback);
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
+
 
 // Given a local channel identifier, |lcid|, this function returns the bound remote
 // channel identifier, |rcid|, and the ACL link handle, |handle|. If |lcid| is not
@@ -544,6 +551,7 @@ bool L2CA_GetIdentifiers(uint16_t lcid, uint16_t *rcid, uint16_t *handle);
 extern BOOLEAN L2CA_SetIdleTimeout (UINT16 cid, UINT16 timeout,
                                     BOOLEAN is_global);
 
+
 /*******************************************************************************
 **
 ** Function         L2CA_SetIdleTimeoutByBdAddr
@@ -566,6 +574,7 @@ extern BOOLEAN L2CA_SetIdleTimeout (UINT16 cid, UINT16 timeout,
 extern BOOLEAN L2CA_SetIdleTimeoutByBdAddr(BD_ADDR bd_addr, UINT16 timeout,
         tBT_TRANSPORT transport);
 
+
 /*******************************************************************************
 **
 ** Function         L2CA_SetTraceLevel
@@ -578,6 +587,7 @@ extern BOOLEAN L2CA_SetIdleTimeoutByBdAddr(BD_ADDR bd_addr, UINT16 timeout,
 *******************************************************************************/
 extern UINT8 L2CA_SetTraceLevel (UINT8 trace_level);
 
+
 /*******************************************************************************
 **
 ** Function     L2CA_SetDesireRole
@@ -595,7 +605,7 @@ extern UINT8 L2CA_SetTraceLevel (UINT8 trace_level);
 **
 *******************************************************************************/
 extern UINT8 L2CA_SetDesireRole (UINT8 new_role);
-
+#if (CLASSIC_BT_INCLUDED == TRUE)
 /*******************************************************************************
 **
 ** Function     L2CA_LocalLoopbackReq
@@ -722,6 +732,7 @@ typedef void (tL2CA_RESERVE_CMPL_CBACK) (void);
 **                  ACL link.
 *******************************************************************************/
 extern BOOLEAN L2CA_SetFlushTimeout (BD_ADDR bd_addr, UINT16 flush_tout);
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
 
 /*******************************************************************************
 **
@@ -780,6 +791,8 @@ extern BOOLEAN L2CA_GetPeerFeatures (BD_ADDR bd_addr, UINT32 *p_ext_feat, UINT8
 *******************************************************************************/
 extern BOOLEAN L2CA_GetBDAddrbyHandle (UINT16 handle, BD_ADDR bd_addr);
 
+#if (CLASSIC_BT_INCLUDED == TRUE)
+
 /*******************************************************************************
 **
 **  Function         L2CA_GetChnlFcrMode
@@ -792,6 +805,7 @@ extern BOOLEAN L2CA_GetBDAddrbyHandle (UINT16 handle, BD_ADDR bd_addr);
 **
 *******************************************************************************/
 extern UINT8 L2CA_GetChnlFcrMode (UINT16 lcid);
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
 
 
 /*******************************************************************************
@@ -1044,6 +1058,7 @@ extern BOOLEAN L2CA_SetFixedChannelTout (BD_ADDR rem_bda, UINT16 fixed_cid, UINT
 
 #endif /* (L2CAP_NUM_FIXED_CHNLS > 0) */
 
+#if (CLASSIC_BT_INCLUDED == TRUE)
 /*******************************************************************************
 **
 ** Function     L2CA_GetCurrentConfig
@@ -1060,6 +1075,8 @@ extern BOOLEAN L2CA_SetFixedChannelTout (BD_ADDR rem_bda, UINT16 fixed_cid, UINT
 extern BOOLEAN L2CA_GetCurrentConfig (UINT16 lcid,
                                       tL2CAP_CFG_INFO **pp_our_cfg,  tL2CAP_CH_CFG_BITS *p_our_cfg_bits,
                                       tL2CAP_CFG_INFO **pp_peer_cfg, tL2CAP_CH_CFG_BITS *p_peer_cfg_bits);
+#endif  ///CLASSIC_BT_INCLUDED == TRUE
+
 
 #if (BLE_INCLUDED == TRUE)
 /*******************************************************************************
diff --git a/tools/sdk/include/bluedroid/l2cap_client.h b/tools/sdk/include/bluedroid/l2cap_client.h
index 168c8db5548..d18be32c4ca 100644
--- a/tools/sdk/include/bluedroid/l2cap_client.h
+++ b/tools/sdk/include/bluedroid/l2cap_client.h
@@ -18,6 +18,7 @@
 
 #ifndef _L2CAP_CLIENT_H_
 #define _L2CAP_CLIENT_H_
+#if (defined(L2CAP_CLIENT_INCLUDED) && L2CAP_CLIENT_INCLUDED == TRUE)
 
 //#include <hardware/bluetooth.h>
 #include <stdbool.h>
@@ -74,4 +75,6 @@ bool l2cap_client_is_connected(const l2cap_client_t *client);
 // |client| nor |packet| may be NULL.
 bool l2cap_client_write(l2cap_client_t *client, buffer_t *packet);
 
+#endif  ///(defined(L2CAP_CLIENT_INCLUDED) && L2CAP_CLIENT_INCLUDED == TRUE)
+
 #endif /*_L2CAP_CLIENT_H_*/
diff --git a/tools/sdk/include/bluedroid/list.h b/tools/sdk/include/bluedroid/list.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/oi_assert.h b/tools/sdk/include/bluedroid/oi_assert.h
new file mode 100644
index 00000000000..9649f660c14
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_assert.h
@@ -0,0 +1,86 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_ASSERT_H
+#define _OI_ASSERT_H
+/** @file
+  This file provides macros and functions for compile-time and run-time assertions.
+
+  When the OI_DEBUG preprocessor value is defined, the macro OI_ASSERT is compiled into
+  the program, providing for a runtime assertion failure check.
+  C_ASSERT is a macro that can be used to perform compile time checks.
+*/
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+
+/** \addtogroup Debugging Debugging APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifdef OI_DEBUG
+
+/** The macro OI_ASSERT takes a condition argument. If the asserted condition
+    does not evaluate to true, the OI_ASSERT macro calls the host-dependent function,
+    OI_AssertFail(), which reports the failure and generates a runtime error.
+*/
+void OI_AssertFail(char *file, int line, char *reason);
+
+
+#define OI_ASSERT(condition) \
+    { if (!(condition)) OI_AssertFail(__FILE__, __LINE__, #condition); }
+
+#define OI_ASSERT_FAIL(msg) \
+    { OI_AssertFail(__FILE__, __LINE__, msg); }
+
+#else
+
+
+#define OI_ASSERT(condition)
+#define OI_ASSERT_FAIL(msg)
+
+#endif
+
+
+/**
+   C_ASSERT() can be used to perform many compile-time assertions: type sizes, field offsets, etc.
+   An assertion failure results in compile time error C2118: negative subscript.
+   Unfortunately, this elegant macro doesn't work with GCC, so it's all commented out
+   for now. Perhaps later.....
+*/
+
+#ifndef C_ASSERT
+// #define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
+// #define C_ASSERT(e)
+#endif
+
+
+/*****************************************************************************/
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+#endif /* _OI_ASSERT_H */
+
diff --git a/tools/sdk/include/bluedroid/oi_bitstream.h b/tools/sdk/include/bluedroid/oi_bitstream.h
new file mode 100644
index 00000000000..c6ce59b4cef
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_bitstream.h
@@ -0,0 +1,123 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2003 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_BITSTREAM_H
+#define _OI_BITSTREAM_H
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+
+/**
+@file
+Function prototypes and macro definitions for manipulating input and output
+bitstreams.
+
+@ingroup codec_internal
+*/
+
+/**
+@addtogroup codec_internal
+@{
+*/
+
+#include "oi_codec_sbc_private.h"
+#include "oi_stddefs.h"
+
+INLINE void OI_BITSTREAM_ReadInit(OI_BITSTREAM *bs, const OI_BYTE *buffer);
+
+INLINE void OI_BITSTREAM_WriteInit(OI_BITSTREAM *bs, OI_BYTE *buffer);
+
+INLINE OI_UINT32 OI_BITSTREAM_ReadUINT(OI_BITSTREAM *bs, OI_UINT bits);
+
+INLINE OI_UINT8 OI_BITSTREAM_ReadUINT4Aligned(OI_BITSTREAM *bs);
+
+INLINE OI_UINT8 OI_BITSTREAM_ReadUINT8Aligned(OI_BITSTREAM *bs);
+
+INLINE void OI_BITSTREAM_WriteUINT(OI_BITSTREAM *bs,
+                                   OI_UINT16 value,
+                                   OI_UINT bits);
+
+/*
+ * Use knowledge that the bitstream is aligned to optimize the write of a byte
+ */
+PRIVATE void OI_BITSTREAM_WriteUINT8Aligned(OI_BITSTREAM *bs,
+        OI_UINT8 datum);
+
+/*
+ * Use knowledge that the bitstream is aligned to optimize the write pair of nibbles
+ */
+PRIVATE void OI_BITSTREAM_Write2xUINT4Aligned(OI_BITSTREAM *bs,
+        OI_UINT8 datum1,
+        OI_UINT8 datum2);
+
+/** Internally the bitstream looks ahead in the stream. When
+ * OI_SBC_ReadScalefactors() goes to temporarily break the abstraction, it will
+ * need to know where the "logical" pointer is in the stream.
+ */
+#define OI_BITSTREAM_GetWritePtr(bs) ((bs)->ptr.w - 3)
+#define OI_BITSTREAM_GetReadPtr(bs) ((bs)->ptr.r - 3)
+
+/** This is declared here as a macro because decoder.c breaks the bitsream
+ * encapsulation for efficiency reasons.
+ */
+#define OI_BITSTREAM_READUINT(result, bits, ptr, value, bitPtr) \
+do { \
+    OI_ASSERT((bits) <= 16); \
+    OI_ASSERT((bitPtr) < 16); \
+    OI_ASSERT((bitPtr) >= 8); \
+    \
+    result = (value) << (bitPtr); \
+    result >>= 32 - (bits); \
+    \
+    bitPtr += (bits); \
+    while (bitPtr >= 16) { \
+        value = ((value) << 8) | *ptr++; \
+        bitPtr -= 8; \
+    } \
+    OI_ASSERT((bits == 0) || (result < (1u << (bits)))); \
+} while (0)
+
+
+#define OI_BITSTREAM_WRITEUINT(ptr, value, bitPtr, datum, bits) \
+do {\
+    bitPtr -= bits;\
+    value |= datum << bitPtr;\
+    \
+    while (bitPtr <= 16) {\
+        bitPtr += 8;\
+        *ptr++ = (OI_UINT8)(value >> 24);\
+        value <<= 8;\
+    }\
+} while (0)
+
+#define OI_BITSTREAM_WRITEFLUSH(ptr, value, bitPtr) \
+do {\
+    while (bitPtr < 32) {\
+        bitPtr += 8;\
+        *ptr++ = (OI_UINT8)(value >> 24);\
+        value <<= 8;\
+    }\
+} while (0)
+
+/**
+@}
+*/
+
+#endif /* _OI_BITSTREAM_H */
diff --git a/tools/sdk/include/bluedroid/oi_bt_spec.h b/tools/sdk/include/bluedroid/oi_bt_spec.h
new file mode 100644
index 00000000000..b98a5821dd4
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_bt_spec.h
@@ -0,0 +1,229 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_BT_SPEC_H
+#define _OI_BT_SPEC_H
+/**
+ * @file
+ *
+ * This file contains common definitions from the Bluetooth specification.
+ *
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#include "oi_stddefs.h"
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** The maximum number of active slaves in a piconet. */
+#define OI_BT_MAX_ACTIVE_SLAVES 7
+
+/** the number of bytes in a Bluetooth device address (BD_ADDR) */
+#define OI_BD_ADDR_BYTE_SIZE   6
+
+/**
+ * 48-bit Bluetooth device address
+ *
+ * Because 48-bit integers may not be supported on all platforms, the
+ * address is defined as an array of bytes. This array is big-endian,
+ * meaning that
+ *  - array[0] contains bits 47-40,
+ *  - array[1] contains bits 39-32,
+ *  - array[2] contains bits 31-24,
+ *  - array[3] contains bits 23-16,
+ *  - array[4] contains bits 15-8, and
+ *  - array[5] contains bits 7-0.
+ */
+typedef struct  {
+    OI_UINT8    addr[OI_BD_ADDR_BYTE_SIZE] ;   /**< Bluetooth device address represented as an array of 8-bit values */
+} OI_BD_ADDR ;
+
+/**
+ * @name Data types for working with UUIDs
+ * UUIDs are 16 bytes (128 bits).
+ *
+ * To avoid having to pass around 128-bit values all the time, 32-bit and 16-bit
+ * UUIDs are defined, along with a mapping from the shorter versions to the full
+ * version.
+ *
+ * @{
+ */
+
+/**
+ * 16-bit representation of a 128-bit UUID
+ */
+typedef OI_UINT16 OI_UUID16;
+
+/**
+ * 32-bit representation of a 128-bit UUID
+ */
+typedef OI_UINT32 OI_UUID32;
+
+/**
+ * number of bytes in a 128 bit UUID
+ */
+#define OI_BT_UUID128_SIZE  16
+
+/**
+ * number of bytes in IPv6 style addresses
+ */
+#define OI_BT_IPV6ADDR_SIZE  16
+
+/**
+ * type definition for a 128-bit UUID
+ *
+ * To simplify conversion between 128-bit UUIDs and 16-bit and 32-bit UUIDs,
+ * the most significant 32 bits are stored with the same endian-ness as is
+ * native on the target (local) device. The remainder of the 128-bit UUID is
+ * stored as bytes in big-endian order.
+ */
+typedef struct {
+    OI_UINT32 ms32bits;                                    /**< most significant 32 bits of 128-bit UUID */
+    OI_UINT8 base[OI_BT_UUID128_SIZE - sizeof(OI_UINT32)]; /**< remainder of 128-bit UUID, array of 8-bit values */
+} OI_UUID128;
+
+/** @} */
+
+/** number of bytes in a link key */
+#define OI_BT_LINK_KEY_SIZE    16
+
+/**
+ * type definition for a baseband link key
+ *
+ * Because 128-bit integers may not be supported on all platforms, we define
+ * link keys as an array of bytes. Unlike the Bluetooth device address,
+ * the link key is stored in little-endian order, meaning that
+ *  - array[0]  contains bits 0  - 7,
+ *  - array[1]  contains bits 8  - 15,
+ *  - array[2]  contains bits 16 - 23,
+ *  - array[3]  contains bits 24 - 31,
+ *  - array[4]  contains bits 32 - 39,
+ *  - array[5]  contains bits 40 - 47,
+ *  - array[6]  contains bits 48 - 55,
+ *  - array[7]  contains bits 56 - 63,
+ *  - array[8]  contains bits 64 - 71,
+ *  - array[9]  contains bits 72 - 79,
+ *  - array[10] contains bits 80 - 87,
+ *  - array[11] contains bits 88 - 95,
+ *  - array[12] contains bits 96 - 103,
+ *  - array[13] contains bits 104- 111,
+ *  - array[14] contains bits 112- 119, and
+ *  - array[15] contains bits 120- 127.
+ */
+typedef struct {
+    OI_UINT8    key[OI_BT_LINK_KEY_SIZE] ;   /**< link key represented as an array of 8-bit values */
+} OI_LINK_KEY ;
+
+
+/** Out-of-band data size - C and R values are 16-bytes each */
+#define OI_BT_OOB_NUM_BYTES     16
+
+typedef struct {
+    OI_UINT8    value[OI_BT_OOB_NUM_BYTES] ;   /**< same struct used for C and R values */
+} OI_OOB_DATA ;
+
+
+/**
+ * link key types
+ */
+typedef enum  {
+    OI_LINK_KEY_TYPE_COMBO              = 0,    /**< combination key */
+    OI_LINK_KEY_TYPE_LOCAL_UNIT         = 1,    /**< local unit key */
+    OI_LINK_KEY_TYPE_REMOTE_UNIT        = 2,    /**< remote unit key */
+    OI_LINK_KEY_TYPE_DEBUG_COMBO        = 3,    /**< debug combination key */
+    OI_LINK_KEY_TYPE_UNAUTHENTICATED    = 4,    /**< Unauthenticated */
+    OI_LINK_KEY_TYPE_AUTHENTICATED      = 5,    /**< Authenticated */
+    OI_LINK_KEY_TYPE_CHANGED_COMBO      = 6     /**< Changed */
+
+} OI_BT_LINK_KEY_TYPE ;
+
+
+/** amount of space allocated for a PIN (personal indentification number) in bytes */
+#define OI_BT_PIN_CODE_SIZE    16
+
+/** data type for a PIN (PINs are treated as strings, so endianness does not apply.) */
+typedef struct  {
+    OI_UINT8    pin[OI_BT_PIN_CODE_SIZE] ; /**< PIN represented as an array of 8-bit values */
+} OI_PIN_CODE ;
+
+/** maximum number of SCO connections per device, which is 3 as of version 2.0+EDR
+    of the Bluetooth specification (see sec 4.3 of vol 2 part B) */
+#define OI_BT_MAX_SCO_CONNECTIONS  3
+
+/** data type for clock offset */
+typedef OI_UINT16   OI_BT_CLOCK_OFFSET ;
+
+/** data type for a LM handle */
+typedef OI_UINT16 OI_HCI_LM_HANDLE;
+
+/** opaque data type for a SCO or ACL connection handle */
+typedef struct _OI_HCI_CONNECTION *OI_HCI_CONNECTION_HANDLE;
+
+/** data type for HCI Error Code, as defined in oi_hcispec.h */
+typedef OI_UINT8    OI_HCI_ERROR_CODE ;
+
+/**
+ * The Bluetooth device type is indicated by a 24-bit bitfield, represented as a
+ * 32-bit number in the stack. The bit layout and values for device class are specified
+ * in the file oi_bt_assigned_nos.h and in the Bluetooth "Assigned Numbers" specification
+ * at http://www.bluetooth.org/assigned-numbers/.
+ */
+typedef OI_UINT32   OI_BT_DEVICE_CLASS ;
+
+#define OI_BT_DEV_CLASS_FORMAT_MASK        0x000003    /**< Bits 0-1 contain format type. */
+#define OI_BT_DEV_CLASS_MINOR_DEVICE_MASK  0x0000FC    /**< Bits 2-7 contain minor device class value. */
+#define OI_BT_DEV_CLASS_MAJOR_DEVICE_MASK  0x001F00    /**< Bits 8-12 contain major device class value. */
+#define OI_BT_DEV_CLASS_MAJOR_SERVICE_MASK 0xFFE000    /**< Bits 13-23 contain major service class value. */
+
+/** There is currently only one device class format defined, type 00. */
+#define OI_BT_DEV_CLASS_FORMAT_TYPE        00
+
+/** Bit 13 in device class indicates limited discoverability mode (GAP v2.0+EDR, section 4.1.2.2) */
+#define OI_BT_DEV_CLASS_LIMITED_DISCO_BIT  BIT13
+
+/** macro to test validity of the Device Class Format */
+#define OI_BT_VALID_DEVICE_CLASS_FORMAT(class) (OI_BT_DEV_CLASS_FORMAT_TYPE == ((class) & OI_BT_DEV_CLASS_FORMAT_MASK))
+
+/** the time between baseband clock ticks, currently 625 microseconds (one slot) */
+#define OI_BT_TICK 625
+/** some macros to convert to/from baseband clock ticks - use no floating point! */
+#define OI_SECONDS_TO_BT_TICKS(secs)    ((secs)*1600)
+#define OI_BT_TICKS_TO_SECONDS(ticks)   ((ticks)/1600)
+#define OI_MSECS_TO_BT_TICKS(msecs)     (((msecs)*8)/5)
+#define OI_BT_TICKS_TO_MSECS(ticks)     (((ticks)*5)/8)
+
+/** EIR byte order */
+#define OI_EIR_BYTE_ORDER   OI_LITTLE_ENDIAN_BYTE_ORDER
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+/*****************************************************************************/
+#endif /* _OI_BT_SPEC_H */
diff --git a/tools/sdk/include/bluedroid/oi_codec_sbc.h b/tools/sdk/include/bluedroid/oi_codec_sbc.h
new file mode 100644
index 00000000000..a3f7d875164
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_codec_sbc.h
@@ -0,0 +1,484 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2003 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#ifndef _OI_CODEC_SBC_CORE_H
+#define _OI_CODEC_SBC_CORE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+@file
+Declarations of codec functions, data types, and macros.
+
+@ingroup codec_lib
+*/
+
+/**
+@addtogroup codec_lib
+@{
+*/
+
+/* Non-BM3 users of of the codec must include oi_codec_sbc_bm3defs.h prior to
+ * including this file, or else these includes will fail because the BM3 SDK is
+ * not in the include path */
+#ifndef _OI_CODEC_SBC_BM3DEFS_H
+#include "oi_stddefs.h"
+#include "oi_status.h"
+#endif
+
+#include <stdint.h>
+
+#define SBC_MAX_CHANNELS 2
+#define SBC_MAX_BANDS 8
+#define SBC_MAX_BLOCKS 16
+#define SBC_MIN_BITPOOL 2   /**< Minimum size of the bit allocation pool used to encode the stream */
+#define SBC_MAX_BITPOOL 250 /**< Maximum size of the bit allocation pool used to encode the stream */
+#define SBC_MAX_ONE_CHANNEL_BPS 320000
+#define SBC_MAX_TWO_CHANNEL_BPS 512000
+
+
+#define SBC_WBS_BITRATE 62000
+#define SBC_WBS_BITPOOL 27
+#define SBC_WBS_NROF_BLOCKS 16
+#define SBC_WBS_FRAME_LEN 62
+#define SBC_WBS_SAMPLES_PER_FRAME 128
+
+
+#define SBC_HEADER_LEN 4
+#define SBC_MAX_FRAME_LEN (SBC_HEADER_LEN + \
+                             ((SBC_MAX_BANDS * SBC_MAX_CHANNELS / 2) + \
+                              (SBC_MAX_BANDS + SBC_MAX_BLOCKS * SBC_MAX_BITPOOL + 7)/8))
+#define SBC_MAX_SAMPLES_PER_FRAME   (SBC_MAX_BANDS * SBC_MAX_BLOCKS)
+
+#define SBC_MAX_SCALEFACTOR_BYTES ((4*(SBC_MAX_CHANNELS * SBC_MAX_BANDS) + 7)/8)
+
+#define OI_SBC_SYNCWORD 0x9c
+#define OI_SBC_ENHANCED_SYNCWORD 0x9d
+
+/**@name Sampling frequencies */
+/**@{*/
+#define SBC_FREQ_16000 0 /**< The sampling frequency is 16 kHz. One possible value for the @a frequency parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_FREQ_32000 1 /**< The sampling frequency is 32 kHz. One possible value for the @a frequency parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_FREQ_44100 2 /**< The sampling frequency is 44.1 kHz. One possible value for the @a frequency parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_FREQ_48000 3 /**< The sampling frequency is 48 kHz. One possible value for the @a frequency parameter of OI_CODEC_SBC_EncoderConfigure() */
+/**@}*/
+
+/**@name Channel modes */
+/**@{*/
+#define SBC_MONO 0         /**< The mode of the encoded channel is mono. One possible value for the @a mode parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_DUAL_CHANNEL 1 /**< The mode of the encoded channel is dual-channel. One possible value for the @a mode parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_STEREO 2       /**< The mode of the encoded channel is stereo. One possible value for the @a mode parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_JOINT_STEREO 3 /**< The mode of the encoded channel is joint stereo. One possible value for the @a mode parameter of OI_CODEC_SBC_EncoderConfigure() */
+/**@}*/
+
+/**@name Subbands */
+/**@{*/
+#define SBC_SUBBANDS_4  0 /**< The encoded stream has 4 subbands. One possible value for the @a subbands parameter of OI_CODEC_SBC_EncoderConfigure()*/
+#define SBC_SUBBANDS_8  1 /**< The encoded stream has 8 subbands. One possible value for the @a subbands parameter of OI_CODEC_SBC_EncoderConfigure() */
+/**@}*/
+
+/**@name Block lengths */
+/**@{*/
+#define SBC_BLOCKS_4    0 /**< A block size of 4 blocks was used to encode the stream. One possible value for the @a blocks parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_BLOCKS_8    1 /**< A block size of 8 blocks was used to encode the stream is. One possible value for the @a blocks parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_BLOCKS_12   2 /**< A block size of 12 blocks was used to encode the stream. One possible value for the @a blocks parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_BLOCKS_16   3 /**< A block size of 16 blocks was used to encode the stream. One possible value for the @a blocks parameter of OI_CODEC_SBC_EncoderConfigure() */
+/**@}*/
+
+/**@name Bit allocation methods */
+/**@{*/
+#define SBC_LOUDNESS 0    /**< The bit allocation method. One possible value for the @a loudness parameter of OI_CODEC_SBC_EncoderConfigure() */
+#define SBC_SNR 1         /**< The bit allocation method. One possible value for the @a loudness parameter of OI_CODEC_SBC_EncoderConfigure() */
+/**@}*/
+
+/**
+@}
+
+@addtogroup codec_internal
+@{
+*/
+
+typedef OI_INT16 SBC_BUFFER_T;
+
+
+/** Used internally. */
+typedef struct {
+    OI_UINT16 frequency;    /**< The sampling frequency. Input parameter. */
+    OI_UINT8 freqIndex;
+
+    OI_UINT8 nrof_blocks;   /**< The block size used to encode the stream. Input parameter. */
+    OI_UINT8 blocks;
+
+
+    OI_UINT8 nrof_subbands; /**< The number of subbands of the encoded stream. Input parameter. */
+    OI_UINT8 subbands;
+
+    OI_UINT8 mode;          /**< The mode of the encoded channel. Input parameter. */
+    OI_UINT8 nrof_channels; /**< The number of channels of the encoded stream. */
+
+    OI_UINT8 alloc;         /**< The bit allocation method. Input parameter. */
+    OI_UINT8 bitpool;       /**< Size of the bit allocation pool used to encode the stream. Input parameter. */
+    OI_UINT8 crc;           /**< Parity check byte used for error detection. */
+    OI_UINT8 join;          /**< Whether joint stereo has been used. */
+    OI_UINT8 enhanced;
+    OI_UINT8 min_bitpool;   /**< This value is only used when encoding. SBC_MAX_BITPOOL if variable
+                                 bitpools are disallowed, otherwise the minimum bitpool size that will
+                                 be used by the bit allocator.  */
+
+    OI_UINT8 cachedInfo;    /**< Information about the previous frame */
+} OI_CODEC_SBC_FRAME_INFO;
+
+/** Used internally. */
+typedef struct {
+    const OI_CHAR *codecInfo;
+    OI_CODEC_SBC_FRAME_INFO frameInfo;
+    OI_INT8 scale_factor[SBC_MAX_CHANNELS * SBC_MAX_BANDS];
+    OI_UINT32 frameCount;
+    OI_INT32 *subdata;
+
+    SBC_BUFFER_T *filterBuffer[SBC_MAX_CHANNELS];
+    OI_INT32 filterBufferLen;
+    OI_UINT filterBufferOffset;
+
+    union {
+        OI_UINT8 uint8[SBC_MAX_CHANNELS * SBC_MAX_BANDS];
+        OI_UINT32 uint32[SBC_MAX_CHANNELS * SBC_MAX_BANDS / 4];
+    } bits;
+    OI_UINT8 maxBitneed;    /**< Running maximum bitneed */
+    OI_BYTE formatByte;
+    OI_UINT8 pcmStride;
+    OI_UINT8 maxChannels;
+} OI_CODEC_SBC_COMMON_CONTEXT;
+
+
+/*
+ * A smaller value reduces RAM usage at the expense of increased CPU usage. Values in the range
+ * 27..50 are recommended, beyond 50 there is a diminishing return on reduced CPU usage.
+ */
+#define SBC_CODEC_MIN_FILTER_BUFFERS 16
+#define SBC_CODEC_FAST_FILTER_BUFFERS 27
+
+/* Expands to the number of OI_UINT32s needed to ensure enough memory to encode
+ * or decode streams of numChannels channels, using numBuffers buffers.
+ * Example:
+ * OI_UINT32 decoderData[CODEC_DATA_WORDS(SBC_MAX_CHANNELS, SBC_DECODER_FAST_SYNTHESIS_BUFFERS)];
+ * */
+#define CODEC_DATA_WORDS(numChannels, numBuffers) \
+    ((\
+        (sizeof(OI_INT32) * SBC_MAX_BLOCKS * numChannels * SBC_MAX_BANDS) \
+         + (sizeof(SBC_BUFFER_T) * SBC_MAX_CHANNELS * SBC_MAX_BANDS * numBuffers) \
+         + (sizeof (OI_UINT32) - 1) \
+    ) / sizeof(OI_UINT32))
+
+/** Opaque parameter to decoding functions; maintains decoder context. */
+typedef struct {
+    OI_CODEC_SBC_COMMON_CONTEXT common;
+    OI_UINT8 limitFrameFormat;              /* Boolean, set by OI_CODEC_SBC_DecoderLimit() */
+    OI_UINT8 restrictSubbands;
+    OI_UINT8 enhancedEnabled;
+    OI_UINT8 bufferedBlocks;
+} OI_CODEC_SBC_DECODER_CONTEXT;
+
+typedef struct {
+    OI_UINT32 data[CODEC_DATA_WORDS(1, SBC_CODEC_FAST_FILTER_BUFFERS)];
+} OI_CODEC_SBC_CODEC_DATA_MONO;
+
+typedef struct {
+    OI_UINT32 data[CODEC_DATA_WORDS(2, SBC_CODEC_FAST_FILTER_BUFFERS)];
+} OI_CODEC_SBC_CODEC_DATA_STEREO;
+
+/**
+@}
+
+@addtogroup codec_lib
+@{
+*/
+
+/**
+ * This function resets the decoder. The context must be reset when
+ * changing streams, or if the following stream parameters change:
+ * number of subbands, stereo mode, or frequency.
+ *
+ * @param context   Pointer to the decoder context structure to be reset.
+ *
+ * @param enhanced  If true, enhanced SBC operation is enabled. If enabled,
+ *                  the codec will recognize the alternative syncword for
+ *                  decoding an enhanced SBC stream. Enhancements should not
+ *                  be enabled unless the stream is known to be generated
+ *                  by an enhanced encoder, or there is a small possibility
+ *                  for decoding glitches if synchronization were to be lost.
+ */
+OI_STATUS OI_CODEC_SBC_DecoderReset(OI_CODEC_SBC_DECODER_CONTEXT *context,
+                                    OI_UINT32 *decoderData,
+                                    OI_UINT32 decoderDataBytes,
+                                    OI_UINT8 maxChannels,
+                                    OI_UINT8 pcmStride,
+                                    OI_BOOL enhanced);
+
+/**
+ * This function restricts the kind of SBC frames that the Decoder will
+ * process.  Its use is optional.  If used, it must be called after
+ * calling OI_CODEC_SBC_DecoderReset(). After it is called, any calls
+ * to OI_CODEC_SBC_DecodeFrame() with SBC frames that do not conform
+ * to the Subband and Enhanced SBC setting will be rejected with an
+ * OI_STATUS_INVALID_PARAMETERS return.
+ *
+ * @param context   Pointer to the decoder context structure to be limited.
+ *
+ * @param enhanced  If true, all frames passed to the decoder must be
+ *                  Enhanced SBC frames. If false, all frames must be
+ *                  standard SBC frames.
+ *
+ * @param subbands  May be set to SBC_SUBBANDS_4 or SBC_SUBBANDS_8. All
+ *                  frames passed to the decoder must be encoded with
+ *                  the requested number of subbands.
+ *
+ */
+OI_STATUS OI_CODEC_SBC_DecoderLimit(OI_CODEC_SBC_DECODER_CONTEXT *context,
+                                    OI_BOOL enhanced,
+                                    OI_UINT8 subbands);
+
+/**
+ * This function sets the decoder parameters for a raw decode where the decoder parameters are not
+ * available in the sbc data stream. OI_CODEC_SBC_DecoderReset must be called
+ * prior to calling this function.
+ *
+ * @param context        Decoder context structure. This must be the context must be
+ *                       used each time a frame is decoded.
+ *
+ * @param enhanced       Set to TRUE to enable Qualcomm proprietary
+ *                       quality enhancements.
+ *
+ * @param frequency      One of SBC_FREQ_16000, SBC_FREQ_32000, SBC_FREQ_44100,
+ *                       SBC_FREQ_48000
+ *
+ * @param mode           One of SBC_MONO, SBC_DUAL_CHANNEL, SBC_STEREO,
+ *                       SBC_JOINT_STEREO
+ *
+ * @param subbands       One of SBC_SUBBANDS_4, SBC_SUBBANDS_8
+ *
+ * @param blocks         One of SBC_BLOCKS_4, SBC_BLOCKS_8, SBC_BLOCKS_12,
+ *                       SBC_BLOCKS_16
+ *
+ * @param alloc          One of SBC_LOUDNESS, SBC_SNR
+ *
+ * @param maxBitpool     The maximum bitpool size for this context
+ */
+OI_STATUS OI_CODEC_SBC_DecoderConfigureRaw(OI_CODEC_SBC_DECODER_CONTEXT *context,
+        OI_BOOL enhanced,
+        OI_UINT8 frequency,
+        OI_UINT8 mode,
+        OI_UINT8 subbands,
+        OI_UINT8 blocks,
+        OI_UINT8 alloc,
+        OI_UINT8 maxBitpool);
+
+/**
+ * Decode one SBC frame. The frame has no header bytes. The context must have been previously
+ * initialized by calling  OI_CODEC_SBC_DecoderConfigureRaw().
+ *
+ * @param context       Pointer to a decoder context structure. The same context
+ *                      must be used each time when decoding from the same stream.
+ *
+ * @param bitpool       The actual bitpool size for this frame. Must be <= the maxbitpool specified
+ *                      in the call to OI_CODEC_SBC_DecoderConfigureRaw(),
+ *
+ * @param frameData     Address of a pointer to the SBC data to decode. This
+ *                      value will be updated to point to the next frame after
+ *                      successful decoding.
+ *
+ * @param frameBytes    Pointer to a UINT32 containing the number of available
+ *                      bytes of frame data. This value will be updated to reflect
+ *                      the number of bytes remaining after a decoding operation.
+ *
+ * @param pcmData       Address of an array of OI_INT16 pairs, which will be
+ *                      populated with the decoded audio data. This address
+ *                      is not updated.
+ *
+ * @param pcmBytes      Pointer to a UINT32 in/out parameter. On input, it
+ *                      should contain the number of bytes available for pcm
+ *                      data. On output, it will contain the number of bytes
+ *                      written. Note that this differs from the semantics of
+ *                      frameBytes.
+ */
+OI_STATUS OI_CODEC_SBC_DecodeRaw(OI_CODEC_SBC_DECODER_CONTEXT *context,
+                                 OI_UINT8 bitpool,
+                                 const OI_BYTE **frameData,
+                                 OI_UINT32 *frameBytes,
+                                 OI_INT16 *pcmData,
+                                 OI_UINT32 *pcmBytes);
+
+/**
+ * Decode one SBC frame.
+ *
+ * @param context       Pointer to a decoder context structure. The same context
+ *                      must be used each time when decoding from the same stream.
+ *
+ * @param frameData     Address of a pointer to the SBC data to decode. This
+ *                      value will be updated to point to the next frame after
+ *                      successful decoding.
+ *
+ * @param frameBytes    Pointer to a UINT32 containing the number of available
+ *                      bytes of frame data. This value will be updated to reflect
+ *                      the number of bytes remaining after a decoding operation.
+ *
+ * @param pcmData       Address of an array of OI_INT16 pairs, which will be
+ *                      populated with the decoded audio data. This address
+ *                      is not updated.
+ *
+ * @param pcmBytes      Pointer to a UINT32 in/out parameter. On input, it
+ *                      should contain the number of bytes available for pcm
+ *                      data. On output, it will contain the number of bytes
+ *                      written. Note that this differs from the semantics of
+ *                      frameBytes.
+ */
+OI_STATUS OI_CODEC_SBC_DecodeFrame(OI_CODEC_SBC_DECODER_CONTEXT *context,
+                                   const OI_BYTE **frameData,
+                                   OI_UINT32 *frameBytes,
+                                   OI_INT16 *pcmData,
+                                   OI_UINT32 *pcmBytes);
+
+/**
+ * Calculate the number of SBC frames but don't decode. CRC's are not checked,
+ * but the Sync word is found prior to count calculation.
+ *
+ * @param frameData     Pointer to the SBC data.
+ *
+ * @param frameBytes    Number of bytes avaiable in the frameData buffer
+ *
+ */
+OI_UINT8 OI_CODEC_SBC_FrameCount(OI_BYTE  *frameData,
+                                 OI_UINT32 frameBytes);
+
+/**
+ * Analyze an SBC frame but don't do the decode.
+ *
+ * @param context       Pointer to a decoder context structure. The same context
+ *                      must be used each time when decoding from the same stream.
+ *
+ * @param frameData     Address of a pointer to the SBC data to decode. This
+ *                      value will be updated to point to the next frame after
+ *                      successful decoding.
+ *
+ * @param frameBytes    Pointer to a UINT32 containing the number of available
+ *                      bytes of frame data. This value will be updated to reflect
+ *                      the number of bytes remaining after a decoding operation.
+ *
+ */
+OI_STATUS OI_CODEC_SBC_SkipFrame(OI_CODEC_SBC_DECODER_CONTEXT *context,
+                                 const OI_BYTE **frameData,
+                                 OI_UINT32 *frameBytes);
+
+/* Common functions */
+
+/**
+  Calculate the frame length.
+
+  @param frame The frame whose length to calculate
+
+  @return the length of an individual encoded frame in
+  bytes
+  */
+OI_UINT16 OI_CODEC_SBC_CalculateFramelen(OI_CODEC_SBC_FRAME_INFO *frame);
+
+
+/**
+ * Calculate the maximum bitpool size that fits within a given frame length.
+ *
+ * @param frame     The frame to calculate the bitpool size for
+ * @param frameLen  The frame length to fit the bitpool to
+ *
+ * @return the maximum bitpool that will fit in the specified frame length
+ */
+OI_UINT16 OI_CODEC_SBC_CalculateBitpool(OI_CODEC_SBC_FRAME_INFO *frame,
+                                        OI_UINT16 frameLen);
+
+/**
+  Calculate the bit rate.
+
+  @param frame The frame whose bit rate to calculate
+
+  @return the approximate bit rate in bits per second,
+  assuming that stream parameters are constant
+  */
+OI_UINT32 OI_CODEC_SBC_CalculateBitrate(OI_CODEC_SBC_FRAME_INFO *frame);
+
+/**
+  Calculate decoded audio data length for one frame.
+
+  @param frame The frame whose audio data length to calculate
+
+  @return length of decoded audio data for a
+  single frame, in bytes
+  */
+OI_UINT16 OI_CODEC_SBC_CalculatePcmBytes(OI_CODEC_SBC_COMMON_CONTEXT *common);
+
+/**
+ * Get the codec version text.
+ *
+ * @return  pointer to text string containing codec version text
+ *
+ */
+OI_CHAR *OI_CODEC_Version(void);
+
+
+/**
+@}
+
+@addtogroup codec_internal
+@{
+*/
+
+extern const OI_CHAR *const OI_CODEC_SBC_FreqText[];
+extern const OI_CHAR *const OI_CODEC_SBC_ModeText[];
+extern const OI_CHAR *const OI_CODEC_SBC_SubbandsText[];
+extern const OI_CHAR *const OI_CODEC_SBC_BlocksText[];
+extern const OI_CHAR *const OI_CODEC_SBC_AllocText[];
+
+/**
+@}
+
+@addtogroup codec_lib
+@{
+*/
+
+#ifdef OI_DEBUG
+void OI_CODEC_SBC_DumpConfig(OI_CODEC_SBC_FRAME_INFO *frameInfo);
+#else
+#define OI_CODEC_SBC_DumpConfig(f)
+#endif
+
+/**
+@}
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _OI_CODEC_SBC_CORE_H */
+
+
diff --git a/tools/sdk/include/bluedroid/oi_codec_sbc_private.h b/tools/sdk/include/bluedroid/oi_codec_sbc_private.h
new file mode 100644
index 00000000000..4e3897614ff
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_codec_sbc_private.h
@@ -0,0 +1,229 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2003 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_CODEC_SBC_PRIVATE_H
+#define _OI_CODEC_SBC_PRIVATE_H
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+/**
+@file
+Function prototypes and macro definitions used internally by the codec.
+
+@ingroup codec_internal
+*/
+
+/**
+@addtogroup codec_internal
+@{
+*/
+
+#ifdef USE_RESTRICT_KEYWORD
+#define RESTRICT restrict
+#else
+#define RESTRICT
+#endif
+
+#ifdef CODEC_DEBUG
+#include <stdio.h>
+#define ERROR(x) do { printf x; printf("\n"); } while (0)
+#else
+#define ERROR(x)
+#endif
+
+#ifdef TRACE_EXECUTION
+#define TRACE(x) do { printf x; printf("\n"); } while (0)
+#else
+#define TRACE(x)
+#endif
+
+#ifndef PRIVATE
+#define PRIVATE
+#endif
+
+#ifndef INLINE
+#define INLINE
+#endif
+
+#include "oi_assert.h"
+#include "oi_codec_sbc.h"
+
+#ifndef OI_SBC_SYNCWORD
+#define OI_SBC_SYNCWORD 0x9c
+#endif
+
+#ifndef DIVIDE
+#define DIVIDE(a, b) ((a) / (b))
+#endif
+
+typedef union {
+    OI_UINT8 uint8[SBC_MAX_BANDS];
+    OI_UINT32 uint32[SBC_MAX_BANDS / 4];
+} BITNEED_UNION1;
+
+typedef union {
+    OI_UINT8 uint8[2 * SBC_MAX_BANDS];
+    OI_UINT32 uint32[2 * SBC_MAX_BANDS / 4];
+} BITNEED_UNION2;
+
+static const OI_UINT16 freq_values[] =    { 16000, 32000, 44100, 48000 };
+static const OI_UINT8 block_values[] =    { 4, 8, 12, 16 };
+static const OI_UINT8 channel_values[] =  { 1, 2, 2, 2 };
+static const OI_UINT8 band_values[] =     { 4, 8 };
+
+
+#define TEST_MODE_SENTINEL "OINA"
+#define TEST_MODE_SENTINEL_LENGTH 4
+
+/** Used internally. */
+typedef struct {
+    union {
+        const OI_UINT8 *r;
+        OI_UINT8 *w;
+    } ptr;
+    OI_UINT32 value;
+    OI_UINT bitPtr;
+} OI_BITSTREAM;
+
+
+#define VALID_INT16(x) (((x) >= OI_INT16_MIN) && ((x) <= OI_INT16_MAX))
+#define VALID_INT32(x) (((x) >= OI_INT32_MIN) && ((x) <= OI_INT32_MAX))
+
+#define DCTII_8_SHIFT_IN 0
+#define DCTII_8_SHIFT_OUT 16-DCTII_8_SHIFT_IN
+
+#define DCTII_8_SHIFT_0 (DCTII_8_SHIFT_OUT)
+#define DCTII_8_SHIFT_1 (DCTII_8_SHIFT_OUT)
+#define DCTII_8_SHIFT_2 (DCTII_8_SHIFT_OUT)
+#define DCTII_8_SHIFT_3 (DCTII_8_SHIFT_OUT)
+#define DCTII_8_SHIFT_4 (DCTII_8_SHIFT_OUT)
+#define DCTII_8_SHIFT_5 (DCTII_8_SHIFT_OUT)
+#define DCTII_8_SHIFT_6 (DCTII_8_SHIFT_OUT-1)
+#define DCTII_8_SHIFT_7 (DCTII_8_SHIFT_OUT-2)
+
+#define DCT_SHIFT 15
+
+#define DCTIII_4_SHIFT_IN 2
+#define DCTIII_4_SHIFT_OUT 15
+
+#define DCTIII_8_SHIFT_IN 3
+#define DCTIII_8_SHIFT_OUT 14
+
+OI_UINT computeBitneed(OI_CODEC_SBC_COMMON_CONTEXT *common,
+                       OI_UINT8 *bitneeds,
+                       OI_UINT ch,
+                       OI_UINT *preferredBitpool);
+
+void oneChannelBitAllocation(OI_CODEC_SBC_COMMON_CONTEXT *common,
+                             BITNEED_UNION1 *bitneeds,
+                             OI_UINT ch,
+                             OI_UINT bitcount);
+
+
+OI_INT adjustToFitBitpool(const OI_UINT bitpool,
+                          OI_UINT32 *bitneeds,
+                          const OI_UINT subbands,
+                          OI_UINT bitcount,
+                          OI_UINT *excess);
+
+INLINE OI_INT allocAdjustedBits(OI_UINT8 *dest,
+                                OI_INT bits,
+                                OI_INT excess);
+
+INLINE OI_INT allocExcessBits(OI_UINT8 *dest,
+                              OI_INT excess);
+
+PRIVATE OI_UINT32 internal_CalculateBitrate(OI_CODEC_SBC_FRAME_INFO *frame);
+
+PRIVATE OI_UINT16 internal_CalculateFramelen(OI_CODEC_SBC_FRAME_INFO *frame);
+
+void monoBitAllocation(OI_CODEC_SBC_COMMON_CONTEXT *common);
+
+typedef void (*BIT_ALLOC)(OI_CODEC_SBC_COMMON_CONTEXT *common);
+
+PRIVATE OI_STATUS internal_DecodeRaw(OI_CODEC_SBC_DECODER_CONTEXT *context,
+                                     OI_UINT8 bitpool,
+                                     const OI_BYTE **frameData,
+                                     OI_UINT32 *frameBytes,
+                                     OI_INT16 *pcmData,
+                                     OI_UINT32 *pcmBytes);
+
+INLINE OI_STATUS internal_DecoderReset(OI_CODEC_SBC_DECODER_CONTEXT *context,
+                                       OI_UINT32 *decoderData,
+                                       OI_UINT32 decoderDataBytes,
+                                       OI_BYTE maxChannels,
+                                       OI_BYTE pcmStride,
+                                       OI_BOOL enhanced);
+
+INLINE OI_UINT16 OI_SBC_CalculateFrameAndHeaderlen(OI_CODEC_SBC_FRAME_INFO *frame, OI_UINT *headerLen_);
+
+PRIVATE OI_UINT32 OI_SBC_MaxBitpool(OI_CODEC_SBC_FRAME_INFO *frame);
+
+PRIVATE void OI_SBC_ComputeBitAllocation(OI_CODEC_SBC_COMMON_CONTEXT *frame);
+PRIVATE OI_UINT8 OI_SBC_CalculateChecksum(OI_CODEC_SBC_FRAME_INFO *frame, OI_BYTE const *data);
+
+/* Transform functions */
+PRIVATE void shift_buffer(SBC_BUFFER_T *dest, SBC_BUFFER_T *src, OI_UINT wordCount);
+PRIVATE void cosineModulateSynth4(SBC_BUFFER_T *RESTRICT out, OI_INT32 const *RESTRICT in);
+PRIVATE void SynthWindow40_int32_int32_symmetry_with_sum(OI_INT16 *pcm, SBC_BUFFER_T buffer[80], OI_UINT strideShift);
+
+INLINE void dct3_4(OI_INT32 *RESTRICT out, OI_INT32 const *RESTRICT in);
+PRIVATE void analyze4_generated(SBC_BUFFER_T analysisBuffer[RESTRICT 40],
+                                OI_INT16 *pcm,
+                                OI_UINT strideShift,
+                                OI_INT32 subband[4]);
+
+INLINE void dct3_8(OI_INT32 *RESTRICT out, OI_INT32 const *RESTRICT in);
+
+PRIVATE void analyze8_generated(SBC_BUFFER_T analysisBuffer[RESTRICT 80],
+                                OI_INT16 *pcm,
+                                OI_UINT strideShift,
+                                OI_INT32 subband[8]);
+
+#ifdef SBC_ENHANCED
+PRIVATE void analyze8_enhanced_generated(SBC_BUFFER_T analysisBuffer[RESTRICT 112],
+        OI_INT16 *pcm,
+        OI_UINT strideShift,
+        OI_INT32 subband[8]);
+#endif
+
+/* Decoder functions */
+
+INLINE  void OI_SBC_ReadHeader(OI_CODEC_SBC_COMMON_CONTEXT *common, const OI_BYTE *data);
+PRIVATE void OI_SBC_ReadScalefactors(OI_CODEC_SBC_COMMON_CONTEXT *common, const OI_BYTE *b, OI_BITSTREAM *bs);
+PRIVATE void OI_SBC_ReadSamples(OI_CODEC_SBC_DECODER_CONTEXT *common, OI_BITSTREAM *ob);
+PRIVATE void OI_SBC_ReadSamplesJoint(OI_CODEC_SBC_DECODER_CONTEXT *common, OI_BITSTREAM *global_bs);
+PRIVATE void OI_SBC_SynthFrame(OI_CODEC_SBC_DECODER_CONTEXT *context, OI_INT16 *pcm, OI_UINT start_block, OI_UINT nrof_blocks);
+INLINE OI_INT32 OI_SBC_Dequant(OI_UINT32 raw, OI_UINT scale_factor, OI_UINT bits);
+PRIVATE OI_BOOL OI_SBC_ExamineCommandPacket(OI_CODEC_SBC_DECODER_CONTEXT *context, const OI_BYTE *data, OI_UINT32 len);
+PRIVATE void OI_SBC_GenerateTestSignal(OI_INT16 pcmData[][2], OI_UINT32 sampleCount);
+
+PRIVATE void OI_SBC_ExpandFrameFields(OI_CODEC_SBC_FRAME_INFO *frame);
+PRIVATE OI_STATUS OI_CODEC_SBC_Alloc(OI_CODEC_SBC_COMMON_CONTEXT *common,
+                                     OI_UINT32 *codecDataAligned,
+                                     OI_UINT32 codecDataBytes,
+                                     OI_UINT8 maxChannels,
+                                     OI_UINT8 pcmStride);
+/**
+@}
+*/
+
+#endif /* _OI_CODEC_SBC_PRIVATE_H */
+
diff --git a/tools/sdk/include/bluedroid/oi_common.h b/tools/sdk/include/bluedroid/oi_common.h
new file mode 100644
index 00000000000..c4169f932c6
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_common.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_COMMON_H
+#define _OI_COMMON_H
+/**
+ * @file
+ *
+ * This file is used to group commonly used BLUEmagic 3.0 software
+ * header files.
+ *
+ * This file should be included in application source code along with the header
+ * files for the specific modules of the protocol stack being used.
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#include "oi_bt_spec.h"
+#include "oi_stddefs.h"
+#include "oi_status.h"
+#include "oi_time.h"
+#include "oi_osinterface.h"
+
+
+/*****************************************************************************/
+#endif /* _OI_COMMON_H */
diff --git a/tools/sdk/include/bluedroid/oi_cpu_dep.h b/tools/sdk/include/bluedroid/oi_cpu_dep.h
new file mode 100644
index 00000000000..dfa52c16b5e
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_cpu_dep.h
@@ -0,0 +1,505 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_CPU_DEP_H
+#define _OI_CPU_DEP_H
+/**
+ * @file
+ * This file contains definitions for characteristics of the target CPU and
+ * compiler, including primitive data types and endianness.
+ *
+ * This file defines the byte order and primitive data types for various
+ * CPU families. The preprocessor symbol 'CPU' must be defined to be an
+ * appropriate value or this header will generate a compile-time error.
+ *
+ * @note The documentation for this header file uses the x86 family of processors
+ * as an illustrative example for CPU/compiler-dependent data type definitions.
+ * Go to the source code of this header file to see the details of primitive type
+ * definitions for each platform.
+ *
+ * Additional information is available in the @ref data_types_docpage section.
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+/** @name Definitions indicating family of target OI_CPU_TYPE
+ *  @{
+ */
+
+#define OI_CPU_X86         1 /**< x86 processor family */
+#define OI_CPU_ARM         2 /**< ARM processor family.
+                                  @deprecated Use #OI_CPU_ARM7_LEND or
+                                  #OI_CPU_ARM7_BEND. */
+#define OI_CPU_ARC         3 /**< ARC processor family.
+                                  @deprecated Use #OI_CPU_ARC_LEND or
+                                  #OI_CPU_ARC_BEND. */
+#define OI_CPU_SH3         4 /**< Hitachi SH-3 processor family */
+#define OI_CPU_H8          5 /**< Hitachi H8 processor family */
+#define OI_CPU_MIPS        6 /**< MIPS processor family */
+#define OI_CPU_SPARC       7 /**< SPARC processor family */
+#define OI_CPU_M68000      8 /**< Motorola M68000 processor family */
+#define OI_CPU_PPC         9 /**< PowerPC (PPC) processor family */
+#define OI_CPU_SH4_7750   10 /**< Hitachi SH7750 series in SH-4 processor family */
+#define OI_CPU_SH2        11 /**< Hitachi SH-2 processor family */
+#define OI_CPU_ARM7_LEND  12 /**< ARM7, little-endian */
+#define OI_CPU_ARM7_BEND  13 /**< ARM7, big-endian */
+#define OI_CPU_GDM1202    14 /**< GCT GDM1202 */
+#define OI_CPU_ARC_LEND   15 /**< ARC processor family, little-endian */
+#define OI_CPU_ARC_BEND   16 /**< ARC processor family, big-endian */
+#define OI_CPU_M30833F    17 /**< Mitsubishi M308 processor family */
+#define OI_CPU_CR16C      18 /**< National Semiconductor 16 bit processor family */
+#define OI_CPU_M64111     19 /**< Renesas M64111 processor (M32R family) */
+#define OI_CPU_ARMV5_LEND 20 //*< ARM5, little-endian */
+
+#define OI_CPU_TYPE 12
+
+#ifndef OI_CPU_TYPE
+#error "OI_CPU_TYPE type not defined"
+#endif
+
+/**@}*/
+
+
+/** @name Definitions indicating byte-wise endianness of target CPU
+ *  @{
+ */
+
+#define OI_BIG_ENDIAN_BYTE_ORDER    0  /**< Multiple-byte values are stored in memory beginning with the most significant byte at the lowest address.  */
+#define OI_LITTLE_ENDIAN_BYTE_ORDER 1  /**< Multiple-byte values are stored in memory beginning with the least significant byte at the lowest address. */
+
+/**@}*/
+
+
+/** @name  CPU/compiler-independent primitive data type definitions
+ *  @{
+ */
+
+typedef int             OI_BOOL;  /**< Boolean values use native integer data type for target CPU. */
+typedef int             OI_INT;   /**< Integer values use native integer data type for target CPU. */
+typedef unsigned int    OI_UINT;  /**< Unsigned integer values use native unsigned integer data type for target CPU. */
+typedef unsigned char   OI_BYTE;  /**< Raw bytes type uses native character data type for target CPU. */
+
+/**@}*/
+
+
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_X86
+
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER  /**< x86 platform byte ordering is little-endian */
+
+/** @name CPU/compiler-dependent primitive data type definitions for x86 processor family
+ *  @{
+ */
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for x86 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for x86 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for x86 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for x86 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for x86 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for x86 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_ARM
+/* This CPU type is deprecated (removed from use). Instead, use OI_CPU_ARM7_LEND or OI_CPU_ARM7_BEND for
+   little-endian or big-endian configurations of the ARM7, respectively. */
+#error OI_CPU_ARM is deprecated
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_ARC
+/* This CPU type is deprecated (removed from use). Instead, use OI_CPU_ARC_LEND or OI_CPU_ARC_BEND for
+   little-endian or big-endian configurations of the ARC, respectively. */
+#error OI_CPU_ARC is deprecated
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_SH3
+/* The Hitachi SH C compiler defines _LIT or _BIG, depending on the endianness
+    specified to the compiler on the command line. */
+#if defined(_LIT)
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER  /**< If _LIT is defined, SH-3 platform byte ordering is little-endian. */
+#elif defined(_BIG)
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER     /**< If _BIG is defined, SH-3 platform byte ordering is big-endian. */
+#else
+#error SH compiler endianness undefined
+#endif
+
+/** @name CPU/compiler-dependent primitive data type definitions for SH-3 processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for SH-3 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for SH-3 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for SH-3 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for SH-3 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for SH-3 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for SH-3 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_SH2
+
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER /**< SH-2 platform byte ordering is big-endian. */
+
+/** @name  CPU/compiler-dependent primitive data type definitions for SH-2 processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for SH-2 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for SH-2 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for SH-2 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for SH-2 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for SH-2 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for SH-2 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_H8
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER
+#error basic types not defined
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_MIPS
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER
+/** @name  CPU/compiler-dependent primitive data type definitions for MIPS processor family
+ *  @{
+ */
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for ARM7 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for ARM7 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for ARM7 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for ARM7 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for ARM7 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for ARM7 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_SPARC
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER
+#error basic types not defined
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_M68000
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER  /**< M68000 platform byte ordering is big-endian. */
+
+/** @name  CPU/compiler-dependent primitive data type definitions for M68000 processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for M68000 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for M68000 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for M68000 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for M68000 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for M68000 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for M68000 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_PPC
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER
+
+
+/** @name  CPU/compiler-dependent primitive data type definitions for PPC 8XX processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for PPC8XX processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for PPC8XX processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for PPC8XX processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for PPC8XX processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for PPC8XX processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for PPC8XX processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_SH4_7750
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER  /**< SH7750 platform byte ordering is big-endian. */
+
+/** @name   CPU/compiler-dependent primitive data type definitions for SH7750 processor series of the SH-4 processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for SH7750 SH-4 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for SH7750 SH-4 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for SH7750 SH-4 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for SH7750 SH-4 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for SH7750 SH-4 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for SH7750 SH-4 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_ARM7_LEND
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER
+
+/** @name   little-endian CPU/compiler-dependent primitive data type definitions for the ARM7 processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for ARM7 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for ARM7 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for ARM7 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for ARM7 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for ARM7 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for ARM7 processor. */
+
+typedef void *OI_ELEMENT_UNION;  /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_ARM7_BEND
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER
+/** @name   big-endian CPU/compiler-dependent primitive data type definitions for the ARM7 processor family
+ *  @{
+ */
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for ARM7 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for ARM7 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for ARM7 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for ARM7 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for ARM7 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for ARM7 processor. */
+
+typedef void *OI_ELEMENT_UNION;  /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_GDM1202
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_ARC_LEND
+
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER
+
+/** @name CPU/compiler-dependent primitive data type definitions for ARC processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for ARC processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for ARC processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for ARC processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for ARC processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for ARC processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for ARC processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_ARC_BEND
+
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER
+
+/** @name CPU/compiler-dependent primitive data type definitions for ARC processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for ARC processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for ARC processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for ARC processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for ARC processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for ARC processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for ARC processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_M30833F
+
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER
+
+/** @name CPU/compiler-dependent primitive data type definitions for Mitsubishi M308 processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for M308 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for M308 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for M308 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for M308 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for M308 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for M308 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_CR16C
+
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER
+
+/** @name CPU/compiler-dependent primitive data type definitions for National Semicnductor processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for CR16C processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for CR16C processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for CR16C processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for CR16C processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for CR16C processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for CR16C processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_M64111
+
+#define OI_CPU_BYTE_ORDER OI_BIG_ENDIAN_BYTE_ORDER
+
+/** @name CPU/compiler-dependent primitive data type definitions for Renesas M32R processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for M64111 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for M64111 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for M64111 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for M64111 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for M64111 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for M64111 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+#endif
+
+/*********************************************************************************/
+
+#if OI_CPU_TYPE==OI_CPU_ARMV5_LEND
+#define OI_CPU_BYTE_ORDER OI_LITTLE_ENDIAN_BYTE_ORDER
+
+/** @name   little-endian CPU/compiler-dependent primitive data type definitions for the ARM7 processor family
+ *  @{
+ */
+
+typedef signed char     OI_INT8;   /**< 8-bit signed integer values use native signed character data type for ARM7 processor. */
+typedef signed short    OI_INT16;  /**< 16-bit signed integer values use native signed short integer data type for ARM7 processor. */
+typedef signed long     OI_INT32;  /**< 32-bit signed integer values use native signed long integer data type for ARM7 processor. */
+typedef unsigned char   OI_UINT8;  /**< 8-bit unsigned integer values use native unsigned character data type for ARM7 processor. */
+typedef unsigned short  OI_UINT16; /**< 16-bit unsigned integer values use native unsigned short integer data type for ARM7 processor. */
+typedef unsigned long   OI_UINT32; /**< 32-bit unsigned integer values use native unsigned long integer data type for ARM7 processor. */
+
+typedef OI_UINT32 OI_ELEMENT_UNION; /**< Type for first element of a union to support all data types up to pointer width. */
+
+/**@}*/
+
+#endif
+
+/*********************************************************************************/
+
+
+#ifndef OI_CPU_BYTE_ORDER
+#error "Byte order (endian-ness) not defined"
+#endif
+
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+/*********************************************************************************/
+#endif /* _OI_CPU_DEP_H */
diff --git a/tools/sdk/include/bluedroid/oi_modules.h b/tools/sdk/include/bluedroid/oi_modules.h
new file mode 100644
index 00000000000..7784212ad25
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_modules.h
@@ -0,0 +1,171 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_MODULES_H
+#define _OI_MODULES_H
+/**
+ * @file
+ *
+ * Enumeration type defining the inidivual stack components.
+ *
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * This enumeration lists constants for referencing the components of
+ * the BLUEmagic 3.0 protocol stack, profiles, and other functionalities.
+ *
+ * In order to distinguish types of modules, items are grouped with markers to
+ * delineate start and end of the groups
+ *
+ * The module type is used for various purposes:
+ *      identification in debug print statements
+ *      access to initialization flags
+ *      access to the configuration table
+ */
+
+typedef enum {
+    /* profiles and protocols  --> Updates to oi_debug.c and oi_config_table.c */
+
+    /*   XX --> Keep Enum values up-to-date! */
+    OI_MODULE_AT,               /**< 00 AT command processing */
+    OI_MODULE_A2DP,             /**< 01 Advanced Audio Distribution Profile */
+    OI_MODULE_AVCTP,            /**< 02 Audio-Visual Control Transport Profile */
+    OI_MODULE_AVDTP,            /**< 03 Audio-Visual Distribution Protocol */
+    OI_MODULE_AVRCP,            /**< 04 Audio-Visual Remote Control Profile */
+    OI_MODULE_BIP_CLI,          /**< 05 Basic Imaging Profile protocol client */
+    OI_MODULE_BIP_SRV,          /**< 06 Basic Imaging Profile protocol server */
+    OI_MODULE_BNEP,             /**< 07 Bluetooth Network Encapsulation Protocol */
+    OI_MODULE_BPP_SENDER,       /**< 08 Basic Printing Profile */
+    OI_MODULE_BPP_PRINTER,      /**< 09 Basic Printing Profile */
+    OI_MODULE_CTP,              /**< 10 Cordless Telephony Profile */
+    OI_MODULE_DUN,              /**< 11 Dial-Up Networking Profile */
+    OI_MODULE_FAX,              /**< 12 Fax Profile */
+    OI_MODULE_FTP_CLI,          /**< 13 File Transfer Profile protocol client */
+    OI_MODULE_FTP_SRV,          /**< 14 File Transfer Profile protocol server */
+    OI_MODULE_HANDSFREE,        /**< 15 Hands-Free Profile */
+    OI_MODULE_HANDSFREE_AG,     /**< 16 Hands-Free Profile */
+    OI_MODULE_HCRP_CLI,         /**< 17 Hardcopy Cable Replacement Profile */
+    OI_MODULE_HCRP_SRV,         /**< 18 Hardcopy Cable Replacement Profile */
+    OI_MODULE_HEADSET,          /**< 19 Headset Profile */
+    OI_MODULE_HEADSET_AG,       /**< 20 Headset Profile */
+    OI_MODULE_HID,              /**< 21 Human Interface Device profile */
+    OI_MODULE_INTERCOM,         /**< 22 Intercom Profile */
+    OI_MODULE_OBEX_CLI,         /**< 23 OBEX protocol client, Generic Object Exchange Profile */
+    OI_MODULE_OBEX_SRV,         /**< 24 OBEX protocol server, Generic Object Exchange Profile */
+    OI_MODULE_OPP_CLI,          /**< 25 Object Push Profile protocol client */
+    OI_MODULE_OPP_SRV,          /**< 26 Object Push Profile protocol server */
+    OI_MODULE_PAN,              /**< 27 PAN profile */
+    OI_MODULE_PBAP_CLI,         /**< 28 Phonebook Access Profile client */
+    OI_MODULE_PBAP_SRV,         /**< 29 Phonebook Access Profile server */
+    OI_MODULE_SAP_CLI,          /**< 30 SIM Access Profile */
+    OI_MODULE_SAP_SRV,          /**< 31 SIM Access Profile */
+    OI_MODULE_SPP,              /**< 32 Serial Port Profile */
+    OI_MODULE_SYNC_CLI,         /**< 33 Synchronization Profile */
+    OI_MODULE_SYNC_SRV,         /**< 34 Synchronization Profile */
+    OI_MODULE_SYNC_CMD_CLI,     /**< 35 Synchronization Profile */
+    OI_MODULE_SYNC_CMD_SRV,     /**< 36 Synchronization Profile */
+    OI_MODULE_SYNCML,           /**< 37 SyncML Profile */
+    OI_MODULE_TCS,              /**< 38 TCS Binary */
+    OI_MODULE_VDP,              /**< 39 Video Distribution Profile */
+
+    /* corestack components   --> Updates to oi_debug.c and oi_config_table.c */
+
+    OI_MODULE_COMMON_CONFIG,    /**< 40 Common configuration, module has no meaning other than for config struct */
+    OI_MODULE_CMDCHAIN,         /**< 41 Command chaining utility */
+    OI_MODULE_DISPATCH,         /**< 42 Dispatcher */
+    OI_MODULE_DATAELEM,         /**< 43 Data Elements, marshaller */
+    OI_MODULE_DEVMGR,           /**< 44 Device Manager */
+    OI_MODULE_DEVMGR_MODES,     /**< 45 Device Manager connectability/discoverability modes */
+    OI_MODULE_HCI,              /**< 46 Host Controller Interface command layer */
+    OI_MODULE_L2CAP,            /**< 47 L2CAP */
+    OI_MODULE_MEMMGR,           /**< 48 modules that do memory management */
+    OI_MODULE_POLICYMGR,        /**< 49 Policy Manager */
+    OI_MODULE_RFCOMM,           /**< 50 RFCOMM */
+    OI_MODULE_RFCOMM_SD,        /**< 51 RFCOMM Service discovery */
+    OI_MODULE_SDP_CLI,          /**< 52 Service Discovery Protocol client */
+    OI_MODULE_SDP_SRV,          /**< 53 Service Discovery Protocol server */
+    OI_MODULE_SDPDB,            /**< 54 Service Discovery Protocol database */
+    OI_MODULE_SECMGR,           /**< 55 Security Manager */
+    OI_MODULE_SNIFFLOG,         /**< 56 sniff log */
+    OI_MODULE_SUPPORT,          /**< 57 support functions, including CThru Dispatcher, time functions, and stack initialization */
+    OI_MODULE_TRANSPORT,        /**< 58 transport layer between HCI command layer and driver */
+    OI_MODULE_TEST,             /**< 59 used to debug output from internal test programs */
+    OI_MODULE_XML,              /**< 60 XML/CSS parser */
+
+    OI_MODULE_DI,               /**< 61 Device Identification Profile */
+
+    // bhapi components  --> Updates to oi_debug.c
+
+    OI_MODULE_BHAPI,            /**< 62 BLUEmagic Host API generic */
+    OI_MODULE_BHCLI,            /**< 63 BLUEmagic Host API client side */
+    OI_MODULE_BHSRV,            /**< 64 BLUEmagic Host API server side */
+    OI_MODULE_MSGQ,             /**< 65 module that handles message queuing */
+    OI_MODULE_BHAPI_TRANSPORT,  /**< 66 module that handles message queuing */
+    OI_MODULE_BLST_SRV,         /**< 67 module that provides server side BHAPI Lightweight Serial Transport */
+    OI_MODULE_BLST_CLI,         /**< 68 module that provides client side BHAPI Lightweight Serial Transport */
+
+    // OEM files --> Updates to oi_debug.c
+    OI_MODULE_OEM,              /**< 69 Application Memory allocation */
+
+    // Application glue --> Updates to oi_debug.c
+    OI_MODULE_APP,              /**< 70 Application Memory allocation */
+
+    /* various pieces of code depend on these last 2 elements occuring in a specific order:
+       OI_MODULE_ALL must be the 2nd to last element
+       OI_MODULE_UNKNOWN must be the last element
+       */
+    OI_MODULE_ALL,              /**< 71 special value identifying all modules - used for control of debug print statements */
+    OI_MODULE_UNKNOWN           /**< 72 special value - used for debug print statements */
+} OI_MODULE;
+
+/**
+ * This constant is the number of actual modules in the list.  ALL and UNKNOWN are
+ * special values that are not actually modules.
+ * Used for debug print and memmgr profiling
+ */
+#define OI_NUM_MODULES  OI_MODULE_ALL
+
+
+/**
+ * This constant is the number of profile and core components.  It is used to size
+ * the initialization and configuration tables.
+ */
+#define OI_NUM_STACK_MODULES    OI_MODULE_BHAPI
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+#endif /* _OI_MODULES_H */
+
diff --git a/tools/sdk/include/bluedroid/oi_osinterface.h b/tools/sdk/include/bluedroid/oi_osinterface.h
new file mode 100644
index 00000000000..78680419001
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_osinterface.h
@@ -0,0 +1,197 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_OSINTERFACE_H
+#define _OI_OSINTERFACE_H
+/**
+ @file
+ * This file provides the platform-independent interface for functions for which
+ * implementation is platform-specific.
+ *
+ * The functions in this header file define the operating system or hardware
+ * services needed by the BLUEmagic 3.0 protocol stack. The
+ * actual implementation of these services is platform-dependent.
+ *
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#include "oi_stddefs.h"
+#include "oi_time.h"
+#include "oi_status.h"
+#include "oi_modules.h"
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * Terminates execution.
+ *
+ * @param reason  Reason for termination
+ */
+void OI_FatalError(OI_STATUS reason);
+
+/**
+ * This function logs an error.
+ *
+ * When built for release mode, BLUEmagic 3 errors are logged to
+ * this function. (in debug mode, errors are logged via
+ * OI_Print()).
+ *
+ * @param module Module in which the error was detected (see
+ *                oi_modules.h)
+ * @param lineno Line number of the C file OI_SLOG_ERROR called
+ * @param status Status code associated with the error event
+ */
+void OI_LogError(OI_MODULE module, OI_INT lineno, OI_STATUS status);
+
+/**
+ * This function initializes the debug code handling.
+ *
+ * When built for debug mode, this function performs platform
+ * dependent initialization to handle message codes passed in
+ * via OI_SetMsgCode().
+ */
+void OI_InitDebugCodeHandler(void);
+
+
+/**
+ * This function reads the time from the real time clock.
+ *
+ * All timing in BM3 is relative, typically a granularity
+ * of 5 or 10 msecs is adequate.
+ *
+ * @param[out] now  Pointer to the buffer to which the current
+ *       time will be returned
+ */
+void OI_Time_Now(OI_TIME *now);
+
+/**
+ * This function causes the current thread to sleep for the
+ * specified amount of time. This function must be called
+ * without the stack access token.
+ *
+ * @note BM3 corestack and profiles never suspend and never call
+ * OI_Sleep. The use of OI_Sleep is limited to applications and
+ * platform-specific code.
+ *
+ * If your port and applications never use OI_Sleep, this function can be left unimplemented.
+ *
+ * @param milliseconds  Number of milliseconds to sleep
+ */
+void OI_Sleep(OI_UINT32 milliseconds);
+
+
+/**
+ * Defines for message type codes.
+ */
+#define OI_MSG_CODE_APPLICATION               0   /**< Application output */
+#define OI_MSG_CODE_ERROR                     1   /**< Error message output */
+#define OI_MSG_CODE_WARNING                   2   /**< Warning message output */
+#define OI_MSG_CODE_TRACE                     3   /**< User API function trace output */
+#define OI_MSG_CODE_PRINT1                    4   /**< Catagory 1 debug print output */
+#define OI_MSG_CODE_PRINT2                    5   /**< Catagory 2 debug print output */
+#define OI_MSG_CODE_HEADER                    6   /**< Error/Debug output header */
+
+/**
+ * This function is used to indicate the type of text being output with
+ * OI_Print(). For the Linux and Win32 platforms, it will set
+ * the color of the text. Other possible uses could be to insert
+ * HTML style tags, add some other message type indication, or
+ * be completely ignored altogether.
+ *
+ * @param code  OI_MSG_CODE_* indicating setting the message type.
+ */
+void OI_SetMsgCode(OI_UINT8 code);
+
+/**
+ * All output from OI_Printf() and all debug output is sent to OI_Print.
+ * Typically, if the platform has a console, OI_Print() is sent to stdout.
+ * Embedded platforms typically send OI_Print() output to a serial port.
+ *
+ * @param str  String to print
+ */
+void OI_Print(OI_CHAR const *str);
+
+/**
+ *  In cases where OI_Print() is sending output to a logfile in addition to console,
+ *  it is desirable to also put console input into the logfile.
+ *  This function can be called by the console input process.
+ *
+ *  @note This is an optional API which is strictly
+ *  between the platform-specific stack_console and osinterface
+ *  modules. This API need only be implemented on those
+ *  platforms where is serves a useful purpose, e.g., win32.
+ *
+ * @param str  Console input string
+ */
+
+void OI_Print_ConsoleInput(OI_CHAR const *str);
+
+/**
+ *  This function computes the CRC16 of the program image.
+ */
+OI_UINT16  OI_ProgramImageCRC16(void);
+
+/**
+ * Writes an integer to stdout in hex. This macro is intended
+ * for selective use when debugging in small memory
+ * configurations or other times when it is not possible to use
+ * OI_DBGPRINT.
+ *
+ * @param n  the integer to print
+ */
+
+#define OI_Print_Int(n) \
+{ \
+    static const OI_CHAR _digits[] = "0123456789ABCDEF"; \
+    OI_CHAR _buf[9]; \
+    OI_CHAR *_str = &_buf[8]; \
+    OI_UINT32 _i = n; \
+    *_str = 0; \
+    do { *(--_str) = _digits[(_i & 0xF)]; _i >>= 4; } while (_i); \
+    OI_Print(_str); \
+}
+
+/**
+ *  Application Dynamic Memory allocation.
+ *
+ *  These APIs are provided for application use on those
+ *  platforms which have no dynamic memory support. Memory is
+ *  allocated from the pool-based heap managed by the stack's
+ *  internal memory manager.
+ */
+void *OI_APP_Malloc(OI_INT32 size);
+void OI_APP_Free(void *ptr);
+
+/*****************************************************************************/
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+#endif /* _OI_OSINTERFACE_H */
+
diff --git a/tools/sdk/include/bluedroid/oi_status.h b/tools/sdk/include/bluedroid/oi_status.h
new file mode 100644
index 00000000000..8c392a292de
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_status.h
@@ -0,0 +1,579 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_STATUS_H
+#define _OI_STATUS_H
+/**
+ * @file
+ * This file contains status codes for BLUEmagic 3.0 software.
+ */
+
+#include "oi_stddefs.h"
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** test it **/
+
+/**
+ * OI_STATUS must fit in 16 bits, so status codes can range from 0 to 66535, inclusive.
+ */
+
+typedef enum {
+    OI_STATUS_SUCCESS                      = 0,   /**< function call succeeded alias for #OI_OK */
+    OI_OK                                  = 0,   /**< function call succeeded alias for #OI_STATUS_SUCCESS */
+    OI_STATUS_INVALID_PARAMETERS           = 101, /**< invalid function input parameters */
+    OI_STATUS_NOT_IMPLEMENTED              = 102, /**< attempt to use an unimplemented function */
+    OI_STATUS_NOT_INITIALIZED              = 103, /**< data not initialized */
+    OI_STATUS_NO_RESOURCES                 = 104, /**< generic resource allocation failure status */
+    OI_STATUS_INTERNAL_ERROR               = 105, /**< internal inconsistency */
+    OI_STATUS_OUT_OF_MEMORY                = 106, /**< generally, OI_Malloc failed */
+    OI_ILLEGAL_REENTRANT_CALL              = 107, /**< violation of non-reentrant module policy */
+    OI_STATUS_INITIALIZATION_FAILED        = 108, /**< module initialization failed */
+    OI_STATUS_INITIALIZATION_PENDING       = 109, /**< inititialization not yet complete */
+    OI_STATUS_NO_SCO_SUPPORT               = 110, /**< SCO operation rejected; system not configured for SCO */
+    OI_STATUS_OUT_OF_STATIC_MEMORY         = 111, /**< static malloc failed */
+    OI_TIMEOUT                             = 112, /**< generic timeout */
+    OI_OS_ERROR                            = 113, /**< some operating system error */
+    OI_FAIL                                = 114, /**< generic failure */
+    OI_STRING_FORMAT_ERROR                 = 115, /**< error in VarString formatting string */
+    OI_STATUS_PENDING                      = 116, /**< The operation is pending. */
+    OI_STATUS_INVALID_COMMAND              = 117, /**< The command was invalid. */
+    OI_BUSY_FAIL                           = 118, /**< command rejected due to busy */
+    OI_STATUS_ALREADY_REGISTERED           = 119, /**< The registration has already been performed. */
+    OI_STATUS_NOT_FOUND                    = 120, /**< The referenced resource was not found. */
+    OI_STATUS_NOT_REGISTERED               = 121, /**< not registered */
+    OI_STATUS_NOT_CONNECTED                = 122, /**< not connected */
+    OI_CALLBACK_FUNCTION_REQUIRED          = 123, /**< A callback function parameter was required. */
+    OI_STATUS_MBUF_OVERFLOW                = 124, /**< There is no room to add another buffer to an mbuf. */
+    OI_STATUS_MBUF_UNDERFLOW               = 125, /**< There was an attempt to pull too many bytes from an mbuf. */
+    OI_STATUS_CONNECTION_EXISTS            = 126, /**< connection exists */
+    OI_STATUS_NOT_CONFIGURED               = 127, /**< module not configured */
+    OI_LOWER_STACK_ERROR                   = 128, /**< An error was reported by lower stack API. This is used for embedded platforms. */
+    OI_STATUS_RESET_IN_PROGRESS            = 129, /**< Request failed/rejected because we're busy resetting. */
+    OI_STATUS_ACCESS_DENIED                = 130, /**< Generic access denied error. */
+    OI_STATUS_DATA_ERROR                   = 131, /**< Generic data error. */
+    OI_STATUS_INVALID_ROLE                 = 132, /**< The requested role was invalid. */
+    OI_STATUS_ALREADY_CONNECTED            = 133, /**< The requested connection is already established. */
+    OI_STATUS_PARSE_ERROR                  = 134, /**< Parse error */
+    OI_STATUS_END_OF_FILE                  = 135, /**< End of file */
+    OI_STATUS_READ_ERROR                   = 136, /**< Generic read error */
+    OI_STATUS_WRITE_ERROR                  = 137, /**< Generic write error */
+    OI_STATUS_NEGOTIATION_FAILURE          = 138, /**< Error in negotiation */
+    OI_STATUS_READ_IN_PROGRESS             = 139, /**< A read is already in progress */
+    OI_STATUS_ALREADY_INITIALIZED          = 140, /**< Initialization has already been done */
+    OI_STATUS_STILL_CONNECTED              = 141, /**< The service cannot be shutdown because there are still active connections. */
+    OI_STATUS_MTU_EXCEEDED                 = 142, /**< The packet is too big */
+    OI_STATUS_LINK_TERMINATED              = 143, /**< The link was terminated */
+    OI_STATUS_PIN_CODE_TOO_LONG            = 144, /**< Application gave us a pin code that is too long */
+    OI_STATUS_STILL_REGISTERED             = 145, /**< The service cannot be shutdown because there are still active registrations. */
+    OI_STATUS_SPEC_VIOLATION               = 146, /**< Some application behavior contrary to BT specifications */
+
+
+    OI_STATUS_PSM_ALREADY_REGISTERED       = 402, /**< L2CAP: The specified PSM has already been registered. */
+    OI_STATUS_INVALID_CID                  = 403, /**< L2CAP: CID is invalid or no longer valid (connection terminated) */
+    OI_STATUS_CID_NOT_FOUND                = 404, /**< L2CAP: CID does not represent a current connection */
+    OI_STATUS_CHANNEL_NOT_FOUND            = 406, /**< L2CAP: CID does not represent a current connection */
+    OI_STATUS_PSM_NOT_FOUND                = 407, /**< L2CAP: PSM not found */
+    OI_STATUS_INVALID_STATE                = 408, /**< L2CAP: invalid state */
+    OI_STATUS_WRITE_IN_PROGRESS            = 410, /**< L2CAP: write in progress */
+    OI_STATUS_INVALID_PACKET               = 411, /**< L2CAP: invalid packet */
+    OI_STATUS_SEND_COMPLETE                = 412, /**< L2CAP: send is complete */
+    OI_STATUS_INVALID_HANDLE               = 414, /**< L2CAP: handle is invalid */
+    OI_STATUS_GROUP_FULL                   = 418, /**< L2CAP: No more members can be added to the specified group. */
+    OI_STATUS_DEVICE_ALREADY_IN_GROUP      = 423, /**< L2CAP: The device already exists in the group. */
+    OI_STATUS_DUPLICATE_GROUP              = 425, /**< L2CAP: attempt to add more than one group */
+    OI_STATUS_EMPTY_GROUP                  = 426, /**< L2CAP: group is empty */
+    OI_STATUS_PACKET_NOT_FOUND             = 427, /**< L2CAP: packet not found */
+    OI_STATUS_BUFFER_TOO_SMALL             = 428, /**< L2CAP: The buffer size is too small. */
+    OI_STATUS_IDENTIFIER_NOT_FOUND         = 429, /**< L2CAP: identifier not found */
+
+    OI_L2CAP_DISCONNECT_LOWER_LAYER        = 430, /**< L2CAP: The lower level forced a disconnect. */
+    OI_L2CAP_DISCONNECT_REMOTE_REQUEST     = 431, /**< L2CAP: The remote device requested a disconnect. */
+    OI_L2CAP_GROUP_ADD_CONNECT_FAIL        = 433, /**< L2CAP: Group add connect faiL */
+    OI_L2CAP_GROUP_REMOVE_FAILURE          = 434, /**< L2CAP: Group remove failure */
+    OI_L2CAP_DATA_WRITE_ERROR_LINK_TERM    = 435, /**< L2CAP: Data write error LINK_TERM */
+    OI_L2CAP_DISCONNECT_LOCAL_REQUEST      = 436, /**< L2CAP: Disconnect local request */
+
+    OI_L2CAP_CONNECT_TIMEOUT               = 437, /**< L2CAP: Connect timeout */
+    OI_L2CAP_DISCONNECT_TIMEOUT            = 439, /**< L2CAP: Disconnect timeout */
+    OI_L2CAP_PING_TIMEOUT                  = 440, /**< L2CAP: Ping timeout */
+    OI_L2CAP_GET_INFO_TIMEOUT              = 441, /**< L2CAP: Get info timeout */
+    OI_L2CAP_INVALID_ADDRESS               = 444, /**< L2CAP: Invalid address */
+    OI_L2CAP_CMD_REJECT_RCVD               = 445, /**< L2CAP: remote sent us 'command reject' response */
+
+    OI_L2CAP_CONNECT_BASE                  = 450, /**< L2CAP: Connect base */
+    OI_L2CAP_CONNECT_PENDING               = 451, /**< L2CAP: Connect pending */
+    OI_L2CAP_CONNECT_REFUSED_INVALID_PSM   = 452, /**< L2CAP: Connect refused invalid PSM */
+    OI_L2CAP_CONNECT_REFUSED_SECURITY      = 453, /**< L2CAP: Connect refused security */
+    OI_L2CAP_CONNECT_REFUSED_NO_RESOURCES  = 454, /**< L2CAP: Connect refused no resources */
+
+    OI_L2CAP_CONFIG_BASE                   = 460, /**< L2CAP: Config base */
+    OI_L2CAP_CONFIG_FAIL_INVALID_PARAMETERS = 461, /**< L2CAP: Config fail invalid parameters */
+    OI_L2CAP_CONFIG_FAIL_NO_REASON         = 462, /**< L2CAP: Config fail no reason */
+    OI_L2CAP_CONFIG_FAIL_UNKNOWN_OPTIONS   = 463, /**< L2CAP: Config fail unknown options */
+
+    OI_L2CAP_GET_INFO_BASE                 = 470, /**< L2CAP: Get info base */
+    OI_L2CAP_GET_INFO_NOT_SUPPORTED        = 471, /**< L2CAP: Get info not supported */
+    OI_L2CAP_MTU_EXCEEDED                  = 472, /**< L2CAP: The MTU of the channel was exceeded */
+    OI_L2CAP_INVALID_PSM                   = 482, /**< L2CAP: Invalid PSM */
+    OI_L2CAP_INVALID_MTU                   = 483, /**< L2CAP: Invalid MTU */
+    OI_L2CAP_INVALID_FLUSHTO               = 484, /**< L2CAP: Invalid flush timeout */
+
+    OI_HCI_NO_SUCH_CONNECTION               = 601, /**< HCI: caller specified a non-existent connection handle */
+    OI_HCI_CB_LIST_FULL                     = 603, /**< HCI: callback list is full, cannot attempt to send command */
+    OI_HCI_EVENT_UNDERRUN                   = 605, /**< HCI: parsing event packet, premature end-of-parameters */
+    OI_HCI_UNKNOWN_EVENT_CODE               = 607, /**< HCI: event received - event code is unknown */
+    OI_HCI_BAD_EVENT_PARM_LEN               = 608, /**< HCI: event - parameter length is incorrect */
+    OI_HCI_CMD_QUEUE_FULL                   = 611, /**< HCI: command queue is full */
+    OI_HCI_SHORT_EVENT                      = 612, /**< HCI: event received, missing event code and/or parm len */
+    OI_HCI_TRANSMIT_NOT_READY               = 613, /**< HCI: ACL/SCO transmit request failed - busy or no buffers available */
+    OI_HCI_ORPHAN_SENT_EVENT                = 614, /**< HCI: got spurious 'sent' event from transport layer */
+    OI_HCI_CMD_TABLE_ERROR                  = 615, /**< HCI: inconsistency in the internal command table */
+    OI_HCI_UNKNOWN_CMD_ID                   = 616, /**< HCI: HciApi Command - unknown command id */
+    OI_HCI_UNEXPECTED_EVENT                 = 619, /**< HCI: event received which only occurs in response to our cmd */
+    OI_HCI_EVENT_TABLE_ERROR                = 620, /**< HCI: inconsistency in the internal event table */
+    OI_HCI_EXPECTED_EVENT_TIMOUT            = 621, /**< HCI: timed out waiting for an expected event */
+    OI_HCI_NO_CMD_DESC_FOR_OPCODE           = 622, /**< HCI: event opcode is not known */
+    OI_HCI_INVALID_OPCODE_ERROR             = 623, /**< HCI: command opcode is invalid */
+    OI_HCI_FLOW_CONTROL_DISABLED            = 624, /**< HCI: can not use host flow control APIs if disabled in configuration */
+    OI_HCI_TX_COMPLETE                      = 625, /**< HCI: packet delivery to Host Controler complete */
+    OI_HCI_TX_ERROR                         = 626, /**< HCI: failed to deliver packet to Host Controler */
+    OI_HCI_DEVICE_NOT_INITIALIZED           = 627, /**< HCI: commands from upper layers disallowed until device is up and running */
+    OI_HCI_UNSUPPORTED_COMMAND              = 628, /**< HCI: command requested is not supported by local device */
+    OI_HCI_PASSTHROUGH_ERROR                = 629, /**< HCI: Error processing passthrough command */
+    OI_HCI_PASSTHROUGH_ALREADY_SET          = 630, /**< HCI: Passthrough mode already enabled */
+    OI_HCI_RESET_FAILURE                    = 631, /**< HCI: failed to reset the device/baseband */
+    OI_HCI_TRANSPORT_RESET                  = 632, /**< HCI: some operation failed because of a reset in the transport */
+    OI_HCIERR_HCIIFC_INIT_FAILURE           = 633, /**< HCI: failed to initialize transport layer interface */
+
+    OI_HCIERR_FIRST_ERROR_VALUE                = 701, /**< marker for first HCI protocol error */
+    OI_HCIERR_UNKNOWN_HCI_COMMAND              = 701, /**< HCI: protocol error 0x01 */
+    OI_HCIERR_NO_CONNECTION                    = 702, /**< HCI: protocol error 0x02 */
+    OI_HCIERR_HARDWARE_FAILURE                 = 703, /**< HCI: protocol error 0x03 */
+    OI_HCIERR_PAGE_TIMEOUT                     = 704, /**< HCI: protocol error 0x04 */
+    OI_HCIERR_AUTHENTICATION_FAILURE           = 705, /**< HCI: protocol error 0x05 */
+    OI_HCIERR_KEY_MISSING                      = 706, /**< HCI: protocol error 0x06 */
+    OI_HCIERR_MEMORY_FULL                      = 707, /**< HCI: protocol error 0x07 */
+    OI_HCIERR_CONNECTION_TIMEOUT               = 708, /**< HCI: protocol error 0x08 */
+    OI_HCIERR_MAX_NUM_OF_CONNECTIONS           = 709, /**< HCI: protocol error 0x09 */
+    OI_HCIERR_MAX_NUM_OF_SCO_CONNECTIONS       = 710, /**< HCI: protocol error 0x0A */
+    OI_HCIERR_ACL_CONNECTION_ALREADY_EXISTS    = 711, /**< HCI: protocol error 0x0B */
+    OI_HCIERR_COMMAND_DISALLOWED               = 712, /**< HCI: protocol error 0x0C */
+    OI_HCIERR_HOST_REJECTED_RESOURCES          = 713, /**< HCI: protocol error 0x0D */
+    OI_HCIERR_HOST_REJECTED_SECURITY           = 714, /**< HCI: protocol error 0x0E */
+    OI_HCIERR_HOST_REJECTED_PERSONAL_DEVICE    = 715, /**< HCI: protocol error 0x0F */
+    OI_HCIERR_HOST_TIMEOUT                     = 716, /**< HCI: protocol error 0x10 */
+    OI_HCIERR_UNSUPPORTED                      = 717, /**< HCI: protocol error 0x11 */
+    OI_HCIERR_INVALID_PARAMETERS               = 718, /**< HCI: protocol error 0x12 */
+    OI_HCIERR_OTHER_END_USER_DISCONNECT        = 719, /**< HCI: protocol error 0x13 */
+    OI_HCIERR_OTHER_END_LOW_RESOURCES          = 720, /**< HCI: protocol error 0x14 */
+    OI_HCIERR_OTHER_END_POWERING_OFF           = 721, /**< HCI: protocol error 0x15 */
+    OI_HCIERR_CONNECTION_TERMINATED_LOCALLY    = 722, /**< HCI: protocol error 0x16 */
+    OI_HCIERR_REPEATED_ATTEMPTS                = 723, /**< HCI: protocol error 0x17 */
+    OI_HCIERR_PAIRING_NOT_ALLOWED              = 724, /**< HCI: protocol error 0x18 */
+    OI_HCIERR_UNKNOWN_LMP_PDU                  = 725, /**< HCI: protocol error 0x19 */
+    OI_HCIERR_UNSUPPORTED_REMOTE_FEATURE       = 726, /**< HCI: protocol error 0x1A */
+    OI_HCIERR_SCO_OFFSET_REJECTED              = 727, /**< HCI: protocol error 0x1B */
+    OI_HCIERR_SCO_INTERVAL_REJECTED            = 728, /**< HCI: protocol error 0x1C */
+    OI_HCIERR_SCO_AIR_MODE_REJECTED            = 729, /**< HCI: protocol error 0x1D */
+    OI_HCIERR_INVALID_LMP_PARMS                = 730, /**< HCI: protocol error 0x1E */
+    OI_HCIERR_UNSPECIFIED_ERROR                = 731, /**< HCI: protocol error 0x1F */
+    OI_HCIERR_UNSUPPORTED_LMP_PARAMETERS       = 732, /**< HCI: protocol error 0x20 */
+    OI_HCIERR_ROLE_CHANGE_NOT_ALLOWED          = 733, /**< HCI: protocol error 0x21 */
+    OI_HCIERR_LMP_RESPONSE_TIMEOUT             = 734, /**< HCI: protocol error 0x22 */
+    OI_HCIERR_LMP_ERROR_TRANS_COLLISION        = 735, /**< HCI: protocol error 0x23 */
+    OI_HCIERR_LMP_PDU_NOT_ALLOWED              = 736, /**< HCI: protocol error 0x24 */
+    OI_HCIERR_ENCRYPTION_MODE_NOT_ACCEPTABLE   = 737, /**< HCI: protocol error 0x25 */
+    OI_HCIERR_UNIT_KEY_USED                    = 738, /**< HCI: protocol error 0x26 */
+    OI_HCIERR_QOS_NOT_SUPPORTED                = 739, /**< HCI: protocol error 0x27 */
+    OI_HCIERR_INSTANT_PASSED                   = 740, /**< HCI: protocol error 0x28 */
+    OI_HCIERR_UNIT_KEY_PAIRING_UNSUPPORTED     = 741, /**< HCI: protocol error 0x29 */
+    OI_HCIERR_DIFFERENT_TRANS_COLLISION        = 742, /**< HCI: protocol error 0x2A */
+    OI_HCIERR_RESERVED_2B                      = 743, /**< HCI: protocol error 0x2B */
+    OI_HCIERR_QOS_UNACCEPTABLE_PARAMETER       = 744, /**< HCI: protocol error 0x2C */
+    OI_HCIERR_QOS_REJECTED                     = 745, /**< HCI: protocol error 0x2D */
+    OI_HCIERR_CHANNEL_CLASSIFICATION_NS        = 746, /**< HCI: protocol error 0x2E */
+    OI_HCIERR_INSUFFICIENT_SECURITY            = 747, /**< HCI: protocol error 0x2F */
+    OI_HCIERR_PARM_OUT_OF_MANDATORY_RANGE      = 748, /**< HCI: protocol error 0x30 */
+    OI_HCIERR_RESERVED_31                      = 749, /**< HCI: protocol error 0x31 */
+    OI_HCIERR_ROLE_SWITCH_PENDING              = 750, /**< HCI: protocol error 0x32 */
+    OI_HCIERR_RESERVED_33                      = 751, /**< HCI: protocol error 0x33 */
+    OI_HCIERR_RESERVED_SLOT_VIOLATION          = 752, /**< HCI: protocol error 0x34 */
+    OI_HCIERR_ROLE_SWITCH_FAILED               = 753, /**< HCI: protocol error 0x35 */
+    OI_HCIERR_EIR_TOO_LARGE                    = 754, /**< HCI: protocol error 0x36 */
+    OI_HCIERR_SSP_NOT_SUPPORTED_BY_HOST        = 755, /**< HCI: protocol error 0x37 */
+    OI_HCIERR_HOST_BUSY_PAIRING                = 756, /**< HCI: protocol error 0x38 */
+
+    OI_HCIERR_UNKNOWN_ERROR                    = 757, /**< HCI: unknown error code */
+    OI_HCIERR_LAST_ERROR_VALUE                 = 757, /**< marker for last HCI protocol error */
+
+    OI_SDP_SPEC_ERROR                    = 800, /**< SDP: Base error status for mapping OI_STATUS codes to SDP errors */
+    OI_SDP_INVALID_SERVICE_RECORD_HANDLE = (OI_SDP_SPEC_ERROR + 2), /**< SDP: protocol error Invalid Service Record Handle */
+    OI_SDP_INVALID_REQUEST_SYNTAX        = (OI_SDP_SPEC_ERROR + 3), /**< SDP: protocol error Invalid Request Syntax */
+    OI_SDP_INVALID_PDU_SIZE              = (OI_SDP_SPEC_ERROR + 4), /**< SDP: protocol error Invalid PDU Size */
+    OI_SDP_INVALID_CONTINUATION_STATE    = (OI_SDP_SPEC_ERROR + 5), /**< SDP: protocol error Invalid Continuation State */
+    OI_SDP_INSUFFICIENT_RESOURCES        = (OI_SDP_SPEC_ERROR + 6), /**< SDP: protocol error Insufficient Resources */
+    OI_SDP_ERROR                         = 807, /**< SDP: server returned an error code */
+    OI_SDP_CORRUPT_DATA_ELEMENT          = 808, /**< SDP: Invalid or corrupt data element representation */
+    OI_SDP_SERVER_NOT_CONNECTED          = 810, /**< SDP: Attempt to disconnect from an unconnected server */
+    OI_SDP_ACCESS_DENIED                 = 811, /**< SDP: Server denied access to server */
+    OI_SDP_ATTRIBUTES_OUT_OF_ORDER       = 812, /**< SDP: Attributes in attribute list not in ascending order */
+    OI_SDP_DEVICE_DOES_NOT_SUPPORT_SDP   = 813, /**< SDP: Tried to connect to a device that does not support SDP */
+    OI_SDP_NO_MORE_DATA                  = 815, /**< SDP: Server does not have more continuation data */
+    OI_SDP_REQUEST_PARAMS_TOO_LONG       = 816, /**< SDP: Parameters for a request exceed the L2CAP buffer size */
+    OI_SDP_REQUEST_PENDING               = 817, /**< SDP: Cannot make a request when another request is being processed */
+    OI_SDP_SERVER_CONNECT_FAILED         = 819, /**< SDP: Failed attempt to connect to an SDP server */
+    OI_SDP_SERVER_TOO_MANY_CONNECTIONS   = 821, /**< SDP: Exceeded maximum number of simultaneous server connections */
+    OI_SDP_NO_MATCHING_SERVICE_RECORD    = 823, /**< SDP: No service record matched the UUID list */
+    OI_SDP_PARTIAL_RESPONSE              = 824, /**< SDP: Internal use only */
+    OI_SDP_ILLEGAL_ARGUMENT              = 825, /**< SDP: Illegal argument passed to an SDP function */
+    OI_SDP_ATTRIBUTE_NOT_FOUND           = 826, /**< SDP: A requested attribute was not found in a service record */
+    OI_SDP_DATABASE_OUT_OF_RESOURCES     = 827, /**< SDP: server database is out of memory */
+    OI_SDP_SHORT_PDU                     = 829, /**< SDP: Not enough bytes in the packet */
+    OI_SDP_TRANSACTION_ID_MISMATCH       = 830, /**< SDP: Transaction Id was not as expected */
+    OI_SDP_UNEXPECTED_RESPONSE_PDU_ID    = 831, /**< SDP: Did not expect this response PDU */
+    OI_SDP_REQUEST_TIMEOUT               = 832, /**< SDP: Did not get a response within the timeout period */
+    OI_SDP_INVALID_RESPONSE_SYNTAX       = 833, /**< SDP: Response is not correctly formatted */
+    OI_SDP_CONNECTION_TIMEOUT            = 834, /**< SDP: Connection attempt timed out at a lower layer */
+    OI_SDP_RESPONSE_DATA_ERROR           = 835, /**< SDP: Response to a service request appears to be corrupt */
+    OI_SDP_TOO_MANY_ATTRIBUTE_BYTES      = 836, /**< SDP: Response contained more bytes than requested. */
+    OI_SDP_TOO_MANY_SERVICE_RECORDS      = 837, /**< SDP: Response contained more service records than requested. */
+    OI_SDP_INVALID_CONNECTION_ID         = 838, /**< SDP: Invalid connection ID in an SDP request */
+    OI_SDP_CANNOT_SET_ATTRIBUTE          = 839, /**< SDP: Attempt to set a dynamic attribute value failed */
+    OI_SDP_BADLY_FORMED_ATTRIBUTE_VALUE  = 840, /**< SDP: An attribute value has the wrong type or structure */
+    OI_SDP_NO_ATTRIBUTE_LIST_TO_REMOVE   = 841, /**< SDP: Attempt to remove a non-existent attribute list from a service record */
+    OI_SDP_ATTRIBUTE_LIST_ALREADY_ADDED  = 842, /**< SDP: An attribute list has already been added to the service record */
+    OI_SDP_DATA_ELEMENT_TRUNCATED        = 843, /**< SDP: Data element truncated (too few bytes) */
+
+    OI_RFCOMM_WRITE_IN_PROGRESS          = 901, /**< RFCOMM: Write in progress */
+    OI_RFCOMM_INVALID_BAUDRATE           = 903, /**< RFCOMM: Invalid baudrate */
+    OI_RFCOMM_INVALID_DATABIT            = 904, /**< RFCOMM: Invalid databit */
+    OI_RFCOMM_INVALID_STOPBIT            = 905, /**< RFCOMM: Invalid stopbit */
+    OI_RFCOMM_INVALID_PARITY             = 906, /**< RFCOMM: Invalid parity */
+    OI_RFCOMM_INVALID_PARITYTYPE         = 907, /**< RFCOMM: Invalid paritytype */
+    OI_RFCOMM_INVALID_FLOWCONTROL        = 908, /**< RFCOMM: Invalid flowcontrol */
+    OI_RFCOMM_SESSION_EXISTS             = 909, /**< RFCOMM: Session exists */
+    OI_RFCOMM_INVALID_CHANNEL            = 910, /**< RFCOMM: Invalid channel */
+    OI_RFCOMM_DLCI_EXISTS                = 911, /**< RFCOMM: DLCI exists */
+    OI_RFCOMM_LINK_NOT_FOUND             = 912, /**< RFCOMM: Link not found */
+    OI_RFCOMM_REMOTE_REJECT              = 913, /**< RFCOMM: Remote reject */
+    OI_RFCOMM_TEST_IN_PROGRESS           = 915, /**< RFCOMM: Test in progress */
+    OI_RFCOMM_SESSION_NOT_FOUND          = 916, /**< RFCOMM: Session not found */
+    OI_RFCOMM_INVALID_PACKET             = 917, /**< RFCOMM: Invalid packet */
+    OI_RFCOMM_FRAMESIZE_EXCEEDED         = 918, /**< RFCOMM: Framesize exceeded */
+    OI_RFCOMM_INVALID_DLCI               = 920, /**< RFCOMM: Invalid dlci */
+    OI_RFCOMM_SERVER_NOT_REGISTERED      = 921, /**< RFCOMM: Server not registered */
+    OI_RFCOMM_CREDIT_ERROR               = 922, /**< RFCOMM: Credit error */
+    OI_RFCOMM_NO_CHANNEL_NUMBER          = 923, /**< RFCOMM: No channel number */
+    OI_RFCOMM_QUERY_IN_PROGRESS          = 924, /**< RFCOMM: Query in progress */
+    OI_RFCOMM_SESSION_SHUTDOWN           = 925, /**< RFCOMM: Session shutdown */
+    OI_RFCOMM_LOCAL_DEVICE_DISCONNECTED  = 926, /**< RFCOMM: Local device disconnected */
+    OI_RFCOMM_REMOTE_DEVICE_DISCONNECTED = 927, /**< RFCOMM: Remote device disconnected */
+    OI_RFCOMM_OUT_OF_SERVER_CHANNELS     = 928, /**< RFCOMM: Out of server channels */
+
+    OI_DISPATCH_INVALID_CB_HANDLE        = 1001, /**< Dispatcher was handed an invalid callback handle */
+    OI_DISPATCH_TABLE_OVERFLOW           = 1002, /**< Dispatcher table is full */
+
+    OI_TEST_UNKNOWN_TEST                 = 1101, /**< TEST: Unknown test */
+    OI_TEST_FAIL                         = 1102, /**< TEST: Fail */
+
+    OI_HCITRANS_CANNOT_CONNECT_TO_DEVICE   = 1201, /**< TRANSPORT: Cannot connect to device */
+    OI_HCITRANS_BUFFER_TOO_SMALL           = 1203, /**< TRANSPORT: Buffer too small */
+    OI_HCITRANS_NULL_DEVICE_HANDLE         = 1204, /**< TRANSPORT: Null device handle */
+    OI_HCITRANS_IO_ERROR                   = 1205, /**< TRANSPORT: IO error */
+    OI_HCITRANS_DEVICE_NOT_READY           = 1206, /**< TRANSPORT: Device not ready */
+    OI_HCITRANS_FUNCTION_NOT_SUPPORTED     = 1207, /**< TRANSPORT: Function not supporteD */
+    OI_HCITRANS_ACCESS_DENIED              = 1209, /**< TRANSPORT: win32 */
+    OI_HCITRANS_ACL_DATA_ERROR             = 1210, /**< TRANSPORT: ACL data error */
+    OI_HCITRANS_SCO_DATA_ERROR             = 1211, /**< TRANSPORT: SCO data error */
+    OI_HCITRANS_EVENT_DATA_ERROR           = 1212, /**< TRANSPORT: HCI event data error */
+    OI_HCITRANS_INTERNAL_ERROR             = 1214, /**< TRANSPORT: Internal error in the transport */
+    OI_HCITRANS_LINK_NOT_ACTIVE            = 1215, /**< TRANSPORT: Link to the device is not currently active */
+    OI_HCITRANS_INITIALIZING               = 1216, /**< TRANSPORT: Transport is initializing */
+
+    OI_DEVMGR_NO_CONNECTION                = 1301, /**< DEVMGR: No connection */
+    OI_DEVMGR_HARDWARE_ERROR               = 1305, /**< DEVMGR: error reported by HCI */
+    OI_DEVMGR_PENDING_CONNECT_LIST_FULL    = 1307, /**< DEVMGR: Pending connect list full */
+    OI_DEVMGR_CONNECTION_LIST_FULL         = 1309, /**< DEVMGR: Connection list full */
+    OI_DEVMGR_NO_SUCH_CONNECTION           = 1310, /**< DEVMGR: No such connection */
+    OI_DEVMGR_INQUIRY_IN_PROGRESS          = 1311, /**< DEVMGR: Inquiry in progress */
+    OI_DEVMGR_PERIODIC_INQUIRY_ACTIVE      = 1312, /**< DEVMGR: Periodic inquiry active */
+    OI_DEVMGR_NO_INQUIRIES_ACTIVE          = 1313, /**< DEVMGR: can not cancel/exit if not active */
+    OI_DEVMGR_DUPLICATE_CONNECTION         = 1314, /**< DEVMGR: internal error */
+    OI_DEVMGR_DUPLICATE_EVENT_CALLBACK     = 1316, /**< DEVMGR: attempt to register same callback twice */
+    OI_DEVMGR_EVENT_CALLBACK_LIST_FULL     = 1317, /**< DEVMGR: can not register event callback, list is full */
+    OI_DEVMGR_EVENT_CALLBACK_NOT_FOUND     = 1318, /**< DEVMGR: attempt to unregister callback failed */
+    OI_DEVMGR_BUSY                         = 1319, /**< DEVMGR: some operations can only execute one at a time */
+    OI_DEVMGR_ENUM_UNEXPECTED_INQ_COMPLETE = 1320, /**< DEVMGR: inquiry complete event in inappropriate enumeration state */
+    OI_DEVMGR_ENUM_UNEXPECTED_INQ_RESULT   = 1321, /**< DEVMGR: inquiry result event in inappropriate enumeration state */
+    OI_DEVMGR_ENUM_DATABASE_FULL           = 1322, /**< DEVMGR: device enumeration, database is full, couldn't add a new device */
+    OI_DEVMGR_ENUM_INQUIRIES_OVERLAP       = 1323, /**< DEVMGR: device enumeration, periodic inquiries occurring too close together */
+    OI_DEVMGR_UNKNOWN_LINK_TYPE            = 1324, /**< DEVMGR: HCI connect request with unkown link type */
+    OI_DEVMGR_PARAM_IO_ACTIVE              = 1325, /**< DEVMGR: request for parameter read/write while param read/write active */
+    OI_DEVMGR_UNKNOWN_IAC_LAP              = 1326, /**< DEVMGR: unrecognized IAC LAP */
+    OI_DEVMGR_SCO_ALREADY_REGISTERED       = 1327, /**< DEVMGR: only one application can use SCO */
+    OI_DEVMGR_SCO_NOT_REGISTERED           = 1328, /**< DEVMGR: SCO applications must register before using the API */
+    OI_DEVMGR_SCO_WITHOUT_ACL              = 1329, /**< DEVMGR: Got SCO connection but there is no underlying ACL connection */
+    OI_DEVMGR_NO_SUPPORT                   = 1330, /**< DEVMGR: Request is not supported by the device */
+    OI_DEVMGR_WRITE_POLICY_FAILED          = 1331, /**< DEVMGR: connection attempt failed - unable to write link policy */
+    OI_DEVMGR_NOT_IN_MASTER_MODE           = 1332, /**< DEVMGR: OI_DEVMGR EndMasterMode without prior OI_DEVMGR_BeginMasterMode */
+    OI_DEVMGR_POLICY_VIOLATION             = 1333, /**< DEVMGR: low-power request is rejected - link policy does not allow it */
+    OI_DEVMGR_BUSY_TIMEOUT                 = 1334, /**< DEVMGR: queued operation timed out while in the queue; \n
+        timeout configurable via @ref OI_CONFIG_DEVMGR::connectQueueTimeoutSecs "connectQueueTimeoutSecs" */
+    OI_DEVMGR_REENCRYPT_FAILED             = 1335, /**< DEVMGR: failed to re-encrypt link after role switch */
+    OI_DEVMGR_ROLE_POLICY_CONFLICT         = 1336, /**< DEVMGR: requested role conflicts with current policy */
+    OI_DEVMGR_BAD_INTERVAL                 = 1337, /**< DEVMGR: current linkTO outside range of requested min/max interval */
+    OI_DEVMGR_INVALID_SCO_HANDLE           = 1338, /**< DEVMGR: HCI SCO event, invalid handle */
+    OI_DEVMGR_CONNECTION_OVERLAP           = 1339, /**< DEVMGR: Connection failed due to race condition with remote side */
+    OI_DEVMGR_ORPHAN_SUBRATE_COMPLETE      = 1340, /**< DEVMGR: sniff subrate complete, but no callback */
+    OI_DEVMGR_EIR_RESPONSE_2_LARGE         = 1341, /**< DEVMGR: eir builder, response length would exceed spec max */
+
+    OI_SECMGR_NO_POLICY                    = 1401, /**< SECMGR: no security policy has been established */
+    OI_SECMGR_INTERNAL_ERROR               = 1402, /**< SECMGR: internal inconsistency */
+    OI_SECMGR_ORPHANED_CALLBACK            = 1403, /**< SECMGR: we've been called back, but CB context is gone */
+    OI_SECMGR_BUSY                         = 1404, /**< SECMGR: configure and access request cannot be concurrent */
+    OI_SECMGR_DEVICE_NOT_TRUSTED           = 1405, /**< SECMGR: l2cap access denied - device is not trusted */
+    OI_SECMGR_DEVICE_ENCRYPT_FAIL          = 1407, /**< SECMGR: l2cap access denied - failed to start encryption */
+    OI_SECMGR_DISCONNECTED_FAIL            = 1408, /**< SECMGR: l2cap access denied - disconnected */
+    OI_SECMGR_ACCESS_PENDING               = 1409, /**< SECMGR: l2cap access request is still pending  */
+    OI_SECMGR_PIN_CODE_TOO_SHORT           = 1410, /**< SECMGR: Higher-layer process gave us a pin code that is too short */
+    OI_SECMGR_UNKNOWN_ENCRYPT_VALUE        = 1411, /**< SECMGR: got EncryptionChange event, unknown encryption enable value */
+    OI_SECMGR_INVALID_POLICY               = 1412, /**< SECMGR: the specified security policy is not valid for security mode */
+    OI_SECMGR_AUTHORIZATION_FAILED         = 1413, /**< SECMGR: device authorization failed */
+    OI_SECMGR_ENCRYPTION_FAILED            = 1414, /**< SECMGR: device encryption failed */
+    OI_SECMGR_UNIT_KEY_UNSUPPORTED         = 1415, /**< SECMGR: authentication failed due to non-support of unit keys */
+    OI_SECMGR_NOT_REGISTERED               = 1416, /**< SECMGR: required registrations have not yet occurred */
+    OI_SECMGR_ILLEGAL_WRITE_SSP_MODE       = 1417, /**< SECMGR: 2.1 HCI spec does not allow SSP mode to be disabled */
+    OI_SECMGR_INVALID_SEC_LEVEL            = 1418, /**< SECMGR: security level for a service is not a valid value */
+    OI_SECMGR_INSUFFICIENT_LINK_KEY        = 1419, /**< SECMGR: link key type is not sufficient to meet service requirements */
+    OI_SECMGR_INVALID_KEY_TYPE             = 1420, /**< SECMGR: link key type is not a valid value */
+    OI_SECMGR_SSP_NOT_ENCRYPTED            = 1421, /**< SECMGR: ssp required encryption on incoming link */
+    OI_SECMGR_ORPHAN_EVENT                 = 1422, /**< SECMGR: some HCI security event unrelated to current processes */
+    OI_SECMGR_NOT_BONDABLE                 = 1423, /**< SECMGR: not in bondable mode */
+
+    OI_TCS_INVALID_ELEMENT_TYPE            = 1602, /**< TCS: element type is invalid */
+    OI_TCS_INVALID_PACKET                  = 1603, /**< TCS: packet is invalide */
+    OI_TCS_CALL_IN_PROGRESS                = 1604, /**< TCS: call is in progress */
+    OI_TCS_NO_CALL_IN_PROGRESS             = 1605, /**< TCS: no call in progress */
+
+    OI_OBEX_CONTINUE                       = 1701, /**< OBEX: Continue processing OBEX request */
+    OI_OBEX_COMMAND_ERROR                  = 1702, /**< OBEX: An unrecognized OBEX command opcode */
+    OI_OBEX_CONNECTION_TIMEOUT             = 1703, /**< OBEX: Timeout waiting for a response to a request */
+    OI_OBEX_CONNECT_FAILED                 = 1704, /**< OBEX: An OBEX connection request did not succeed */
+    OI_OBEX_DISCONNECT_FAILED              = 1705, /**< OBEX: A disconnect failed probably because the connection did not exist */
+    OI_OBEX_ERROR                          = 1706, /**< OBEX: Unspecified OBEX error */
+    OI_OBEX_INCOMPLETE_PACKET              = 1707, /**< OBEX: Packet too short or corrupt */
+    OI_OBEX_LENGTH_REQUIRED                = 1708, /**< OBEX: Length header required in OBEX command */
+    OI_OBEX_NOT_CONNECTED                  = 1709, /**< OBEX: No connection to OBEX server */
+    OI_OBEX_NO_MORE_CONNECTIONS            = 1710, /**< OBEX: Reached max connections limit */
+    OI_OBEX_OPERATION_IN_PROGRESS          = 1711, /**< OBEX: Another operation is still in progress on a connection */
+    OI_OBEX_PUT_RESPONSE_ERROR             = 1712, /**< OBEX: An error in the response to a PUT command */
+    OI_OBEX_GET_RESPONSE_ERROR             = 1713, /**< OBEX: An error in the response to a GET command */
+    OI_OBEX_REQUIRED_HEADER_NOT_FOUND      = 1714, /**< OBEX: packet was missing a required header */
+    OI_OBEX_SERVICE_UNAVAILABLE            = 1715, /**< OBEX: Unown OBEX target or required service */
+    OI_OBEX_TOO_MANY_HEADER_BYTES          = 1716, /**< OBEX: Headers will not fit in single OBEX packet */
+    OI_OBEX_UNKNOWN_COMMAND                = 1717, /**< OBEX: Unrecognized OBEX command */
+    OI_OBEX_UNSUPPORTED_VERSION            = 1718, /**< OBEX: Version mismatch */
+    OI_OBEX_CLIENT_ABORTED_COMMAND         = 1719, /**< OBEX: server received abort command */
+    OI_OBEX_BAD_PACKET                     = 1720, /**< OBEX: Any malformed OBEX packet */
+    OI_OBEX_BAD_REQUEST                    = 1721, /**< OBEX: Maps to OBEX response of the same name */
+    OI_OBEX_OBJECT_OVERFLOW                = 1723, /**< OBEX: Too many bytes received. */
+    OI_OBEX_NOT_FOUND                      = 1724, /**< OBEX: Maps to obex response of same name */
+    OI_OBEX_ACCESS_DENIED                  = 1735, /**< OBEX: Object could not be read or written. */
+    OI_OBEX_VALUE_NOT_ACCEPTABLE           = 1736, /**< OBEX: Value in a command was not in the acceptable range. */
+    OI_OBEX_PACKET_OVERFLOW                = 1737, /**< OBEX: Buffer will not fit in a single OBEX packet. */
+    OI_OBEX_NO_SUCH_FOLDER                 = 1738, /**< OBEX: Error returned by a setpath operation. */
+    OI_OBEX_NAME_REQUIRED                  = 1739, /**< OBEX: Name must be non-null and non-empty. */
+    OI_OBEX_PASSWORD_TOO_LONG              = 1740, /**< OBEX: Password exceeds implementation imposed length limit. */
+    OI_OBEX_PRECONDITION_FAILED            = 1741, /**< OBEX: response Precondition Failed */
+    OI_OBEX_UNAUTHORIZED                   = 1742, /**< OBEX: authentication was not successful. */
+    OI_OBEX_NOT_IMPLEMENTED                = 1743, /**< OBEX: Unimplemented feature. */
+    OI_OBEX_INVALID_AUTH_DIGEST            = 1744, /**< OBEX: An authentication digest was bad. */
+    OI_OBEX_INVALID_OPERATION              = 1745, /**< OBEX: Operation not allowed at this time. */
+    OI_OBEX_DATABASE_FULL                  = 1746, /**< OBEX: Sync database full. */
+    OI_OBEX_DATABASE_LOCKED                = 1747, /**< OBEX: Sync database locked. */
+    OI_OBEX_INTERNAL_SERVER_ERROR          = 1748, /**< OBEX: response Internal Server Error */
+    OI_OBEX_UNSUPPORTED_MEDIA_TYPE         = 1749, /**< OBEX: response Unsupported Media Type */
+    OI_OBEX_PARTIAL_CONTENT                = 1750, /**< OBEX: response Partial Content */
+    OI_OBEX_METHOD_NOT_ALLOWED             = 1751, /**< OBEX: response Method Not Allowed */
+    OI_OBEXSRV_INCOMPLETE_GET              = 1752, /**< OBEX: Indicates to a GET handler that the request phase is still in progress */
+    OI_OBEX_FOLDER_BROWSING_NOT_ALLOWED    = 1753, /**< OBEX: Indicates that an FTP server does not allow folder browsing */
+    OI_OBEX_SERVER_FORCED_DISCONNECT       = 1754, /**< OBEX: connection was forcibly terminated by the server */
+    OI_OBEX_OFS_ERROR                      = 1755, /**< OBEX: OPP object file system error occurred */
+    OI_OBEX_FILEOP_ERROR                   = 1756, /**< OBEX: FTP/PBAP file operation system error occurred */
+    OI_OBEX_USERID_TOO_LONG                = 1757, /**< OBEX: User Id exceeds spec limited length limit. */
+
+    OI_HANDSFREE_EVENT_REPORTING_DISABLED  = 1801, /**< HANDSFREE: Event reporting disabled */
+    OI_HANDSFREE_NOT_CONNECTED             = 1802, /**< HANDSFREE: Not connected */
+    OI_HANDSFREE_SERVICE_NOT_STARTED       = 1803, /**< HANDSFREE: Cannot connect to handsfree AG if handsfree service not started */
+    OI_HANDSFREE_AG_SERVICE_NOT_STARTED    = 1804, /**< HANDSFREE: Cannot connect to handsfree device if handsfree AG service not started */
+    OI_HANDSFREE_COMMAND_IN_PROGRESS       = 1805, /**< HANDSFREE: Cannot accept a command at this time */
+    OI_HANDSFREE_AUDIO_ALREADY_CONNECTED   = 1806, /**< HANDSFREE: Audio is already connected */
+    OI_HANDSFREE_AUDIO_NOT_CONNECTED       = 1807, /**< HANDSFREE: Audio is not connected */
+    OI_HANDSFREE_FEATURE_NOT_SUPPORTED     = 1808, /**< HANDSFREE: Local or remote feature not supported for requested command */
+
+    OI_HEADSET_SERVICE_NOT_STARTED         = 1901, /**< HEADSET: Cannot connect to headset AG if headset service not started */
+    OI_HEADSET_AG_SERVICE_NOT_STARTED      = 1902, /**< HEADSET: Cannot connect to headset device if headset AG service not started */
+    OI_HEADSET_COMMAND_IN_PROGRESS         = 1903, /**< HEADSET: Cannot accept a command at this time */
+
+    OI_BNEP_INVALID_MTU                             = 2001, /**< BNEP: The remote device cannot support the minimum BNEP MTU */
+    OI_BNEP_SETUP_TIMEOUT                           = 2002, /**< BNEP: The setup request timed out. */
+    OI_BNEP_SERVICE_NOT_REGISTERED                  = 2003, /**< BNEP: The requested service was not found. */
+    OI_BNEP_INVALID_HANDLE                          = 2004, /**< BNEP: The specified connection handle is not valid. */
+    OI_BNEP_RESPONSE_TIMEOUT                        = 2005, /**< BNEP: The timer for receiving a response has expired. */
+    OI_BNEP_INVALID_CONNECTION                      = 2006, /**< BNEP: Invalid connection */
+    OI_BNEP_INVALID_FILTER                          = 2007, /**< BNEP: The supplied filter was invalid. */
+    OI_BNEP_CONNECTION_EXISTS                       = 2008, /**< BNEP: An attempt was made to create a duplicate connection. */
+    OI_BNEP_NOT_INITIALIZED                         = 2009, /**< BNEP: Init has not been called */
+    OI_BNEP_CONNECT_BASE                            = 2010, /**< BNEP: connection response codes */
+    OI_BNEP_CONNECT_FAILED_INVALID_DEST_UUID        = 2011, /**< BNEP: connect response code Invalid Dest UUID */
+    OI_BNEP_CONNECT_FAILED_INVALID_SOURCE_UUID      = 2012, /**< BNEP: connect response code Invalid Source UUID */
+    OI_BNEP_CONNECT_FAILED_INVALID_UUID_SIZE        = 2013, /**< BNEP: connect response code Invalid UUID Size */
+    OI_BNEP_CONNECT_FAILED_NOT_ALLOWED              = 2014, /**< BNEP: connect response code Not Allowed */
+    OI_BNEP_FILTER_NET_BASE                         = 2020, /**< BNEP: filter response codes */
+    OI_BNEP_FILTER_NET_UNSUPPORTED_REQUEST          = 2021, /**< BNEP: filter response code Unsupported Request */
+    OI_BNEP_FILTER_NET_FAILED_INVALID_PROTOCOL_TYPE = 2022, /**< BNEP: filter response code Invalid Protocol Type */
+    OI_BNEP_FILTER_NET_FAILED_MAX_LIMIT_REACHED     = 2023, /**< BNEP: filter response code Max Limit Reached */
+    OI_BNEP_FILTER_NET_FAILED_SECURITY              = 2024, /**< BNEP: filter response code Security */
+    OI_BNEP_FILTER_MULTI_BASE                       = 2030, /**< BNEP: multicast response codes */
+    OI_BNEP_FILTER_MULTI_UNSUPPORTED_REQUEST        = 2031, /**< BNEP: multicast response code Unsupported Request */
+    OI_BNEP_FILTER_MULTI_FAILED_INVALID_ADDRESS     = 2032, /**< BNEP: multicast response code Invalid Address */
+    OI_BNEP_FILTER_MULTI_FAILED_MAX_LIMIT_REACHED   = 2033, /**< BNEP: multicast response code Max Limit Reached */
+    OI_BNEP_FILTER_MULTI_FAILED_SECURITY            = 2034, /**< BNEP: multicast response code Security */
+    OI_BNEP_LOCAL_DEVICE_MUST_BE_MASTER             = 2040, /**< BNEP: Device must be master of the piconet for this function */
+    OI_BNEP_PACKET_FILTERED_OUT                     = 2041, /**< BNEP: Packet did not pass current filters */
+
+    OI_NETIFC_UP_FAILED                    = 2101, /**< NETIFC: Could not bring up network interface */
+    OI_NETIFC_COULD_NOT_CREATE_THREAD      = 2102, /**< NETIFC: Network interface could not create a read thread */
+    OI_NETIFC_INITIALIZATION_FAILED        = 2103, /**< NETIFC: Error in network interface initialization */
+    OI_NETIFC_INTERFACE_ALREADY_UP         = 2104, /**< NETIFC: Network interface is already up */
+    OI_NETIFC_INTERFACE_NOT_UP             = 2105, /**< NETIFC: Network interface is not up */
+    OI_NETIFC_PACKET_TOO_BIG               = 2106, /**< NETIFC: The packet is too big */
+
+    OI_PAN_ROLE_ALREADY_REGISTERED         = 2201, /**< PAN: This PAN role was already registered */
+    OI_PAN_ROLE_NOT_ALLOWED                = 2202, /**< PAN: The PAN role is not currently allowed */
+    OI_PAN_INCOMPATIBLE_ROLES              = 2203, /**< PAN: Only certain local and remote role combinations are permitted */
+    OI_PAN_INVALID_ROLE                    = 2204, /**< PAN: Role specified is not one the defined PAN roles */
+    OI_PAN_CONNECTION_IN_PROGRESS          = 2205, /**< PAN: A PAN connection is currently being established */
+    OI_PAN_USER_ALREADY_CONNECTED          = 2206, /**< PAN: PAN user role only allows a single connection */
+    OI_PAN_DEVICE_CONNECTED                = 2207, /**< PAN: A PAN connection already exists to specified device */
+
+    OI_CODEC_SBC_NO_SYNCWORD               = 2301, /**< CODEC: Couldn't find an SBC SYNCWORD */
+    OI_CODEC_SBC_NOT_ENOUGH_HEADER_DATA    = 2302, /**< CODEC: Not enough data provided to decode an SBC header */
+    OI_CODEC_SBC_NOT_ENOUGH_BODY_DATA      = 2303, /**< CODEC: Decoded the header, but not enough data to contain the rest of the frame */
+    OI_CODEC_SBC_NOT_ENOUGH_AUDIO_DATA     = 2304, /**< CODEC: Not enough audio data for this frame */
+    OI_CODEC_SBC_CHECKSUM_MISMATCH         = 2305, /**< CODEC: The frame header didn't match the checksum */
+    OI_CODEC_SBC_PARTIAL_DECODE            = 2306, /**< CODEC: Decoding was successful, but frame data still remains. Next call will provide audio without consuming input data. */
+
+    OI_FIFOQ_QUEUE_NOT_ALIGNED             = 2401, /**< FIFOQ: queue must be 32-bit aligned */
+    OI_FIFOQ_INVALID_Q                     = 2402, /**< FIFOQ: queue parameter is not a valid queue */
+    OI_FIFOQ_BUF_TOO_LARGE                 = 2403, /**< FIFOQ: attempt to queue a buffer which is too large */
+    OI_FIFOQ_FULL                          = 2404, /**< FIFOQ: enqueue() failed, queue is full */
+    OI_FIFOQ_NOT_ALLOCATED                 = 2405, /**< FIFOQ: Enqueue QBuf() failed, buffer not allocated */
+    OI_FIFOQ_INVALID_DATA_PTR              = 2406, /**< FIFOQ: Enqueue QBuf() failed, data pointer does not match */
+
+    OI_HID_HOST_SERVICE_NOT_STARTED        = 2601, /**< HID: Cannot connect to a HID device unless HID host is started */
+    OI_HID_DEVICE_SERVICE_NOT_STARTED      = 2602, /**< HID: Cannot connect to a HID host unless HID device is started */
+
+    OI_AT_ERROR                            = 2701, /**< AT: ERROR response */
+    OI_AT_NO_CARRIER                       = 2702, /**< AT: NO CARRIER response */
+    OI_AT_BUSY                             = 2703, /**< AT: BUSY response */
+    OI_AT_NO_ANSWER                        = 2704, /**< AT: NO ANSWER response */
+    OI_AT_DELAYED                          = 2705, /**< AT: DELAYED response */
+    OI_AT_BLACKLISTED                      = 2706, /**< AT: BLACKLISTED response */
+    OI_AT_CME_ERROR                        = 2707, /**< AT: +CME ERROR response */
+    OI_AT_CMS_ERROR                        = 2708, /**< AT: +CMS ERROR response */
+
+    OI_BLST_CHARACTER_TIMEOUT              = 2801, /**< BLST: Timeout expired while waiting for a character from the client. */
+    OI_BLST_ACKNOWLDGE_TIMEOUT             = 2802, /**< BLST: Timeout expired while waiting for event acknowledgment from the client */
+    OI_BLST_TX_NOT_READY                   = 2803, /**< BLST: BLST is not ready to send a BHAPI message to the client. */
+    OI_BLST_TX_BUSY                        = 2804, /**< BLST: BLST transmit buffer is in use. */
+
+    OI_AVDTP_CONNECTION_SEQ_ERROR          = 2901, /**< AVDTP: sequencing of signalling/media channel connections broken. */
+    OI_AVDTP_OUT_OF_RESOURCES              = 2902, /**< AVDTP: Tried to allocate too many endpoints or signalling channels. */
+
+    OI_PBAP_REPOSITORY_NOT_SET             = 3001, /**< PBAP: Phonebook repository must be set for operation to complete. */
+    OI_PBAP_PHONEBOOK_NOT_SET              = 3002, /**< PBAP: Phonebook be set for operation to complete. */
+
+    OI_AADP_BAD_ENDPOINT                   = 3101, /**< AADP: Invalid local endpoint specified */
+    OI_AADP_BAD_STATE                      = 3102, /**< AADP: AADP State is not correct for this operation. */
+
+    OI_UNICODE_INVALID_SOURCE              = 3200, /**< Unicode Conversion: Source string has invalid character encoding. */
+    OI_UNICODE_SOURCE_EXHAUSTED            = 3201, /**< Unicode Conversion: Incomplete Unicode character at end of source buffer. */
+    OI_UNICODE_DESTINATION_EXHAUSTED       = 3202, /**< Unicode Conversion: Destination buffer not large enough to hold resulting Unicode string. */
+
+    OI_AVRCP_TOO_MANY_CONNECTIONS          = 3300, /**< AVRCP: Exceeded maximum number of simultaneous AVCTP connections. */
+    OI_AVRCP_NOT_IMPLEMENTED               = 3301, /**< AVRCP: The target does not implement the command specified by the opcode and operand. */
+    OI_AVRCP_REJECTED                      = 3302, /**< AVRCP: The target cannot respond because of invalid operands in command packet. */
+    OI_AVRCP_INVALID_RESPONSE              = 3303, /**< AVRCP: The controller received the response with invalid parameters */
+    OI_AVRCP_RESPONSE_PACKET_OVERFLOW      = 3304, /**< AVRCP: The response message does not fir in one AVRCP packet (512 bytes), has to be fragmented. */
+    OI_AVRCP_RESPONSE_INVALID_PDU          = 3305, /**< AVRCP: Command rejected: target received a PDU that it did not understand. */
+    OI_AVRCP_RESPONSE_INVALID_PARAMETER    = 3306, /**< AVRCP: Command rejected: target received a PDU with a parameter ID that it did not understand. */
+    OI_AVRCP_RESPONSE_PARAMETER_NOT_FOUND  = 3307, /**< AVRCP: Command rejected: specified parameter not found, sent if the parameter ID is understood, but content is wrong or corrupted.*/
+    OI_AVRCP_RESPONSE_INTERNAL_ERROR       = 3308, /**< AVRCP: Command rejected: target detected other error conditions. */
+    OI_MAX_BM3_STATUS_VAL,       /* Maximum BM3 status code */
+
+    /* Status code values reserved for BM3 SDK platform-specific implementations */
+    OI_STATUS_RESERVED_FOR_BCOT = 9000,
+
+    /* Status code values reserved for BHAPI products */
+    OI_STATUS_RESERVED_FOR_BHAPI = 9200,
+
+    /* Status code values reserved for Soundabout products */
+    OI_STATUS_RESERVED_FOR_SOUNDABOUT = 9400,
+
+    /*
+     * Status code values greater than or equal to this value are reserved for use by applications.
+     * However, because of differences between compilers, and differences between 16-bit and 32-bit
+     * platforms custom status codes should be in the 16-bit range, so status codes can range from 0
+     * to 65534, inclusive (65535 is reserved)
+     */
+    OI_STATUS_RESERVED_FOR_APPS = 10000,
+
+
+
+    OI_STATUS_NONE = 0xffff     /**< Special status code to indicate that there is no status. (Only to be used for special cases involving OI_SLOG_ERROR() and OI_SLOG_WARNING().) */
+
+} OI_STATUS;
+
+
+/* Remeber to update the #define below when new reserved blocks are added to
+ * the list above. */
+#define OI_NUM_RESERVED_STATUS_BLOCKS 4 /**< Number of status code blocks reserved, including user apps */
+
+
+/**
+ * Test for success
+ */
+#define OI_SUCCESS(x)    ((x) == OI_OK)
+
+/*****************************************************************************/
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+#endif /* _OI_STATUS_H */
+
diff --git a/tools/sdk/include/bluedroid/oi_stddefs.h b/tools/sdk/include/bluedroid/oi_stddefs.h
new file mode 100644
index 00000000000..9ab424db2e5
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_stddefs.h
@@ -0,0 +1,232 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef OI_STDDEFS_H
+#define OI_STDDEFS_H
+/**
+ * @file
+ * This file contains BM3 standard type definitions.
+ *
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#include "oi_cpu_dep.h"
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef FALSE
+#define FALSE 0         /**< This define statement sets FALSE as a preprocessor alias for 0. */
+#endif
+
+#ifndef TRUE
+#define TRUE (!FALSE)  /**< This define statement sets TRUE as a preprocessor alias for !FALSE. */
+#endif
+
+#ifdef HEW_TOOLCHAIN
+#ifdef NULL
+#undef NULL         /**< Override HEW toolchain NULL definition */
+#endif
+#define NULL 0          /**< HEW toolchain does not allow us to compare (void*) type to function pointer */
+#else
+#ifndef NULL
+#define NULL ((void*)0) /**< This define statement sets NULL as a preprocessor alias for (void*)0 */
+#endif
+#endif
+
+/**
+ * @name  Maximum and minimum values for basic types
+ * @{
+ */
+#define OI_INT8_MIN   ((OI_INT8)0x80)          /**< decimal value: -128 */
+#define OI_INT8_MAX   ((OI_INT8)0x7F)          /**< decimal value: 127 */
+#define OI_INT16_MIN  ((OI_INT16)0x8000)       /**< decimal value: -32768 */
+#define OI_INT16_MAX  ((OI_INT16)0x7FFF)       /**< decimal value: 32767 */
+#define OI_INT32_MIN  ((OI_INT32)0x80000000)   /**< decimal value: -2,147,483,648 */
+#define OI_INT32_MAX  ((OI_INT32)0x7FFFFFFF)   /**< decimal value: 2,147,483,647 */
+#define OI_UINT8_MIN  ((OI_UINT8)0)            /**< decimal value: 0 */
+#define OI_UINT8_MAX  ((OI_UINT8)0xFF)         /**< decimal value: 255 */
+#define OI_UINT16_MIN ((OI_UINT16)0)           /**< decimal value: 0 */
+#define OI_UINT16_MAX ((OI_UINT16)0xFFFF)      /**< decimal value: 65535 */
+#define OI_UINT32_MIN ((OI_UINT32)0)           /**< decimal value: 0 */
+#define OI_UINT32_MAX ((OI_UINT32)0xFFFFFFFF)  /**< decimal value: 4,294,967,295 */
+
+/**
+ * @}
+ */
+
+/**
+ * @name  Integer types required by the Service Discovery Protocol
+ * @{
+ */
+
+/** unsigned 64-bit integer as a structure of two unsigned 32-bit integers */
+typedef struct {
+    OI_UINT32 I1; /**< most significant 32 bits */
+    OI_UINT32 I2; /**< least significant 32 bits */
+} OI_UINT64;
+
+#define OI_UINT64_MIN { (OI_UINT32)0x00000000, (OI_UINT32)0x00000000 }
+#define OI_UINT64_MAX { (OI_UINT32)0XFFFFFFFF, (OI_UINT32)0XFFFFFFFF }
+
+/** signed 64-bit integer as a structure of one unsigned 32-bit integer and one signed 32-bit integer */
+typedef struct {
+    OI_INT32  I1; /**< most significant 32 bits  as a signed integer */
+    OI_UINT32 I2; /**< least significant 32 bits as an unsigned integer */
+} OI_INT64;
+
+#define OI_INT64_MIN { (OI_INT32)0x80000000, (OI_UINT32)0x00000000 }
+#define OI_INT64_MAX { (OI_INT32)0X7FFFFFFF, (OI_UINT32)0XFFFFFFFF }
+
+/** unsigned 128-bit integer as a structure of four unsigned 32-bit integers */
+typedef struct {
+    OI_UINT32 I1; /**< most significant 32 bits */
+    OI_UINT32 I2; /**< second-most significant 32 bits */
+    OI_UINT32 I3; /**< third-most significant 32 bits */
+    OI_UINT32 I4; /**< least significant 32 bits */
+} OI_UINT128;
+
+#define OI_UINT128_MIN { (OI_UINT32)0x00000000, (OI_UINT32)0x00000000,  (OI_UINT32)0x00000000, (OI_UINT32)0x00000000 }
+#define OI_UINT128_MAX { (OI_UINT32)0XFFFFFFFF, (OI_UINT32)0XFFFFFFFF,  (OI_UINT32)0XFFFFFFFF, (OI_UINT32)0XFFFFFFFF }
+
+/** signed 128-bit integer as a structure of three unsigned 32-bit integers and one signed 32-bit integer */
+typedef struct {
+    OI_INT32  I1;  /**< most significant 32 bits as a signed integer */
+    OI_UINT32 I2;  /**< second-most significant 32 bits as an unsigned integer */
+    OI_UINT32 I3;  /**< third-most significant 32 bits as an unsigned integer */
+    OI_UINT32 I4;  /**< least significant 32 bits as an unsigned integer */
+} OI_INT128;
+
+#define OI_INT128_MIN { (OI_UINT32)0x80000000, (OI_UINT32)0x00000000,  (OI_UINT32)0x00000000, (OI_UINT32)0x00000000 }
+#define OI_INT128_MAX { (OI_UINT32)0X7FFFFFFF, (OI_UINT32)0XFFFFFFFF,  (OI_UINT32)0XFFFFFFFF, (OI_UINT32)0XFFFFFFFF }
+
+/**
+ * @}
+ */
+
+
+/**
+ * type for ASCII character data items
+ */
+typedef char OI_CHAR;
+
+/**
+ * type for double-byte character data items
+ */
+typedef OI_UINT16 OI_CHAR16;
+
+/**
+ * types for UTF encoded strings.
+ */
+typedef OI_UINT8  OI_UTF8;
+typedef OI_UINT16 OI_UTF16;
+typedef OI_UINT32 OI_UTF32;
+
+
+/**
+ * @name Single-bit operation macros
+ * @{
+ * In these macros, x is the data item for which a bit is to be tested or set and y specifies which bit
+ * is to be tested or set.
+ */
+
+/** This macro's value is TRUE if the bit specified by y is set in data item x. */
+#define OI_BIT_TEST(x,y)   ((x) & (y))
+
+/** This macro's value is TRUE if the bit specified by y is not set in data item x. */
+#define OI_BIT_CLEAR_TEST(x,y)  (((x) & (y)) == 0)
+
+/** This macro sets the bit specified by y in data item x. */
+#define OI_BIT_SET(x,y)    ((x) |= (y))
+
+/** This macro clears the bit specified by y in data item x. */
+#define OI_BIT_CLEAR(x,y)  ((x) &= ~(y))
+
+/** @} */
+
+/**
+ * The OI_ARRAYSIZE macro is set to the number of elements in an array
+ * (instead of the number of bytes, which is returned by sizeof()).
+ */
+
+#ifndef OI_ARRAYSIZE
+#define OI_ARRAYSIZE(a) (sizeof(a)/sizeof(a[0]))
+#endif
+
+/**
+ * @name Preprocessor aliases for individual bit positions
+ *      Bits are defined here only if they are not already defined.
+ * @{
+ */
+
+#ifndef BIT0
+
+#define BIT0   0x00000001  /**< preprocessor alias for 32-bit value with bit 0 set, used to specify this single bit */
+#define BIT1   0x00000002  /**< preprocessor alias for 32-bit value with bit 1 set, used to specify this single bit */
+#define BIT2   0x00000004  /**< preprocessor alias for 32-bit value with bit 2 set, used to specify this single bit */
+#define BIT3   0x00000008  /**< preprocessor alias for 32-bit value with bit 3 set, used to specify this single bit */
+#define BIT4   0x00000010  /**< preprocessor alias for 32-bit value with bit 4 set, used to specify this single bit */
+#define BIT5   0x00000020  /**< preprocessor alias for 32-bit value with bit 5 set, used to specify this single bit */
+#define BIT6   0x00000040  /**< preprocessor alias for 32-bit value with bit 6 set, used to specify this single bit */
+#define BIT7   0x00000080  /**< preprocessor alias for 32-bit value with bit 7 set, used to specify this single bit */
+#define BIT8   0x00000100  /**< preprocessor alias for 32-bit value with bit 8 set, used to specify this single bit */
+#define BIT9   0x00000200  /**< preprocessor alias for 32-bit value with bit 9 set, used to specify this single bit */
+#define BIT10  0x00000400  /**< preprocessor alias for 32-bit value with bit 10 set, used to specify this single bit */
+#define BIT11  0x00000800  /**< preprocessor alias for 32-bit value with bit 11 set, used to specify this single bit */
+#define BIT12  0x00001000  /**< preprocessor alias for 32-bit value with bit 12 set, used to specify this single bit */
+#define BIT13  0x00002000  /**< preprocessor alias for 32-bit value with bit 13 set, used to specify this single bit */
+#define BIT14  0x00004000  /**< preprocessor alias for 32-bit value with bit 14 set, used to specify this single bit */
+#define BIT15  0x00008000  /**< preprocessor alias for 32-bit value with bit 15 set, used to specify this single bit */
+#define BIT16  0x00010000  /**< preprocessor alias for 32-bit value with bit 16 set, used to specify this single bit */
+#define BIT17  0x00020000  /**< preprocessor alias for 32-bit value with bit 17 set, used to specify this single bit */
+#define BIT18  0x00040000  /**< preprocessor alias for 32-bit value with bit 18 set, used to specify this single bit */
+#define BIT19  0x00080000  /**< preprocessor alias for 32-bit value with bit 19 set, used to specify this single bit */
+#define BIT20  0x00100000  /**< preprocessor alias for 32-bit value with bit 20 set, used to specify this single bit */
+#define BIT21  0x00200000  /**< preprocessor alias for 32-bit value with bit 21 set, used to specify this single bit */
+#define BIT22  0x00400000  /**< preprocessor alias for 32-bit value with bit 22 set, used to specify this single bit */
+#define BIT23  0x00800000  /**< preprocessor alias for 32-bit value with bit 23 set, used to specify this single bit */
+#define BIT24  0x01000000  /**< preprocessor alias for 32-bit value with bit 24 set, used to specify this single bit */
+#define BIT25  0x02000000  /**< preprocessor alias for 32-bit value with bit 25 set, used to specify this single bit */
+#define BIT26  0x04000000  /**< preprocessor alias for 32-bit value with bit 26 set, used to specify this single bit */
+#define BIT27  0x08000000  /**< preprocessor alias for 32-bit value with bit 27 set, used to specify this single bit */
+#define BIT28  0x10000000  /**< preprocessor alias for 32-bit value with bit 28 set, used to specify this single bit */
+#define BIT29  0x20000000  /**< preprocessor alias for 32-bit value with bit 29 set, used to specify this single bit */
+#define BIT30  0x40000000  /**< preprocessor alias for 32-bit value with bit 30 set, used to specify this single bit */
+#define BIT31  0x80000000  /**< preprocessor alias for 32-bit value with bit 31 set, used to specify this single bit */
+
+#endif  /* BIT0 et al */
+
+
+/** @} */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+/*****************************************************************************/
+#endif /* OI_STDDEFS_H */
diff --git a/tools/sdk/include/bluedroid/oi_string.h b/tools/sdk/include/bluedroid/oi_string.h
new file mode 100644
index 00000000000..928acb07df4
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_string.h
@@ -0,0 +1,208 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef OI_STRING_H
+#define OI_STRING_H
+/**
+ * @file
+ * This file contains BM3 supplied portable string.h functions
+ *
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#include "oi_cpu_dep.h"
+#include "oi_stddefs.h"
+
+#if defined(USE_NATIVE_MEMCPY) || defined(USE_NATIVE_MALLOC)
+#include <string.h>
+#endif
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * If we are using Native malloc(), we must also use
+ * native Ansi string.h functions for memory manipulation.
+ */
+#ifdef USE_NATIVE_MALLOC
+#ifndef USE_NATIVE_MEMCPY
+#define USE_NATIVE_MEMCPY
+#endif
+#endif
+
+#ifdef USE_NATIVE_MEMCPY
+
+#define OI_MemCopy(to, from, size)    memcpy((to), (from), (size))
+#define OI_MemSet(block, val, size)   memset((block), (val), (size))
+#define OI_MemZero(block, size)       memset((block), 0, (size))
+#define OI_MemCmp(s1, s2, n)          memcmp((s1), (s2), (n))
+#define OI_Strcpy(dest, src)          strcpy((dest),(src))
+#define OI_Strcat(dest, src)          strcat((dest),(src))
+#define OI_StrLen(str)                strlen((str))
+#define OI_Strcmp(s1, s2)             strcmp((s1), (s2))
+#define OI_Strncmp(s1, s2, n)         strncmp((s1), (s2), (n))
+
+#else
+
+/*
+ * OI_MemCopy
+ *
+ * Copy an arbitrary number of bytes from one memory address to another.
+ * The underlying implementation is the ANSI memmove() or equivalant, so
+ * overlapping memory copies will work correctly.
+ */
+void OI_MemCopy(void *To, void const *From, OI_UINT32 Size);
+
+
+/*
+ * OI_MemSet
+ *
+ * Sets all bytes in a block of memory to the same value
+ */
+void OI_MemSet(void *Block, OI_UINT8 Val, OI_UINT32 Size);
+
+
+/*
+ * OI_MemZero
+ *
+ * Sets all bytes in a block of memory to zero
+ */
+void OI_MemZero(void *Block, OI_UINT32 Size);
+
+
+/*
+ * OI_MemCmp
+ *
+ * Compare two blocks of memory
+ *
+ * Returns:
+ *        0, if s1 == s2
+ *      < 0, if s1 < s2
+ *      > 0, if s2 > s2
+ */
+OI_INT OI_MemCmp(void const *s1, void const *s2, OI_UINT32 n);
+
+/*
+ * OI_Strcpy
+ *
+ * Copies the Null terminated string from pStr to pDest, and
+ * returns pDest.
+ */
+
+OI_CHAR *OI_Strcpy(OI_CHAR *pDest,
+                   OI_CHAR const *pStr);
+
+/*
+ * OI_Strcat
+ *
+ * Concatonates the pStr string to the end of pDest, and
+ * returns pDest.
+ */
+
+OI_CHAR *OI_Strcat(OI_CHAR *pDest,
+                   OI_CHAR const *pStr) ;
+
+/*
+ * OI_StrLen
+ *
+ * Calculates the number of OI_CHARs in pStr (not including
+ * the Null terminator) and returns the value.
+ */
+OI_UINT OI_StrLen(OI_CHAR const *pStr) ;
+
+/*
+ * OI_Strcmp
+ *
+ * Compares two Null terminated strings
+ *
+ * Returns:
+ *        0, if s1 == s2
+ *      < 0, if s1 < s2
+ *      > 0, if s2 > s2
+ */
+OI_INT OI_Strcmp(OI_CHAR const *s1,
+                 OI_CHAR const *s2);
+
+/*
+ * OI_Strncmp
+ *
+ * Compares the first "len" OI_CHARs of strings s1 and s2.
+ *
+ * Returns:
+ *        0, if s1 == s2
+ *      < 0, if s1 < s2
+ *      > 0, if s2 > s2
+ */
+OI_INT OI_Strncmp(OI_CHAR const *s1,
+                  OI_CHAR const *s2,
+                  OI_UINT32      len);
+
+
+#endif /* USE_NATIVE_MEMCPY */
+
+/*
+ * OI_StrcmpInsensitive
+ *
+ * Compares two Null terminated strings, treating
+ * the Upper and Lower case of 'A' through 'Z' as
+ * equivilent.
+ *
+ * Returns:
+ *        0, if s1 == s2
+ *      < 0, if s1 < s2
+ *      > 0, if s2 > s2
+ */
+OI_INT OI_StrcmpInsensitive(OI_CHAR const *s1,
+                            OI_CHAR const *s2);
+
+/*
+ * OI_StrncmpInsensitive
+ *
+ * Compares the first "len" OI_CHARs of strings s1 and s2,
+ * treating the Upper and Lower case of 'A' through 'Z' as
+ * equivilent.
+ *
+ *
+ * Returns:
+ *        0, if s1 == s2
+ *      < 0, if s1 < s2
+ *      > 0, if s2 > s2
+ */
+OI_INT OI_StrncmpInsensitive(OI_CHAR const *s1,
+                             OI_CHAR const *s2,
+                             OI_UINT        len);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+/*****************************************************************************/
+#endif /* OI_STRING_H */
+
diff --git a/tools/sdk/include/bluedroid/oi_time.h b/tools/sdk/include/bluedroid/oi_time.h
new file mode 100644
index 00000000000..40b8dfc4d73
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_time.h
@@ -0,0 +1,200 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_TIME_H
+#define _OI_TIME_H
+/** @file
+ *
+ * This file provides time type definitions and interfaces to time-related functions.
+ *
+ * The stack maintains a 64-bit real-time millisecond clock. The choice of
+ * milliseconds is for convenience, not accuracy.
+ *
+ * Timeouts are specified as tenths of seconds in a 32-bit value. Timeout values
+ * specified by the Bluetooth specification are usually muliple seconds, so
+ * accuracy to a tenth of a second is more than adequate.
+ *
+ * This file also contains macros to convert between seconds and the Link
+ * Manager's 1.28-second units.
+ *
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#include "oi_stddefs.h"
+
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+/**
+ * Within the core stack timeouts are specified in intervals of tenths of seconds
+ */
+
+typedef OI_UINT16 OI_INTERVAL;
+#define OI_INTERVALS_PER_SECOND     10
+#define MSECS_PER_OI_INTERVAL       (1000 / OI_INTERVALS_PER_SECOND)
+
+/** maximum interval (54 min 36.7 sec) */
+#define OI_MAX_INTERVAL   0x7fff
+
+
+/**
+ * Macro to convert seconds to OI_INTERVAL time units
+ */
+
+#define OI_SECONDS(n)    ((OI_INTERVAL) ((n) * OI_INTERVALS_PER_SECOND))
+
+/**
+ * Macro to convert milliseconds to OI_INTERVAL time units (Rounded Up)
+ */
+
+#define OI_MSECONDS(n)   ((OI_INTERVAL) ((n + MSECS_PER_OI_INTERVAL - 1) / MSECS_PER_OI_INTERVAL))
+
+/**
+ * Macro to convert minutes to OI_INTERVAL time units
+ */
+
+#define OI_MINUTES(n)    ((OI_INTERVAL) ((n) * OI_SECONDS(60)))
+
+/** Convert an OI_INTERVAL to milliseconds. */
+#define OI_INTERVAL_TO_MILLISECONDS(i) ((i) * MSECS_PER_OI_INTERVAL)
+
+/**
+ * The stack depends on relative not absolute time. Any mapping between the
+ * stack's real-time clock and absolute time and date is implementation-dependent.
+ */
+
+typedef struct {
+    OI_INT32 seconds;
+    OI_INT16 mseconds;
+} OI_TIME;
+
+/**
+ * Convert an OI_TIME to milliseconds.
+ *
+ * @param t  the time to convert
+ *
+ * @return the time in milliseconds
+ */
+OI_UINT32 OI_Time_ToMS(OI_TIME *t);
+
+
+/**
+ * This function compares two time values.
+ *
+ * @param T1 first time to compare.
+ *
+ * @param T2 second time to compare.
+ *
+ * @return
+ @verbatim
+     -1 if t1 < t2
+      0 if t1 = t2
+     +1 if t1 > t2
+ @endverbatim
+ */
+
+OI_INT16 OI_Time_Compare(OI_TIME *T1,
+                         OI_TIME *T2);
+
+
+/**
+ * This function returns the interval between two times to a granularity of 0.1 seconds.
+ *
+ * @param Sooner a time value more recent that Later
+ *
+ * @param Later a time value later than Sooner
+ *
+ * @note The result is an OI_INTERVAL value so this function only works for time intervals
+ * that are less than about 71 minutes.
+ *
+ * @return the time interval between the two times = (Later - Sooner)
+ */
+
+OI_INTERVAL OI_Time_Interval(OI_TIME *Sooner,
+                             OI_TIME *Later);
+
+
+
+/**
+ * This function returns the interval between two times to a granularity of milliseconds.
+ *
+ * @param Sooner a time value more recent that Later
+ *
+ * @param Later a time value later than Sooner
+ *
+ * @note The result is an OI_UINT32 value so this function only works for time intervals
+ * that are less than about 50 days.
+ *
+ * @return the time interval between the two times = (Later - Sooner)
+ */
+
+OI_UINT32 OI_Time_IntervalMsecs(OI_TIME *Sooner,
+                                OI_TIME *Later);
+
+
+
+/**
+ * This function answers the question, Have we reached or gone past the target time?
+ *
+ * @param pTargetTime   target time
+ *
+ * @return  TRUE means time now is at or past target time
+ *          FALSE means target time is still some time in the future
+ */
+
+OI_BOOL  OI_Time_NowReachedTime(OI_TIME *pTargetTime);
+
+/**
+ *  Convert seconds to the Link Manager 1.28-second units
+ *  Approximate by using 1.25 conversion factor.
+ */
+
+#define OI_SECONDS_TO_LM_TIME_UNITS(lmUnits) ((lmUnits)<4?(lmUnits):(lmUnits)-((lmUnits)>>2))
+
+
+/**
+ *  Convert Link Manager 1.28-second units to seconds.
+ *  Approximate by using 1.25 conversion factor.
+ */
+
+#define OI_LM_TIME_UNITS_TO_SECONDS(lmUnits) ((lmUnits) + ((lmUnits)>>2))
+
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+/* Include for OI_Time_Now() prototype
+ * Must be included at end to obtain OI_TIME typedef
+ */
+#include "oi_osinterface.h"
+
+/*****************************************************************************/
+#endif /* _OI_TIME_H */
+
diff --git a/tools/sdk/include/bluedroid/oi_utils.h b/tools/sdk/include/bluedroid/oi_utils.h
new file mode 100644
index 00000000000..f12ef0d4bc2
--- /dev/null
+++ b/tools/sdk/include/bluedroid/oi_utils.h
@@ -0,0 +1,377 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 2014 The Android Open Source Project
+ *  Copyright 2002 - 2004 Open Interface North America, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#ifndef _OI_UTILS_H
+#define _OI_UTILS_H
+/**
+ * @file
+ *
+ * This file provides the interface for utility functions.
+ * Among the utilities are strlen (string length), strcmp (string compare), and
+ * other string manipulation functions. These are provided for those plaforms
+ * where this functionality is not available in stdlib.
+ */
+
+/**********************************************************************************
+  $Revision: #1 $
+***********************************************************************************/
+
+#include <stdarg.h>
+#include "oi_common.h"
+#include "oi_string.h"
+#include "oi_bt_spec.h"
+
+/** \addtogroup Misc Miscellaneous APIs */
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Opaque type for a callback function handle. See OI_ScheduleCallbackFunction()
+ */
+typedef OI_UINT32 OI_CALLBACK_HANDLE;
+
+
+/**
+ * Function prototype for a timed procedure callback.
+ *
+ * @param arg                 Value that was passed into the OI_ScheduleCallback() function
+ *
+ */
+typedef void (*OI_SCHEDULED_CALLBACK)(void *arg);
+
+
+/**
+ * Registers a function to be called when a timeout expires. This API uses BLUEmagic's internal
+ * function dispatch mechanism, so applications that make extensive use of this facility may need to
+ * increase the value of DispatchTableSize in the configuration block for the dispatcher (see
+ * oi_bt_stack_config.h).
+ *
+ * @param callbackFunction    The function that will be called when the timeout expires
+ *
+ * @param arg                 Value that will be returned as the parameter to the callback function.
+ *
+ * @param timeout             A timeout expressed in OI_INTERVALs (tenths of seconds). This can be
+ *                            zero in which case the callback function will be called as soon as
+ *                            possible.
+ *
+ * @param handle              NULL or a pointer receive the callback handle.
+ *
+ * @return                    OI_OK if the function was reqistered, or an error status.
+ */
+OI_STATUS OI_ScheduleCallbackFunction(OI_SCHEDULED_CALLBACK callbackFunction,
+                                      void                 *arg,
+                                      OI_INTERVAL           timeout,
+                                      OI_CALLBACK_HANDLE   *handle);
+
+
+/**
+ * Cancels a function registered with OI_ScheduleCallbackFunction() before its timer expires.
+ *
+ * @param handle              handle returned by  OI_ScheduleCallbackFunction().
+ *
+ * @return                    OI_OK if the function was cancelled, or an error status.
+ */
+OI_STATUS OI_CancelCallbackFunction(OI_CALLBACK_HANDLE handle);
+
+
+/**
+ * Registers a function to be called when a timeout expires. This version does not return a handle
+ * so can only be canceled by calling OI_CancelCallback().
+ *
+ * @param callbackFunction    The function that will be called when the timeout expires
+ *
+ * @param arg                 Value that will be returned as the parameter to the callback function.
+ *
+ * @param timeout             A timeout expressed in OI_INTERVALs (tenths of seconds). This can be
+ *                            zero in which case the callback function will be called as soon as
+ *                            possible.
+ *
+ * @return                    OI_OK if the function was reqistered, or an error status.
+ */
+#define OI_ScheduleCallback(f, a, t)  OI_ScheduleCallbackFunction(f, a, t, NULL);
+
+
+/**
+ * Cancels a function registered with OI_ScheduleCallback() before its timer expires. This
+ * function will cancel the first entry matches the indicated callback function pointer.
+ *
+ * @param callbackFunction    The function that was originally registered
+ *
+ * @return                    OI_OK if the function was cancelled, or an error status.
+ */
+OI_STATUS OI_CancelCallback(OI_SCHEDULED_CALLBACK callbackFunction);
+
+
+/**
+ * Parse a Bluetooth device address from the specified string.
+ *
+ * @param str   the string to parse
+ * @param addr  the parsed address, if successful
+ *
+ * @return TRUE if an address was successfully parsed, FALSE otherwise
+ */
+
+OI_BOOL OI_ParseBdAddr(const OI_CHAR *str,
+                       OI_BD_ADDR    *addr) ;
+
+/**
+ * Printf function for platforms which have no stdio or printf available.
+ * OI_Printf supports the basic formatting types, with the exception of
+ * floating point types. Additionally, OI_Printf supports several formats
+ * specific to BLUEmagic 3.0 software:
+ *
+ * \%!   prints the string for an #OI_STATUS value.
+ *       @code OI_Printf("There was an error %!", status); @endcode
+ *
+ * \%@   prints a hex dump of a buffer.
+ *       Requires a pointer to the buffer and a signed integer length
+ *       (0 for default length). If the buffer is large, only an excerpt will
+ *       be printed.
+ *       @code OI_Printf("Contents of buffer %@", buffer, sizeof(buffer)); @endcode
+ *
+ * \%:   prints a Bluetooth address in the form "HH:HH:HH:HH:HH:HH".
+ *       Requires a pointer to an #OI_BD_ADDR.
+ *       @code OI_Printf("Bluetooth address %:", &bdaddr); @endcode
+ *
+ * \%^   decodes and prints a data element as formatted XML.
+ *       Requires a pointer to an #OI_DATAELEM.
+ *       @code OI_Printf("Service attribute list is:\n%^", &attributes); @endcode
+ *
+ * \%/   prints the base file name of a path, that is, the final substring
+ *       following a '/' or '\\' character. Requires a pointer to a null
+ *       terminated string.
+ *       @code OI_Printf("File %/", "c:\\dir1\\dir2\\file.txt"); @endcode
+ *
+ * \%~   prints a string, escaping characters as needed to display it in
+ *       ASCII. Requires a pointer to an #OI_PSTR and an #OI_UNICODE_ENCODING
+ *       parameter.
+ *       @code OI_Printf("Identifier %~", &id, OI_UNICODE_UTF16_BE); @endcode
+ *
+ * \%[   inserts an ANSI color escape sequence. Requires a single character
+ *       identifying the color to select. Colors are red (r/R), green (g/G),
+ *       blue (b/B), yellow (y/Y), cyan (c/C), magenta (m/M), white (W),
+ *       light-gray (l/L), dark-gray (d/D), and black (0). The lower case is
+ *       dim, the upper case is bright (except in the case of light-gray and
+ *       dark-gray, where bright and dim are identical). Any other value will
+ *       select the default color.
+ *       @code OI_Printf("%[red text %[black %[normal\n", 'r', '0', 0); @endcode
+ *
+ * \%a   same as \%s, except '\\r' and '\\n' are output as "<cr>" and "<lf>".
+ *       \%?a is valid, but \%la is not.
+ *
+ * \%b   prints an integer in base 2.
+ *       @code OI_Printf("Bits are %b", I); @endcode
+ *
+ * \%lb  prints a long integer in base 2.
+ *
+ * \%?b  prints the least significant N bits of an integer (or long integer)
+ *       in base 2. Requires the integer and a length N.
+ *       @code OI_Printf("Bottom 4 bits are: %?b", I, 4); @endcode
+ *
+ * \%B   prints an integer as boolean text, "TRUE" or "FALSE".
+ *       @code OI_Printf("The value 0 is %B, the value 1 is %B", 0, 1); @endcode
+ *
+ * \%?s  prints a substring up to a specified maximum length.
+ *       Requires a pointer to a string and a length parameter.
+ *       @code OI_Printf("String prefix is %?s", str, 3); @endcode
+ *
+ * \%ls  same as \%S.
+ *
+ * \%S   prints a UTF16 string as UTF8 (plain ASCII, plus 8-bit char sequences
+ *       where needed). Requires a pointer to #OI_CHAR16. \%?S is valid. The
+ *       length parameter is in OI_CHAR16 characters.
+ *
+ * \%T   prints time, formatted as "secs.msecs".
+ *       Requires pointer to #OI_TIME struct, NULL pointer prints current time.
+ *       @code OI_Printf("The time now is %T", NULL); @endcode
+ *
+ *  @param format   The format string
+ *
+ */
+void OI_Printf(const OI_CHAR *format, ...);
+
+
+/**
+ * Var-args version OI_Printf
+ *
+ * @param format   Same as for OI_Printf.
+ *
+ * @param argp     Var-args list.
+ */
+void OI_VPrintf(const OI_CHAR *format, va_list argp);
+
+
+/**
+ * Writes a formatted string to a buffer. This function supports the same format specifiers as
+ * OI_Printf().
+ *
+ * @param buffer   Destination buffer for the formatted string.
+ *
+ * @param bufLen   The length of the destination buffer.
+ *
+ * @param format   The format string
+ *
+ * @return   Number of characters written or -1 in the case of an error.
+ */
+OI_INT32 OI_SNPrintf(OI_CHAR *buffer,
+                     OI_UINT16 bufLen,
+                     const OI_CHAR *format, ...);
+
+
+/**
+ * Var-args version OI_SNPrintf
+ *
+ * @param buffer   Destination buffer for the formatted string.
+ *
+ * @param bufLen   The length of the destination buffer.
+ *
+ * @param format   The format string
+ *
+ * @param argp     Var-args list.
+ *
+ * @return   Number of characters written or -1 in the case of an error.
+ */
+OI_INT32 OI_VSNPrintf(OI_CHAR *buffer,
+                      OI_UINT16 bufLen,
+                      const OI_CHAR *format, va_list argp);
+
+
+/**
+ * Convert a string to an integer.
+ *
+ * @param str  the string to parse
+ *
+ * @return the integer value of the string or 0 if the string could not be parsed
+ */
+OI_INT OI_atoi(const OI_CHAR *str);
+
+
+/**
+ * Parse a signed integer in a string.
+ *
+ * Skips leading whitespace (space and tabs only) and parses a decimal or hex string. Hex string
+ * must be prefixed by "0x". Returns pointer to first character following the integer. Returns the
+ * pointer passed in if the string does not describe an integer.
+ *
+ * @param str    String to parse.
+ *
+ * @param val    Pointer to receive the parsed integer value.
+ *
+ * @return       A pointer to the first character following the integer or the pointer passed in.
+ */
+const OI_CHAR *OI_ScanInt(const OI_CHAR *str,
+                          OI_INT32 *val);
+
+
+/**
+ * Parse an unsigned integer in a string.
+ *
+ * Skips leading whitespace (space and tabs only) and parses a decimal or hex string. Hex string
+ * must be prefixed by "0x". Returns pointer to first character following the integer. Returns the
+ * pointer passed in if the string does not describe an integer.
+ *
+ * @param str    String to parse.
+ *
+ * @param val    Pointer to receive the parsed unsigned integer value.
+ *
+ * @return       A pointer to the first character following the unsigned integer or the pointer passed in.
+ */
+const OI_CHAR *OI_ScanUInt(const OI_CHAR *str,
+                           OI_UINT32 *val);
+
+/**
+ * Parse a whitespace delimited substring out of a string.
+ *
+ * @param str     Input string to parse.
+ * @param outStr  Buffer to return the substring
+ * @param len     Length of outStr
+ *
+ *
+ * @return       A pointer to the first character following the substring or the pointer passed in.
+ */
+const OI_CHAR *OI_ScanStr(const OI_CHAR *str,
+                          OI_CHAR *outStr,
+                          OI_UINT16 len);
+
+
+/**
+ * Parse a string for one of a set of alternative value. Skips leading whitespace (space and tabs
+ * only) and parses text matching one of the alternative strings. Returns pointer to first character
+ * following the matched text.
+ *
+ * @param str    String to parse.
+ *
+ * @param alts   Alternative matching strings separated by '|'
+ *
+ * @param index  Pointer to receive the index of the matching alternative, return value is -1 if
+ *               there is no match.
+ *
+ * @return       A pointer to the first character following the matched value or the pointer passed in
+ *               if there was no matching text.
+ */
+const OI_CHAR *OI_ScanAlt(const OI_CHAR *str,
+                          const OI_CHAR *alts,
+                          OI_INT *index);
+
+/**
+ * Parse a string for a BD Addr. Skips leading whitespace (space and tabs only) and parses a
+ * Bluetooth device address with nibbles optionally separated by colons. Return pointet to first
+ * character following the BD Addr.
+ *
+ * @param str    String to parse.
+ *
+ * @param addr   Pointer to receive the Bluetooth device address
+ *
+ * @return       A pointer to the first character following the BD Addr or the pointer passed in.
+ */
+const OI_CHAR *OI_ScanBdAddr(const OI_CHAR *str,
+                             OI_BD_ADDR *addr);
+
+
+/** Get a character from a digit integer value (0 - 9). */
+#define OI_DigitToChar(d) ((d) + '0')
+
+/**
+ * Determine Maximum and Minimum between two arguments.
+ *
+ * @param a  1st value
+ * @param b  2nd value
+ *
+ * @return the max or min value between a & b
+ */
+#define OI_MAX(a, b) (((a) < (b)) ? (b) : (a) )
+#define OI_MIN(a, b) (((a) > (b)) ? (b) : (a) )
+
+/**
+ * Compare two BD_ADDRs
+ * SAME_BD_ADDR - Boolean: TRUE if they are the same address
+ */
+
+#define SAME_BD_ADDR(x, y)      (0 == OI_MemCmp((x),(y),OI_BD_ADDR_BYTE_SIZE) )
+
+#ifdef __cplusplus
+}
+#endif
+
+/**@}*/
+
+#endif /* _OI_UTILS_H */
+
diff --git a/tools/sdk/include/bluedroid/osi.h b/tools/sdk/include/bluedroid/osi.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/osi_arch.h b/tools/sdk/include/bluedroid/osi_arch.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/port_ext.h b/tools/sdk/include/bluedroid/port_ext.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/port_int.h b/tools/sdk/include/bluedroid/port_int.h
new file mode 100644
index 00000000000..fb72d5038a2
--- /dev/null
+++ b/tools/sdk/include/bluedroid/port_int.h
@@ -0,0 +1,246 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/*****************************************************************************
+ *
+ *  This file contains definitions internal to the PORT unit
+ *
+ *****************************************************************************/
+
+#ifndef PORT_INT_H
+#define PORT_INT_H
+
+#include "bt_target.h"
+#include "gki.h"
+#include "rfcdefs.h"
+#include "port_api.h"
+
+/* Local events passed when application event is sent from the api to PORT */
+/* ???*/
+#define PORT_EVENT_OPEN         (1  | BT_EVT_TO_BTU_SP_EVT)
+#define PORT_EVENT_CONTROL      (2  | BT_EVT_TO_BTU_SP_EVT)
+#define PORT_EVENT_SET_STATE    (3  | BT_EVT_TO_BTU_SP_EVT)
+#define PORT_EVENT_SET_CALLBACK (5  | BT_EVT_TO_BTU_SP_EVT)
+#define PORT_EVENT_WRITE        (6  | BT_EVT_TO_BTU_SP_EVT)
+#define PORT_EVENT_PURGE        (7  | BT_EVT_TO_BTU_SP_EVT)
+#define PORT_EVENT_SEND_ERROR   (8  | BT_EVT_TO_BTU_SP_EVT)
+#define PORT_EVENT_FLOW_CONTROL (9  | BT_EVT_TO_BTU_SP_EVT)
+
+/*
+** Flow control configuration values for the mux
+*/
+#define PORT_FC_UNDEFINED       0   /* mux flow control mechanism not defined yet */
+#define PORT_FC_TS710           1   /* use TS 07.10 flow control  */
+#define PORT_FC_CREDIT          2   /* use RFCOMM credit based flow control */
+
+/*
+** Define Port Data Transfere control block
+*/
+typedef struct {
+    BUFFER_Q queue;         /* Queue of buffers waiting to be sent */
+    BOOLEAN  peer_fc;       /* TRUE if flow control is set based on peer's request */
+    BOOLEAN  user_fc;       /* TRUE if flow control is set based on user's request  */
+    UINT32   queue_size;    /* Number of data bytes in the queue */
+    tPORT_CALLBACK *p_callback;  /* Address of the callback function */
+} tPORT_DATA;
+
+/*
+** Port control structure used to pass modem info
+*/
+typedef struct {
+#define MODEM_SIGNAL_DTRDSR        0x01
+#define MODEM_SIGNAL_RTSCTS        0x02
+#define MODEM_SIGNAL_RI            0x04
+#define MODEM_SIGNAL_DCD           0x08
+
+    UINT8   modem_signal;       /* [DTR/DSR | RTS/CTS | RI | DCD ] */
+
+    UINT8   break_signal;       /* 0-3 s in steps of 200 ms */
+
+    UINT8   discard_buffers;    /* 0 - do not discard, 1 - discard */
+
+#define RFCOMM_CTRL_BREAK_ASAP      0
+#define RFCOMM_CTRL_BREAK_IN_SEQ    1
+
+    UINT8   break_signal_seq;   /* as soon as possible | in sequence (default) */
+
+    BOOLEAN fc;                 /* TRUE when the device is unable to accept frames */
+} tPORT_CTRL;
+
+
+/*
+** RFCOMM multiplexer Control Block
+*/
+typedef struct {
+    TIMER_LIST_ENT tle;       /* Timer list entry */
+    BUFFER_Q  cmd_q;          /* Queue for command messages on this mux */
+    UINT8     port_inx[RFCOMM_MAX_DLCI + 1];  /* Array for quick access to  */
+    /* tPORT based on dlci        */
+    BD_ADDR   bd_addr;        /* BD ADDR of the peer if initiator */
+    UINT16    lcid;           /* Local cid used for this channel */
+    UINT16    peer_l2cap_mtu; /* Max frame that can be sent to peer L2CAP */
+    UINT8     state;          /* Current multiplexer channel state */
+    UINT8     is_initiator;   /* TRUE if this side sends SABME (dlci=0) */
+    BOOLEAN   local_cfg_sent;
+    BOOLEAN   peer_cfg_rcvd;
+    BOOLEAN   restart_required; /* TRUE if has to restart channel after disc */
+    BOOLEAN   peer_ready;      /* True if other side can accept frames */
+    UINT8     flow;            /* flow control mechanism for this mux */
+    BOOLEAN   l2cap_congested; /* TRUE if L2CAP is congested */
+    BOOLEAN   is_disc_initiator; /* TRUE if initiated disc of port */
+    UINT16    pending_lcid;    /* store LCID for incoming connection while connecting */
+    UINT8     pending_id;      /* store l2cap ID for incoming connection while connecting */
+} tRFC_MCB;
+
+
+/*
+** RFCOMM Port Connection Control Block
+*/
+struct t_rfc_port {
+#define RFC_PORT_STATE_IDLE          0
+#define RFC_PORT_STATE_WAIT_START    1
+#define RFC_PORT_STATE_OPENING       2
+#define RFC_PORT_STATE_OPENED        3
+#define RFC_PORT_STATE_CLOSING       4
+
+    UINT8     state;          /* Current state of the connection */
+
+#define RFC_RSP_PN                  0x01
+#define RFC_RSP_RPN_REPLY           0x02
+#define RFC_RSP_RPN                 0x04
+#define RFC_RSP_MSC                 0x08
+#define RFC_RSP_RLS                 0x10
+
+    UINT8    expected_rsp;
+
+    tRFC_MCB *p_mcb;
+
+    TIMER_LIST_ENT tle;       /* Timer list entry */
+};
+typedef struct t_rfc_port tRFC_PORT;
+
+
+/*
+** Define control block containing information about PORT connection
+*/
+struct t_port_info {
+    UINT8   inx;            /* Index of this control block in the port_info array */
+    BOOLEAN in_use;         /* True when structure is allocated */
+
+#define PORT_STATE_CLOSED   0
+#define PORT_STATE_OPENING  1
+#define PORT_STATE_OPENED   2
+#define PORT_STATE_CLOSING  3
+
+    UINT8   state;          /* State of the application */
+
+    UINT8   scn;            /* Service channel number */
+    UINT16  uuid;           /* Service UUID */
+
+    BD_ADDR bd_addr;        /* BD ADDR of the device for the multiplexer channel */
+    BOOLEAN is_server;      /* TRUE if the server application */
+    UINT8   dlci;           /* DLCI of the connection */
+
+    UINT8   error;          /* Last error detected */
+
+    UINT8   line_status;    /* Line status as reported by peer */
+
+    UINT8   default_signal_state; /* Initial signal state depending on uuid */
+
+    UINT16  mtu;            /* Max MTU that port can receive */
+    UINT16  peer_mtu;       /* Max MTU that port can send */
+
+    tPORT_DATA tx;          /* Control block for data from app to peer */
+    tPORT_DATA rx;          /* Control block for data from peer to app */
+
+    tPORT_STATE user_port_pars;  /* Port parameters for user connection */
+    tPORT_STATE peer_port_pars;  /* Port parameters for user connection */
+
+    tPORT_CTRL  local_ctrl;
+    tPORT_CTRL  peer_ctrl;
+
+#define PORT_CTRL_REQ_SENT          0x01
+#define PORT_CTRL_REQ_CONFIRMED     0x02
+#define PORT_CTRL_IND_RECEIVED      0x04
+#define PORT_CTRL_IND_RESPONDED     0x08
+
+    UINT8       port_ctrl;                  /* Modem Status Command  */
+
+    BOOLEAN     rx_flag_ev_pending;         /* RXFLAG Character is received */
+
+    tRFC_PORT   rfc;                        /* RFCOMM port control block */
+
+    UINT32      ev_mask;                    /* Event mask for the callback */
+    tPORT_CALLBACK      *p_callback;        /* Pointer to users callback function */
+    tPORT_CALLBACK      *p_mgmt_callback;   /* Callback function to receive connection up/down */
+    tPORT_DATA_CALLBACK *p_data_callback;   /* Callback function to receive data indications */
+    tPORT_DATA_CO_CALLBACK *p_data_co_callback;   /* Callback function with callouts and flowctrl */
+    UINT16      credit_tx;                  /* Flow control credits for tx path */
+    UINT16      credit_rx;                  /* Flow control credits for rx path, this is */
+    /* number of buffers peer is allowed to sent */
+    UINT16      credit_rx_max;              /* Max number of credits we will allow this guy to sent */
+    UINT16      credit_rx_low;              /* Number of credits when we send credit update */
+    UINT16      rx_buf_critical;            /* port receive queue critical watermark level */
+    BOOLEAN     keep_port_handle;           /* TRUE if port is not deallocated when closing */
+    /* it is set to TRUE for server when allocating port */
+    UINT16      keep_mtu;                   /* Max MTU that port can receive by server */
+};
+typedef struct t_port_info tPORT;
+
+
+/* Define the PORT/RFCOMM control structure
+*/
+typedef struct {
+    tPORT        port[MAX_RFC_PORTS];            /* Port info pool */
+    tRFC_MCB     rfc_mcb[MAX_BD_CONNECTIONS];    /* RFCOMM bd_connections pool */
+} tPORT_CB;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Functions provided by the port_utils.c
+*/
+extern tPORT    *port_allocate_port (UINT8 dlci, BD_ADDR bd_addr);
+extern void     port_set_defaults (tPORT *p_port);
+extern void     port_select_mtu (tPORT *p_port);
+extern void     port_release_port (tPORT *p_port);
+extern tPORT    *port_find_mcb_dlci_port (tRFC_MCB *p_mcb, UINT8 dlci);
+extern tRFC_MCB *port_find_mcb (BD_ADDR bd_addr);
+extern tPORT    *port_find_dlci_port (UINT8 dlci);
+extern tPORT    *port_find_port (UINT8 dlci, BD_ADDR bd_addr);
+extern UINT32   port_get_signal_changes (tPORT *p_port, UINT8 old_signals, UINT8 signal);
+extern UINT32   port_flow_control_user (tPORT *p_port);
+extern void     port_flow_control_peer(tPORT *p_port, BOOLEAN enable, UINT16 count);
+
+/*
+** Functions provided by the port_rfc.c
+*/
+extern int  port_open_continue (tPORT *p_port);
+extern void port_start_port_open (tPORT *p_port);
+extern void port_start_par_neg (tPORT *p_port);
+extern void port_start_control (tPORT *p_port);
+extern void port_start_close (tPORT *p_port);
+extern void port_rfc_closed (tPORT *p_port, UINT8 res);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/tools/sdk/include/bluedroid/rfc_int.h b/tools/sdk/include/bluedroid/rfc_int.h
new file mode 100644
index 00000000000..9194583e5d7
--- /dev/null
+++ b/tools/sdk/include/bluedroid/rfc_int.h
@@ -0,0 +1,376 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/*****************************************************************************
+ *
+ *  This file contains definitions internal to the RFC unit
+ *
+ *****************************************************************************/
+
+#ifndef RFC_INT_H
+#define RFC_INT_H
+
+#include "l2c_api.h"
+#include "port_int.h"
+
+/*
+** Define RFCOMM result codes
+*/
+#define RFCOMM_SUCCESS          0
+#define RFCOMM_ERROR            1
+#define RFCOMM_LOW_RESOURCES    2
+#define RFCOMM_TRY_LATER        3
+
+#define RFCOMM_USER_ERR         111
+#define RFCOMM_SECURITY_ERR     112
+
+/*
+** Define max and min RFCOMM MTU (N1)
+*/
+#define RFCOMM_MIN_MTU          23
+#define RFCOMM_MAX_MTU          32767
+
+extern void RFCOMM_StartReq (tRFC_MCB *p_mcb);
+extern void RFCOMM_StartRsp (tRFC_MCB *p_mcb, UINT16 result);
+
+extern void RFCOMM_DlcEstablishReq (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu);
+extern void RFCOMM_DlcEstablishRsp (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu, UINT16 result);
+
+extern void RFCOMM_DataReq (tRFC_MCB *p_mcb, UINT8 dlci, BT_HDR *p_buf);
+
+extern void RFCOMM_DlcReleaseReq (tRFC_MCB *p_mcb, UINT8 dlci);
+
+extern void RFCOMM_ParNegReq (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu);
+extern void RFCOMM_ParNegRsp (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu, UINT8 cl, UINT8 k);
+
+extern void RFCOMM_TestReq (UINT8 *p_data, UINT16 len);
+
+#define RFCOMM_FLOW_STATE_DISABLE       0
+#define RFCOMM_FLOW_STATE_ENABLE        1
+
+extern void RFCOMM_FlowReq (tRFC_MCB *p_mcb, UINT8 dlci, UINT8 state);
+
+extern void RFCOMM_PortNegReq (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_STATE *p_pars);
+extern void RFCOMM_PortNegRsp (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_STATE *p_pars, UINT16 param_mask);
+
+extern void RFCOMM_ControlReq (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_CTRL *p_pars);
+extern void RFCOMM_ControlRsp (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_CTRL *p_pars);
+
+extern void RFCOMM_LineStatusReq (tRFC_MCB *p_mcb, UINT8 dlci, UINT8 line_status);
+/*
+** Define logical struct used for sending and decoding MX frames
+*/
+typedef struct {
+    UINT8   dlci;
+    UINT8   type;
+    UINT8   cr;
+    UINT8   ea;
+    UINT8   pf;
+    UINT8   credit;
+
+    union {
+        struct {
+            UINT8 dlci;
+            UINT8 frame_type;
+            UINT8 conv_layer;
+            UINT8 priority;
+            UINT8 t1;
+            UINT16 mtu;
+            UINT8 n2;
+            UINT8 k;
+        } pn;
+        struct {
+            UINT8   *p_data;
+            UINT16  data_len;
+        } test;
+        struct {
+            UINT8 dlci;
+            UINT8 signals;
+            UINT8 break_present;
+            UINT8 break_duration;
+        } msc;
+        struct {
+            UINT8 ea;
+            UINT8 cr;
+            UINT8 type;
+        } nsc;
+        struct {
+            UINT8 dlci;
+            UINT8 is_request;
+            UINT8 baud_rate;
+            UINT8 byte_size;
+            UINT8 stop_bits;
+            UINT8 parity;
+            UINT8 parity_type;
+            UINT8 fc_type;
+            UINT8 xon_char;
+            UINT8 xoff_char;
+            UINT16 param_mask;
+        } rpn;
+        struct {
+            UINT8 dlci;
+            UINT8 line_status;
+        } rls;
+    } u;
+} MX_FRAME;
+
+#define LINE_STATUS_NO_ERROR       0x00
+#define LINE_STATUS_OVERRUN        0x02  /* Receive Overrun Error   */
+#define LINE_STATUS_RXPARITY       0x04  /* Receive Parity Error    */
+#define LINE_STATUS_FRAME          0x08  /* Receive Framing error   */
+#define LINE_STATUS_FAILED         0x10  /* Connection Failed       */
+
+/*
+** Define states and events for the RFC multiplexer state machine
+*/
+#define RFC_MX_STATE_IDLE           0
+#define RFC_MX_STATE_WAIT_CONN_CNF  1
+#define RFC_MX_STATE_CONFIGURE      2
+#define RFC_MX_STATE_SABME_WAIT_UA  3
+#define RFC_MX_STATE_WAIT_SABME     4
+#define RFC_MX_STATE_CONNECTED      5
+#define RFC_MX_STATE_DISC_WAIT_UA   6
+
+/*
+** Define port states
+*/
+#define RFC_STATE_CLOSED                0
+#define RFC_STATE_SABME_WAIT_UA         1
+#define RFC_STATE_ORIG_WAIT_SEC_CHECK   2
+#define RFC_STATE_TERM_WAIT_SEC_CHECK   3
+#define RFC_STATE_OPENED                4
+#define RFC_STATE_DISC_WAIT_UA          5
+
+/*
+** Events that can be received by multiplexer as well as port state machines
+*/
+#define RFC_EVENT_SABME                 0
+#define RFC_EVENT_UA                    1
+#define RFC_EVENT_DM                    2
+#define RFC_EVENT_DISC                  3
+#define RFC_EVENT_UIH                   4
+#define RFC_EVENT_TIMEOUT               5
+#define RFC_EVENT_BAD_FRAME             50
+/*
+** Multiplexer events
+*/
+#define RFC_MX_EVENT_START_REQ          6
+#define RFC_MX_EVENT_START_RSP          7
+#define RFC_MX_EVENT_CLOSE_REQ          8
+#define RFC_MX_EVENT_CONN_CNF           9
+#define RFC_MX_EVENT_CONN_IND           10
+#define RFC_MX_EVENT_CONF_CNF           11
+#define RFC_MX_EVENT_CONF_IND           12
+#define RFC_MX_EVENT_QOS_VIOLATION_IND  13
+#define RFC_MX_EVENT_DISC_IND           14
+#define RFC_MX_EVENT_TEST_CMD           15
+#define RFC_MX_EVENT_TEST_RSP           16
+#define RFC_MX_EVENT_FCON_CMD           17
+#define RFC_MX_EVENT_FCOFF_CMD          18
+#define RFC_MX_EVENT_NSC                19
+#define RFC_MX_EVENT_NSC_RSP            20
+
+/*
+** Port events
+*/
+#define RFC_EVENT_OPEN                  9
+#define RFC_EVENT_ESTABLISH_RSP         11
+#define RFC_EVENT_CLOSE                 12
+#define RFC_EVENT_CLEAR                 13
+#define RFC_EVENT_DATA                  14
+#define RFC_EVENT_SEC_COMPLETE          15
+
+// btla-specific ++
+#define RFC_T1_TIMEOUT                  20   /* seconds to wait for reply with Poll bit */
+#define RFC_PORT_T1_TIMEOUT             60   /* seconds to wait for reply with Poll bit other than MX */
+#define RFC_T2_TIMEOUT                  20   /* timeout to wait for Mx UIH */
+// btla-specific --
+#define RFC_DISC_TIMEOUT                3    /* If something goes wrong and we send DISC we should not wait for min */
+#define RFC_CLOSE_TIMEOUT               10
+#define RFCOMM_CONN_TIMEOUT            120   /* first connection to be established on Mx */
+
+
+/* Define RFComm control block
+*/
+typedef struct {
+    MX_FRAME  rx_frame;
+    tL2CAP_APPL_INFO  reg_info;              /* L2CAP Registration info */
+    tRFC_MCB *p_rfc_lcid_mcb[MAX_L2CAP_CHANNELS];     /* MCB based on the L2CAP's lcid */
+    BOOLEAN   peer_rx_disabled;              /* If TRUE peer sent FCOFF */
+    UINT8     last_mux;                      /* Last mux allocated */
+    UINT8     last_port;                     /* Last port allocated */
+} tRFCOMM_CB;
+
+/* Main Control Block for the RFCOMM Layer (PORT and RFC) */
+typedef struct {
+    tRFCOMM_CB  rfc;
+    tPORT_CB    port;
+    UINT8       trace_level;
+} tRFC_CB;
+
+
+#if RFC_DYNAMIC_MEMORY == FALSE
+extern tRFC_CB  rfc_cb;
+#else
+extern tRFC_CB *rfc_cb_ptr;
+#define rfc_cb (*rfc_cb_ptr)
+#endif
+
+/* Timer running on the multiplexor channel while no DLCI connection is opened */
+#define RFC_MCB_INIT_INACT_TIMER    60  /* in seconds */
+
+/* Timer running on the multiplexor channel after last DLCI is released */
+#define RFC_MCB_RELEASE_INACT_TIMER 2   /* in seconds */
+
+/*
+** Define RFCOMM frame processing errors
+*/
+#define RFCOMM_ERR_BAD_SABME        1
+#define RFCOMM_ERR_BAD_UA           2
+#define RFCOMM_ERR_BAD_DM           3
+#define RFCOMM_ERR_BAD_DISC         4
+#define RFCOMM_ERR_BAD_UIH          5
+
+#ifdef RFCOMM_PRECALC_FCS
+
+#define RFCOMM_SABME_FCS(p_data, cr, dlci) rfc_sabme_fcs[cr][dlci]
+#define RFCOMM_UA_FCS(p_data, cr, dlci)    rfc_ua_fcs[cr][dlci]
+#define RFCOMM_DM_FCS(p_data, cr, dlci)    rfc_dm_fcs[cr][dlci]
+#define RFCOMM_DISC_FCS(p_data, cr, dlci)  rfc_disc_fcs[cr][dlci]
+#define RFCOMM_UIH_FCS(p_data, dlci)       rfc_uih_fcs[dlci]
+
+#else
+
+extern  UINT8 rfc_calc_fcs (UINT16 len, UINT8 *p);
+
+#define RFCOMM_SABME_FCS(p_data, cr, dlci) rfc_calc_fcs(3, p_data)
+#define RFCOMM_UA_FCS(p_data, cr, dlci)    rfc_calc_fcs(3, p_data)
+#define RFCOMM_DM_FCS(p_data, cr, dlci)    rfc_calc_fcs(3, p_data)
+#define RFCOMM_DISC_FCS(p_data, cr, dlci)  rfc_calc_fcs(3, p_data)
+#define RFCOMM_UIH_FCS(p_data, dlci)       rfc_calc_fcs(2, p_data)
+
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void rfc_mx_sm_execute (tRFC_MCB *p_mcb, UINT16 event, void *p_data);
+
+/*
+** Functions provided by the rfc_port_fsm.c
+*/
+extern void rfc_port_sm_execute (tPORT *p_port, UINT16 event, void *p_data);
+
+
+extern void rfc_process_pn (tRFC_MCB *p_rfc_mcb, BOOLEAN is_command, MX_FRAME *p_frame);
+extern void rfc_process_msc (tRFC_MCB *p_rfc_mcb, BOOLEAN is_command, MX_FRAME *p_frame);
+extern void rfc_process_rpn (tRFC_MCB *p_rfc_mcb, BOOLEAN is_command, BOOLEAN is_request, MX_FRAME *p_frame);
+extern void rfc_process_rls (tRFC_MCB *p_rfc_mcb, BOOLEAN is_command, MX_FRAME *p_frame);
+extern void rfc_process_nsc (tRFC_MCB *p_rfc_mcb, MX_FRAME *p_frame);
+extern void rfc_process_test_rsp (tRFC_MCB *p_rfc_mcb, BT_HDR *p_buf);
+extern void rfc_process_fcon (tRFC_MCB *p_rfc_mcb, BOOLEAN is_command);
+extern void rfc_process_fcoff (tRFC_MCB *p_rfc_mcb, BOOLEAN is_command);
+extern void rfc_process_l2cap_congestion (tRFC_MCB *p_mcb, BOOLEAN is_congested);
+
+/*
+** Functions provided by the rfc_utils.c
+*/
+tRFC_MCB  *rfc_alloc_multiplexer_channel (BD_ADDR bd_addr, BOOLEAN is_initiator);
+extern void      rfc_release_multiplexer_channel (tRFC_MCB *p_rfc_mcb);
+extern void      rfc_timer_start (tRFC_MCB *p_rfc_mcb, UINT16 timeout);
+extern void      rfc_timer_stop (tRFC_MCB *p_rfc_mcb);
+extern void      rfc_port_timer_start (tPORT *p_port, UINT16 tout);
+extern void      rfc_port_timer_stop (tPORT *p_port);
+
+BOOLEAN   rfc_check_uih_fcs (UINT8 dlci, UINT8 received_fcs);
+BOOLEAN   rfc_check_fcs (UINT16 len, UINT8 *p, UINT8 received_fcs);
+tRFC_MCB  *rfc_find_lcid_mcb (UINT16 lcid);
+extern void      rfc_save_lcid_mcb (tRFC_MCB *p_rfc_mcb, UINT16 lcid);
+extern void      rfc_check_mcb_active (tRFC_MCB *p_mcb);
+extern void      rfc_port_closed (tPORT *p_port);
+extern void      rfc_sec_check_complete (BD_ADDR bd_addr, tBT_TRANSPORT transport, void *p_ref_data, UINT8 res);
+extern void      rfc_inc_credit (tPORT *p_port, UINT8 credit);
+extern void      rfc_dec_credit (tPORT *p_port);
+extern void      rfc_check_send_cmd(tRFC_MCB *p_mcb, BT_HDR *p_buf);
+
+/*
+** Functions provided by the rfc_ts_frames.c
+*/
+extern void     rfc_send_sabme (tRFC_MCB *p_rfc_mcb, UINT8 dlci);
+extern void     rfc_send_ua (tRFC_MCB *p_rfc_mcb, UINT8 dlci);
+extern void     rfc_send_dm (tRFC_MCB *p_rfc_mcb, UINT8 dlci, BOOLEAN pf);
+extern void     rfc_send_disc (tRFC_MCB *p_rfc_mcb, UINT8 dlci);
+extern void     rfc_send_pn (tRFC_MCB *p_mcb, UINT8 dlci, BOOLEAN is_command, UINT16 mtu,
+                             UINT8 cl, UINT8 k);
+extern void     rfc_send_test (tRFC_MCB *p_rfc_mcb, BOOLEAN is_command, BT_HDR *p_buf);
+extern void     rfc_send_msc (tRFC_MCB *p_mcb, UINT8 dlci, BOOLEAN is_command,
+                              tPORT_CTRL *p_pars);
+extern void     rfc_send_rls (tRFC_MCB *p_mcb, UINT8 dlci, BOOLEAN is_command, UINT8 status);
+extern void     rfc_send_rpn (tRFC_MCB *p_mcb, UINT8 dlci, BOOLEAN is_command,
+                              tPORT_STATE *p_pars, UINT16 mask);
+extern void     rfc_send_fcon (tRFC_MCB *p_mcb, BOOLEAN is_command);
+extern void     rfc_send_fcoff (tRFC_MCB *p_mcb, BOOLEAN is_command);
+extern void     rfc_send_buf_uih (tRFC_MCB *p_rfc_mcb, UINT8 dlci, BT_HDR *p_buf);
+extern void     rfc_send_credit(tRFC_MCB *p_mcb, UINT8 dlci, UINT8 credit);
+extern void     rfc_process_mx_message (tRFC_MCB *p_rfc_mcb, BT_HDR *p_buf);
+extern UINT8    rfc_parse_data (tRFC_MCB *p_rfc_mcb, MX_FRAME *p_frame, BT_HDR *p_buf);
+
+/*
+** Functions provided by the rfc_disp.c
+*/
+
+
+
+/* Call back functions from RFCOMM */
+extern void rfcomm_l2cap_if_init (void);
+
+extern void PORT_StartInd (tRFC_MCB *p_mcb);
+extern void PORT_StartCnf (tRFC_MCB *p_mcb, UINT16 result);
+
+extern void PORT_CloseInd (tRFC_MCB *p_mcb);
+extern void Port_TimeOutCloseMux (tRFC_MCB *p_mcb);
+
+extern void PORT_DlcEstablishInd (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu);
+extern void PORT_DlcEstablishCnf (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu, UINT16 result);
+
+extern void PORT_DataInd (tRFC_MCB *p_mcb, UINT8 dlci, BT_HDR *p_buf);
+
+extern void PORT_DlcReleaseInd (tRFC_MCB *p_mcb, UINT8 dlci);
+
+extern void PORT_ParNegInd (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu, UINT8 cl, UINT8 k);
+extern void PORT_ParNegCnf (tRFC_MCB *p_mcb, UINT8 dlci, UINT16 mtu, UINT8 cl, UINT8 k);
+
+extern void PORT_TestCnf (tRFC_MCB *p_mcb, UINT8 *p_data, UINT16 len);
+
+extern void PORT_FlowInd (tRFC_MCB *p_mcb, UINT8 dlci, BOOLEAN fc);
+
+extern void PORT_PortNegInd (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_STATE *p_pars, UINT16 param_mask);
+extern void PORT_PortNegCnf (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_STATE *p_pars, UINT16 result);
+
+extern void PORT_ControlInd (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_CTRL *p_pars);
+extern void PORT_ControlCnf (tRFC_MCB *p_mcb, UINT8 dlci, tPORT_CTRL *p_pars);
+
+extern void PORT_LineStatusInd (tRFC_MCB *p_mcb, UINT8 dlci, UINT8 line_status);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/tools/sdk/include/bluedroid/rfcdefs.h b/tools/sdk/include/bluedroid/rfcdefs.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/sbc_dct.h b/tools/sdk/include/bluedroid/sbc_dct.h
new file mode 100644
index 00000000000..165a8c1cd97
--- /dev/null
+++ b/tools/sdk/include/bluedroid/sbc_dct.h
@@ -0,0 +1,91 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  Definitions for the fast DCT.
+ *
+ ******************************************************************************/
+
+#ifndef SBC_DCT_H
+#define SBC_DCT_H
+
+#if (SBC_ARM_ASM_OPT==TRUE)
+#define SBC_MULT_32_16_SIMPLIFIED(s16In2, s32In1, s32OutLow)                    \
+{                                                                               \
+    __asm                                                                       \
+{                                                                               \
+    MUL s32OutLow,(SINT32)s16In2, (s32In1>>15)        \
+}                                                                               \
+}
+#else
+#if (SBC_DSP_OPT==TRUE)
+#define SBC_MULT_32_16_SIMPLIFIED(s16In2, s32In1 , s32OutLow) s32OutLow = SBC_Multiply_32_16_Simplified((SINT32)s16In2,s32In1);
+#else
+#if (SBC_IPAQ_OPT==TRUE)
+/*#define SBC_MULT_32_16_SIMPLIFIED(s16In2, s32In1 , s32OutLow) s32OutLow=(SINT32)((SINT32)(s16In2)*(SINT32)(s32In1>>15)); */
+#define SBC_MULT_32_16_SIMPLIFIED(s16In2, s32In1 , s32OutLow) s32OutLow=(SINT32)(((SINT64)s16In2*(SINT64)s32In1)>>15);
+#if (SBC_IS_64_MULT_IN_IDCT == TRUE)
+#define SBC_MULT_32_32(s32In2, s32In1, s32OutLow)                           \
+{                                                                           \
+    s64Temp = ((SINT64) s32In2) * ((SINT64) s32In1)>>31;            \
+    s32OutLow = (SINT32) s64Temp;                                                    \
+}
+#endif
+#else
+#define SBC_MULT_32_16_SIMPLIFIED(s16In2, s32In1 , s32OutLow)                   \
+{                                                                               \
+    s32In1Temp = s32In1;                                                        \
+    s32In2Temp = (SINT32)s16In2;                                                \
+                                                                                \
+    /* Multiply one +ve and the other -ve number */                             \
+    if (s32In1Temp < 0)                                                         \
+    {                                                                           \
+        s32In1Temp ^= 0xFFFFFFFF;                                               \
+        s32In1Temp++;                                                           \
+        s32OutLow  = (s32In2Temp * (s32In1Temp >> 16));                         \
+        s32OutLow += (( s32In2Temp * (s32In1Temp & 0xFFFF)) >> 16);             \
+        s32OutLow ^= 0xFFFFFFFF;                                                \
+        s32OutLow++;                                                            \
+    }                                                                           \
+    else                                                                        \
+    {                                                                           \
+        s32OutLow  = (s32In2Temp * (s32In1Temp >> 16));                         \
+        s32OutLow += (( s32In2Temp * (s32In1Temp & 0xFFFF)) >> 16);             \
+    }                                                                           \
+    s32OutLow <<= 1;                                                            \
+}
+#if (SBC_IS_64_MULT_IN_IDCT == TRUE)
+#define SBC_MULT_64(s32In1, s32In2, s32OutLow, s32OutHi)  \
+{\
+        s32OutLow=(SINT32)(((SINT64)s32In1*(SINT64)s32In2)& 0x00000000FFFFFFFF);\
+        s32OutHi=(SINT32)(((SINT64)s32In1*(SINT64)s32In2)>>32);\
+}
+#define SBC_MULT_32_32(s32In2, s32In1, s32OutLow)                           \
+{                                                                           \
+    s32HiTemp = 0;                                                          \
+    SBC_MULT_64(s32In2,s32In1 , s32OutLow, s32HiTemp);                      \
+    s32OutLow   = (((s32OutLow>>15)&0x1FFFF) | (s32HiTemp << 17));          \
+}
+#endif
+
+#endif
+#endif
+#endif
+
+#endif
diff --git a/tools/sdk/include/bluedroid/sbc_enc_func_declare.h b/tools/sdk/include/bluedroid/sbc_enc_func_declare.h
new file mode 100644
index 00000000000..cc85b716435
--- /dev/null
+++ b/tools/sdk/include/bluedroid/sbc_enc_func_declare.h
@@ -0,0 +1,57 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  Function declarations.
+ *
+ ******************************************************************************/
+
+#ifndef SBC_FUNCDECLARE_H
+#define SBC_FUNCDECLARE_H
+
+/*#include "sbc_encoder.h"*/
+/* Global data */
+#if (SBC_IS_64_MULT_IN_WINDOW_ACCU == FALSE)
+extern const SINT16 gas32CoeffFor4SBs[];
+extern const SINT16 gas32CoeffFor8SBs[];
+#else
+extern const SINT32 gas32CoeffFor4SBs[];
+extern const SINT32 gas32CoeffFor8SBs[];
+#endif
+
+/* Global functions*/
+
+extern void sbc_enc_bit_alloc_mono(SBC_ENC_PARAMS *CodecParams);
+extern void sbc_enc_bit_alloc_ste(SBC_ENC_PARAMS *CodecParams);
+
+extern void SbcAnalysisInit (void);
+
+extern void SbcAnalysisFilter4(SBC_ENC_PARAMS *strEncParams);
+extern void SbcAnalysisFilter8(SBC_ENC_PARAMS *strEncParams);
+
+extern void SBC_FastIDCT8 (SINT32 *pInVect, SINT32 *pOutVect);
+extern void SBC_FastIDCT4 (SINT32 *x0, SINT32 *pOutVect);
+
+extern void EncPacking(SBC_ENC_PARAMS *strEncParams);
+extern void EncQuantizer(SBC_ENC_PARAMS *);
+#if (SBC_DSP_OPT==TRUE)
+SINT32 SBC_Multiply_32_16_Simplified(SINT32 s32In2Temp, SINT32 s32In1Temp);
+#endif
+#endif
+
diff --git a/tools/sdk/include/bluedroid/sbc_encoder.h b/tools/sdk/include/bluedroid/sbc_encoder.h
new file mode 100644
index 00000000000..8e2e6dd3649
--- /dev/null
+++ b/tools/sdk/include/bluedroid/sbc_encoder.h
@@ -0,0 +1,201 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  This file contains constants and structures used by Encoder.
+ *
+ ******************************************************************************/
+
+#ifndef SBC_ENCODER_H
+#define SBC_ENCODER_H
+
+#define ENCODER_VERSION "0025"
+
+#ifdef BUILDCFG
+#include "bt_target.h"
+#endif
+
+/*DEFINES*/
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef TRUE
+#define TRUE (!FALSE)
+#endif
+
+#define SBC_MAX_NUM_OF_SUBBANDS 8
+#define SBC_MAX_NUM_OF_CHANNELS 2
+#define SBC_MAX_NUM_OF_BLOCKS   16
+
+#define SBC_LOUDNESS    0
+#define SBC_SNR 1
+
+#define SUB_BANDS_8 8
+#define SUB_BANDS_4 4
+
+#define SBC_sf16000 0
+#define SBC_sf32000 1
+#define SBC_sf44100 2
+#define SBC_sf48000 3
+
+#define SBC_MONO    0
+#define SBC_DUAL    1
+#define SBC_STEREO  2
+#define SBC_JOINT_STEREO    3
+
+#define SBC_BLOCK_0 4
+#define SBC_BLOCK_1 8
+#define SBC_BLOCK_2 12
+#define SBC_BLOCK_3 16
+
+#define SBC_NULL    0
+
+#ifndef SBC_MAX_NUM_FRAME
+#define SBC_MAX_NUM_FRAME 1
+#endif
+
+#ifndef SBC_DSP_OPT
+#define SBC_DSP_OPT FALSE
+#endif
+
+/* Set SBC_USE_ARM_PRAGMA to TRUE to use "#pragma arm section zidata" */
+#ifndef SBC_USE_ARM_PRAGMA
+#define SBC_USE_ARM_PRAGMA FALSE
+#endif
+
+/* Set SBC_ARM_ASM_OPT to TRUE in case the target is an ARM */
+/* this will replace all the 32 and 64 bit mult by in line assembly code */
+#ifndef SBC_ARM_ASM_OPT
+#define SBC_ARM_ASM_OPT FALSE
+#endif
+
+/* green hill compiler option -> Used to distinguish the syntax for inline assembly code*/
+#ifndef SBC_GHS_COMPILER
+#define SBC_GHS_COMPILER FALSE
+#endif
+
+/* ARM compiler option -> Used to distinguish the syntax for inline assembly code */
+#ifndef SBC_ARM_COMPILER
+#define SBC_ARM_COMPILER TRUE
+#endif
+
+/* Set SBC_IPAQ_OPT to TRUE in case the target is an ARM */
+/* 32 and 64 bit mult will be performed using SINT64 ( usualy __int64 ) cast that usualy give optimal performance if supported */
+#ifndef SBC_IPAQ_OPT
+#define SBC_IPAQ_OPT TRUE
+#endif
+
+/* Debug only: set SBC_IS_64_MULT_IN_WINDOW_ACCU to TRUE to use 64 bit multiplication in the windowing */
+/* -> not recomended, more MIPS for the same restitution.  */
+#ifndef SBC_IS_64_MULT_IN_WINDOW_ACCU
+#define SBC_IS_64_MULT_IN_WINDOW_ACCU  FALSE
+#endif /*SBC_IS_64_MULT_IN_WINDOW_ACCU */
+
+/* Set SBC_IS_64_MULT_IN_IDCT to TRUE to use 64 bits multiplication in the DCT of Matrixing */
+/* -> more MIPS required for a better audio quality. comparasion with the SIG utilities shows a division by 10 of the RMS */
+/* CAUTION: It only apply in the if SBC_FAST_DCT is set to TRUE */
+#ifndef SBC_IS_64_MULT_IN_IDCT
+#define SBC_IS_64_MULT_IN_IDCT  FALSE
+#endif /*SBC_IS_64_MULT_IN_IDCT */
+
+/* set SBC_IS_64_MULT_IN_QUANTIZER to TRUE to use 64 bits multiplication in the quantizer */
+/* setting this flag to FALSE add whistling noise at 5.5 and 11 KHz usualy not perceptible by human's hears. */
+#ifndef SBC_IS_64_MULT_IN_QUANTIZER
+#define SBC_IS_64_MULT_IN_QUANTIZER  TRUE
+#endif /*SBC_IS_64_MULT_IN_IDCT */
+
+/* Debug only: set this flag to FALSE to disable fast DCT algorithm */
+#ifndef SBC_FAST_DCT
+#define SBC_FAST_DCT  TRUE
+#endif /*SBC_FAST_DCT */
+
+/* In case we do not use joint stereo mode the flag save some RAM and ROM in case it is set to FALSE */
+#ifndef SBC_JOINT_STE_INCLUDED
+#define SBC_JOINT_STE_INCLUDED TRUE
+#endif
+
+/* TRUE -> application should provide PCM buffer, FALSE PCM buffer reside in SBC_ENC_PARAMS */
+#ifndef SBC_NO_PCM_CPY_OPTION
+#define SBC_NO_PCM_CPY_OPTION FALSE
+#endif
+
+#define MINIMUM_ENC_VX_BUFFER_SIZE (8*10*2)
+#ifndef ENC_VX_BUFFER_SIZE
+#define ENC_VX_BUFFER_SIZE (MINIMUM_ENC_VX_BUFFER_SIZE + 64)
+/*#define ENC_VX_BUFFER_SIZE MINIMUM_ENC_VX_BUFFER_SIZE + 1024*/
+#endif
+
+#ifndef SBC_FOR_EMBEDDED_LINUX
+#define SBC_FOR_EMBEDDED_LINUX FALSE
+#endif
+
+/*constants used for index calculation*/
+#define SBC_BLK (SBC_MAX_NUM_OF_CHANNELS * SBC_MAX_NUM_OF_SUBBANDS)
+
+#include "sbc_types.h"
+
+typedef struct SBC_ENC_PARAMS_TAG {
+    SINT16 s16SamplingFreq;                         /* 16k, 32k, 44.1k or 48k*/
+    SINT16 s16ChannelMode;                          /* mono, dual, streo or joint streo*/
+    SINT16 s16NumOfSubBands;                        /* 4 or 8 */
+    SINT16 s16NumOfChannels;
+    SINT16 s16NumOfBlocks;                          /* 4, 8, 12 or 16*/
+    SINT16 s16AllocationMethod;                     /* loudness or SNR*/
+    SINT16 s16BitPool;                              /* 16*numOfSb for mono & dual;
+                                                       32*numOfSb for stereo & joint stereo */
+    UINT16 u16BitRate;
+    UINT8   u8NumPacketToEncode;                    /* number of sbc frame to encode. Default is 1 */
+#if (SBC_JOINT_STE_INCLUDED == TRUE)
+    SINT16 as16Join[SBC_MAX_NUM_OF_SUBBANDS];       /*1 if JS, 0 otherwise*/
+#endif
+
+    SINT16 s16MaxBitNeed;
+    SINT16 as16ScaleFactor[SBC_MAX_NUM_OF_CHANNELS * SBC_MAX_NUM_OF_SUBBANDS];
+
+    SINT16 *ps16NextPcmBuffer;
+#if (SBC_NO_PCM_CPY_OPTION == TRUE)
+    SINT16 *ps16PcmBuffer;
+#else
+    SINT16 as16PcmBuffer[SBC_MAX_NUM_FRAME * SBC_MAX_NUM_OF_BLOCKS * SBC_MAX_NUM_OF_CHANNELS * SBC_MAX_NUM_OF_SUBBANDS];
+#endif
+
+    SINT16  s16ScartchMemForBitAlloc[16];
+
+    SINT32  s32SbBuffer[SBC_MAX_NUM_OF_CHANNELS * SBC_MAX_NUM_OF_SUBBANDS * SBC_MAX_NUM_OF_BLOCKS];
+
+    SINT16 as16Bits[SBC_MAX_NUM_OF_CHANNELS * SBC_MAX_NUM_OF_SUBBANDS];
+
+    UINT8  *pu8Packet;
+    UINT8  *pu8NextPacket;
+    UINT16 FrameHeader;
+    UINT16 u16PacketLength;
+
+} SBC_ENC_PARAMS;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+extern void SBC_Encoder(SBC_ENC_PARAMS *strEncParams);
+extern void SBC_Encoder_Init(SBC_ENC_PARAMS *strEncParams);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/tools/sdk/include/bluedroid/sbc_if.h b/tools/sdk/include/bluedroid/sbc_if.h
new file mode 100644
index 00000000000..993b066340e
--- /dev/null
+++ b/tools/sdk/include/bluedroid/sbc_if.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+#ifndef _SBC_IF_H
+#define _SBC_IF_H
+
+#define PCM_BUFFER_SIZE 512
+
+/*
+ SBC_Init - called once for each track played
+
+ pcm_sample_freq - 4000 to 48000
+ channels - 1 mono 2 stereo
+ bits_per_sample - 8 or 16
+ return - 0 sucess
+*/
+
+int SBC_init(int pcm_sample_freq, int channels, int bits_per_sample);
+
+/*
+ SBC_write - called repeatedly with pcm_in pointer
+    increasing by length until track is finished.
+
+ pcm_in - pointer to PCM buffer
+ length - any
+ sbc_out - pointer to SBC output buffer
+ return - number of bytes written to sbc_out
+*/
+
+int SBC_write(unsigned char *pcm_in, int length, unsigned char *sbc_out);
+
+#endif
diff --git a/tools/sdk/include/bluedroid/sbc_types.h b/tools/sdk/include/bluedroid/sbc_types.h
new file mode 100644
index 00000000000..4bb8829c707
--- /dev/null
+++ b/tools/sdk/include/bluedroid/sbc_types.h
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *  Data type declarations.
+ *
+ ******************************************************************************/
+
+#ifndef SBC_TYPES_H
+#define SBC_TYPES_H
+
+#include <stdint.h>
+
+#ifdef BUILDCFG
+#include "bt_target.h"
+#endif
+
+#include "bt_types.h"
+
+typedef short SINT16;
+typedef long SINT32;
+
+#if (SBC_IPAQ_OPT == TRUE)
+
+#if (SBC_FOR_EMBEDDED_LINUX == TRUE)
+typedef long long SINT64;
+#else
+typedef int64_t SINT64;
+#endif
+
+#elif (SBC_IS_64_MULT_IN_WINDOW_ACCU == TRUE) || (SBC_IS_64_MULT_IN_IDCT == TRUE)
+
+#if (SBC_FOR_EMBEDDED_LINUX == TRUE)
+typedef long long SINT64;
+#else
+typedef int64_t SINT64;
+#endif
+
+#endif
+
+#define abs32(x) ( (x >= 0) ? x : (-x) )
+
+#endif
diff --git a/tools/sdk/include/bluedroid/sdp_api.h b/tools/sdk/include/bluedroid/sdp_api.h
index c35c124393f..db11df55803 100644
--- a/tools/sdk/include/bluedroid/sdp_api.h
+++ b/tools/sdk/include/bluedroid/sdp_api.h
@@ -20,7 +20,7 @@
 
 #include "bt_target.h"
 #include "sdpdefs.h"
-
+#if (SDP_INCLUDED == TRUE)
 /*****************************************************************************
 **  Constants
 *****************************************************************************/
@@ -721,4 +721,6 @@ BOOLEAN SDP_FindServiceUUIDInRec(tSDP_DISC_REC *p_rec, tBT_UUID *p_uuid);
 }
 #endif
 
+#endif  ///SDP_INCLUDED == TRUE
+
 #endif  /* SDP_API_H */
diff --git a/tools/sdk/include/bluedroid/sdpdefs.h b/tools/sdk/include/bluedroid/sdpdefs.h
old mode 100755
new mode 100644
diff --git a/tools/sdk/include/bluedroid/sdpint.h b/tools/sdk/include/bluedroid/sdpint.h
index 9e935ea5add..3e89606f0e0 100644
--- a/tools/sdk/include/bluedroid/sdpint.h
+++ b/tools/sdk/include/bluedroid/sdpint.h
@@ -29,7 +29,7 @@
 #include "sdp_api.h"
 #include "l2c_api.h"
 
-
+#if (SDP_INCLUDED == TRUE)
 /* Continuation length - we use a 2-byte offset */
 #define SDP_CONTINUATION_LEN        2
 #define SDP_MAX_CONTINUATION_LEN    16          /* As per the spec */
@@ -309,6 +309,6 @@ extern void sdp_disc_server_rsp (tCONN_CB *p_ccb, BT_HDR *p_msg);
 #define sdp_disc_server_rsp(p_ccb, p_msg)
 #endif
 
-
+#endif  ///SDP_INCLUDED == TRUE
 
 #endif
diff --git a/tools/sdk/include/bluedroid/smp_int.h b/tools/sdk/include/bluedroid/smp_int.h
index ad6e99ea53e..734c3fcba36 100644
--- a/tools/sdk/include/bluedroid/smp_int.h
+++ b/tools/sdk/include/bluedroid/smp_int.h
@@ -24,7 +24,7 @@
 #ifndef  SMP_INT_H
 #define  SMP_INT_H
 
-#if BLE_INCLUDED == TRUE
+#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
 
 #include "btu.h"
 #include "btm_ble_api.h"
@@ -530,6 +530,6 @@ extern BOOLEAN aes_cipher_msg_auth_code(BT_OCTET16 key, UINT8 *input, UINT16 len
                                         UINT16 tlen, UINT8 *p_signature);
 extern void print128(BT_OCTET16 x, const UINT8 *key_name);
 
-#endif
+#endif  ///BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE
 
 #endif /* SMP_INT_H */
diff --git a/tools/sdk/include/bluedroid/srvc_battery_int.h b/tools/sdk/include/bluedroid/srvc_battery_int.h
new file mode 100644
index 00000000000..4979f101eda
--- /dev/null
+++ b/tools/sdk/include/bluedroid/srvc_battery_int.h
@@ -0,0 +1,79 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+#ifndef SRVC_BATTERY_INT_H
+#define SRVC_BATTERY_INT_H
+
+#include "bt_target.h"
+#include "srvc_api.h"
+#include "gatt_api.h"
+
+#ifndef BA_MAX_INT_NUM
+#define BA_MAX_INT_NUM     4
+#endif
+
+#define BATTERY_LEVEL_SIZE      1
+
+
+typedef struct {
+    UINT8           app_id;
+    UINT16          ba_level_hdl;
+    UINT16          clt_cfg_hdl;
+    UINT16          rpt_ref_hdl;
+    UINT16          pres_fmt_hdl;
+
+    tBA_CBACK       *p_cback;
+
+    UINT16          pending_handle;
+    UINT8           pending_clcb_idx;
+    UINT8           pending_evt;
+
+} tBA_INST;
+
+typedef struct {
+    tBA_INST                battery_inst[BA_MAX_INT_NUM];
+    UINT8                   inst_id;
+    BOOLEAN                 enabled;
+
+} tBATTERY_CB;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Global GATT data */
+#if GATT_DYNAMIC_MEMORY == FALSE
+extern tBATTERY_CB battery_cb;
+#else
+extern tBATTERY_CB *battery_cb_ptr;
+#define battery_cb (*battery_cb_ptr)
+#endif
+
+
+extern BOOLEAN battery_valid_handle_range(UINT16 handle);
+
+extern UINT8 battery_s_write_attr_value(UINT8 clcb_idx, tGATT_WRITE_REQ *p_value,
+                                        tGATT_STATUS *p_status);
+extern UINT8 battery_s_read_attr_value (UINT8 clcb_idx, UINT16 handle, tGATT_VALUE *p_value, BOOLEAN is_long, tGATT_STATUS *p_status);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/tools/sdk/include/bluedroid/srvc_dis_int.h b/tools/sdk/include/bluedroid/srvc_dis_int.h
new file mode 100644
index 00000000000..5da32d1e460
--- /dev/null
+++ b/tools/sdk/include/bluedroid/srvc_dis_int.h
@@ -0,0 +1,82 @@
+/******************************************************************************
+ *
+ *  Copyright (C) 1999-2012 Broadcom Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+#ifndef SRVC_DIS_INT_H
+#define SRVC_DIS_INT_H
+
+#include "bt_target.h"
+#include "srvc_api.h"
+#include "gatt_api.h"
+
+#define DIS_MAX_CHAR_NUM            9
+
+
+typedef struct {
+    UINT16      uuid;
+    UINT16      handle;
+} tDIS_DB_ENTRY;
+
+#define DIS_SYSTEM_ID_SIZE      8
+#define DIS_PNP_ID_SIZE         7
+
+
+
+typedef struct {
+    tDIS_DB_ENTRY           dis_attr[DIS_MAX_CHAR_NUM];
+    tDIS_VALUE              dis_value;
+
+    tDIS_READ_CBACK         *p_read_dis_cback;
+
+    UINT16                  service_handle;
+    UINT16                  max_handle;
+
+    BOOLEAN                 enabled;
+
+    UINT8                   dis_read_uuid_idx;
+
+    tDIS_ATTR_MASK          request_mask;
+} tDIS_CB;
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Global GATT data */
+#if GATT_DYNAMIC_MEMORY == FALSE
+extern tDIS_CB dis_cb;
+#else
+extern tDIS_CB *dis_cb_ptr;
+#define dis_cb (*dis_cb_ptr)
+#endif
+
+
+extern BOOLEAN dis_valid_handle_range(UINT16 handle);
+extern UINT8 dis_read_attr_value (UINT8 clcb_idx, UINT16 handle, tGATT_VALUE *p_value,
+                                  BOOLEAN is_long, tGATT_STATUS *p_status);
+extern UINT8 dis_write_attr_value(tGATT_WRITE_REQ *p_data, tGATT_STATUS *p_status);
+
+extern void dis_c_cmpl_cback (tSRVC_CLCB *p_clcb, tGATTC_OPTYPE op,
+                              tGATT_STATUS status, tGATT_CL_COMPLETE *p_data);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/tools/sdk/include/bluedroid/thread.h b/tools/sdk/include/bluedroid/thread.h
index c148cef70ca..c10f8c2afd9 100644
--- a/tools/sdk/include/bluedroid/thread.h
+++ b/tools/sdk/include/bluedroid/thread.h
@@ -40,7 +40,6 @@ enum {
     SIG_PRF_WORK = 0xfd,
     SIG_BTU_START_UP = 0xfe,
     SIG_BTU_WORK = 0xff,
-    SIG_BTIF_WORK = 0xff
 };
 
 #define HCI_HOST_TASK_STACK_SIZE        (2048 + BT_TASK_EXTRA_STACK_SIZE)
@@ -53,7 +52,7 @@ enum {
 #define HCI_H4_TASK_NAME                "hciH4T"
 #define HCI_H4_QUEUE_NUM                60
 
-#define BTU_TASK_STACK_SIZE             (3584 + BT_TASK_EXTRA_STACK_SIZE)
+#define BTU_TASK_STACK_SIZE             (4096 + BT_TASK_EXTRA_STACK_SIZE)
 #define BTU_TASK_PRIO                   (configMAX_PRIORITIES - 5)
 #define BTU_TASK_NAME                   "btuT"
 #define BTU_QUEUE_NUM                   50
diff --git a/tools/sdk/include/config/sdkconfig.h b/tools/sdk/include/config/sdkconfig.h
index f58bf8bb522..32da0608413 100644
--- a/tools/sdk/include/config/sdkconfig.h
+++ b/tools/sdk/include/config/sdkconfig.h
@@ -4,6 +4,7 @@
  * Espressif IoT Development Framework Configuration
  *
  */
+#define CONFIG_GATTC_ENABLE 1
 #define CONFIG_ESP32_PHY_MAX_TX_POWER 20
 #define CONFIG_PHY_ENABLED 1
 #define CONFIG_TRACEMEM_RESERVE_DRAM 0x0
@@ -47,6 +48,7 @@
 #define CONFIG_MBEDTLS_MPI_USE_INTERRUPT 1
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE 1
 #define CONFIG_BTDM_CONTROLLER_RUN_CPU 0
+#define CONFIG_TCPIP_TASK_STACK_SIZE 2560
 #define CONFIG_FATFS_CODEPAGE_850 1
 #define CONFIG_TASK_WDT 1
 #define CONFIG_MAIN_TASK_STACK_SIZE 4096
@@ -60,6 +62,7 @@
 #define CONFIG_TIMER_QUEUE_LENGTH 10
 #define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 0
 #define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
+#define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
 #define CONFIG_ESP32_WIFI_NVS_ENABLED 1
 #define CONFIG_ULP_COPROC_ENABLED 1
 #define CONFIG_DMA_RX_BUF_NUM 10
@@ -73,10 +76,11 @@
 #define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4
 #define CONFIG_WIFI_ENABLED 1
 #define CONFIG_FLASHMODE_QIO 1
+#define CONFIG_BASE_MAC_STORED_DEFAULT_EFUSE 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_80M 1
 #define CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE 2048
-#define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 1000
-#define CONFIG_PHY_DATA_OFFSET 0xf000
+#define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY 2000
+#define CONFIG_ESP32_APPTRACE_DEST_NONE 1
 #define CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET 0x10000
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32
 #define CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ 240
@@ -84,12 +88,15 @@
 #define CONFIG_FREERTOS_HZ 1000
 #define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1
 #define CONFIG_FREERTOS_ASSERT_FAIL_ABORT 1
+#define CONFIG_ESP32_XTAL_FREQ 0
 #define CONFIG_MONITOR_BAUD_115200B 1
 #define CONFIG_LOG_BOOTLOADER_LEVEL 1
+#define CONFIG_SMP_ENABLE 1
 #define CONFIG_ESPTOOLPY_BEFORE_RESET 1
 #define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
 #define CONFIG_ENABLE_ARDUINO_DEPENDS 1
 #define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
+#define CONFIG_ESP32_XTAL_FREQ_AUTO 1
 #define CONFIG_TCP_MAXRTX 12
 #define CONFIG_ESPTOOLPY_AFTER "hard_reset"
 #define CONFIG_LWIP_SO_REUSE 1
@@ -102,10 +109,14 @@
 #define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
 #define CONFIG_MBEDTLS_HAVE_TIME 1
 #define CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY 1
+#define CONFIG_GATTS_ENABLE 1
 #define CONFIG_FREERTOS_ISR_STACKSIZE 1536
+#define CONFIG_CLASSIC_BT_ENABLED 1
+#define CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK 1
 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1
 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
+#define CONFIG_BT_ACL_CONNECTIONS 4
 #define CONFIG_FATFS_MAX_LFN 255
 #define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1
 #define CONFIG_ESPTOOLPY_BAUD_921600B 1
diff --git a/tools/sdk/include/driver/driver/gpio.h b/tools/sdk/include/driver/driver/gpio.h
index 485afb696ee..6c79f7b8b3b 100644
--- a/tools/sdk/include/driver/driver/gpio.h
+++ b/tools/sdk/include/driver/driver/gpio.h
@@ -221,7 +221,7 @@ typedef intr_handle_t gpio_isr_handle_t;
  *     - ESP_ERR_INVALID_ARG Parameter error
  *
  */
-esp_err_t gpio_config(gpio_config_t *pGPIOConfig);
+esp_err_t gpio_config(const gpio_config_t *pGPIOConfig);
 
 
 /**
@@ -356,7 +356,7 @@ esp_err_t gpio_wakeup_disable(gpio_num_t gpio_num);
  * @param  handle Pointer to return handle. If non-NULL, a handle for the interrupt will be returned here.
  *
  * \verbatim embed:rst:leading-asterisk
- * To disable or remove the ISR, pass the returned handle to the :doc:`interrupt allocation functions </api/system/intr_alloc>`.
+ * To disable or remove the ISR, pass the returned handle to the :doc:`interrupt allocation functions </api-reference/system/intr_alloc>`.
  * \endverbatim
  *
  * @return
diff --git a/tools/sdk/include/driver/driver/i2c.h b/tools/sdk/include/driver/driver/i2c.h
index 960ec61d276..323a91a3c5c 100644
--- a/tools/sdk/include/driver/driver/i2c.h
+++ b/tools/sdk/include/driver/driver/i2c.h
@@ -135,7 +135,7 @@ esp_err_t i2c_driver_delete(i2c_port_t i2c_num);
  *     - ESP_OK Success
  *     - ESP_ERR_INVALID_ARG Parameter error
  */
-esp_err_t i2c_param_config(i2c_port_t i2c_num, i2c_config_t* i2c_conf);
+esp_err_t i2c_param_config(i2c_port_t i2c_num, const i2c_config_t* i2c_conf);
 
 /**
  * @brief reset I2C tx hardware fifo
diff --git a/tools/sdk/include/driver/driver/i2s.h b/tools/sdk/include/driver/driver/i2s.h
index b904b77140b..562f0985d32 100644
--- a/tools/sdk/include/driver/driver/i2s.h
+++ b/tools/sdk/include/driver/driver/i2s.h
@@ -43,6 +43,15 @@ typedef enum {
     I2S_BITS_PER_SAMPLE_32BIT   = 32,       /*!< I2S bits per sample: 32-bits*/
 } i2s_bits_per_sample_t;
 
+/**
+ * @brief I2S channel.
+ *
+ */
+typedef enum {
+    I2S_CHANNEL_MONO        = 1,            /*!< I2S 1 channel (mono)*/
+    I2S_CHANNEL_STEREO      = 2             /*!< I2S 2 channel (stereo)*/
+} i2s_channel_t;
+
 /**
  * @brief I2S communication standard format
  *
@@ -338,6 +347,25 @@ esp_err_t i2s_start(i2s_port_t i2s_num);
  */
 esp_err_t i2s_zero_dma_buffer(i2s_port_t i2s_num);
 
+/**
+ * @brief Set clock & bit width used for I2S RX and TX.
+ * 
+ * Similar to i2s_set_sample_rates(), but also sets bit width.
+ *
+ * @param i2s_num  I2S_NUM_0, I2S_NUM_1
+ *
+ * @param rate I2S sample rate (ex: 8000, 44100...)
+ *
+ * @param bits I2S bit width (I2S_BITS_PER_SAMPLE_16BIT, I2S_BITS_PER_SAMPLE_24BIT, I2S_BITS_PER_SAMPLE_32BIT)
+ *
+ * @param ch I2S channel, (I2S_CHANNEL_MONO, I2S_CHANNEL_STEREO)
+ * 
+ * @return
+ *     - ESP_OK   Success
+ *     - ESP_FAIL Parameter error
+ */
+esp_err_t i2s_set_clk(i2s_port_t i2s_num, uint32_t rate, i2s_bits_per_sample_t bits, i2s_channel_t ch);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tools/sdk/include/driver/driver/ledc.h b/tools/sdk/include/driver/driver/ledc.h
index 70e21d9e490..841b1c8d7ad 100644
--- a/tools/sdk/include/driver/driver/ledc.h
+++ b/tools/sdk/include/driver/driver/ledc.h
@@ -115,7 +115,7 @@ typedef intr_handle_t ledc_isr_handle_t;
  *     - ESP_OK Success
  *     - ESP_ERR_INVALID_ARG Parameter error
  */
-esp_err_t ledc_channel_config(ledc_channel_config_t* ledc_conf);
+esp_err_t ledc_channel_config(const ledc_channel_config_t* ledc_conf);
 
 /**
  * @brief LEDC timer configuration
@@ -128,7 +128,7 @@ esp_err_t ledc_channel_config(ledc_channel_config_t* ledc_conf);
  *     - ESP_ERR_INVALID_ARG Parameter error
  *     - ESP_FAIL Can not find a proper pre-divider number base on the given frequency and the current bit_num.
  */
-esp_err_t ledc_timer_config(ledc_timer_config_t* timer_conf);
+esp_err_t ledc_timer_config(const ledc_timer_config_t* timer_conf);
 
 /**
  * @brief LEDC update channel parameters
diff --git a/tools/sdk/include/driver/driver/pcnt.h b/tools/sdk/include/driver/driver/pcnt.h
index f5a10581c06..38a7e41d78c 100644
--- a/tools/sdk/include/driver/driver/pcnt.h
+++ b/tools/sdk/include/driver/driver/pcnt.h
@@ -88,7 +88,7 @@ typedef intr_handle_t pcnt_isr_handle_t;
  *     - ESP_OK Success
  *     - ESP_ERR_INVALID_ARG Parameter error
  */
-esp_err_t pcnt_unit_config(pcnt_config_t *pcnt_config);
+esp_err_t pcnt_unit_config(const pcnt_config_t *pcnt_config);
 
 /**
  * @brief Get pulse counter value
diff --git a/tools/sdk/include/driver/driver/sigmadelta.h b/tools/sdk/include/driver/driver/sigmadelta.h
index db167837b80..61a35c21f91 100644
--- a/tools/sdk/include/driver/driver/sigmadelta.h
+++ b/tools/sdk/include/driver/driver/sigmadelta.h
@@ -57,7 +57,7 @@ typedef struct {
  *     - ESP_OK Success
  *     - ESP_ERR_INVALID_ARG Parameter error
  */
-esp_err_t sigmadelta_config(sigmadelta_config_t *config);
+esp_err_t sigmadelta_config(const sigmadelta_config_t *config);
 
 /**
  * @brief Set Sigma-delta channel duty.
diff --git a/tools/sdk/include/driver/driver/spi_common.h b/tools/sdk/include/driver/driver/spi_common.h
new file mode 100644
index 00000000000..5d4270fd1ee
--- /dev/null
+++ b/tools/sdk/include/driver/driver/spi_common.h
@@ -0,0 +1,233 @@
+// Copyright 2010-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+#ifndef _DRIVER_SPI_COMMON_H_
+#define _DRIVER_SPI_COMMON_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "esp_err.h"
+#include "soc/spi_struct.h"
+#include "rom/lldesc.h"
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+//Maximum amount of bytes that can be put in one DMA descriptor
+#define SPI_MAX_DMA_LEN (4096-4)
+
+
+/**
+ * @brief Enum with the three SPI peripherals that are software-accessible in it
+ */
+typedef enum {
+    SPI_HOST=0,                     ///< SPI1, SPI
+    HSPI_HOST=1,                    ///< SPI2, HSPI
+    VSPI_HOST=2                     ///< SPI3, VSPI
+} spi_host_device_t;
+
+/**
+ * @brief This is a configuration structure for a SPI bus.
+ *
+ * You can use this structure to specify the GPIO pins of the bus. Normally, the driver will use the
+ * GPIO matrix to route the signals. An exception is made when all signals either can be routed through 
+ * the IO_MUX or are -1. In that case, the IO_MUX is used, allowing for >40MHz speeds.
+ */
+typedef struct {
+    int mosi_io_num;                ///< GPIO pin for Master Out Slave In (=spi_d) signal, or -1 if not used.
+    int miso_io_num;                ///< GPIO pin for Master In Slave Out (=spi_q) signal, or -1 if not used.
+    int sclk_io_num;                ///< GPIO pin for Spi CLocK signal, or -1 if not used.
+    int quadwp_io_num;              ///< GPIO pin for WP (Write Protect) signal which is used as D2 in 4-bit communication modes, or -1 if not used.
+    int quadhd_io_num;              ///< GPIO pin for HD (HolD) signal which is used as D3 in 4-bit communication modes, or -1 if not used.
+    int max_transfer_sz;            ///< Maximum transfer size, in bytes. Defaults to 4094 if 0.
+} spi_bus_config_t;
+
+
+/**
+ * @brief Try to claim a SPI peripheral
+ *
+ * Call this if your driver wants to manage a SPI peripheral.
+ *
+ * @param host Peripheral to claim
+ * @return True if peripheral is claimed successfully; false if peripheral already is claimed.
+ */
+bool spicommon_periph_claim(spi_host_device_t host);
+
+/**
+ * @brief Return the SPI peripheral so another driver can claim it.
+ *
+ * @param host Peripheral to claim
+ * @return True if peripheral is returned successfully; false if peripheral was free to claim already.
+ */
+bool spicommon_periph_free(spi_host_device_t host);
+
+
+#define SPICOMMON_BUSFLAG_SLAVE  0          ///< Initialize I/O in slave mode
+#define SPICOMMON_BUSFLAG_MASTER (1<<0)     ///< Initialize I/O in master mode
+#define SPICOMMON_BUSFLAG_QUAD   (1<<1)     ///< Also initialize WP/HD pins, if specified
+
+/**
+ * @brief Connect a SPI peripheral to GPIO pins
+ *
+ * This routine is used to connect a SPI peripheral to the IO-pads and DMA channel given in
+ * the arguments. Depending on the IO-pads requested, the routing is done either using the 
+ * IO_mux or using the GPIO matrix.
+ *
+ * @param host SPI peripheral to be routed
+ * @param bus_config Pointer to a spi_bus_config struct detailing the GPIO pins
+ * @param dma_chan DMA-channel (1 or 2) to use, or 0 for no DMA.
+ * @param flags Combination of SPICOMMON_BUSFLAG_* flags
+ * @param[out] is_native A value of 'true' will be written to this address if the GPIOs can be
+ *                  routed using the IO_mux, 'false' if the GPIO matrix is used.
+ * @return 
+ *         - ESP_ERR_INVALID_ARG   if parameter is invalid
+ *         - ESP_OK                on success
+ */
+esp_err_t spicommon_bus_initialize_io(spi_host_device_t host, const spi_bus_config_t *bus_config, int dma_chan, int flags, bool *is_native);
+
+/**
+ * @brief Free the IO used by a SPI peripheral
+ *
+ * @param host SPI peripheral to be freed
+ * @return 
+ *         - ESP_ERR_INVALID_ARG   if parameter is invalid
+ *         - ESP_OK                on success
+ */
+
+esp_err_t spicommon_bus_free_io(spi_host_device_t host);
+
+/**
+ * @brief Initialize a Chip Select pin for a specific SPI peripheral
+ *
+ *
+ * @param host SPI peripheral
+ * @param cs_io_num GPIO pin to route
+ * @param cs_num CS id to route
+ * @param force_gpio_matrix If true, CS will always be routed through the GPIO matrix. If false,
+ *                          if the GPIO number allows it, the routing will happen through the IO_mux.
+ */
+
+void spicommon_cs_initialize(spi_host_device_t host, int cs_io_num, int cs_num, int force_gpio_matrix);
+
+/**
+ * @brief Free a chip select line
+ *
+ * @param host SPI peripheral
+ * @param cs_num CS id to free
+ */
+void spicommon_cs_free(spi_host_device_t host, int cs_num);
+
+
+/**
+ * @brief Setup a DMA link chain
+ *
+ * This routine will set up a chain of linked DMA descriptors in the array pointed to by
+ * ``dmadesc``. Enough DMA descriptors will be used to fit the buffer of ``len`` bytes in, and the
+ * descriptors will point to the corresponding positions in ``buffer`` and linked together. The
+ * end result is that feeding ``dmadesc[0]`` into DMA hardware results in the entirety ``len`` bytes
+ * of ``data`` being read or written.
+ *
+ * @param dmadesc Pointer to array of DMA descriptors big enough to be able to convey ``len`` bytes
+ * @param len Length of buffer
+ * @param data Data buffer to use for DMA transfer
+ * @param isrx True if data is to be written into ``data``, false if it's to be read from ``data``.
+ */
+void spicommon_setup_dma_desc_links(lldesc_t *dmadesc, int len, const uint8_t *data, bool isrx);
+
+/**
+ * @brief Get the position of the hardware registers for a specific SPI host
+ *
+ * @param host The SPI host
+ *
+ * @return A register descriptor stuct pointer, pointed at the hardware registers
+ */
+spi_dev_t *spicommon_hw_for_host(spi_host_device_t host);
+
+/**
+ * @brief Get the IRQ source for a specific SPI host
+ *
+ * @param host The SPI host
+ *
+ * @return The hosts IRQ source
+ */
+int spicommon_irqsource_for_host(spi_host_device_t host);
+
+
+
+
+/**
+ * Callback, to be called when a DMA engine reset is completed
+*/
+typedef void(*dmaworkaround_cb_t)(void *arg);
+
+
+/**
+ * @brief Request a reset for a certain DMA channel
+ *
+ * @note In some (well-defined) cases in the ESP32 (at least rev v.0 and v.1), a SPI DMA channel will get confused. This can be remedied
+ * by resetting the SPI DMA hardware in case this happens. Unfortunately, the reset knob used for thsi will reset _both_ DMA channels, and
+ * as such can only done safely when both DMA channels are idle. These functions coordinate this.
+ * 
+ * Essentially, when a reset is needed, a driver can request this using spicommon_dmaworkaround_req_reset. This is supposed to be called
+ * with an user-supplied function as an argument. If both DMA channels are idle, this call will reset the DMA subsystem and return true. 
+ * If the other DMA channel is still busy, it will return false; as soon as the other DMA channel is done, however, it will reset the 
+ * DMA subsystem and call the callback. The callback is then supposed to be used to continue the SPI drivers activity.
+ *
+ * @param dmachan DMA channel associated with the SPI host that needs a reset
+ * @param cb Callback to call in case DMA channel cannot be reset immediately
+ * @param arg Argument to the callback
+ *
+ * @return True when a DMA reset could be executed immediately. False when it could not; in this
+ *         case the callback will be called with the specified argument when the logic can execute
+ *         a reset, after that reset.
+ */
+bool spicommon_dmaworkaround_req_reset(int dmachan, dmaworkaround_cb_t cb, void *arg);
+
+
+/**
+ * @brief Check if a DMA reset is requested but has not completed yet
+ *
+ * @return True when a DMA reset is requested but hasn't completed yet. False otherwise.
+ */
+bool spicommon_dmaworkaround_reset_in_progress();
+
+
+/**
+ * @brief Mark a DMA channel as idle.
+ *
+ * A call to this function tells the workaround logic that this channel will
+ * not be affected by a global SPI DMA reset.
+ */
+void spicommon_dmaworkaround_idle(int dmachan);
+
+/**
+ * @brief Mark a DMA channel as active.
+ *
+ * A call to this function tells the workaround logic that this channel will
+ * be affected by a global SPI DMA reset, and a reset like that should not be attempted.
+ */
+void spicommon_dmaworkaround_transfer_active(int dmachan);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/tools/sdk/include/driver/driver/spi_master.h b/tools/sdk/include/driver/driver/spi_master.h
index d78f5ea0b1e..ba8bc5d90fd 100644
--- a/tools/sdk/include/driver/driver/spi_master.h
+++ b/tools/sdk/include/driver/driver/spi_master.h
@@ -20,6 +20,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 
+#include "driver/spi_common.h"
 
 
 #ifdef __cplusplus
@@ -27,37 +28,10 @@ extern "C"
 {
 #endif
 
-
-/**
- * @brief Enum with the three SPI peripherals that are software-accessible in it
- */
-typedef enum {
-    SPI_HOST=0,                     ///< SPI1, SPI
-    HSPI_HOST=1,                    ///< SPI2, HSPI
-    VSPI_HOST=2                     ///< SPI3, VSPI
-} spi_host_device_t;
-
-
-/**
- * @brief This is a configuration structure for a SPI bus.
- *
- * You can use this structure to specify the GPIO pins of the bus. Normally, the driver will use the
- * GPIO matrix to route the signals. An exception is made when all signals either can be routed through 
- * the IO_MUX or are -1. In that case, the IO_MUX is used, allowing for >40MHz speeds.
- */
-typedef struct {
-    int mosi_io_num;                ///< GPIO pin for Master Out Slave In (=spi_d) signal, or -1 if not used.
-    int miso_io_num;                ///< GPIO pin for Master In Slave Out (=spi_q) signal, or -1 if not used.
-    int sclk_io_num;                ///< GPIO pin for Spi CLocK signal, or -1 if not used.
-    int quadwp_io_num;              ///< GPIO pin for WP (Write Protect) signal which is used as D2 in 4-bit communication modes, or -1 if not used.
-    int quadhd_io_num;              ///< GPIO pin for HD (HolD) signal which is used as D3 in 4-bit communication modes, or -1 if not used.
-} spi_bus_config_t;
-
-
 #define SPI_DEVICE_TXBIT_LSBFIRST          (1<<0)  ///< Transmit command/address/data LSB first instead of the default MSB first
 #define SPI_DEVICE_RXBIT_LSBFIRST          (1<<1)  ///< Receive data LSB first instead of the default MSB first
 #define SPI_DEVICE_BIT_LSBFIRST            (SPI_TXBIT_LSBFIRST|SPI_RXBIT_LSBFIRST); ///< Transmit and receive LSB first
-#define SPI_DEVICE_3WIRE                   (1<<2)  ///< Use spiq for both sending and receiving data
+#define SPI_DEVICE_3WIRE                   (1<<2)  ///< Use MOSI (=spid) for both sending and receiving data
 #define SPI_DEVICE_POSITIVE_CS             (1<<3)  ///< Make CS positive during a transaction instead of negative
 #define SPI_DEVICE_HALFDUPLEX              (1<<4)  ///< Transmit data before receiving it, instead of simultaneously
 #define SPI_DEVICE_CLK_AS_CS               (1<<5)  ///< Output clock on CS line if CS is active
@@ -122,16 +96,17 @@ typedef struct spi_device_t* spi_device_handle_t;  ///< Handle for a device on a
  *
  * @param host SPI peripheral that controls this bus
  * @param bus_config Pointer to a spi_bus_config_t struct specifying how the host should be initialized
- * @param dma_chan Either 1 or 2. A SPI bus used by this driver must have a DMA channel associated with
- *                 it. The SPI hardware has two DMA channels to share. This parameter indicates which
- *                 one to use.
+ * @param dma_chan Either channel 1 or 2, or 0 in the case when no DMA is required. Selecting a DMA channel
+ *                 for a SPI bus allows transfers on the bus to have sizes only limited by the amount of 
+ *                 internal memory. Selecting no DMA channel (by passing the value 0) limits the amount of
+ *                 bytes transfered to a maximum of 32.
  * @return 
  *         - ESP_ERR_INVALID_ARG   if configuration is invalid
  *         - ESP_ERR_INVALID_STATE if host already is in use
  *         - ESP_ERR_NO_MEM        if out of memory
  *         - ESP_OK                on success
  */
-esp_err_t spi_bus_initialize(spi_host_device_t host, spi_bus_config_t *bus_config, int dma_chan);
+esp_err_t spi_bus_initialize(spi_host_device_t host, const spi_bus_config_t *bus_config, int dma_chan);
 
 /**
  * @brief Free a SPI bus
@@ -235,4 +210,4 @@ esp_err_t spi_device_transmit(spi_device_handle_t handle, spi_transaction_t *tra
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/tools/sdk/include/driver/driver/spi_slave.h b/tools/sdk/include/driver/driver/spi_slave.h
new file mode 100644
index 00000000000..a3706bb6614
--- /dev/null
+++ b/tools/sdk/include/driver/driver/spi_slave.h
@@ -0,0 +1,161 @@
+// Copyright 2010-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+#ifndef _DRIVER_SPI_SLAVE_H_
+#define _DRIVER_SPI_SLAVE_H_
+
+#include "esp_err.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/semphr.h"
+#include "driver/spi_common.h"
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+#define SPI_SLAVE_TXBIT_LSBFIRST          (1<<0)  ///< Transmit command/address/data LSB first instead of the default MSB first
+#define SPI_SLAVE_RXBIT_LSBFIRST          (1<<1)  ///< Receive data LSB first instead of the default MSB first
+#define SPI_SLAVE_BIT_LSBFIRST            (SPI_TXBIT_LSBFIRST|SPI_RXBIT_LSBFIRST); ///< Transmit and receive LSB first
+
+
+typedef struct spi_slave_transaction_t spi_slave_transaction_t;
+typedef void(*slave_transaction_cb_t)(spi_slave_transaction_t *trans);
+
+/**
+ * @brief This is a configuration for a SPI host acting as a slave device.
+ */
+typedef struct {
+    int spics_io_num;               ///< CS GPIO pin for this device
+    uint32_t flags;                 ///< Bitwise OR of SPI_SLAVE_* flags
+    int queue_size;                 ///< Transaction queue size. This sets how many transactions can be 'in the air' (queued using spi_slave_queue_trans but not yet finished using spi_slave_get_trans_result) at the same time
+    uint8_t mode;                   ///< SPI mode (0-3)
+    slave_transaction_cb_t post_setup_cb; ///< Callback called after the SPI registers are loaded with new data
+    slave_transaction_cb_t post_trans_cb; ///< Callback called after a transaction is done
+} spi_slave_interface_config_t;
+
+/**
+ * This structure describes one SPI transaction
+ */
+struct spi_slave_transaction_t {
+    size_t length;                  ///< Total data length, in bits
+    const void *tx_buffer;          ///< Pointer to transmit buffer, or NULL for no MOSI phase
+    void *rx_buffer;                ///< Pointer to receive buffer, or NULL for no MISO phase
+    void *user;                     ///< User-defined variable. Can be used to store eg transaction ID.
+};
+
+/**
+ * @brief Initialize a SPI bus as a slave interface
+ *
+ * @warning For now, only supports HSPI and VSPI.
+ *
+ * @param host SPI peripheral to use as a SPI slave interface
+ * @param bus_config Pointer to a spi_bus_config_t struct specifying how the host should be initialized
+ * @param slave_config Pointer to a spi_slave_interface_config_t struct specifying the details for the slave interface
+ * @param dma_chan Either 1 or 2. A SPI bus used by this driver must have a DMA channel associated with
+ *                 it. The SPI hardware has two DMA channels to share. This parameter indicates which
+ *                 one to use.
+ * @return 
+ *         - ESP_ERR_INVALID_ARG   if configuration is invalid
+ *         - ESP_ERR_INVALID_STATE if host already is in use
+ *         - ESP_ERR_NO_MEM        if out of memory
+ *         - ESP_OK                on success
+ */
+esp_err_t spi_slave_initialize(spi_host_device_t host, const spi_bus_config_t *bus_config, const spi_slave_interface_config_t *slave_config, int dma_chan);
+
+/**
+ * @brief Free a SPI bus claimed as a SPI slave interface
+ *
+ * @param host SPI peripheral to free
+ * @return 
+ *         - ESP_ERR_INVALID_ARG   if parameter is invalid
+ *         - ESP_ERR_INVALID_STATE if not all devices on the bus are freed
+ *         - ESP_OK                on success
+ */
+esp_err_t spi_slave_free(spi_host_device_t host);
+
+
+/**
+ * @brief Queue a SPI transaction for execution
+ *
+ * Queues a SPI transaction to be executed by this slave device. (The transaction queue size was specified when the slave
+ * device was initialised via spi_slave_initialize.) This function may block if the queue is full (depending on the
+ * ticks_to_wait parameter). No SPI operation is directly initiated by this function, the next queued transaction
+ * will happen when the master initiates a SPI transaction by pulling down CS and sending out clock signals.
+ *
+ * This function hands over ownership of the buffers in ``trans_desc`` to the SPI slave driver; the application is
+ * not to access this memory until ``spi_slave_queue_trans`` is called to hand ownership back to the application.
+ *
+ * @param host SPI peripheral that is acting as a slave
+ * @param trans_desc Description of transaction to execute. Not const because we may want to write status back
+ *                   into the transaction description.
+ * @param ticks_to_wait Ticks to wait until there's room in the queue; use portMAX_DELAY to
+ *                      never time out.
+ * @return 
+ *         - ESP_ERR_INVALID_ARG   if parameter is invalid
+ *         - ESP_OK                on success
+ */
+esp_err_t spi_slave_queue_trans(spi_host_device_t host, const spi_slave_transaction_t *trans_desc, TickType_t ticks_to_wait);
+
+
+/**
+ * @brief Get the result of a SPI transaction queued earlier
+ *
+ * This routine will wait until a transaction to the given device (queued earlier with 
+ * spi_slave_queue_trans) has succesfully completed. It will then return the description of the
+ * completed transaction so software can inspect the result and e.g. free the memory or 
+ * re-use the buffers.
+ *
+ * It is mandatory to eventually use this function for any transaction queued by ``spi_slave_queue_trans``.
+ *
+ * @param host SPI peripheral to that is acting as a slave
+ * @param[out] trans_desc Pointer to variable able to contain a pointer to the description of the 
+ *                   transaction that is executed
+ * @param ticks_to_wait Ticks to wait until there's a returned item; use portMAX_DELAY to never time
+ *                      out.
+ * @return 
+ *         - ESP_ERR_INVALID_ARG   if parameter is invalid
+ *         - ESP_OK                on success
+ */
+esp_err_t spi_slave_get_trans_result(spi_host_device_t host, spi_slave_transaction_t **trans_desc, TickType_t ticks_to_wait);
+
+
+/**
+ * @brief Do a SPI transaction
+ *
+ * Essentially does the same as spi_slave_queue_trans followed by spi_slave_get_trans_result. Do
+ * not use this when there is still a transaction queued that hasn't been finalized 
+ * using spi_slave_get_trans_result.
+ *
+ * @param host SPI peripheral to that is acting as a slave
+ * @param trans_desc Pointer to variable able to contain a pointer to the description of the 
+ *                   transaction that is executed. Not const because we may want to write status back
+ *                   into the transaction description.
+ * @param ticks_to_wait Ticks to wait until there's a returned item; use portMAX_DELAY to never time
+ *                      out.
+ * @return 
+ *         - ESP_ERR_INVALID_ARG   if parameter is invalid
+ *         - ESP_OK                on success
+ */
+esp_err_t spi_slave_transmit(spi_host_device_t host, spi_slave_transaction_t *trans_desc, TickType_t ticks_to_wait);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/tools/sdk/include/driver/driver/timer.h b/tools/sdk/include/driver/driver/timer.h
index 134fd504fb7..2914a90a353 100644
--- a/tools/sdk/include/driver/driver/timer.h
+++ b/tools/sdk/include/driver/driver/timer.h
@@ -287,7 +287,7 @@ esp_err_t timer_isr_register(timer_group_t group_num, timer_idx_t timer_num, voi
  *     - ESP_OK Success
  *     - ESP_ERR_INVALID_ARG Parameter error
  */
-esp_err_t timer_init(timer_group_t group_num, timer_idx_t timer_num, timer_config_t* config);
+esp_err_t timer_init(timer_group_t group_num, timer_idx_t timer_num, const timer_config_t* config);
 
 /** @brief Get timer configure value.
  *
diff --git a/tools/sdk/include/esp32/esp_app_trace.h b/tools/sdk/include/esp32/esp_app_trace.h
new file mode 100644
index 00000000000..bd33e589d3a
--- /dev/null
+++ b/tools/sdk/include/esp32/esp_app_trace.h
@@ -0,0 +1,123 @@
+// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef ESP_APP_TRACE_H_
+#define ESP_APP_TRACE_H_
+
+#include <stdarg.h>
+#include "esp_err.h"
+
+// infinite waiting timeout
+#define ESP_APPTRACE_TMO_INFINITE               ((uint32_t)-1)
+
+// Trace memory block size
+#define ESP_APPTRACE_TRAX_BLOCK_SIZE            0x4000UL
+
+/**
+ * Application trace data destinations bits.
+ */
+typedef enum {
+    ESP_APPTRACE_DEST_TRAX = 0x1,
+    ESP_APPTRACE_DEST_UART0 = 0x2,
+    //ESP_APPTRACE_DEST_UART1 = 0x4,
+} esp_apptrace_dest_t;
+
+/**
+ * @brief  Initializes application tracing module.
+ *
+ * @note   Should be called before any esp_apptrace_xxx call.
+ *
+ * @return ESP_OK on success, otherwise \see esp_err_t
+ */
+esp_err_t esp_apptrace_init();
+
+/**
+ * @brief Allocates buffer for trace data.
+ *        After data in buffer are ready to be sent off esp_apptrace_buffer_put must be called to indicate it.
+ *
+ * @param dest Indicates HW interface to send data.
+ * @param size Size of data to write to trace buffer.
+ * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+ *
+ * @return non-NULL on success, otherwise NULL.
+ */
+uint8_t *esp_apptrace_buffer_get(esp_apptrace_dest_t dest, size_t size, uint32_t tmo);
+
+/**
+ * @brief Indicates that the data in buffer are ready to be sent off.
+ *        This function is a counterpart of must be preceeded by esp_apptrace_buffer_get.
+ *
+ * @param dest Indicates HW interface to send data. Should be identical to the same parameter in call to esp_apptrace_buffer_get.
+ * @param ptr  Address of trace buffer to release. Should be the value returned by call to esp_apptrace_buffer_get.
+ * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+ *
+ * @return ESP_OK on success, otherwise \see esp_err_t
+ */
+esp_err_t esp_apptrace_buffer_put(esp_apptrace_dest_t dest, uint8_t *ptr, uint32_t tmo);
+
+/**
+ * @brief  Writes data to trace buffer.
+ *
+ * @param dest Indicates HW interface to send data.
+ * @param data Address of data to write to trace buffer.
+ * @param size Size of data to write to trace buffer.
+ * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+ *
+ * @return ESP_OK on success, otherwise \see esp_err_t
+ */
+esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, void *data, size_t size, uint32_t tmo);
+
+/**
+ * @brief vprintf-like function to sent log messages to host via specified HW interface.
+ *
+ * @param dest Indicates HW interface to send data.
+ * @param fmt  Address of format string.
+ * @param ap   List of arguments.
+ *
+ * @return Number of bytes written.
+ */
+int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t user_tmo, const char *fmt, va_list ap);
+
+/**
+ * @brief vprintf-like function to sent log messages to host.
+ *
+ * @param fmt  Address of format string.
+ * @param ap   List of arguments.
+ *
+ * @return Number of bytes written.
+ */
+int esp_apptrace_vprintf(const char *fmt, va_list ap);
+
+/**
+ * @brief  Flushes remaining data in trace buffer to host.
+ *
+ * @param dest Indicates HW interface to flush data on.
+ * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+ *
+ * @return ESP_OK on success, otherwise \see esp_err_t
+ */
+esp_err_t esp_apptrace_flush(esp_apptrace_dest_t dest, uint32_t tmo);
+
+/**
+ * @brief Flushes remaining data in trace buffer to host without locking internal data.
+          This is special version of esp_apptrace_flush which should be called from panic handler.
+ *
+ * @param dest   Indicates HW interface to flush data on.
+ * @param min_sz Threshold for flushing data. If current filling level is above this value, data will be flushed. TRAX destinations only.
+ * @param tmo    Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+ *
+ * @return ESP_OK on success, otherwise \see esp_err_t
+ */
+esp_err_t esp_apptrace_flush_nolock(esp_apptrace_dest_t dest, uint32_t min_sz, uint32_t tmo);
+
+#endif
diff --git a/tools/sdk/include/esp32/esp_cache_err_int.h b/tools/sdk/include/esp32/esp_cache_err_int.h
new file mode 100644
index 00000000000..bcbd63e7998
--- /dev/null
+++ b/tools/sdk/include/esp32/esp_cache_err_int.h
@@ -0,0 +1,33 @@
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+/**
+ * @brief initialize cache invalid access interrupt
+ *
+ * This function enables cache invalid access interrupt source and connects it
+ * to interrupt input number ETS_CACHEERR_INUM (see soc/soc.h). It is called
+ * from the startup code.
+ */
+void esp_cache_err_int_init();
+
+
+/**
+ * @brief get the CPU which caused cache invalid access interrupt
+ * @return
+ *  - PRO_CPU_NUM, if PRO_CPU has caused cache IA interrupt
+ *  - APP_CPU_NUM, if APP_CPU has caused cache IA interrupt
+ *  - (-1) otherwise
+ */
+int esp_cache_err_get_cpuid();
diff --git a/tools/sdk/include/esp32/esp_clk.h b/tools/sdk/include/esp32/esp_clk.h
new file mode 100644
index 00000000000..0cedf0373e6
--- /dev/null
+++ b/tools/sdk/include/esp32/esp_clk.h
@@ -0,0 +1,44 @@
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+/**
+ * @file esp_clk.h
+ *
+ * This file contains declarations of clock related functions.
+ * These functions are used in ESP-IDF components, but should not be considered
+ * to be part of public API.
+ */
+
+/**
+ * @brief Initialize clock-related settings
+ *
+ * Called from cpu_start.c, not intended to be called from other places.
+ * This function configures the CPU clock, RTC slow and fast clocks, and
+ * performs RTC slow clock calibration.
+ */
+void esp_clk_init(void);
+
+
+/**
+ * @brief Get the cached calibration value of RTC slow clock
+ *
+ * The value is in the same format as returned by rtc_clk_cal (microseconds,
+ * in Q13.19 fixed-point format).
+ *
+ * @return the calibration value obtained using rtc_clk_cal, at startup time
+ */
+uint32_t esp_clk_slowclk_cal_get();
+
diff --git a/tools/sdk/include/esp32/esp_panic.h b/tools/sdk/include/esp32/esp_panic.h
index c9ee14099d6..4e0630a2458 100644
--- a/tools/sdk/include/esp32/esp_panic.h
+++ b/tools/sdk/include/esp32/esp_panic.h
@@ -13,7 +13,8 @@ extern "C"
 #define PANIC_RSN_COPROCEXCEPTION 4
 #define PANIC_RSN_INTWDT_CPU0 5
 #define PANIC_RSN_INTWDT_CPU1 6
-#define PANIC_RSN_MAX 6
+#define PANIC_RSN_CACHEERR 7
+#define PANIC_RSN_MAX 7
 
 
 #ifndef __ASSEMBLER__
@@ -66,6 +67,13 @@ void esp_clear_watchpoint(int no);
  */
 void esp_panic_wdt_stop(void);
 
+/**
+ * @brief Checks stack pointer
+ */
+static inline bool esp_stack_ptr_is_sane(uint32_t sp)
+{
+	return !(sp < 0x3ffae010UL || sp > 0x3ffffff0UL || ((sp & 0xf) != 0));
+}
 #endif
 
 #ifdef __cplusplus
diff --git a/tools/sdk/include/esp32/esp_system.h b/tools/sdk/include/esp32/esp_system.h
index 9a88743b806..24eebb8b0e3 100644
--- a/tools/sdk/include/esp32/esp_system.h
+++ b/tools/sdk/include/esp32/esp_system.h
@@ -103,7 +103,33 @@ uint32_t system_get_free_heap_size(void)  __attribute__ ((deprecated));
 uint32_t esp_random(void);
 
 /**
-  * @brief  Read hardware MAC address.
+  * @brief  Set base MAC address from external storage e.g. flash and EEPROM.
+  *
+  * Base MAC address is used to generate the MAC addresses used by the networking interfaces.
+  * If using base MAC address stored in external storage, call this API to set base MAC
+  * address from external storage before initializing WiFi/BT/Ethernet.
+  *
+  * @param  mac  base MAC address, length: 6 bytes.
+  *
+  * @return ESP_OK on success
+  */
+esp_err_t esp_base_mac_addr_set_external(uint8_t *mac);
+
+/**
+  * @brief  Return base MAC address set using esp_mac_addr_set_external.
+  *
+  * @param  mac  base MAC address, length: 6 bytes.
+  *
+  * Base MAC address is used to generate the MAC addresses used by the networking interfaces.
+  * If using base MAC address stored in external storage, call this API to set base MAC
+  * address from external storage before initializing WiFi/BT/Ethernet.
+  *
+  * @return ESP_OK on success
+  */
+esp_err_t esp_base_mac_addr_get_external(uint8_t *mac);
+
+/**
+  * @brief  Read hardware MAC address from efuse.
   *
   * In WiFi MAC, only ESP32 station MAC is the hardware MAC, ESP32 softAP MAC is a software MAC 
   * calculated from ESP32 station MAC. 
diff --git a/tools/sdk/include/esp32/esp_task.h b/tools/sdk/include/esp32/esp_task.h
index 522067ca7cb..aa694d3aa3f 100644
--- a/tools/sdk/include/esp32/esp_task.h
+++ b/tools/sdk/include/esp32/esp_task.h
@@ -46,7 +46,7 @@
 #define ESP_TASKD_EVENT_PRIO          (ESP_TASK_PRIO_MAX - 5)
 #define ESP_TASKD_EVENT_STACK         CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE
 #define ESP_TASK_TCPIP_PRIO           (ESP_TASK_PRIO_MAX - 7)
-#define ESP_TASK_TCPIP_STACK          2048
+#define ESP_TASK_TCPIP_STACK          CONFIG_TCPIP_TASK_STACK_SIZE
 #define ESP_TASK_MAIN_PRIO            (ESP_TASK_PRIO_MIN + 1)
 #define ESP_TASK_MAIN_STACK           CONFIG_MAIN_TASK_STACK_SIZE
 
diff --git a/tools/sdk/include/esp32/esp_wifi.h b/tools/sdk/include/esp32/esp_wifi.h
index 88a477f12d8..10fd409cef7 100755
--- a/tools/sdk/include/esp32/esp_wifi.h
+++ b/tools/sdk/include/esp32/esp_wifi.h
@@ -79,16 +79,17 @@ extern "C" {
 
 #define ESP_ERR_WIFI_NOT_INIT    (ESP_ERR_WIFI_BASE + 1)   /*!< WiFi driver was not installed by esp_wifi_init */
 #define ESP_ERR_WIFI_NOT_STARTED (ESP_ERR_WIFI_BASE + 2)   /*!< WiFi driver was not started by esp_wifi_start */
-#define ESP_ERR_WIFI_IF          (ESP_ERR_WIFI_BASE + 3)   /*!< WiFi interface error */
-#define ESP_ERR_WIFI_MODE        (ESP_ERR_WIFI_BASE + 4)   /*!< WiFi mode error */
-#define ESP_ERR_WIFI_STATE       (ESP_ERR_WIFI_BASE + 5)   /*!< WiFi internal state error */
-#define ESP_ERR_WIFI_CONN        (ESP_ERR_WIFI_BASE + 6)   /*!< WiFi internal control block of station or soft-AP error */
-#define ESP_ERR_WIFI_NVS         (ESP_ERR_WIFI_BASE + 7)   /*!< WiFi internal NVS module error */
-#define ESP_ERR_WIFI_MAC         (ESP_ERR_WIFI_BASE + 8)   /*!< MAC address is invalid */
-#define ESP_ERR_WIFI_SSID        (ESP_ERR_WIFI_BASE + 9)   /*!< SSID is invalid */
-#define ESP_ERR_WIFI_PASSWORD    (ESP_ERR_WIFI_BASE + 10)  /*!< Password is invalid */
-#define ESP_ERR_WIFI_TIMEOUT     (ESP_ERR_WIFI_BASE + 11)  /*!< Timeout error */
-#define ESP_ERR_WIFI_WAKE_FAIL   (ESP_ERR_WIFI_BASE + 12)  /*!< WiFi is in sleep state(RF closed) and wakeup fail */
+#define ESP_ERR_WIFI_NOT_STOPPED (ESP_ERR_WIFI_BASE + 3)   /*!< WiFi driver was not stopped by esp_wifi_stop */
+#define ESP_ERR_WIFI_IF          (ESP_ERR_WIFI_BASE + 4)   /*!< WiFi interface error */
+#define ESP_ERR_WIFI_MODE        (ESP_ERR_WIFI_BASE + 5)   /*!< WiFi mode error */
+#define ESP_ERR_WIFI_STATE       (ESP_ERR_WIFI_BASE + 6)   /*!< WiFi internal state error */
+#define ESP_ERR_WIFI_CONN        (ESP_ERR_WIFI_BASE + 7)   /*!< WiFi internal control block of station or soft-AP error */
+#define ESP_ERR_WIFI_NVS         (ESP_ERR_WIFI_BASE + 8)   /*!< WiFi internal NVS module error */
+#define ESP_ERR_WIFI_MAC         (ESP_ERR_WIFI_BASE + 9)   /*!< MAC address is invalid */
+#define ESP_ERR_WIFI_SSID        (ESP_ERR_WIFI_BASE + 10)   /*!< SSID is invalid */
+#define ESP_ERR_WIFI_PASSWORD    (ESP_ERR_WIFI_BASE + 11)  /*!< Password is invalid */
+#define ESP_ERR_WIFI_TIMEOUT     (ESP_ERR_WIFI_BASE + 12)  /*!< Timeout error */
+#define ESP_ERR_WIFI_WAKE_FAIL   (ESP_ERR_WIFI_BASE + 13)  /*!< WiFi is in sleep state(RF closed) and wakeup fail */
 
 /**
  * @brief WiFi stack configuration parameters passed to esp_wifi_init call.
diff --git a/tools/sdk/include/esp32/esp_wifi_types.h b/tools/sdk/include/esp32/esp_wifi_types.h
index be5435da0ed..7dd2ee4efb9 100755
--- a/tools/sdk/include/esp32/esp_wifi_types.h
+++ b/tools/sdk/include/esp32/esp_wifi_types.h
@@ -20,7 +20,6 @@
 #include <stdbool.h>
 #include "rom/queue.h"
 #include "esp_err.h"
-#include "esp_wifi_types.h"
 #include "esp_interface.h"
 
 #ifdef __cplusplus
@@ -124,7 +123,7 @@ typedef struct {
 
 typedef struct {
     uint8_t bssid[6];                     /**< MAC address of AP */
-    uint8_t ssid[32];                     /**< SSID of AP */
+    uint8_t ssid[33];                     /**< SSID of AP */
     uint8_t primary;                      /**< channel of AP */
     wifi_second_chan_t second;            /**< second channel of AP */
     int8_t  rssi;                         /**< signal strength of AP */
@@ -164,6 +163,7 @@ typedef struct {
     uint8_t password[64];  /**< password of target AP*/
     bool bssid_set;        /**< whether set MAC address of target AP or not. Generally, station_config.bssid_set needs to be 0; and it needs to be 1 only when users need to check the MAC address of the AP.*/
     uint8_t bssid[6];     /**< MAC address of target AP*/
+    uint8_t channel;       /**< channel of target AP. Set to 1~13 to scan starting from the specified channel before connecting to AP. If the channel of AP is unknown, set it to 0.*/
 } wifi_sta_config_t;
 
 typedef union {
diff --git a/tools/sdk/include/esp32/rom/efuse.h b/tools/sdk/include/esp32/rom/efuse.h
index 58cfdb20bc3..337227ab0d4 100644
--- a/tools/sdk/include/esp32/rom/efuse.h
+++ b/tools/sdk/include/esp32/rom/efuse.h
@@ -60,15 +60,20 @@ void ets_efuse_program_op(void);
 uint32_t ets_efuse_get_8M_clock(void);
 
 /**
-  * @brief  Read spi pad configuration, show gpio number of flash pad, includes 5 pads.
+  * @brief  Read spi flash pin configuration from Efuse
   *
-  * @param  null
-  *
-  * @return uint32_t: 0, invalid, flash pad decided by strapping
-  *      else, bit[5:0] spiclk, bit[11:6] spiq, bit[17:12] spid, bit[23:18] spics0, bit[29:24] spihd
+  * @return
+  * - 0 for default SPI pins.
+  * - 1 for default HSPI pins.
+  * - Other values define a custom pin configuration mask. Pins are encoded as per the EFUSE_SPICONFIG_RET_SPICLK,
+  *   EFUSE_SPICONFIG_RET_SPIQ, EFUSE_SPICONFIG_RET_SPID, EFUSE_SPICONFIG_RET_SPICS0, EFUSE_SPICONFIG_RET_SPIHD macros.
+  *   WP pin (for quad I/O modes) is not saved in efuse and not returned by this function.
   */
 uint32_t ets_efuse_get_spiconfig(void);
 
+#define EFUSE_SPICONFIG_SPI_DEFAULTS 0
+#define EFUSE_SPICONFIG_HSPI_DEFAULTS 1
+
 #define EFUSE_SPICONFIG_RET_SPICLK_MASK         0x3f
 #define EFUSE_SPICONFIG_RET_SPICLK_SHIFT        0
 #define EFUSE_SPICONFIG_RET_SPICLK(ret)         (((ret) >> EFUSE_SPICONFIG_RET_SPICLK_SHIFT) & EFUSE_SPICONFIG_RET_SPICLK_MASK)
diff --git a/tools/sdk/include/esp32/rom/spi_flash.h b/tools/sdk/include/esp32/rom/spi_flash.h
index bb2da748ba6..35d010d7979 100644
--- a/tools/sdk/include/esp32/rom/spi_flash.h
+++ b/tools/sdk/include/esp32/rom/spi_flash.h
@@ -279,25 +279,13 @@ esp_rom_spiflash_result_t esp_rom_spiflash_read_user_cmd(uint32_t *status, uint8
   *
   * @param  esp_rom_spiflash_read_mode_t mode : QIO/QOUT/DIO/DOUT/FastRD/SlowRD.
   *
-  * @param  uint8_t legacy: In legacy mode, more SPI command is used in line.
-  *
-  * @return ESP_ROM_SPIFLASH_RESULT_OK : config OK.
-  *         ESP_ROM_SPIFLASH_RESULT_ERR : config error.
-  *         ESP_ROM_SPIFLASH_RESULT_TIMEOUT : config timeout.
-  */
-esp_rom_spiflash_result_t esp_rom_spiflash_config_readmode(esp_rom_spiflash_read_mode_t mode, bool legacy);
-
-/**
-  * @brief Config SPI Flash read mode when Flash is running in some mode.
-  *        Please do not call this function in SDK.
-  *
-  * @param  esp_rom_spiflash_read_mode_t mode : QIO/QOUT/DIO/DOUT/FastRD/SlowRD.
+  * This function does not try to set the QIO Enable bit in the status register, caller is responsible for this.
   *
   * @return ESP_ROM_SPIFLASH_RESULT_OK : config OK.
   *         ESP_ROM_SPIFLASH_RESULT_ERR : config error.
   *         ESP_ROM_SPIFLASH_RESULT_TIMEOUT : config timeout.
   */
-esp_rom_spiflash_result_t esp_rom_spiflash_master_config_readmode(esp_rom_spiflash_read_mode_t mode);
+esp_rom_spiflash_result_t esp_rom_spiflash_config_readmode(esp_rom_spiflash_read_mode_t mode);
 
 /**
   * @brief Config SPI Flash clock divisor.
@@ -524,6 +512,24 @@ esp_rom_spiflash_result_t esp_rom_spiflash_write_encrypted(uint32_t flash_addr,
 esp_rom_spiflash_result_t esp_rom_spiflash_wait_idle(esp_rom_spiflash_chip_t *spi);
 
 
+/** @brief Enable Quad I/O pin functions
+ *
+ * @note Please do not call this function in SDK.
+ *
+ * Sets the HD & WP pin functions for Quad I/O modes, based on the
+ * efuse SPI pin configuration.
+ *
+ * @param wp_gpio_num - Number of the WP pin to reconfigure for quad I/O.
+ *
+ * @param spiconfig - Pin configuration, as returned from ets_efuse_get_spiconfig().
+ * - If this parameter is 0, default SPI pins are used and wp_gpio_num parameter is ignored.
+ * - If this parameter is 1, default HSPI pins are used and wp_gpio_num parameter is ignored.
+ * - For other values, this parameter encodes the HD pin number and also the CLK pin number. CLK pin selection is used
+ *   to determine if HSPI or SPI peripheral will be used (use HSPI if CLK pin is the HSPI clock pin, otherwise use SPI).
+ *   Both HD & WP pins are configured via GPIO matrix to map to the selected peripheral.
+ */
+void esp_rom_spiflash_select_qio_pins(uint8_t wp_gpio_num, uint32_t spiconfig);
+
 /** @brief Global esp_rom_spiflash_chip_t structure used by ROM functions
  *
  */
diff --git a/tools/sdk/include/ethernet/esp_eth.h b/tools/sdk/include/ethernet/esp_eth.h
index c2a3554b115..a7f92ad4bad 100644
--- a/tools/sdk/include/ethernet/esp_eth.h
+++ b/tools/sdk/include/ethernet/esp_eth.h
@@ -15,6 +15,7 @@
 #ifndef __ESP_ETH_H__
 #define __ESP_ETH_H__
 
+#include <stdbool.h>
 #include <stdint.h>
 #include "esp_err.h"
 
@@ -24,7 +25,7 @@ extern "C" {
 
 typedef enum {
     ETH_MODE_RMII = 0,
-    ETH_MDOE_MII,
+    ETH_MODE_MII,
 } eth_mode_t;
 
 typedef enum {
@@ -34,7 +35,7 @@ typedef enum {
 
 typedef enum {
     ETH_MODE_HALFDUPLEX = 0,
-    ETH_MDOE_FULLDUPLEX,
+    ETH_MODE_FULLDUPLEX,
 } eth_duplex_mode_t;
 
 typedef enum {
@@ -99,9 +100,10 @@ typedef struct {
     bool flow_ctrl_enable;                      /*!< flag of flow ctrl enable */
     eth_phy_get_partner_pause_enable_func  phy_get_partner_pause_enable; /*!< get partner pause enable */
     eth_phy_power_enable_func  phy_power_enable;  /*!< enable or disable phy power */
-    
+
 } eth_config_t;
 
+
 /**
  * @brief  Init ethernet mac
  *
@@ -173,7 +175,7 @@ void esp_eth_get_mac(uint8_t mac[6]);
 void esp_eth_smi_write(uint32_t reg_num, uint16_t value);
 
 /**
- * @brief  Write phy reg with smi interface.
+ * @brief  Read phy reg with smi interface.
  *
  * @note  phy base addr must be right.
  *
@@ -183,6 +185,35 @@ void esp_eth_smi_write(uint32_t reg_num, uint16_t value);
  */
 uint16_t esp_eth_smi_read(uint32_t reg_num);
 
+/**
+ * @brief Continuously read a PHY register over SMI interface, wait until the register has the desired value.
+ *
+ * @note PHY base address must be right.
+ *
+ * @param reg_num: PHY register number
+ * @param value: Value to wait for (masked with value_mask)
+ * @param value_mask: Mask of bits to match in the register.
+ * @param timeout_ms: Timeout to wait for this value (milliseconds). 0 means never timeout.
+ *
+ * @return ESP_OK if desired value matches, ESP_ERR_TIMEOUT if timed out.
+ */
+esp_err_t esp_eth_smi_wait_value(uint32_t reg_num, uint16_t value, uint16_t value_mask, int timeout_ms);
+
+/**
+ * @brief Continuously read a PHY register over SMI interface, wait until the register has all bits in a mask set.
+ *
+ * @note PHY base address must be right.
+ *
+ * @param reg_num: PHY register number
+ * @param value_mask: Value mask to wait for (all bits in this mask must be set)
+ * @param timeout_ms: Timeout to wait for this value (milliseconds). 0 means never timeout.
+ *
+ * @return ESP_OK if desired value matches, ESP_ERR_TIMEOUT if timed out.
+ */
+static inline esp_err_t esp_eth_smi_wait_set(uint32_t reg_num, uint16_t value_mask, int timeout_ms) {
+    return esp_eth_smi_wait_value(reg_num, value_mask, value_mask, timeout_ms);
+}
+
 /**
  * @brief  Free emac rx buf.
  *
diff --git a/tools/sdk/include/ethernet/eth_phy/phy.h b/tools/sdk/include/ethernet/eth_phy/phy.h
new file mode 100644
index 00000000000..44edd749106
--- /dev/null
+++ b/tools/sdk/include/ethernet/eth_phy/phy.h
@@ -0,0 +1,59 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "esp_eth.h"
+
+/* Common PHY-management functions.
+
+   These are not enough to drive any particular Ethernet PHY, but they provide a common configuration structure and
+   management functions.
+*/
+
+/* Configure fixed pins for RMII data interface.
+
+   This configures GPIOs 0, 19, 22, 25, 26, 27 for use with RMII
+   data interface. These pins cannot be changed, and must be wired to
+   ethernet functions.
+
+   This is not sufficient to fully configure the Ethernet PHY,
+   MDIO configuration interface pins (such as SMI MDC, MDO, MDI)
+   must also be configured correctly in the GPIO matrix.
+*/
+void phy_rmii_configure_data_interface_pins(void);
+
+/* Configure variable pins for SMI (MDIO) ethernet functions.
+
+   Calling this function along with mii_configure_default_pins() will
+   fully configure the GPIOs for the ethernet PHY.
+ */
+void phy_rmii_smi_configure_pins(uint8_t mdc_gpio, uint8_t mdio_gpio);
+
+
+/* Enable flow control in standard PHY MII register.
+ */
+void phy_mii_enable_flow_ctrl(void);
+
+bool phy_mii_check_link_status(void);
+
+bool phy_mii_get_partner_pause_enable(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tools/sdk/include/ethernet/eth_phy/phy_lan8720.h b/tools/sdk/include/ethernet/eth_phy/phy_lan8720.h
new file mode 100644
index 00000000000..7bde42eca37
--- /dev/null
+++ b/tools/sdk/include/ethernet/eth_phy/phy_lan8720.h
@@ -0,0 +1,67 @@
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "phy.h"
+
+
+/* @brief Dump all LAN8720 PHY SMI configuration registers
+ *
+ * @note These registers are dumped at 'debug' level, so output
+ * may not be visible depending on default log levels.
+ */
+void phy_lan8720_dump_registers();
+
+/* @brief Default LAN8720 phy_check_init function.
+ */
+void phy_lan8720_check_phy_init(void);
+
+/* @brief Default LAN8720 phy_get_speed_mode function.
+ */
+eth_speed_mode_t phy_lan8720_get_speed_mode(void);
+
+/* @brief Default LAN8720 phy_get_duplex_mode function.
+ */
+eth_duplex_mode_t phy_lan8720_get_duplex_mode(void);
+
+/* @brief Default LAN8720 phy_power_enable function.
+ *
+ * @note This function may need to be replaced with a custom function
+ * if the PHY has a GPIO to enable power or start a clock.
+ *
+ * Consult the ethernet example to see how this is done.
+ */
+void phy_lan8720_power_enable(bool);
+
+/* @brief Default LAN8720 phy_init function.
+ */
+void phy_lan8720_init(void);
+
+/* @brief Default LAN8720 PHY configuration
+ *
+ * This configuration is not suitable for use as-is, it will need
+ * to be modified for your particular PHY hardware setup.
+ *
+ * Consult the Ethernet example to see how this is done.
+ */
+extern const eth_config_t phy_lan8720_default_ethernet_config;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tools/sdk/include/ethernet/eth_phy/phy_reg.h b/tools/sdk/include/ethernet/eth_phy/phy_reg.h
new file mode 100644
index 00000000000..33c9a064a3a
--- /dev/null
+++ b/tools/sdk/include/ethernet/eth_phy/phy_reg.h
@@ -0,0 +1,37 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+/* This header contains register/bit masks for the standard
+   PHY MII registers that should be supported by all PHY models.
+*/
+
+#define MII_BASIC_MODE_CONTROL_REG          (0x0)
+#define MII_SOFTWARE_RESET                     BIT(15)
+
+#define MII_BASIC_MODE_STATUS_REG           (0x1)
+#define MII_AUTO_NEGOTIATION_COMPLETE          BIT(5)
+#define MII_LINK_STATUS                        BIT(2)
+
+#define MII_PHY_IDENTIFIER_1_REG              (0x2)
+#define MII_PHY_IDENTIFIER_2_REG              (0x3)
+
+#define MII_AUTO_NEG_ADVERTISEMENT_REG      (0x4)
+#define MII_ASM_DIR                            BIT(11)
+#define MII_PAUSE                              BIT(10)
+
+#define MII_PHY_LINK_PARTNER_ABILITY_REG    (0x5)
+#define MII_PARTNER_ASM_DIR                    BIT(11)
+#define MII_PARTNER_PAUSE                      BIT(10)
diff --git a/tools/sdk/include/ethernet/eth_phy/phy_tlk110.h b/tools/sdk/include/ethernet/eth_phy/phy_tlk110.h
new file mode 100644
index 00000000000..1019044e959
--- /dev/null
+++ b/tools/sdk/include/ethernet/eth_phy/phy_tlk110.h
@@ -0,0 +1,66 @@
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "phy.h"
+
+/* @brief Dump all TLK110 PHY SMI configuration registers
+ *
+ * @note These registers are dumped at 'debug' level, so output
+ * may not be visible depending on default log levels.
+ */
+void phy_tlk110_dump_registers();
+
+/* @brief Default TLK110 phy_check_init function.
+ */
+void phy_tlk110_check_phy_init(void);
+
+/* @brief Default TLK110 phy_get_speed_mode function.
+ */
+eth_speed_mode_t phy_tlk110_get_speed_mode(void);
+
+/* @brief Default TLK110 phy_get_duplex_mode function.
+ */
+eth_duplex_mode_t phy_tlk110_get_duplex_mode(void);
+
+/* @brief Default TLK110 phy_power_enable function.
+ *
+ * @note This function may need to be replaced with a custom function
+ * if the PHY has a GPIO to enable power or start a clock.
+ *
+ * Consult the ethernet example to see how this is done.
+ */
+void phy_tlk110_power_enable(bool);
+
+/* @brief Default TLK110 phy_init function.
+ */
+void phy_tlk110_init(void);
+
+/* @brief Default TLK110 PHY configuration
+ *
+ * This configuration is not suitable for use as-is, it will need
+ * to be modified for your particular PHY hardware setup.
+ *
+ * Consult the Ethernet example to see how this is done.
+ */
+extern const eth_config_t phy_tlk110_default_ethernet_config;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tools/sdk/include/fatfs/diskio_spiflash.h b/tools/sdk/include/fatfs/diskio_spiflash.h
new file mode 100644
index 00000000000..d1de1d3dacb
--- /dev/null
+++ b/tools/sdk/include/fatfs/diskio_spiflash.h
@@ -0,0 +1,39 @@
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _DISKIO_SPIFLASH_DEFINED
+#define _DISKIO_SPIFLASH_DEFINED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "integer.h"
+#include "wear_levelling.h"
+
+
+/**
+ * Register spi flash partition 
+ *
+ * @param pdrv  drive number
+ * @param flash_handle  handle of the wear levelling partition.
+ */
+esp_err_t ff_diskio_register_wl_partition(BYTE pdrv, wl_handle_t flash_handle);
+BYTE ff_diskio_get_pdrv_wl(wl_handle_t flash_handle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _DISKIO_SPIFLASH_DEFINED
diff --git a/tools/sdk/include/fatfs/esp_vfs_fat.h b/tools/sdk/include/fatfs/esp_vfs_fat.h
index 4e27dce6991..140f8bdc32d 100644
--- a/tools/sdk/include/fatfs/esp_vfs_fat.h
+++ b/tools/sdk/include/fatfs/esp_vfs_fat.h
@@ -19,6 +19,7 @@
 #include "driver/sdmmc_types.h"
 #include "driver/sdmmc_host.h"
 #include "ff.h"
+#include "wear_levelling.h"
 
 /**
  * @brief Register FATFS with VFS component
@@ -77,13 +78,17 @@ esp_err_t esp_vfs_fat_unregister() __attribute__((deprecated));
  */
 esp_err_t esp_vfs_fat_unregister_path(const char* base_path);
 
+
 /**
- * @brief Configuration arguments for esp_vfs_fat_sdmmc_mount function
+ * @brief Configuration arguments for esp_vfs_fat_sdmmc_mount and esp_vfs_fat_spiflash_mount functions
  */
 typedef struct {
-	bool format_if_mount_failed;    ///< If FAT partition can not be mounted, and this parameter is true, create partition table and format the filesystem
-	int max_files;                  ///< Max number of open files
-} esp_vfs_fat_sdmmc_mount_config_t;
+    bool format_if_mount_failed;    ///< If FAT partition can not be mounted, and this parameter is true, create partition table and format the filesystem
+    int max_files;                  ///< Max number of open files
+} esp_vfs_fat_mount_config_t;
+
+// Compatibility definition
+typedef esp_vfs_fat_mount_config_t esp_vfs_fat_sdmmc_mount_config_t;
 
 /**
  * @brief Convenience function to get FAT filesystem on SD card registered in VFS
@@ -114,7 +119,7 @@ typedef struct {
 esp_err_t esp_vfs_fat_sdmmc_mount(const char* base_path,
     const sdmmc_host_t* host_config,
     const sdmmc_slot_config_t* slot_config,
-    const esp_vfs_fat_sdmmc_mount_config_t* mount_config,
+    const esp_vfs_fat_mount_config_t* mount_config,
     sdmmc_card_t** out_card);
 
 /**
@@ -125,3 +130,46 @@ esp_err_t esp_vfs_fat_sdmmc_mount(const char* base_path,
  *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_sdmmc_mount hasn't been called
  */
 esp_err_t esp_vfs_fat_sdmmc_unmount();
+
+/**
+ * @brief Convenience function to initialize FAT filesystem in SPI flash and register it in VFS
+ *
+ * This is an all-in-one function which does the following:
+ *
+ * - finds the partition with defined partition_label. Partition label should be
+ *   configured in the partition table.
+ * - initializes flash wear levelling library on top of the given partition
+ * - mounts FAT partition using FATFS library on top of flash wear levelling
+ *   library
+ * - registers FATFS library with VFS, with prefix given by base_prefix variable
+ *
+ * This function is intended to make example code more compact.
+ *
+ * @param base_path        path where FATFS partition should be mounted (e.g. "/spiflash")
+ * @param partition_label  label of the partition which should be used
+ * @param mount_config     pointer to structure with extra parameters for mounting FATFS
+ * @param[out] wl_handle   wear levelling driver handle
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_NOT_FOUND if the partition table does not contain FATFS partition with given label
+ *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_spiflash_mount was already called
+ *      - ESP_ERR_NO_MEM if memory can not be allocated
+ *      - ESP_FAIL if partition can not be mounted
+ *      - other error codes from wear levelling library, SPI flash driver, or FATFS drivers
+ */
+esp_err_t esp_vfs_fat_spiflash_mount(const char* base_path,
+    const char* partition_label,
+    const esp_vfs_fat_mount_config_t* mount_config,
+    wl_handle_t* wl_handle);
+
+/**
+ * @brief Unmount FAT filesystem and release resources acquired using esp_vfs_fat_spiflash_mount
+ *
+ * @param base_path  path where partition should be registered (e.g. "/spiflash")
+ * @param wl_handle  wear levelling driver handle returned by esp_vfs_fat_spiflash_mount
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_spiflash_mount hasn't been called
+ */
+ esp_err_t esp_vfs_fat_spiflash_unmount(const char* base_path, wl_handle_t wl_handle);
diff --git a/tools/sdk/include/fatfs/ffconf.h b/tools/sdk/include/fatfs/ffconf.h
index 3556b31b2cc..ab17e6922cc 100644
--- a/tools/sdk/include/fatfs/ffconf.h
+++ b/tools/sdk/include/fatfs/ffconf.h
@@ -179,7 +179,7 @@
 
 
 #define	_MIN_SS		512
-#define	_MAX_SS		512
+#define	_MAX_SS		4096
 /* These options configure the range of sector size to be supported. (512, 1024,
 /  2048 or 4096) Always set both 512 for most systems, all type of memory cards and
 /  harddisk. But a larger value may be required for on-board flash memory and some
diff --git a/tools/sdk/include/lwip/apps/dhcpserver.h b/tools/sdk/include/lwip/apps/dhcpserver.h
index 39781d9666e..9e361833d3d 100644
--- a/tools/sdk/include/lwip/apps/dhcpserver.h
+++ b/tools/sdk/include/lwip/apps/dhcpserver.h
@@ -166,6 +166,7 @@ enum dhcps_offer_option{
 	OFFER_END
 };
 
+#define DHCPS_COARSE_TIMER_SECS  1
 #define DHCPS_MAX_LEASE 0x64
 #define DHCPS_LEASE_TIME_DEF	(120)
 
diff --git a/tools/sdk/include/lwip/lwip/memp.h b/tools/sdk/include/lwip/lwip/memp.h
index fc45d54ad4f..abb8e57f66c 100755
--- a/tools/sdk/include/lwip/lwip/memp.h
+++ b/tools/sdk/include/lwip/lwip/memp.h
@@ -71,7 +71,7 @@ extern const struct memp_desc* const memp_pools[MEMP_MAX];
 #include "lwip/mem.h"
 
 #define memp_init()
-#if ESP_CNT_DEBUG
+#if ESP_STATS_MEM
 static inline void* memp_malloc(int type)
 {
     ESP_CNT_MEM_MALLOC_INC(type);
diff --git a/tools/sdk/include/lwip/lwip/priv/memp_priv.h b/tools/sdk/include/lwip/lwip/priv/memp_priv.h
index 7bfa94d789e..abb5ebcf72a 100755
--- a/tools/sdk/include/lwip/lwip/priv/memp_priv.h
+++ b/tools/sdk/include/lwip/lwip/priv/memp_priv.h
@@ -140,7 +140,7 @@ struct memp_desc {
 #endif /* MEMP_MEM_MALLOC */
 };
 
-#if (ESP_CNT_DEBUG == 1)
+#if (ESP_STATS_MEM == 1)
 extern uint32_t g_lwip_mem_cnt[MEMP_MAX][2];
 #define ESP_CNT_MEM_MALLOC_INC(type)  g_lwip_mem_cnt[type][0]++
 #define ESP_CNT_MEM_FREE_INC(type)    g_lwip_mem_cnt[type][1]++
diff --git a/tools/sdk/include/lwip/lwip/stats.h b/tools/sdk/include/lwip/lwip/stats.h
index fd6a4076a76..a4c700b2c48 100755
--- a/tools/sdk/include/lwip/lwip/stats.h
+++ b/tools/sdk/include/lwip/lwip/stats.h
@@ -282,7 +282,7 @@ struct stats_ {
 #if MIB2_STATS
   struct stats_mib2 mib2;
 #endif
-#if ESP_STATS
+#if ESP_STATS_DROP
   struct stats_esp esp;
 #endif
 };
@@ -458,12 +458,12 @@ void stats_init(void);
 #define MIB2_STATS_INC(x)
 #endif
 
-#if ESP_STATS
-#define ESP_STATS_INC(x) STATS_INC(x)
-#define ESP_STATS_DISPLAY() stats_display_esp(&lwip_stats.esp);
+#if ESP_STATS_DROP
+#define ESP_STATS_DROP_INC(x) STATS_INC(x)
+#define ESP_STATS_DROP_DISPLAY() stats_display_esp(&lwip_stats.esp);
 #else
-#define ESP_STATS_INC(x)
-#define ESP_STATS_DISPLAY()
+#define ESP_STATS_DROP_INC(x)
+#define ESP_STATS_DROP_DISPLAY()
 #endif
 
 /* Display of statistics */
diff --git a/tools/sdk/include/lwip/lwip/tcp.h b/tools/sdk/include/lwip/lwip/tcp.h
index 6b8c4b6c48d..f7a46b2e830 100755
--- a/tools/sdk/include/lwip/lwip/tcp.h
+++ b/tools/sdk/include/lwip/lwip/tcp.h
@@ -310,8 +310,29 @@ struct tcp_pcb {
   u8_t snd_scale;
   u8_t rcv_scale;
 #endif
+
+#if ESP_STATS_TCP
+#define ESP_STATS_TCP_ARRAY_SIZE 20
+  u16_t retry_cnt[TCP_MAXRTX];
+  u16_t rto_cnt[ESP_STATS_TCP_ARRAY_SIZE];
+#endif
 };
 
+#if ESP_STATS_TCP
+#define ESP_STATS_TCP_PCB(_pcb) do {\
+  if ((_pcb)->unacked) {\
+    (_pcb)->retry_cnt[(_pcb)->nrtx]++;\
+    if ((_pcb)->rto < ESP_STATS_TCP_ARRAY_SIZE) {\
+      (_pcb)->rto_cnt[(_pcb)->rto]++;\
+    } else {\
+      (_pcb)->rto_cnt[ESP_STATS_TCP_ARRAY_SIZE-1] ++;\
+    }\
+  }\
+} while(0)
+#else
+#define ESP_STATS_TCP_PCB(pcb) 
+#endif
+
 struct tcp_pcb_listen {
 /* Common members of all PCB types */
   IP_PCB;
diff --git a/tools/sdk/include/lwip/lwipopts.h b/tools/sdk/include/lwip/lwipopts.h
index 60d7ecf2120..3b8c5485c41 100644
--- a/tools/sdk/include/lwip/lwipopts.h
+++ b/tools/sdk/include/lwip/lwipopts.h
@@ -503,6 +503,56 @@
    ---------------------------------
 */
 
+/**
+ * PPP_SUPPORT==1: Enable PPP.
+ */
+#define PPP_SUPPORT                     CONFIG_PPP_SUPPORT
+
+#if PPP_SUPPORT
+
+/**
+ * PAP_SUPPORT==1: Support PAP.
+ */
+#define PAP_SUPPORT                     CONFIG_PPP_PAP_SUPPORT
+
+/**
+ * CHAP_SUPPORT==1: Support CHAP.
+ */
+#define CHAP_SUPPORT                    CONFIG_PPP_CHAP_SUPPORT
+
+/**
+ * MSCHAP_SUPPORT==1: Support MSCHAP.
+ */
+#define MSCHAP_SUPPORT                  CONFIG_PPP_MSCHAP_SUPPORT
+
+/**
+ * CCP_SUPPORT==1: Support CCP.
+ */
+#define MPPE_SUPPORT                    CONFIG_PPP_MPPE_SUPPORT
+
+/**
+ * PPP_MAXIDLEFLAG: Max Xmit idle time (in ms) before resend flag char.
+ * TODO: If PPP_MAXIDLEFLAG > 0 and next package is send during PPP_MAXIDLEFLAG time,
+ *       then 0x7E is not added at the begining of PPP package but 0x7E termination
+ *       is always at the end. This behaviour brokes PPP dial with GSM (PPPoS).
+ *       The PPP package should always start and end with 0x7E.
+ */
+
+#define PPP_MAXIDLEFLAG                 0
+
+/**
+ * PPP_DEBUG: Enable debugging for PPP.
+ */
+#define PPP_DEBUG_ON					CONFIG_PPP_DEBUG_ON
+
+#if PPP_DEBUG_ON
+#define PPP_DEBUG                       LWIP_DBG_ON
+#else
+#define PPP_DEBUG                       LWIP_DBG_OFF
+#endif
+
+#endif
+
 /*
    --------------------------------------
    ---------- Checksum options ----------
@@ -585,6 +635,18 @@
  */
 #define TCPIP_DEBUG                     LWIP_DBG_OFF
 
+/**
+ * ETHARP_TRUST_IP_MAC==1: Incoming IP packets cause the ARP table to be
+ * updated with the source MAC and IP addresses supplied in the packet.
+ * You may want to disable this if you do not trust LAN peers to have the
+ * correct addresses, or as a limited approach to attempt to handle
+ * spoofing. If disabled, lwIP will need to make a new ARP request if
+ * the peer is not already in the ARP table, adding a little latency.
+ * The peer *is* in the ARP table if it requested our address before.
+ * Also notice that this slows down input processing of every IP packet!
+ */
+#define ETHARP_TRUST_IP_MAC             1
+
 
 /* Enable all Espressif-only options */
 
@@ -601,11 +663,14 @@
 #define ESP_IP4_ATON                    1
 #define ESP_LIGHT_SLEEP                 1
 #define ESP_L2_TO_L3_COPY               CONFIG_L2_TO_L3_COPY
-#define ESP_CNT_DEBUG                   0
+#define ESP_STATS_MEM                   0
+#define ESP_STATS_DROP                  0
+#define ESP_STATS_TCP                   0
 #define ESP_DHCP_TIMER                  1
+#define ESP_LWIP_LOGI(...)              ESP_LOGI("lwip", __VA_ARGS__)
 
 #define TCP_WND_DEFAULT                 (4*TCP_MSS)
-#define TCP_SND_BUF_DEFAULT             (2*TCP_MSS)
+#define TCP_SND_BUF_DEFAULT             (4*TCP_MSS)
 
 #if ESP_PERF
 #define DBG_PERF_PATH_SET(dir, point)
@@ -642,7 +707,6 @@ enum {
 #define DHCP_DEBUG                      LWIP_DBG_OFF
 #define LWIP_DEBUG                      LWIP_DBG_OFF
 #define TCP_DEBUG                       LWIP_DBG_OFF
-#define ESP_STATS                       0
 
 #define CHECKSUM_CHECK_UDP              0
 #define CHECKSUM_CHECK_IP               0
diff --git a/tools/sdk/include/lwip/netif/etharp.h b/tools/sdk/include/lwip/netif/etharp.h
index e745dcc3ee6..3e25c389d25 100755
--- a/tools/sdk/include/lwip/netif/etharp.h
+++ b/tools/sdk/include/lwip/netif/etharp.h
@@ -134,6 +134,10 @@ err_t etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr,
 
 void etharp_arp_input(struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p);
 
+#if ETHARP_TRUST_IP_MAC
+void etharp_ip_input(struct netif *netif, struct pbuf *p);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tools/sdk/include/lwip/netif/wlanif.h b/tools/sdk/include/lwip/netif/wlanif.h
index 5a93640f191..9c79f5b0aff 100755
--- a/tools/sdk/include/lwip/netif/wlanif.h
+++ b/tools/sdk/include/lwip/netif/wlanif.h
@@ -26,7 +26,8 @@
 extern "C" {
 #endif
 
-err_t wlanif_init(struct netif *netif);
+err_t wlanif_init_ap(struct netif *netif);
+err_t wlanif_init_sta(struct netif *netif);
 
 void wlanif_input(struct netif *netif, void *buffer, u16_t len, void* eb);
 
diff --git a/tools/sdk/include/lwip/port/lwipopts.h b/tools/sdk/include/lwip/port/lwipopts.h
index 60d7ecf2120..3b8c5485c41 100644
--- a/tools/sdk/include/lwip/port/lwipopts.h
+++ b/tools/sdk/include/lwip/port/lwipopts.h
@@ -503,6 +503,56 @@
    ---------------------------------
 */
 
+/**
+ * PPP_SUPPORT==1: Enable PPP.
+ */
+#define PPP_SUPPORT                     CONFIG_PPP_SUPPORT
+
+#if PPP_SUPPORT
+
+/**
+ * PAP_SUPPORT==1: Support PAP.
+ */
+#define PAP_SUPPORT                     CONFIG_PPP_PAP_SUPPORT
+
+/**
+ * CHAP_SUPPORT==1: Support CHAP.
+ */
+#define CHAP_SUPPORT                    CONFIG_PPP_CHAP_SUPPORT
+
+/**
+ * MSCHAP_SUPPORT==1: Support MSCHAP.
+ */
+#define MSCHAP_SUPPORT                  CONFIG_PPP_MSCHAP_SUPPORT
+
+/**
+ * CCP_SUPPORT==1: Support CCP.
+ */
+#define MPPE_SUPPORT                    CONFIG_PPP_MPPE_SUPPORT
+
+/**
+ * PPP_MAXIDLEFLAG: Max Xmit idle time (in ms) before resend flag char.
+ * TODO: If PPP_MAXIDLEFLAG > 0 and next package is send during PPP_MAXIDLEFLAG time,
+ *       then 0x7E is not added at the begining of PPP package but 0x7E termination
+ *       is always at the end. This behaviour brokes PPP dial with GSM (PPPoS).
+ *       The PPP package should always start and end with 0x7E.
+ */
+
+#define PPP_MAXIDLEFLAG                 0
+
+/**
+ * PPP_DEBUG: Enable debugging for PPP.
+ */
+#define PPP_DEBUG_ON					CONFIG_PPP_DEBUG_ON
+
+#if PPP_DEBUG_ON
+#define PPP_DEBUG                       LWIP_DBG_ON
+#else
+#define PPP_DEBUG                       LWIP_DBG_OFF
+#endif
+
+#endif
+
 /*
    --------------------------------------
    ---------- Checksum options ----------
@@ -585,6 +635,18 @@
  */
 #define TCPIP_DEBUG                     LWIP_DBG_OFF
 
+/**
+ * ETHARP_TRUST_IP_MAC==1: Incoming IP packets cause the ARP table to be
+ * updated with the source MAC and IP addresses supplied in the packet.
+ * You may want to disable this if you do not trust LAN peers to have the
+ * correct addresses, or as a limited approach to attempt to handle
+ * spoofing. If disabled, lwIP will need to make a new ARP request if
+ * the peer is not already in the ARP table, adding a little latency.
+ * The peer *is* in the ARP table if it requested our address before.
+ * Also notice that this slows down input processing of every IP packet!
+ */
+#define ETHARP_TRUST_IP_MAC             1
+
 
 /* Enable all Espressif-only options */
 
@@ -601,11 +663,14 @@
 #define ESP_IP4_ATON                    1
 #define ESP_LIGHT_SLEEP                 1
 #define ESP_L2_TO_L3_COPY               CONFIG_L2_TO_L3_COPY
-#define ESP_CNT_DEBUG                   0
+#define ESP_STATS_MEM                   0
+#define ESP_STATS_DROP                  0
+#define ESP_STATS_TCP                   0
 #define ESP_DHCP_TIMER                  1
+#define ESP_LWIP_LOGI(...)              ESP_LOGI("lwip", __VA_ARGS__)
 
 #define TCP_WND_DEFAULT                 (4*TCP_MSS)
-#define TCP_SND_BUF_DEFAULT             (2*TCP_MSS)
+#define TCP_SND_BUF_DEFAULT             (4*TCP_MSS)
 
 #if ESP_PERF
 #define DBG_PERF_PATH_SET(dir, point)
@@ -642,7 +707,6 @@ enum {
 #define DHCP_DEBUG                      LWIP_DBG_OFF
 #define LWIP_DEBUG                      LWIP_DBG_OFF
 #define TCP_DEBUG                       LWIP_DBG_OFF
-#define ESP_STATS                       0
 
 #define CHECKSUM_CHECK_UDP              0
 #define CHECKSUM_CHECK_IP               0
diff --git a/tools/sdk/include/lwip/port/netif/wlanif.h b/tools/sdk/include/lwip/port/netif/wlanif.h
index 5a93640f191..9c79f5b0aff 100755
--- a/tools/sdk/include/lwip/port/netif/wlanif.h
+++ b/tools/sdk/include/lwip/port/netif/wlanif.h
@@ -26,7 +26,8 @@
 extern "C" {
 #endif
 
-err_t wlanif_init(struct netif *netif);
+err_t wlanif_init_ap(struct netif *netif);
+err_t wlanif_init_sta(struct netif *netif);
 
 void wlanif_input(struct netif *netif, void *buffer, u16_t len, void* eb);
 
diff --git a/tools/sdk/include/newlib/limits.h b/tools/sdk/include/newlib/limits.h
index 190f1f783a3..633b44593eb 100644
--- a/tools/sdk/include/newlib/limits.h
+++ b/tools/sdk/include/newlib/limits.h
@@ -142,5 +142,5 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX	4096
+#define PATH_MAX	1024
 #endif
diff --git a/tools/sdk/include/newlib/sys/syslimits.h b/tools/sdk/include/newlib/sys/syslimits.h
index ba9dbd66745..c0bb3a2ce09 100644
--- a/tools/sdk/include/newlib/sys/syslimits.h
+++ b/tools/sdk/include/newlib/sys/syslimits.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_SYSLIMITS_H_
 #define _SYS_SYSLIMITS_H_
 
-#define	ARG_MAX			65536	/* max bytes for an exec function */
+#define	ARG_MAX			 4096	/* max bytes for an exec function */
 #ifndef CHILD_MAX
 #define	CHILD_MAX		   40	/* max simultaneous processes */
 #endif
diff --git a/tools/sdk/include/soc/soc/bb_reg.h b/tools/sdk/include/soc/soc/bb_reg.h
index fca84deb15e..69d2f43d206 100644
--- a/tools/sdk/include/soc/soc/bb_reg.h
+++ b/tools/sdk/include/soc/soc/bb_reg.h
@@ -21,12 +21,20 @@
 
 #define BBPD_CTRL (DR_REG_BB_BASE + 0x0054)
 #define BB_FFT_FORCE_PU (BIT(3))
+#define BB_FFT_FORCE_PU_M (BIT(3))
+#define BB_FFT_FORCE_PU_V 1
 #define BB_FFT_FORCE_PU_S 3
 #define BB_FFT_FORCE_PD (BIT(2))
+#define BB_FFT_FORCE_PD_M (BIT(2))
+#define BB_FFT_FORCE_PD_V 1
 #define BB_FFT_FORCE_PD_S 2
 #define BB_DC_EST_FORCE_PU (BIT(1))
+#define BB_DC_EST_FORCE_PU_M (BIT(1))
+#define BB_DC_EST_FORCE_PU_V 1
 #define BB_DC_EST_FORCE_PU_S 1
 #define BB_DC_EST_FORCE_PD (BIT(0))
+#define BB_DC_EST_FORCE_PD_M (BIT(0))
+#define BB_DC_EST_FORCE_PD_V 1
 #define BB_DC_EST_FORCE_PD_S 0
 
 
diff --git a/tools/sdk/include/soc/soc/cpu.h b/tools/sdk/include/soc/soc/cpu.h
index 7e1301345b3..b56fb3dc840 100644
--- a/tools/sdk/include/soc/soc/cpu.h
+++ b/tools/sdk/include/soc/soc/cpu.h
@@ -73,15 +73,6 @@ static inline void cpu_configure_region_protection()
     cpu_write_itlb(0x20000000, 0);
 }
 
-/**
- * @brief Set CPU frequency to the value defined in menuconfig
- *
- * Called from cpu_start.c, not intended to be called from other places.
- * This is a temporary function which will be replaced once dynamic
- * CPU frequency changing is implemented.
- */
-void esp_set_cpu_freq(void);
-
 /**
  * @brief Stall CPU using RTC controller
  * @param cpu_id ID of the CPU to stall (0 = PRO, 1 = APP)
diff --git a/tools/sdk/include/soc/soc/dport_reg.h b/tools/sdk/include/soc/soc/dport_reg.h
index 141b05b4a50..b2e14376e62 100644
--- a/tools/sdk/include/soc/soc/dport_reg.h
+++ b/tools/sdk/include/soc/soc/dport_reg.h
@@ -2851,6 +2851,40 @@
 #define DPORT_PRO_CPU_DISABLED_CACHE_IA_M  ((DPORT_PRO_CPU_DISABLED_CACHE_IA_V)<<(DPORT_PRO_CPU_DISABLED_CACHE_IA_S))
 #define DPORT_PRO_CPU_DISABLED_CACHE_IA_V  0x3F
 #define DPORT_PRO_CPU_DISABLED_CACHE_IA_S  9
+/* This is the contents of DPORT_PRO_CPU_DISABLED_CACHE_IA field expanded */
+/* The following bits will be set upon invalid access for different memory
+ * regions: */
+/* Port of the APP CPU cache when cache is used in high/low or odd/even mode */
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_OPPOSITE   BIT(9)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_OPPOSITE_M BIT(9)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_OPPOSITE_V 1
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_OPPOSITE_S 9
+/* DRAM1: 0x3F80_0000 ~ 0x3FBF_FFFF(R/W) */
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DRAM1    BIT(10)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DRAM1_M  BIT(10)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DRAM1_V  1
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DRAM1_S  10
+/* IROM0: 0x4080_0000 ~ 0x40BF_FFFF(RO) */
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IROM0    BIT(11)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IROM0_M  BIT(11)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IROM0_V  1
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IROM0_S  11
+/* IRAM1:  0x4040_0000 ~ 0x407F_FFFF(RO) */
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM1    BIT(12)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM1_M  BIT(12)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM1_V  1
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM1_S  12
+/* IRAM0: 0x4080_0000 ~ 0x40BF_FFFF(RO) */
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM0    BIT(13)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM0_M  BIT(13)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM0_V  1
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_IRAM0_S  13
+/* DROM0: 0x3F40_0000 ~ 0x3F7F_FFFF (RO) */
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DROM0    BIT(14)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DROM0_M  BIT(14)
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DROM0_V  1
+#define DPORT_PRO_CPU_DISABLED_CACHE_IA_DROM0_S  14
+
 /* DPORT_PRO_MMU_RDATA : RO ;bitpos:[8:0] ;default: 9'h0 ; */
 /*description: */
 #define DPORT_PRO_MMU_RDATA  0x000001FF
@@ -2985,6 +3019,40 @@
 #define DPORT_APP_CPU_DISABLED_CACHE_IA_M  ((DPORT_APP_CPU_DISABLED_CACHE_IA_V)<<(DPORT_APP_CPU_DISABLED_CACHE_IA_S))
 #define DPORT_APP_CPU_DISABLED_CACHE_IA_V  0x3F
 #define DPORT_APP_CPU_DISABLED_CACHE_IA_S  9
+/* This is the contents of DPORT_APP_CPU_DISABLED_CACHE_IA field expanded */
+/* The following bits will be set upon invalid access for different memory
+ * regions: */
+/* Port of the PRO CPU cache when cache is used in high/low or odd/even mode */
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_OPPOSITE   BIT(9)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_OPPOSITE_M BIT(9)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_OPPOSITE_V 1
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_OPPOSITE_S 9
+/* DRAM1: 0x3F80_0000 ~ 0x3FBF_FFFF(R/W) */
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DRAM1    BIT(10)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DRAM1_M  BIT(10)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DRAM1_V  1
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DRAM1_S  10
+/* IROM0: 0x4080_0000 ~ 0x40BF_FFFF(RO) */
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IROM0    BIT(11)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IROM0_M  BIT(11)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IROM0_V  1
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IROM0_S  11
+/* IRAM1:  0x4040_0000 ~ 0x407F_FFFF(RO) */
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM1    BIT(12)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM1_M  BIT(12)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM1_V  1
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM1_S  12
+/* IRAM0: 0x4080_0000 ~ 0x40BF_FFFF(RO) */
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM0    BIT(13)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM0_M  BIT(13)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM0_V  1
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_IRAM0_S  13
+/* DROM0: 0x3F40_0000 ~ 0x3F7F_FFFF (RO) */
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DROM0    BIT(14)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DROM0_M  BIT(14)
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DROM0_V  1
+#define DPORT_APP_CPU_DISABLED_CACHE_IA_DROM0_S  14
+
 /* DPORT_APP_MMU_RDATA : RO ;bitpos:[8:0] ;default: 9'h0 ; */
 /*description: */
 #define DPORT_APP_MMU_RDATA  0x000001FF
@@ -3083,6 +3151,32 @@
 #define DPORT_RECORD_PRO_PDEBUGINST_M  ((DPORT_RECORD_PRO_PDEBUGINST_V)<<(DPORT_RECORD_PRO_PDEBUGINST_S))
 #define DPORT_RECORD_PRO_PDEBUGINST_V  0xFFFFFFFF
 #define DPORT_RECORD_PRO_PDEBUGINST_S  0
+/* register layout:
+ * SIZE [7..0] 		 : Instructions normally complete in the W stage. The size of the instruction in the W is given
+ *                	   by this field in number of bytes. If it is 8’b0 in a given cycle the W stage has no completing
+ *                	   instruction. This is also known as a bubble cycle. Also see DPORT_PRO_CPU_RECORD_PDEBUGSTATUS_REG.
+ * ISRC [14..12]	 : Instruction source.
+** LOOP [23..20]	 : Loopback status.
+** CINTLEVEL [27..24]: CINTLEVEL.
+*/
+#define DPORT_RECORD_PDEBUGINST_SZ_M  		((DPORT_RECORD_PDEBUGINST_SZ_V)<<(DPORT_RECORD_PDEBUGINST_SZ_S))
+#define DPORT_RECORD_PDEBUGINST_SZ_V  		0xFF
+#define DPORT_RECORD_PDEBUGINST_SZ_S  		0
+#define DPORT_RECORD_PDEBUGINST_SZ(_r_)		(((_r_)>>DPORT_RECORD_PDEBUGINST_SZ_S) & DPORT_RECORD_PDEBUGINST_SZ_V)
+#define DPORT_RECORD_PDEBUGINST_ISRC_M  	((DPORT_RECORD_PDEBUGINST_ISRC_V)<<(DPORT_RECORD_PDEBUGINST_ISRC_S))
+#define DPORT_RECORD_PDEBUGINST_ISRC_V  	0x07
+#define DPORT_RECORD_PDEBUGINST_ISRC_S  	12
+#define DPORT_RECORD_PDEBUGINST_ISRC(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGINST_ISRC_S) & DPORT_RECORD_PDEBUGINST_ISRC_V)
+// #define DPORT_RECORD_PDEBUGINST_LOOP_M  	((DPORT_RECORD_PDEBUGINST_LOOP_V)<<(DPORT_RECORD_PDEBUGINST_LOOP_S))
+// #define DPORT_RECORD_PDEBUGINST_LOOP_V  	0x0F
+// #define DPORT_RECORD_PDEBUGINST_LOOP_S  	20
+// #define DPORT_RECORD_PDEBUGINST_LOOP(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGINST_LOOP_S) & DPORT_RECORD_PDEBUGINST_LOOP_V)
+#define DPORT_RECORD_PDEBUGINST_LOOP_REP 	(BIT(20)) /* loopback will occur */
+#define DPORT_RECORD_PDEBUGINST_LOOP		(BIT(21)) /* last inst of loop */
+#define DPORT_RECORD_PDEBUGINST_CINTL_M  	((DPORT_RECORD_PDEBUGINST_CINTL_V)<<(DPORT_RECORD_PDEBUGINST_CINTL_S))
+#define DPORT_RECORD_PDEBUGINST_CINTL_V  	0x0F
+#define DPORT_RECORD_PDEBUGINST_CINTL_S  	24
+#define DPORT_RECORD_PDEBUGINST_CINTL(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGINST_CINTL_S) & DPORT_RECORD_PDEBUGINST_CINTL_V)
 
 #define DPORT_PRO_CPU_RECORD_PDEBUGSTATUS_REG          (DR_REG_DPORT_BASE + 0x450)
 /* DPORT_RECORD_PRO_PDEBUGSTATUS : RO ;bitpos:[7:0] ;default: 8'b0 ; */
@@ -3091,6 +3185,52 @@
 #define DPORT_RECORD_PRO_PDEBUGSTATUS_M  ((DPORT_RECORD_PRO_PDEBUGSTATUS_V)<<(DPORT_RECORD_PRO_PDEBUGSTATUS_S))
 #define DPORT_RECORD_PRO_PDEBUGSTATUS_V  0xFF
 #define DPORT_RECORD_PRO_PDEBUGSTATUS_S  0
+/* register layout:
+ * BBCAUSE [5..0]: Indicates cause for bubble cycle. See below for posible values. When DPORT_RECORD_PDEBUGINST_SZ == 0
+ * INSNTYPE[5..0]: Indicates type of instruction retiring in the W stage. See below for posible values. When DPORT_RECORD_PDEBUGINST_SZ > 0
+*/
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_M  		((DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_V)<<(DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_S))
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_V  		0x3F
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_S  		0
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE(_r_)		(((_r_)>>DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_S) & DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_V)
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_PSO		0x00 /* Power shut off */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_DEP		0x02 /* Register dependency or resource conflict. See DPORT_XXX_CPU_RECORD_PDEBUGDATA_REG for extra info. */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_CTL		0x04 /* Control transfer bubble */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_ICM		0x08 /* I-cache miss (incl uncached miss) */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_DCM		0x0C /* D-cache miss (excl uncached miss) */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_EXC0		0x10 /* Exception or interrupt (W stage). See DPORT_XXX_CPU_RECORD_PDEBUGDATA_REG for extra info.
+															The virtual address of the instruction that was killed appears on DPORT_PRO_CPU_RECORD_PDEBUGPC_REG[31:0] */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_EXC1		0x11 /* Exception or interrupt (W+1 stage). See DPORT_XXX_CPU_RECORD_PDEBUGDATA_REG for extra info. */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_RPL		0x14 /* Instruction replay (other). DPORT_XXX_CPU_RECORD_PDEBUGDATA_REG has the PC of the replaying instruction. */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_ITLB		0x18 /* HW ITLB refill. The refill address and data are available on
+															DPORT_PRO_CPU_RECORD_PDEBUGLS0ADDR_REG and DPORT_PRO_CPU_RECORD_PDEBUGLS0DATA_REG. */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_ITLBM		0x1A /* ITLB miss */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_DTLB		0x1C /* HW DTLB refill. The refill address and data are available on
+															DPORT_PRO_CPU_RECORD_PDEBUGLS0ADDR_REG and DPORT_PRO_CPU_RECORD_PDEBUGLS0DATA_REG. */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_DTLBM		0x1E /* DTLB miss */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_STALL		0x20 /* Stall . The cause of the global stall is further classified in the DPORT_XXX_CPU_RECORD_PDEBUGDATA_REG. */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_HWMEC		0x24 /* HW-corrected memory error */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_WAITI		0x28 /* WAITI mode */
+#define DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_OTHER		0x3C /* all other bubbles */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_M  		((DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_V)<<(DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_S))
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_V  		0x3F
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_S  		0
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE(_r_)		(((_r_)>>DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_S) & DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_V)
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_JX		0x00 /* JX */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_CALLX	0x04 /* CALLX */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_CRET		0x08 /* All call returns */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_ERET		0x0C /* All exception returns */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_B		0x10 /* Branch taken or loop not taken */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_J		0x14 /* J */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_CALL		0x18 /* CALL */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_BN		0x1C /* Branch not taken */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_LOOP		0x20 /* Loop instruction (taken) */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_S32C1I	0x24 /* S32C1I. The address and load data (before the conditional store) are available on the LS signals*/
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_WXSR2LB	0x28 /* WSR/XSR to LBEGIN */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_WSR2MMID	0x2C /* WSR to MMID */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_RWXSR	0x30 /* RSR or WSR (except MMID and LBEGIN) or XSR (except LBEGIN) */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_RWER		0x34 /* RER or WER */
+#define DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_DEF		0x3C /* Default */
 
 #define DPORT_PRO_CPU_RECORD_PDEBUGDATA_REG          (DR_REG_DPORT_BASE + 0x454)
 /* DPORT_RECORD_PRO_PDEBUGDATA : RO ;bitpos:[31:0] ;default: 32'b0 ; */
@@ -3099,6 +3239,115 @@
 #define DPORT_RECORD_PRO_PDEBUGDATA_M  ((DPORT_RECORD_PRO_PDEBUGDATA_V)<<(DPORT_RECORD_PRO_PDEBUGDATA_S))
 #define DPORT_RECORD_PRO_PDEBUGDATA_V  0xFFFFFFFF
 #define DPORT_RECORD_PRO_PDEBUGDATA_S  0
+/* register layout when bubble cycke cause is DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_DEP:
+ *
+ * HALT [17]: HALT instruction (TX only)
+ * MEMW [16]: MEMW, EXTW or EXCW instruction dependency
+ * REG  [12]: register dependencies or resource (e.g.TIE ports) conflicts
+ * STR  [11]: store release (instruction) dependency
+ * LSU  [8] : various LSU dependencies (MHT access, prefetch, cache access insts, s32c1i, etc)
+ * OTHER[0] : all other hold dependencies resulting from data or resource dependencies
+*/
+#define DPORT_RECORD_PDEBUGDATA_DEP_HALT  	(BIT(17))
+#define DPORT_RECORD_PDEBUGDATA_DEP_MEMW  	(BIT(16))
+#define DPORT_RECORD_PDEBUGDATA_DEP_REG  	(BIT(12))
+#define DPORT_RECORD_PDEBUGDATA_DEP_STR  	(BIT(11))
+#define DPORT_RECORD_PDEBUGDATA_DEP_LSU  	(BIT(8))
+#define DPORT_RECORD_PDEBUGDATA_DEP_OTHER	(BIT(0))
+/* register layout when bubble cycke cause is DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_EXCn:
+ *
+ * EXCCAUSE[21..16]: Processor exception cause
+ * EXCVEC  [4..0]  : Encoded Exception Vector
+*/
+#define DPORT_RECORD_PDEBUGDATA_EXCCAUSE_M  	((DPORT_RECORD_PDEBUGDATA_EXCCAUSE_V)<<(DPORT_RECORD_PDEBUGDATA_EXCCAUSE_S))
+#define DPORT_RECORD_PDEBUGDATA_EXCCAUSE_V  	0x3F
+#define DPORT_RECORD_PDEBUGDATA_EXCCAUSE_S  	16
+#define DPORT_RECORD_PDEBUGDATA_EXCCAUSE(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGDATA_EXCCAUSE_S) & DPORT_RECORD_PDEBUGDATA_EXCCAUSE_V)
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_M  		((DPORT_RECORD_PDEBUGDATA_EXCCAUSE_V)<<(DPORT_RECORD_PDEBUGDATA_EXCCAUSE_S))
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_V  		0x1F
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_S  		0
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC(_r_)		(((_r_)>>DPORT_RECORD_PDEBUGDATA_EXCCAUSE_S) & DPORT_RECORD_PDEBUGDATA_EXCCAUSE_V)
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_NONE		0x00 /* no vector */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_RST		0x01 /* Reset */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_DBG		0x02 /* Debug (repl corresp level “n”) */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_NMI		0x03 /* NMI (repl corresp level “n”) */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_USR		0x04 /* User */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_KRNL		0x05 /* Kernel */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_DBL		0x06 /* Double */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_EMEM		0x07 /* Memory Error */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_OVF4		0x0A /* Window Overflow 4 */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_UNF4		0x0B /* Window Underflow 4 */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_OVF8		0x0C /* Window Overflow 8 */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_UNF8		0x0D /* Window Underflow 8 */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_OVF12	0x0E /* Window Overflow 12 */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_UNF12	0x0F /* Window Underflow 12 */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_INT2		0x10 /* Int Level 2 (n/a if debug/NMI) */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_INT3		0x11 /* Int Level 3 (n/a if debug/NMI) */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_INT4		0x12 /* Int Level 4 (n/a if debug/NMI) */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_INT5		0x13 /* Int Level 5 (n/a if debug/NMI) */
+#define DPORT_RECORD_PDEBUGDATA_EXCVEC_INT6		0x14 /* Int Level 6 (n/a if debug/NMI) */
+/* register layout when bubble cycke cause is DPORT_RECORD_PDEBUGSTATUS_BBCAUSE_STALL:
+ *
+ * ITERDIV[19]  : Iterative divide stall.
+ * ITERMUL[18]  : Iterative multiply stall.
+ * BANKCONFL[16]: Bank-conflict stall.
+ * BPLOAD[15]  	: Bypass load stall.
+ * LSPROC[14]  	: Load/store miss-processing stall.
+ * L32R[13]	   	: FastL32R stall.
+ * BPIFETCH[12]	: Bypass I fetch stall.
+ * RUNSTALL[10]	: RunStall.
+ * TIE[9] 	   	: TIE port stall.
+ * IPIF[8]	   	: Instruction RAM inbound-PIF stall.
+ * IRAMBUSY[7] 	: Instruction RAM/ROM busy stall.
+ * ICM[6] 	   	: I-cache-miss stall.
+ * LSU[4]      	: The LSU will stall the pipeline under various local memory access conflict situations.
+ * DCM[3] 	   	: D-cache-miss stall.
+ * BUFFCONFL[2]	: Store buffer conflict stall.
+ * BUFF[1] 	   	: Store buffer full stall.
+*/
+#define DPORT_RECORD_PDEBUGDATA_STALL_ITERDIV	(BIT(19))
+#define DPORT_RECORD_PDEBUGDATA_STALL_ITERMUL	(BIT(18))
+#define DPORT_RECORD_PDEBUGDATA_STALL_BANKCONFL	(BIT(16))
+#define DPORT_RECORD_PDEBUGDATA_STALL_BPLOAD	(BIT(15))
+#define DPORT_RECORD_PDEBUGDATA_STALL_LSPROC	(BIT(14))
+#define DPORT_RECORD_PDEBUGDATA_STALL_L32R		(BIT(13))
+#define DPORT_RECORD_PDEBUGDATA_STALL_BPIFETCH	(BIT(12))
+#define DPORT_RECORD_PDEBUGDATA_STALL_RUN		(BIT(10))
+#define DPORT_RECORD_PDEBUGDATA_STALL_TIE		(BIT(9))
+#define DPORT_RECORD_PDEBUGDATA_STALL_IPIF		(BIT(8))
+#define DPORT_RECORD_PDEBUGDATA_STALL_IRAMBUSY	(BIT(7))
+#define DPORT_RECORD_PDEBUGDATA_STALL_ICM		(BIT(6))
+#define DPORT_RECORD_PDEBUGDATA_STALL_LSU		(BIT(4))
+#define DPORT_RECORD_PDEBUGDATA_STALL_DCM		(BIT(3))
+#define DPORT_RECORD_PDEBUGDATA_STALL_BUFFCONFL	(BIT(2))
+#define DPORT_RECORD_PDEBUGDATA_STALL_BUFF		(BIT(1))
+/* register layout for DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_RWXSR:
+ *
+ * XSR[10]		: XSR Instruction
+ * WSR[9]		: WSR Instruction
+ * RSR[8]		: RSR Instruction
+ * SR[7..0] : Special Register Number
+*/
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_XSR		(BIT(10))
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_WSR		(BIT(9))
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_RSR		(BIT(8))
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR_M  		((DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR_V)<<(DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR_S))
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR_V  		0xFF
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR_S  		0
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR_S) & DPORT_RECORD_PDEBUGDATA_INSNTYPE_SR_V)
+/* register layout for DPORT_RECORD_PDEBUGSTATUS_INSNTYPE_RWER:
+ *
+ * ER[13..2]: ER Address
+ * WER[1]	: WER Instruction
+ * RER[0]	: RER Instruction
+*/
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER_M  		((DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER_V)<<(DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER_S))
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER_V  		0xFFF
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER_S  		2
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER_S) & DPORT_RECORD_PDEBUGDATA_INSNTYPE_ER_V)
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_WER		(BIT(1))
+#define DPORT_RECORD_PDEBUGDATA_INSNTYPE_RER		(BIT(0))
+
 
 #define DPORT_PRO_CPU_RECORD_PDEBUGPC_REG          (DR_REG_DPORT_BASE + 0x458)
 /* DPORT_RECORD_PRO_PDEBUGPC : RO ;bitpos:[31:0] ;default: 32'b0 ; */
@@ -3115,6 +3364,68 @@
 #define DPORT_RECORD_PRO_PDEBUGLS0STAT_M  ((DPORT_RECORD_PRO_PDEBUGLS0STAT_V)<<(DPORT_RECORD_PRO_PDEBUGLS0STAT_S))
 #define DPORT_RECORD_PRO_PDEBUGLS0STAT_V  0xFFFFFFFF
 #define DPORT_RECORD_PRO_PDEBUGLS0STAT_S  0
+/* register layout:
+ * TYPE [3..0] 	 : Type of instruction in LS.
+ * SZ [7..4]	 : Operand size.
+ * DTLBM [8]	 : Data TLB miss.
+ * DCM [9]		 : D-cache miss.
+ * DCH [10]		 : D-cache hit.
+ * UC [12]		 : Uncached.
+ * WB [13]		 : Writeback.
+ * COH [16]	     : Coherency.
+ * STCOH [18..17]: Coherent state.
+ * TGT [23..20]  : Local target.
+*/
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_M  		((DPORT_RECORD_PDEBUGLS0STAT_TYPE_V)<<(DPORT_RECORD_PDEBUGLS0STAT_TYPE_S))
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_V  		0x0F
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_S  		0
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGLS0STAT_TYPE_S) & DPORT_RECORD_PDEBUGLS0STAT_TYPE_V)
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_NONE	0x00 /* neither */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_ITLBR	0x01 /* hw itlb refill */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_DTLBR	0x02 /* hw dtlb refill */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_LD		0x05 /* load */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_STR		0x06 /* store */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_L32R	0x08 /* l32r */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_S32CLI1	0x0A /* s32ci1 */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_CTI		0x0C /* cache test inst */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_RWXSR	0x0E /* rsr/wsr/xsr */
+#define DPORT_RECORD_PDEBUGLS0STAT_TYPE_RWER	0x0F /* rer/wer */
+#define DPORT_RECORD_PDEBUGLS0STAT_SZ_M  		((DPORT_RECORD_PDEBUGLS0STAT_SZ_V)<<(DPORT_RECORD_PDEBUGLS0STAT_SZ_S))
+#define DPORT_RECORD_PDEBUGLS0STAT_SZ_V  		0x0F
+#define DPORT_RECORD_PDEBUGLS0STAT_SZ_S  		4
+#define DPORT_RECORD_PDEBUGLS0STAT_SZ(_r_)		(((_r_)>>DPORT_RECORD_PDEBUGLS0STAT_SZ_S) & DPORT_RECORD_PDEBUGLS0STAT_SZ_V)
+#define DPORT_RECORD_PDEBUGLS0STAT_SZB(_r_)		((8<<DPORT_RECORD_PDEBUGLS0STAT_SZ(_r_))/8) // in bytes
+#define DPORT_RECORD_PDEBUGLS0STAT_DTLBM		(BIT(8))
+#define DPORT_RECORD_PDEBUGLS0STAT_DCM			(BIT(9))
+#define DPORT_RECORD_PDEBUGLS0STAT_DCH			(BIT(10))
+#define DPORT_RECORD_PDEBUGLS0STAT_UC			(BIT(12))
+#define DPORT_RECORD_PDEBUGLS0STAT_WB			(BIT(13))
+#define DPORT_RECORD_PDEBUGLS0STAT_COH			(BIT(16))
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH_M  	((DPORT_RECORD_PDEBUGLS0STAT_STCOH_V)<<(DPORT_RECORD_PDEBUGLS0STAT_STCOH_S))
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH_V  	0x03
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH_S  	17
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH(_r_)	(((_r_)>>DPORT_RECORD_PDEBUGLS0STAT_STCOH_S) & DPORT_RECORD_PDEBUGLS0STAT_STCOH_V)
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH_NONE  	0x0 /* neither shared nor exclusive nor modified */
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH_SHARED	0x1 /* shared */
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH_EXCL  	0x2 /* exclusive */
+#define DPORT_RECORD_PDEBUGLS0STAT_STCOH_MOD  	0x3 /* modified */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_M  		((DPORT_RECORD_PDEBUGLS0STAT_TGT_V)<<(DPORT_RECORD_PDEBUGLS0STAT_TGT_S))
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_V  		0x0F
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_S  		20
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT(_r_)		(((_r_)>>DPORT_RECORD_PDEBUGLS0STAT_TGT_S) & DPORT_RECORD_PDEBUGLS0STAT_TGT_V)
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_EXT  	0x0 /* not to local memory */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_IRAM0	0x2 /* 001x: InstRAM (0/1) */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_IRAM1	0x3 /* 001x: InstRAM (0/1) */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_IROM0  	0x4 /* 010x: InstROM (0/1) */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_IROM1  	0x5 /* 010x: InstROM (0/1) */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_DRAM0  	0x0A /* 101x: DataRAM (0/1) */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_DRAM1  	0x0B /* 101x: DataRAM (0/1) */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_DROM0  	0xE /* 111x: DataROM (0/1) */
+#define DPORT_RECORD_PDEBUGLS0STAT_TGT_DROM1  	0xF /* 111x: DataROM (0/1) */
+// #define DPORT_RECORD_PDEBUGLS0STAT_TGT_IRAM(_t_)	(((_t_)&0xE)=0x2) /* 001x: InstRAM (0/1) */
+// #define DPORT_RECORD_PDEBUGLS0STAT_TGT_IROM(_t_)  	(((_t_)&0xE)=0x4) /* 010x: InstROM (0/1) */
+// #define DPORT_RECORD_PDEBUGLS0STAT_TGT_DRAM(_t_)  	(((_t_)&0xE)=0x2) /* 101x: DataRAM (0/1) */
+// #define DPORT_RECORD_PDEBUGLS0STAT_TGT_DROM(_t_)  	(((_t_)&0xE)=0x2) /* 111x: DataROM (0/1) */
 
 #define DPORT_PRO_CPU_RECORD_PDEBUGLS0ADDR_REG          (DR_REG_DPORT_BASE + 0x460)
 /* DPORT_RECORD_PRO_PDEBUGLS0ADDR : RO ;bitpos:[31:0] ;default: 32'b0 ; */
@@ -3788,11 +4099,84 @@
 
 #define DPORT_CACHE_IA_INT_EN_REG          (DR_REG_DPORT_BASE + 0x5A0)
 /* DPORT_CACHE_IA_INT_EN : R/W ;bitpos:[27:0] ;default: 28'b0 ; */
-/*description: */
+/*description: Interrupt enable bits for various invalid cache access reasons*/
 #define DPORT_CACHE_IA_INT_EN  0x0FFFFFFF
 #define DPORT_CACHE_IA_INT_EN_M  ((DPORT_CACHE_IA_INT_EN_V)<<(DPORT_CACHE_IA_INT_EN_S))
 #define DPORT_CACHE_IA_INT_EN_V  0xFFFFFFF
 #define DPORT_CACHE_IA_INT_EN_S  0
+/* Contents of DPORT_CACHE_IA_INT_EN field: */
+/* DPORT_CACHE_IA_INT_PRO_OPPOSITE : R/W ;bitpos:[19] ;default: 1'b0 ; */
+/*description: PRO CPU invalid access to APP CPU cache when cache disabled */
+#define DPORT_CACHE_IA_INT_PRO_OPPOSITE    BIT(19)
+#define DPORT_CACHE_IA_INT_PRO_OPPOSITE_M  BIT(19)
+#define DPORT_CACHE_IA_INT_PRO_OPPOSITE_V  (1)
+#define DPORT_CACHE_IA_INT_PRO_OPPOSITE_S  (19)
+/* DPORT_CACHE_IA_INT_PRO_DRAM1 : R/W ;bitpos:[18] ;default: 1'b0 ; */
+/*description: PRO CPU invalid access to DRAM1 when cache is disabled */
+#define DPORT_CACHE_IA_INT_PRO_DRAM1    BIT(18)
+#define DPORT_CACHE_IA_INT_PRO_DRAM1_M  BIT(18)
+#define DPORT_CACHE_IA_INT_PRO_DRAM1_V  (1)
+#define DPORT_CACHE_IA_INT_PRO_DRAM1_S  (18)
+/* DPORT_CACHE_IA_INT_PRO_IROM0 : R/W ;bitpos:[17] ;default: 1'b0 ; */
+/*description: PRO CPU invalid access to IROM0 when cache is disabled */
+#define DPORT_CACHE_IA_INT_PRO_IROM0    BIT(17)
+#define DPORT_CACHE_IA_INT_PRO_IROM0_M  BIT(17)
+#define DPORT_CACHE_IA_INT_PRO_IROM0_V  (1)
+#define DPORT_CACHE_IA_INT_PRO_IROM0_S  (17)
+/* DPORT_CACHE_IA_INT_PRO_IRAM1 : R/W ;bitpos:[16] ;default: 1'b0 ; */
+/*description: PRO CPU invalid access to IRAM1 when cache is disabled */
+#define DPORT_CACHE_IA_INT_PRO_IRAM1    BIT(16)
+#define DPORT_CACHE_IA_INT_PRO_IRAM1_M  BIT(16)
+#define DPORT_CACHE_IA_INT_PRO_IRAM1_V  (1)
+#define DPORT_CACHE_IA_INT_PRO_IRAM1_S  (16)
+/* DPORT_CACHE_IA_INT_PRO_IRAM0 : R/W ;bitpos:[15] ;default: 1'b0 ; */
+/*description: PRO CPU invalid access to IRAM0 when cache is disabled */
+#define DPORT_CACHE_IA_INT_PRO_IRAM0    BIT(15)
+#define DPORT_CACHE_IA_INT_PRO_IRAM0_M  BIT(15)
+#define DPORT_CACHE_IA_INT_PRO_IRAM0_V  (1)
+#define DPORT_CACHE_IA_INT_PRO_IRAM0_S  (15)
+/* DPORT_CACHE_IA_INT_PRO_DROM0 : R/W ;bitpos:[14] ;default: 1'b0 ; */
+/*description: PRO CPU invalid access to DROM0 when cache is disabled */
+#define DPORT_CACHE_IA_INT_PRO_DROM0    BIT(14)
+#define DPORT_CACHE_IA_INT_PRO_DROM0_M  BIT(14)
+#define DPORT_CACHE_IA_INT_PRO_DROM0_V  (1)
+#define DPORT_CACHE_IA_INT_PRO_DROM0_S  (14)
+/* DPORT_CACHE_IA_INT_APP_OPPOSITE : R/W ;bitpos:[5] ;default: 1'b0 ; */
+/*description: APP CPU invalid access to APP CPU cache when cache disabled */
+#define DPORT_CACHE_IA_INT_APP_OPPOSITE    BIT(5)
+#define DPORT_CACHE_IA_INT_APP_OPPOSITE_M  BIT(5)
+#define DPORT_CACHE_IA_INT_APP_OPPOSITE_V  (1)
+#define DPORT_CACHE_IA_INT_APP_OPPOSITE_S  (5)
+/* DPORT_CACHE_IA_INT_APP_DRAM1 : R/W ;bitpos:43] ;default: 1'b0 ; */
+/*description: APP CPU invalid access to DRAM1 when cache is disabled */
+#define DPORT_CACHE_IA_INT_APP_DRAM1    BIT(4)
+#define DPORT_CACHE_IA_INT_APP_DRAM1_M  BIT(4)
+#define DPORT_CACHE_IA_INT_APP_DRAM1_V  (1)
+#define DPORT_CACHE_IA_INT_APP_DRAM1_S  (4)
+/* DPORT_CACHE_IA_INT_APP_IROM0 : R/W ;bitpos:[3] ;default: 1'b0 ; */
+/*description: APP CPU invalid access to IROM0 when cache is disabled */
+#define DPORT_CACHE_IA_INT_APP_IROM0    BIT(3)
+#define DPORT_CACHE_IA_INT_APP_IROM0_M  BIT(3)
+#define DPORT_CACHE_IA_INT_APP_IROM0_V  (1)
+#define DPORT_CACHE_IA_INT_APP_IROM0_S  (3)
+/* DPORT_CACHE_IA_INT_APP_IRAM1 : R/W ;bitpos:[2] ;default: 1'b0 ; */
+/*description: APP CPU invalid access to IRAM1 when cache is disabled */
+#define DPORT_CACHE_IA_INT_APP_IRAM1    BIT(2)
+#define DPORT_CACHE_IA_INT_APP_IRAM1_M  BIT(2)
+#define DPORT_CACHE_IA_INT_APP_IRAM1_V  (1)
+#define DPORT_CACHE_IA_INT_APP_IRAM1_S  (2)
+/* DPORT_CACHE_IA_INT_APP_IRAM0 : R/W ;bitpos:[1] ;default: 1'b0 ; */
+/*description: APP CPU invalid access to IRAM0 when cache is disabled */
+#define DPORT_CACHE_IA_INT_APP_IRAM0    BIT(1)
+#define DPORT_CACHE_IA_INT_APP_IRAM0_M  BIT(1)
+#define DPORT_CACHE_IA_INT_APP_IRAM0_V  (1)
+#define DPORT_CACHE_IA_INT_APP_IRAM0_S  (1)
+/* DPORT_CACHE_IA_INT_APP_DROM0 : R/W ;bitpos:[0] ;default: 1'b0 ; */
+/*description: APP CPU invalid access to DROM0 when cache is disabled */
+#define DPORT_CACHE_IA_INT_APP_DROM0    BIT(0)
+#define DPORT_CACHE_IA_INT_APP_DROM0_M  BIT(0)
+#define DPORT_CACHE_IA_INT_APP_DROM0_V  (1)
+#define DPORT_CACHE_IA_INT_APP_DROM0_S  (0)
 
 #define DPORT_SECURE_BOOT_CTRL_REG          (DR_REG_DPORT_BASE + 0x5A4)
 /* DPORT_SW_BOOTLOADER_SEL : R/W ;bitpos:[0] ;default: 1'b0 ; */
diff --git a/tools/sdk/include/soc/soc/emac_ex_reg.h b/tools/sdk/include/soc/soc/emac_ex_reg.h
index 9b7c5909660..e43217e0833 100644
--- a/tools/sdk/include/soc/soc/emac_ex_reg.h
+++ b/tools/sdk/include/soc/soc/emac_ex_reg.h
@@ -23,75 +23,135 @@ extern "C" {
 
 #define EMAC_EX_CLKOUT_CONF_REG (REG_EMAC_EX_BASE + 0x0000)
 #define EMAC_EX_CLK_OUT_DLY_NUM 0x00000003
+#define EMAC_EX_CLK_OUT_DLY_NUM_M (EMAC_EX_CLK_OUT_DLY_NUM_V << EMAC_EX_CLK_OUT_DLY_NUM_S)
+#define EMAC_EX_CLK_OUT_DLY_NUM_V 0x00000003
 #define EMAC_EX_CLK_OUT_DLY_NUM_S 8
 #define EMAC_EX_CLK_OUT_H_DIV_NUM 0x0000000F
+#define EMAC_EX_CLK_OUT_H_DIV_NUM_M (EMAC_EX_CLK_OUT_H_DIV_NUM_V << EMAC_EX_CLK_OUT_H_DIV_NUM_S)
+#define EMAC_EX_CLK_OUT_H_DIV_NUM_V 0x0000000F
 #define EMAC_EX_CLK_OUT_H_DIV_NUM_S 4
 #define EMAC_EX_CLK_OUT_DIV_NUM 0x0000000F
+#define EMAC_EX_CLK_OUT_DIV_NUM_M (EMAC_EX_CLK_OUT_DIV_NUM_V << EMAC_EX_CLK_OUT_DIV_NUM_S)
+#define EMAC_EX_CLK_OUT_DIV_NUM_V 0x0000000F
 #define EMAC_EX_CLK_OUT_DIV_NUM_S 0
 
 #define EMAC_EX_OSCCLK_CONF_REG (REG_EMAC_EX_BASE + 0x0004)
 #define EMAC_EX_OSC_CLK_SEL (BIT(24))
+#define EMAC_EX_OSC_CLK_SEL_M (BIT(24))
+#define EMAC_EX_OSC_CLK_SEL_V 1
 #define EMAC_EX_OSC_CLK_SEL_S 24
 #define EMAC_EX_OSC_H_DIV_NUM_100M 0x0000003F
+#define EMAC_EX_OSC_H_DIV_NUM_100M_M (EMAC_EX_OSC_H_DIV_NUM_100M_V << EMAC_EX_OSC_H_DIV_NUM_100M_S)
+#define EMAC_EX_OSC_H_DIV_NUM_100M_V 0x0000003F
 #define EMAC_EX_OSC_H_DIV_NUM_100M_S 18
 #define EMAC_EX_OSC_DIV_NUM_100M 0x0000003F
+#define EMAC_EX_OSC_DIV_NUM_100M_M (EMAC_EX_OSC_DIV_NUM_100M_V << EMAC_EX_OSC_DIV_NUM_100M_S)
+#define EMAC_EX_OSC_DIV_NUM_100M_V 0x0000003F
 #define EMAC_EX_OSC_DIV_NUM_100M_S 12
 #define EMAC_EX_OSC_H_DIV_NUM_10M 0x0000003F
+#define EMAC_EX_OSC_H_DIV_NUM_10M_M (EMAC_EX_OSC_H_DIV_NUM_10M_V << EMAC_EX_OSC_H_DIV_NUM_10M_S)
+#define EMAC_EX_OSC_H_DIV_NUM_10M_V 0x0000003F
 #define EMAC_EX_OSC_H_DIV_NUM_10M_S 6
 #define EMAC_EX_OSC_DIV_NUM_10M 0x0000003F
+#define EMAC_EX_OSC_DIV_NUM_10M_M (EMAC_EX_OSC_DIV_NUM_10M_V << EMAC_EX_OSC_DIV_NUM_10M_S)
+#define EMAC_EX_OSC_DIV_NUM_10M_V 0x0000003F
 #define EMAC_EX_OSC_DIV_NUM_10M_S 0
 
 #define EMAC_EX_CLK_CTRL_REG (REG_EMAC_EX_BASE + 0x0008)
 #define EMAC_EX_CLK_EN (BIT(5))
+#define EMAC_EX_CLK_EN_M (BIT(5))
+#define EMAC_EX_CLK_EN_V 1
 #define EMAC_EX_CLK_EN_S 5
 #define EMAC_EX_MII_CLK_RX_EN (BIT(4))
+#define EMAC_EX_MII_CLK_RX_EN_M (BIT(4))
+#define EMAC_EX_MII_CLK_RX_EN_V 1
 #define EMAC_EX_MII_CLK_RX_EN_S 4
 #define EMAC_EX_MII_CLK_TX_EN (BIT(3))
+#define EMAC_EX_MII_CLK_TX_EN_M (BIT(3))
+#define EMAC_EX_MII_CLK_TX_EN_V 1
 #define EMAC_EX_MII_CLK_TX_EN_S 3
 #define EMAC_EX_RX_125_CLK_EN (BIT(2))
+#define EMAC_EX_RX_125_CLK_EN_M (BIT(2))
+#define EMAC_EX_RX_125_CLK_EN_V 1
 #define EMAC_EX_RX_125_CLK_EN_S 2
 #define EMAC_EX_INT_OSC_EN (BIT(1))
+#define EMAC_EX_INT_OSC_EN_M (BIT(1))
+#define EMAC_EX_INT_OSC_EN_V 1
 #define EMAC_EX_INT_OSC_EN_S 1
 #define EMAC_EX_EXT_OSC_EN (BIT(0))
+#define EMAC_EX_EXT_OSC_EN_M (BIT(0))
+#define EMAC_EX_EXT_OSC_EN_V 1
 #define EMAC_EX_EXT_OSC_EN_S 0
 
 #define EMAC_EX_PHYINF_CONF_REG (REG_EMAC_EX_BASE + 0x000c)
 #define EMAC_EX_TX_ERR_OUT_EN (BIT(20))
+#define EMAC_EX_TX_ERR_OUT_EN_M (BIT(20))
+#define EMAC_EX_TX_ERR_OUT_EN_V 1
 #define EMAC_EX_TX_ERR_OUT_EN_S 20
 #define EMAC_EX_SCR_SMI_DLY_RX_SYNC (BIT(19))
+#define EMAC_EX_SCR_SMI_DLY_RX_SYNC_M (BIT(19))
+#define EMAC_EX_SCR_SMI_DLY_RX_SYNC_V 1
 #define EMAC_EX_SCR_SMI_DLY_RX_SYNC_S 19
 #define EMAC_EX_PMT_CTRL_EN (BIT(18))
+#define EMAC_EX_PMT_CTRL_EN_M (BIT(18))
+#define EMAC_EX_PMT_CTRL_EN_V 1
 #define EMAC_EX_PMT_CTRL_EN_S 18
 #define EMAC_EX_SBD_CLK_GATING_EN (BIT(17))
+#define EMAC_EX_SBD_CLK_GATING_EN_M (BIT(17))
+#define EMAC_EX_SBD_CLK_GATING_EN_V 1
 #define EMAC_EX_SBD_CLK_GATING_EN_S 17
 #define EMAC_EX_SS_MODE (BIT(16))
+#define EMAC_EX_SS_MODE_M (BIT(16))
+#define EMAC_EX_SS_MODE_V 1
 #define EMAC_EX_SS_MODE_S 16
 #define EMAC_EX_PHY_INTF_SEL 0x00000007
+#define EMAC_EX_PHY_INTF_SEL_M (EMAC_EX_PHY_INTF_SEL_V << EMAC_EX_PHY_INTF_SEL_S)
+#define EMAC_EX_PHY_INTF_SEL_V 0x00000007
 #define EMAC_EX_PHY_INTF_SEL_S 13
 #define EMAC_EX_REVMII_PHY_ADDR 0x0000001F
+#define EMAC_EX_REVMII_PHY_ADDR_M (EMAC_EX_REVMII_PHY_ADDR_V << EMAC_EX_REVMII_PHY_ADDR_S)
+#define EMAC_EX_REVMII_PHY_ADDR_V 0x0000001F
 #define EMAC_EX_REVMII_PHY_ADDR_S 8
 #define EMAC_EX_CORE_PHY_ADDR 0x0000001F
+#define EMAC_EX_CORE_PHY_ADDR_M (EMAC_EX_CORE_PHY_ADDR_V << EMAC_EX_CORE_PHY_ADDR_S)
+#define EMAC_EX_CORE_PHY_ADDR_V 0x0000001F
 #define EMAC_EX_CORE_PHY_ADDR_S 3
 #define EMAC_EX_SBD_FLOWCTRL (BIT(2))
+#define EMAC_EX_SBD_FLOWCTRL_M (BIT(2))
+#define EMAC_EX_SBD_FLOWCTRL_V 1
 #define EMAC_EX_SBD_FLOWCTRL_S 2
 #define EMAC_EX_EXT_REVMII_RX_CLK_SEL (BIT(1))
+#define EMAC_EX_EXT_REVMII_RX_CLK_SEL_M (BIT(1))
+#define EMAC_EX_EXT_REVMII_RX_CLK_SEL_V 1
 #define EMAC_EX_EXT_REVMII_RX_CLK_SEL_S 1
 #define EMAC_EX_INT_REVMII_RX_CLK_SEL (BIT(0))
+#define EMAC_EX_INT_REVMII_RX_CLK_SEL_M (BIT(0))
+#define EMAC_EX_INT_REVMII_RX_CLK_SEL_V 1
 #define EMAC_EX_INT_REVMII_RX_CLK_SEL_S 0
 
 #define EMAC_EX_PHY_INTF_RMII  4
 
 #define EMAC_EX_EMAC_PD_SEL_REG (REG_EMAC_EX_BASE + 0x0010)
 #define EMAC_EX_RAM_PD_EN 0x00000003
+#define EMAC_EX_RAM_PD_EN_M (EMAC_EX_RAM_PD_EN_V << EMAC_EX_RAM_PD_EN_S)
+#define EMAC_EX_RAM_PD_EN_V 0x00000003
 #define EMAC_EX_RAM_PD_EN_S 0
 
 #define EMAC_EX_DATE_REG (REG_EMAC_EX_BASE + 0x00fc)
 #define EMAC_EX_DATE 0xFFFFFFFF
+#define EMAC_EX_DATE_M (EMAC_EX_DATE_V << EMAC_EX_DATE_S)
+#define EMAC_EX_DATE_V 0xFFFFFFFF
 #define EMAC_EX_DATE_S 0
 #define EMAC_EX_DATE_VERSION 0x16042200
+#define EMAC_EX_DATE_VERSION_M (EMAC_EX_DATE_VERSION_V << EMAC_EX_DATE_VERSION_S)
+#define EMAC_EX_DATE_VERSION_V 0x16042200
 
 #define EMAC_CLK_EN_REG 0x3ff000cc
+#define EMAC_CLK_EN_REG_M (EMAC_CLK_EN_REG_V << EMAC_CLK_EN_REG_S)
+#define EMAC_CLK_EN_REG_V 0x3ff000cc
 #define EMAC_CLK_EN (BIT(14))
+#define EMAC_CLK_EN_M (BIT(14))
+#define EMAC_CLK_EN_V 1
 
 #ifdef __cplusplus
 }
diff --git a/tools/sdk/include/soc/soc/emac_reg_v2.h b/tools/sdk/include/soc/soc/emac_reg_v2.h
index 6ab1afe0330..a33ce44adee 100644
--- a/tools/sdk/include/soc/soc/emac_reg_v2.h
+++ b/tools/sdk/include/soc/soc/emac_reg_v2.h
@@ -24,686 +24,1256 @@ extern "C" {
 
 #define EMAC_DMABUSMODE_REG (REG_EMAC_BASE + 0x0000)
 #define EMAC_DMAREBINCRBURST (BIT(31))
+#define EMAC_DMAREBINCRBURST_M (BIT(31))
+#define EMAC_DMAREBINCRBURST_V 1
 #define EMAC_DMAREBINCRBURST_S 31
 #define EMAC_DMACHANNELPRIOWT 0x00000003
+#define EMAC_DMACHANNELPRIOWT_M (EMAC_DMACHANNELPRIOWT_V << EMAC_DMACHANNELPRIOWT_S)
+#define EMAC_DMACHANNELPRIOWT_V 0x00000003
 #define EMAC_DMACHANNELPRIOWT_S 28
 #define EMAC_DMATXRXPRIO (BIT(27))
+#define EMAC_DMATXRXPRIO_M (BIT(27))
+#define EMAC_DMATXRXPRIO_V 1
 #define EMAC_DMATXRXPRIO_S 27
 #define EMAC_DMAMIXEDBURST (BIT(26))
+#define EMAC_DMAMIXEDBURST_M (BIT(26))
+#define EMAC_DMAMIXEDBURST_V 1
 #define EMAC_DMAMIXEDBURST_S 26
 #define EMAC_DMAADDRALIBEA (BIT(25))
+#define EMAC_DMAADDRALIBEA_M (BIT(25))
+#define EMAC_DMAADDRALIBEA_V 1
 #define EMAC_DMAADDRALIBEA_S 25
 #define EMAC_PBLX8_MODE (BIT(24))
+#define EMAC_PBLX8_MODE_M (BIT(24))
+#define EMAC_PBLX8_MODE_V 1
 #define EMAC_PBLX8_MODE_S 24
 #define EMAC_USE_SEP_PBL (BIT(23))
+#define EMAC_USE_SEP_PBL_M (BIT(23))
+#define EMAC_USE_SEP_PBL_V 1
 #define EMAC_USE_SEP_PBL_S 23
 #define EMAC_RX_DMA_PBL 0x0000003F
+#define EMAC_RX_DMA_PBL_M (EMAC_RX_DMA_PBL_V << EMAC_RX_DMA_PBL_S)
+#define EMAC_RX_DMA_PBL_V 0x0000003F
 #define EMAC_RX_DMA_PBL_S 17
 #define EMAC_FIXED_BURST (BIT(16))
+#define EMAC_FIXED_BURST_M (BIT(16))
+#define EMAC_FIXED_BURST_V 1
 #define EMAC_FIXED_BURST_S 16
 #define EMAC_PRI_RATIO 0x00000003
+#define EMAC_PRI_RATIO_M (EMAC_PRI_RATIO_V << EMAC_PRI_RATIO_S)
+#define EMAC_PRI_RATIO_V 0x00000003
 #define EMAC_PRI_RATIO_S 14
 #define EMAC_PROG_BURST_LEN 0x0000003F
+#define EMAC_PROG_BURST_LEN_M (EMAC_PROG_BURST_LEN_V << EMAC_PROG_BURST_LEN_S)
+#define EMAC_PROG_BURST_LEN_V 0x0000003F
 #define EMAC_PROG_BURST_LEN_S 8
 #define EMAC_ALT_DESC_SIZE (BIT(7))
+#define EMAC_ALT_DESC_SIZE_M (BIT(7))
+#define EMAC_ALT_DESC_SIZE_V 1
 #define EMAC_ALT_DESC_SIZE_S 7
 #define EMAC_DESC_SKIP_LEN 0x0000001F
+#define EMAC_DESC_SKIP_LEN_M (EMAC_DESC_SKIP_LEN_V << EMAC_DESC_SKIP_LEN_S)
+#define EMAC_DESC_SKIP_LEN_V 0x0000001F
 #define EMAC_DESC_SKIP_LEN_S 2
 #define EMAC_DMA_ARB_SCH (BIT(1))
+#define EMAC_DMA_ARB_SCH_M (BIT(1))
+#define EMAC_DMA_ARB_SCH_V 1
 #define EMAC_DMA_ARB_SCH_S 1
 #define EMAC_SW_RST (BIT(0))
+#define EMAC_SW_RST_M (BIT(0))
+#define EMAC_SW_RST_V 1
 #define EMAC_SW_RST_S 0
 
 #define EMAC_DMATXPOLLDEMAND_REG (REG_EMAC_BASE + 0x0004)
 #define EMAC_TRANS_POLL_DEMAND 0xFFFFFFFF
+#define EMAC_TRANS_POLL_DEMAND_M (EMAC_TRANS_POLL_DEMAND_V << EMAC_TRANS_POLL_DEMAND_S)
+#define EMAC_TRANS_POLL_DEMAND_V 0xFFFFFFFF
 #define EMAC_TRANS_POLL_DEMAND_S 0
 
 #define EMAC_DMARXPOLLDEMAND_REG (REG_EMAC_BASE + 0x0008)
 #define EMAC_RECV_POLL_DEMAND 0xFFFFFFFF
+#define EMAC_RECV_POLL_DEMAND_M (EMAC_RECV_POLL_DEMAND_V << EMAC_RECV_POLL_DEMAND_S)
+#define EMAC_RECV_POLL_DEMAND_V 0xFFFFFFFF
 #define EMAC_RECV_POLL_DEMAND_S 0
 
 #define EMAC_DMARXBASEADDR_REG (REG_EMAC_BASE + 0x000C)
 #define EMAC_START_RECV_LIST 0xFFFFFFFF
+#define EMAC_START_RECV_LIST_M (EMAC_START_RECV_LIST_V << EMAC_START_RECV_LIST_S)
+#define EMAC_START_RECV_LIST_V 0xFFFFFFFF
 #define EMAC_START_RECV_LIST_S 0
 
 #define EMAC_DMATXBASEADDR_REG (REG_EMAC_BASE + 0x0010)
 #define EMAC_START_TRANS_LIST 0xFFFFFFFF
+#define EMAC_START_TRANS_LIST_M (EMAC_START_TRANS_LIST_V << EMAC_START_TRANS_LIST_S)
+#define EMAC_START_TRANS_LIST_V 0xFFFFFFFF
 #define EMAC_START_TRANS_LIST_S 0
 
 #define EMAC_DMASTATUS_REG (REG_EMAC_BASE + 0x0014)
 #define EMAC_GMAC_LPI_INT (BIT(30))
+#define EMAC_GMAC_LPI_INT_M (BIT(30))
+#define EMAC_GMAC_LPI_INT_V 1
 #define EMAC_GMAC_LPI_INT_S 30
 #define EMAC_TS_TRI_INT (BIT(29))
+#define EMAC_TS_TRI_INT_M (BIT(29))
+#define EMAC_TS_TRI_INT_V 1
 #define EMAC_TS_TRI_INT_S 29
 #define EMAC_GMAC_PMT_INT (BIT(28))
+#define EMAC_GMAC_PMT_INT_M (BIT(28))
+#define EMAC_GMAC_PMT_INT_V 1
 #define EMAC_GMAC_PMT_INT_S 28
 #define EMAC_GMAC_MMC_INT (BIT(27))
+#define EMAC_GMAC_MMC_INT_M (BIT(27))
+#define EMAC_GMAC_MMC_INT_V 1
 #define EMAC_GMAC_MMC_INT_S 27
 #define EMAC_GMAC_LINE_INF_INT (BIT(26))
+#define EMAC_GMAC_LINE_INF_INT_M (BIT(26))
+#define EMAC_GMAC_LINE_INF_INT_V 1
 #define EMAC_GMAC_LINE_INF_INT_S 26
 #define EMAC_ERROR_BITS 0x00000007
+#define EMAC_ERROR_BITS_M (EMAC_ERROR_BITS_V << EMAC_ERROR_BITS_S)
+#define EMAC_ERROR_BITS_V 0x00000007
 #define EMAC_ERROR_BITS_S 23
 #define EMAC_TRANS_PROC_STATE 0x00000007
+#define EMAC_TRANS_PROC_STATE_M (EMAC_TRANS_PROC_STATE_V << EMAC_TRANS_PROC_STATE_S)
+#define EMAC_TRANS_PROC_STATE_V 0x00000007
 #define EMAC_TRANS_PROC_STATE_S 20
 #define EMAC_RECV_PROC_STATE 0x00000007
+#define EMAC_RECV_PROC_STATE_M (EMAC_RECV_PROC_STATE_V << EMAC_RECV_PROC_STATE_S)
+#define EMAC_RECV_PROC_STATE_V 0x00000007
 #define EMAC_RECV_PROC_STATE_S 17
 #define EMAC_NORM_INT_SUMM (BIT(16))
+#define EMAC_NORM_INT_SUMM_M (BIT(16))
+#define EMAC_NORM_INT_SUMM_V 1
 #define EMAC_NORM_INT_SUMM_S 16
 #define EMAC_ABN_INT_SUMM (BIT(15))
+#define EMAC_ABN_INT_SUMM_M (BIT(15))
+#define EMAC_ABN_INT_SUMM_V 1
 #define EMAC_ABN_INT_SUMM_S 15
 #define EMAC_EARLY_RECV_INT (BIT(14))
+#define EMAC_EARLY_RECV_INT_M (BIT(14))
+#define EMAC_EARLY_RECV_INT_V 1
 #define EMAC_EARLY_RECV_INT_S 14
 #define EMAC_FATAL_BUS_ERR_INT (BIT(13))
+#define EMAC_FATAL_BUS_ERR_INT_M (BIT(13))
+#define EMAC_FATAL_BUS_ERR_INT_V 1
 #define EMAC_FATAL_BUS_ERR_INT_S 13
 #define EMAC_EARLY_TRANS_INT (BIT(10))
+#define EMAC_EARLY_TRANS_INT_M (BIT(10))
+#define EMAC_EARLY_TRANS_INT_V 1
 #define EMAC_EARLY_TRANS_INT_S 10
 #define EMAC_RECV_WDT_TO (BIT(9))
+#define EMAC_RECV_WDT_TO_M (BIT(9))
+#define EMAC_RECV_WDT_TO_V 1
 #define EMAC_RECV_WDT_TO_S 9
 #define EMAC_RECV_PROC_STOP (BIT(8))
+#define EMAC_RECV_PROC_STOP_M (BIT(8))
+#define EMAC_RECV_PROC_STOP_V 1
 #define EMAC_RECV_PROC_STOP_S 8
 #define EMAC_RECV_BUF_UNAVAIL (BIT(7))
+#define EMAC_RECV_BUF_UNAVAIL_M (BIT(7))
+#define EMAC_RECV_BUF_UNAVAIL_V 1
 #define EMAC_RECV_BUF_UNAVAIL_S 7
 #define EMAC_RECV_INT (BIT(6))
+#define EMAC_RECV_INT_M (BIT(6))
+#define EMAC_RECV_INT_V 1
 #define EMAC_RECV_INT_S 6
 #define EMAC_TRANS_UNDFLOW (BIT(5))
+#define EMAC_TRANS_UNDFLOW_M (BIT(5))
+#define EMAC_TRANS_UNDFLOW_V 1
 #define EMAC_TRANS_UNDFLOW_S 5
 #define EMAC_RECV_OVFLOW (BIT(4))
+#define EMAC_RECV_OVFLOW_M (BIT(4))
+#define EMAC_RECV_OVFLOW_V 1
 #define EMAC_RECV_OVFLOW_S 4
 #define EMAC_TRANS_JABBER_TO (BIT(3))
+#define EMAC_TRANS_JABBER_TO_M (BIT(3))
+#define EMAC_TRANS_JABBER_TO_V 1
 #define EMAC_TRANS_JABBER_TO_S 3
 #define EMAC_TRANS_BUF_UNAVAIL (BIT(2))
+#define EMAC_TRANS_BUF_UNAVAIL_M (BIT(2))
+#define EMAC_TRANS_BUF_UNAVAIL_V 1
 #define EMAC_TRANS_BUF_UNAVAIL_S 2
 #define EMAC_TRANS_PROC_STOP (BIT(1))
+#define EMAC_TRANS_PROC_STOP_M (BIT(1))
+#define EMAC_TRANS_PROC_STOP_V 1
 #define EMAC_TRANS_PROC_STOP_S 1
 #define EMAC_TRANS_INT (BIT(0))
+#define EMAC_TRANS_INT_M (BIT(0))
+#define EMAC_TRANS_INT_V 1
 #define EMAC_TRANS_INT_S 0
 
 #define EMAC_DMAOPERATION_MODE_REG (REG_EMAC_BASE + 0x0018)
 #define EMAC_DIS_DROP_TCPIP_CHKSUM_ERR_FRAM (BIT(26))
+#define EMAC_DIS_DROP_TCPIP_CHKSUM_ERR_FRAM_M (BIT(26))
+#define EMAC_DIS_DROP_TCPIP_CHKSUM_ERR_FRAM_V 1
 #define EMAC_DIS_DROP_TCPIP_CHKSUM_ERR_FRAM_S 26
 #define EMAC_RECV_STORE_FORWARD (BIT(25))
+#define EMAC_RECV_STORE_FORWARD_M (BIT(25))
+#define EMAC_RECV_STORE_FORWARD_V 1
 #define EMAC_RECV_STORE_FORWARD_S 25
 #define EMAC_DIS_FLUSH_RECV_FRAMES (BIT(24))
+#define EMAC_DIS_FLUSH_RECV_FRAMES_M (BIT(24))
+#define EMAC_DIS_FLUSH_RECV_FRAMES_V 1
 #define EMAC_DIS_FLUSH_RECV_FRAMES_S 24
 #define EMAC_MSB_THRESHOLD_ACTIVATING_FLOW_CONTROL (BIT(23))
+#define EMAC_MSB_THRESHOLD_ACTIVATING_FLOW_CONTROL_M (BIT(23))
+#define EMAC_MSB_THRESHOLD_ACTIVATING_FLOW_CONTROL_V 1
 #define EMAC_MSB_THRESHOLD_ACTIVATING_FLOW_CONTROL_S 23
 #define EMAC_MSB_THRESHOLD_DEACTIVATING_FLOW_CONTROL (BIT(22))
+#define EMAC_MSB_THRESHOLD_DEACTIVATING_FLOW_CONTROL_M (BIT(22))
+#define EMAC_MSB_THRESHOLD_DEACTIVATING_FLOW_CONTROL_V 1
 #define EMAC_MSB_THRESHOLD_DEACTIVATING_FLOW_CONTROL_S 22
 #define EMAC_TRANSMIT_STORE_FORWARD (BIT(21))
+#define EMAC_TRANSMIT_STORE_FORWARD_M (BIT(21))
+#define EMAC_TRANSMIT_STORE_FORWARD_V 1
 #define EMAC_TRANSMIT_STORE_FORWARD_S 21
 #define EMAC_FLUSH_TRANSMIT_FIFO (BIT(20))
+#define EMAC_FLUSH_TRANSMIT_FIFO_M (BIT(20))
+#define EMAC_FLUSH_TRANSMIT_FIFO_V 1
 #define EMAC_FLUSH_TRANSMIT_FIFO_S 20
 #define EMAC_TRANSMIT_THRESHOLD_CONTROL 0x00000007
+#define EMAC_TRANSMIT_THRESHOLD_CONTROL_M (EMAC_TRANSMIT_THRESHOLD_CONTROL_V << EMAC_TRANSMIT_THRESHOLD_CONTROL_S)
+#define EMAC_TRANSMIT_THRESHOLD_CONTROL_V 0x00000007
 #define EMAC_TRANSMIT_THRESHOLD_CONTROL_S 14
 #define EMAC_START_STOP_TRANSMISSION_COMMAND (BIT(13))
+#define EMAC_START_STOP_TRANSMISSION_COMMAND_M (BIT(13))
+#define EMAC_START_STOP_TRANSMISSION_COMMAND_V 1
 #define EMAC_START_STOP_TRANSMISSION_COMMAND_S 13
 #define EMAC_THRESHOLD_DEACTIVATING_FLOW_CONTROL 0x00000003
+#define EMAC_THRESHOLD_DEACTIVATING_FLOW_CONTROL_M (EMAC_THRESHOLD_DEACTIVATING_FLOW_CONTROL_V << EMAC_THRESHOLD_DEACTIVATING_FLOW_CONTROL_S)
+#define EMAC_THRESHOLD_DEACTIVATING_FLOW_CONTROL_V 0x00000003
 #define EMAC_THRESHOLD_DEACTIVATING_FLOW_CONTROL_S 11
 #define EMAC_THRESHOLD_ACTIVATING_FLOW_CONTROL 0x00000003
+#define EMAC_THRESHOLD_ACTIVATING_FLOW_CONTROL_M (EMAC_THRESHOLD_ACTIVATING_FLOW_CONTROL_V << EMAC_THRESHOLD_ACTIVATING_FLOW_CONTROL_S)
+#define EMAC_THRESHOLD_ACTIVATING_FLOW_CONTROL_V 0x00000003
 #define EMAC_THRESHOLD_ACTIVATING_FLOW_CONTROL_S 9
 #define EMAC_ENABLE_HW_FLOW_CONTROL (BIT(8))
+#define EMAC_ENABLE_HW_FLOW_CONTROL_M (BIT(8))
+#define EMAC_ENABLE_HW_FLOW_CONTROL_V 1
 #define EMAC_ENABLE_HW_FLOW_CONTROL_S 8
 #define EMAC_FORWARD_ERROR_FRAMES (BIT(7))
+#define EMAC_FORWARD_ERROR_FRAMES_M (BIT(7))
+#define EMAC_FORWARD_ERROR_FRAMES_V 1
 #define EMAC_FORWARD_ERROR_FRAMES_S 7
 #define EMAC_FORWARD_UNDERSIZED_GOOD_FRAMES (BIT(6))
+#define EMAC_FORWARD_UNDERSIZED_GOOD_FRAMES_M (BIT(6))
+#define EMAC_FORWARD_UNDERSIZED_GOOD_FRAMES_V 1
 #define EMAC_FORWARD_UNDERSIZED_GOOD_FRAMES_S 6
 #define EMAC_DROP_GIANT_FRAMES (BIT(5))
+#define EMAC_DROP_GIANT_FRAMES_M (BIT(5))
+#define EMAC_DROP_GIANT_FRAMES_V 1
 #define EMAC_DROP_GIANT_FRAMES_S 5
 #define EMAC_RECEIVE_THRESHOLD_CONTROL 0x00000003
+#define EMAC_RECEIVE_THRESHOLD_CONTROL_M (EMAC_RECEIVE_THRESHOLD_CONTROL_V << EMAC_RECEIVE_THRESHOLD_CONTROL_S)
+#define EMAC_RECEIVE_THRESHOLD_CONTROL_V 0x00000003
 #define EMAC_RECEIVE_THRESHOLD_CONTROL_S 3
 #define EMAC_OPERATE_SECOND_FRAME (BIT(2))
+#define EMAC_OPERATE_SECOND_FRAME_M (BIT(2))
+#define EMAC_OPERATE_SECOND_FRAME_V 1
 #define EMAC_OPERATE_SECOND_FRAME_S 2
 #define EMAC_START_STOP_RECEIVE (BIT(1))
+#define EMAC_START_STOP_RECEIVE_M (BIT(1))
+#define EMAC_START_STOP_RECEIVE_V 1
 #define EMAC_START_STOP_RECEIVE_S 1
 
 #define EMAC_DMAINTERRUPT_EN_REG (REG_EMAC_BASE + 0x001C)
 #define EMAC_NORMAL_INTERRUPT_SUMMARY_ENABLE (BIT(16))
+#define EMAC_NORMAL_INTERRUPT_SUMMARY_ENABLE_M (BIT(16))
+#define EMAC_NORMAL_INTERRUPT_SUMMARY_ENABLE_V 1
 #define EMAC_NORMAL_INTERRUPT_SUMMARY_ENABLE_S 16
 #define EMAC_ABNORMAL_INTERRUPT_SUMMARY_ENABLE (BIT(15))
+#define EMAC_ABNORMAL_INTERRUPT_SUMMARY_ENABLE_M (BIT(15))
+#define EMAC_ABNORMAL_INTERRUPT_SUMMARY_ENABLE_V 1
 #define EMAC_ABNORMAL_INTERRUPT_SUMMARY_ENABLE_S 15
 #define EMAC_EARLY_RECEIVE_INTERRUPT_ENABLE (BIT(14))
+#define EMAC_EARLY_RECEIVE_INTERRUPT_ENABLE_M (BIT(14))
+#define EMAC_EARLY_RECEIVE_INTERRUPT_ENABLE_V 1
 #define EMAC_EARLY_RECEIVE_INTERRUPT_ENABLE_S 14
 #define EMAC_FATAL_BUS_ERROR_ENABLE (BIT(13))
+#define EMAC_FATAL_BUS_ERROR_ENABLE_M (BIT(13))
+#define EMAC_FATAL_BUS_ERROR_ENABLE_V 1
 #define EMAC_FATAL_BUS_ERROR_ENABLE_S 13
 #define EMAC_EARLY_TRANSMIT_INTERRUPT_ENABLE (BIT(10))
+#define EMAC_EARLY_TRANSMIT_INTERRUPT_ENABLE_M (BIT(10))
+#define EMAC_EARLY_TRANSMIT_INTERRUPT_ENABLE_V 1
 #define EMAC_EARLY_TRANSMIT_INTERRUPT_ENABLE_S 10
 #define EMAC_RECEIVE_WATCHDOG_TIMEOUT_ENABLE (BIT(9))
+#define EMAC_RECEIVE_WATCHDOG_TIMEOUT_ENABLE_M (BIT(9))
+#define EMAC_RECEIVE_WATCHDOG_TIMEOUT_ENABLE_V 1
 #define EMAC_RECEIVE_WATCHDOG_TIMEOUT_ENABLE_S 9
 #define EMAC_RECEIVE_STOPPED_ENABLE (BIT(8))
+#define EMAC_RECEIVE_STOPPED_ENABLE_M (BIT(8))
+#define EMAC_RECEIVE_STOPPED_ENABLE_V 1
 #define EMAC_RECEIVE_STOPPED_ENABLE_S 8
 #define EMAC_RECEIVE_BUFFER_UNAVAILABLE_ENABLE (BIT(7))
+#define EMAC_RECEIVE_BUFFER_UNAVAILABLE_ENABLE_M (BIT(7))
+#define EMAC_RECEIVE_BUFFER_UNAVAILABLE_ENABLE_V 1
 #define EMAC_RECEIVE_BUFFER_UNAVAILABLE_ENABLE_S 7
 #define EMAC_RECEIVE_INTERRUPT_ENABLE (BIT(6))
+#define EMAC_RECEIVE_INTERRUPT_ENABLE_M (BIT(6))
+#define EMAC_RECEIVE_INTERRUPT_ENABLE_V 1
 #define EMAC_RECEIVE_INTERRUPT_ENABLE_S 6
 #define EMAC_UNDERFLOW_INTERRUPT_ENABLE (BIT(5))
+#define EMAC_UNDERFLOW_INTERRUPT_ENABLE_M (BIT(5))
+#define EMAC_UNDERFLOW_INTERRUPT_ENABLE_V 1
 #define EMAC_UNDERFLOW_INTERRUPT_ENABLE_S 5
 #define EMAC_OVERFLOW_INTERRUPT_ENABLE (BIT(4))
+#define EMAC_OVERFLOW_INTERRUPT_ENABLE_M (BIT(4))
+#define EMAC_OVERFLOW_INTERRUPT_ENABLE_V 1
 #define EMAC_OVERFLOW_INTERRUPT_ENABLE_S 4
 #define EMAC_TRANSMIT_JABBER_TIMEOUT_ENABLE (BIT(3))
+#define EMAC_TRANSMIT_JABBER_TIMEOUT_ENABLE_M (BIT(3))
+#define EMAC_TRANSMIT_JABBER_TIMEOUT_ENABLE_V 1
 #define EMAC_TRANSMIT_JABBER_TIMEOUT_ENABLE_S 3
 #define EMAC_TRANSMIT_BUFFER_UNAVAILABLE_ENABLE (BIT(2))
+#define EMAC_TRANSMIT_BUFFER_UNAVAILABLE_ENABLE_M (BIT(2))
+#define EMAC_TRANSMIT_BUFFER_UNAVAILABLE_ENABLE_V 1
 #define EMAC_TRANSMIT_BUFFER_UNAVAILABLE_ENABLE_S 2
 #define EMAC_TRANSMIT_STOPPED_ENABLE (BIT(1))
+#define EMAC_TRANSMIT_STOPPED_ENABLE_M (BIT(1))
+#define EMAC_TRANSMIT_STOPPED_ENABLE_V 1
 #define EMAC_TRANSMIT_STOPPED_ENABLE_S 1
 #define EMAC_TRANSMIT_INTERRUPT_ENABLE (BIT(0))
+#define EMAC_TRANSMIT_INTERRUPT_ENABLE_M (BIT(0))
+#define EMAC_TRANSMIT_INTERRUPT_ENABLE_V 1
 #define EMAC_TRANSMIT_INTERRUPT_ENABLE_S 0
 
 #define EMAC_DMAMISSEDFR_REG (REG_EMAC_BASE + 0x0020)
 #define EMAC_OVERFLOW_BIT_FIFO_OVERFLOW_COUNTER (BIT(28))
+#define EMAC_OVERFLOW_BIT_FIFO_OVERFLOW_COUNTER_M (BIT(28))
+#define EMAC_OVERFLOW_BIT_FIFO_OVERFLOW_COUNTER_V 1
 #define EMAC_OVERFLOW_BIT_FIFO_OVERFLOW_COUNTER_S 28
 #define EMAC_OVERFLOW_FRAME_COUNTER 0x000007FF
+#define EMAC_OVERFLOW_FRAME_COUNTER_M (EMAC_OVERFLOW_FRAME_COUNTER_V << EMAC_OVERFLOW_FRAME_COUNTER_S)
+#define EMAC_OVERFLOW_FRAME_COUNTER_V 0x000007FF
 #define EMAC_OVERFLOW_FRAME_COUNTER_S 17
 #define EMAC_OVERFLOW_BIT_MISSED_FRAME_COUNTER (BIT(16))
+#define EMAC_OVERFLOW_BIT_MISSED_FRAME_COUNTER_M (BIT(16))
+#define EMAC_OVERFLOW_BIT_MISSED_FRAME_COUNTER_V 1
 #define EMAC_OVERFLOW_BIT_MISSED_FRAME_COUNTER_S 16
 #define EMAC_MISSED_FRAME_COUNTER 0x0000FFFF
+#define EMAC_MISSED_FRAME_COUNTER_M (EMAC_MISSED_FRAME_COUNTER_V << EMAC_MISSED_FRAME_COUNTER_S)
+#define EMAC_MISSED_FRAME_COUNTER_V 0x0000FFFF
 #define EMAC_MISSED_FRAME_COUNTER_S 0
 
 #define EMAC_DMARECEIVE_INTERRUPT_WATCHDOG_TIMER_REG (REG_EMAC_BASE + 0x0024)
 #define EMAC_RI_WATCHDOG_TIMER_COUNT 0x000000FF
+#define EMAC_RI_WATCHDOG_TIMER_COUNT_M (EMAC_RI_WATCHDOG_TIMER_COUNT_V << EMAC_RI_WATCHDOG_TIMER_COUNT_S)
+#define EMAC_RI_WATCHDOG_TIMER_COUNT_V 0x000000FF
 #define EMAC_RI_WATCHDOG_TIMER_COUNT_S 0
 
 #define EMAC_DMATXCURRDESC_REG (REG_EMAC_BASE + 0x0048)
 #define EMAC_HOST_TRANSMIT_DESCRIPTOR_ADDRESS_POINTER 0xFFFFFFFF
+#define EMAC_HOST_TRANSMIT_DESCRIPTOR_ADDRESS_POINTER_M (EMAC_HOST_TRANSMIT_DESCRIPTOR_ADDRESS_POINTER_V << EMAC_HOST_TRANSMIT_DESCRIPTOR_ADDRESS_POINTER_S)
+#define EMAC_HOST_TRANSMIT_DESCRIPTOR_ADDRESS_POINTER_V 0xFFFFFFFF
 #define EMAC_HOST_TRANSMIT_DESCRIPTOR_ADDRESS_POINTER_S 0
 
 #define EMAC_DMARXCURRDESC_REG (REG_EMAC_BASE + 0x004C)
 #define EMAC_HOST_RECEIVE_DESCRIPTOR_ADDRESS_POINTER 0xFFFFFFFF
+#define EMAC_HOST_RECEIVE_DESCRIPTOR_ADDRESS_POINTER_M (EMAC_HOST_RECEIVE_DESCRIPTOR_ADDRESS_POINTER_V << EMAC_HOST_RECEIVE_DESCRIPTOR_ADDRESS_POINTER_S)
+#define EMAC_HOST_RECEIVE_DESCRIPTOR_ADDRESS_POINTER_V 0xFFFFFFFF
 #define EMAC_HOST_RECEIVE_DESCRIPTOR_ADDRESS_POINTER_S 0
 
 #define EMAC_DMATXCURRADDR_BUF_REG (REG_EMAC_BASE + 0x0050)
 #define EMAC_HOST_TRANSMIT_BUFFER_ADDRESS_POINTER 0xFFFFFFFF
+#define EMAC_HOST_TRANSMIT_BUFFER_ADDRESS_POINTER_M (EMAC_HOST_TRANSMIT_BUFFER_ADDRESS_POINTER_V << EMAC_HOST_TRANSMIT_BUFFER_ADDRESS_POINTER_S)
+#define EMAC_HOST_TRANSMIT_BUFFER_ADDRESS_POINTER_V 0xFFFFFFFF
 #define EMAC_HOST_TRANSMIT_BUFFER_ADDRESS_POINTER_S 0
 
 #define EMAC_DMARXCURRADDR_BUF_REG (REG_EMAC_BASE + 0x0054)
 #define EMAC_HOST_RECEIVE_BUFFER_ADDRESS_POINTER 0xFFFFFFFF
+#define EMAC_HOST_RECEIVE_BUFFER_ADDRESS_POINTER_M (EMAC_HOST_RECEIVE_BUFFER_ADDRESS_POINTER_V << EMAC_HOST_RECEIVE_BUFFER_ADDRESS_POINTER_S)
+#define EMAC_HOST_RECEIVE_BUFFER_ADDRESS_POINTER_V 0xFFFFFFFF
 #define EMAC_HOST_RECEIVE_BUFFER_ADDRESS_POINTER_S 0
 
 #define EMAC_DMAHWFEATURE_REG (REG_EMAC_BASE + 0x0058)
 #define EMAC_SELECTED_PHY_INTERFACE 0x00000007
+#define EMAC_SELECTED_PHY_INTERFACE_M (EMAC_SELECTED_PHY_INTERFACE_V << EMAC_SELECTED_PHY_INTERFACE_S)
+#define EMAC_SELECTED_PHY_INTERFACE_V 0x00000007
 #define EMAC_SELECTED_PHY_INTERFACE_S 28
 #define EMAC_SOURCE_ADDRESS_VLAN_INSERTION (BIT(27))
+#define EMAC_SOURCE_ADDRESS_VLAN_INSERTION_M (BIT(27))
+#define EMAC_SOURCE_ADDRESS_VLAN_INSERTION_V 1
 #define EMAC_SOURCE_ADDRESS_VLAN_INSERTION_S 27
 #define EMAC_FLEXIBLE_PULSE_PER_SECOND_OUTPUT (BIT(26))
+#define EMAC_FLEXIBLE_PULSE_PER_SECOND_OUTPUT_M (BIT(26))
+#define EMAC_FLEXIBLE_PULSE_PER_SECOND_OUTPUT_V 1
 #define EMAC_FLEXIBLE_PULSE_PER_SECOND_OUTPUT_S 26
 #define EMAC_TIMESTAMPING_INTERNAL_SYSTEM_TIME (BIT(25))
+#define EMAC_TIMESTAMPING_INTERNAL_SYSTEM_TIME_M (BIT(25))
+#define EMAC_TIMESTAMPING_INTERNAL_SYSTEM_TIME_V 1
 #define EMAC_TIMESTAMPING_INTERNAL_SYSTEM_TIME_S 25
 #define EMAC_ENHANCED_DESCRIPTOR (BIT(24))
+#define EMAC_ENHANCED_DESCRIPTOR_M (BIT(24))
+#define EMAC_ENHANCED_DESCRIPTOR_V 1
 #define EMAC_ENHANCED_DESCRIPTOR_S 24
 #define EMAC_NUMBER_ADDITIONAL_TX_CHANNELS 0x00000003
+#define EMAC_NUMBER_ADDITIONAL_TX_CHANNELS_M (EMAC_NUMBER_ADDITIONAL_TX_CHANNELS_V << EMAC_NUMBER_ADDITIONAL_TX_CHANNELS_S)
+#define EMAC_NUMBER_ADDITIONAL_TX_CHANNELS_V 0x00000003
 #define EMAC_NUMBER_ADDITIONAL_TX_CHANNELS_S 22
 #define EMAC_NUMBER_ADDITIONAL_RX_CHANNELS 0x00000003
+#define EMAC_NUMBER_ADDITIONAL_RX_CHANNELS_M (EMAC_NUMBER_ADDITIONAL_RX_CHANNELS_V << EMAC_NUMBER_ADDITIONAL_RX_CHANNELS_S)
+#define EMAC_NUMBER_ADDITIONAL_RX_CHANNELS_V 0x00000003
 #define EMAC_NUMBER_ADDITIONAL_RX_CHANNELS_S 20
 #define EMAC_RXFIFOSIZE (BIT(19))
+#define EMAC_RXFIFOSIZE_M (BIT(19))
+#define EMAC_RXFIFOSIZE_V 1
 #define EMAC_RXFIFOSIZE_S 19
 #define EMAC_IP_CHECKSUM_OFFLOAD_TYPE2 (BIT(18))
+#define EMAC_IP_CHECKSUM_OFFLOAD_TYPE2_M (BIT(18))
+#define EMAC_IP_CHECKSUM_OFFLOAD_TYPE2_V 1
 #define EMAC_IP_CHECKSUM_OFFLOAD_TYPE2_S 18
 #define EMAC_IP_CHECKSUM_OFFLOAD_TYPE1 (BIT(17))
+#define EMAC_IP_CHECKSUM_OFFLOAD_TYPE1_M (BIT(17))
+#define EMAC_IP_CHECKSUM_OFFLOAD_TYPE1_V 1
 #define EMAC_IP_CHECKSUM_OFFLOAD_TYPE1_S 17
 #define EMAC_CHECKSUM_OFFLOAD_TX (BIT(16))
+#define EMAC_CHECKSUM_OFFLOAD_TX_M (BIT(16))
+#define EMAC_CHECKSUM_OFFLOAD_TX_V 1
 #define EMAC_CHECKSUM_OFFLOAD_TX_S 16
 #define EMAC_AV_FEATURE_SEL (BIT(15))
+#define EMAC_AV_FEATURE_SEL_M (BIT(15))
+#define EMAC_AV_FEATURE_SEL_V 1
 #define EMAC_AV_FEATURE_SEL_S 15
 #define EMAC_EEE_SEL (BIT(14))
+#define EMAC_EEE_SEL_M (BIT(14))
+#define EMAC_EEE_SEL_V 1
 #define EMAC_EEE_SEL_S 14
 #define EMAC_TSVER2_SEL (BIT(13))
+#define EMAC_TSVER2_SEL_M (BIT(13))
+#define EMAC_TSVER2_SEL_V 1
 #define EMAC_TSVER2_SEL_S 13
 #define EMAC_TSVER1_SEL (BIT(12))
+#define EMAC_TSVER1_SEL_M (BIT(12))
+#define EMAC_TSVER1_SEL_V 1
 #define EMAC_TSVER1_SEL_S 12
 #define EMAC_MMC_SEL (BIT(11))
+#define EMAC_MMC_SEL_M (BIT(11))
+#define EMAC_MMC_SEL_V 1
 #define EMAC_MMC_SEL_S 11
 #define EMAC_MGK_SEL (BIT(10))
+#define EMAC_MGK_SEL_M (BIT(10))
+#define EMAC_MGK_SEL_V 1
 #define EMAC_MGK_SEL_S 10
 #define EMAC_RWK_SEL (BIT(9))
+#define EMAC_RWK_SEL_M (BIT(9))
+#define EMAC_RWK_SEL_V 1
 #define EMAC_RWK_SEL_S 9
 #define EMAC_SMA_SEL (BIT(8))
+#define EMAC_SMA_SEL_M (BIT(8))
+#define EMAC_SMA_SEL_V 1
 #define EMAC_SMA_SEL_S 8
 #define EMAC_L3L4FLTR_EN (BIT(7))
+#define EMAC_L3L4FLTR_EN_M (BIT(7))
+#define EMAC_L3L4FLTR_EN_V 1
 #define EMAC_L3L4FLTR_EN_S 7
 #define EMAC_PCS_SEL (BIT(6))
+#define EMAC_PCS_SEL_M (BIT(6))
+#define EMAC_PCS_SEL_V 1
 #define EMAC_PCS_SEL_S 6
 #define EMAC_ADDMACADR_SEL (BIT(5))
+#define EMAC_ADDMACADR_SEL_M (BIT(5))
+#define EMAC_ADDMACADR_SEL_V 1
 #define EMAC_ADDMACADR_SEL_S 5
 #define EMAC_HASH_SEL (BIT(4))
+#define EMAC_HASH_SEL_M (BIT(4))
+#define EMAC_HASH_SEL_V 1
 #define EMAC_HASH_SEL_S 4
 #define EMAC_EXTHASH_EN (BIT(3))
+#define EMAC_EXTHASH_EN_M (BIT(3))
+#define EMAC_EXTHASH_EN_V 1
 #define EMAC_EXTHASH_EN_S 3
 #define EMAC_HD_SEL (BIT(2))
+#define EMAC_HD_SEL_M (BIT(2))
+#define EMAC_HD_SEL_V 1
 #define EMAC_HD_SEL_S 2
 #define EMAC_GMII_SEL (BIT(1))
+#define EMAC_GMII_SEL_M (BIT(1))
+#define EMAC_GMII_SEL_V 1
 #define EMAC_GMII_SEL_S 1
 #define EMAC_MII_SEL (BIT(0))
+#define EMAC_MII_SEL_M (BIT(0))
+#define EMAC_MII_SEL_V 1
 #define EMAC_MII_SEL_S 0
 
 #define EMAC_DMASLOTFNCTRLSTS_REG (REG_EMAC_BASE + 0x0130)
 #define EMAC_REFERENCE_SLOT_NUMBER 0x0000000F
+#define EMAC_REFERENCE_SLOT_NUMBER_M (EMAC_REFERENCE_SLOT_NUMBER_V << EMAC_REFERENCE_SLOT_NUMBER_S)
+#define EMAC_REFERENCE_SLOT_NUMBER_V 0x0000000F
 #define EMAC_REFERENCE_SLOT_NUMBER_S 16
 #define EMAC_ADVANCE_SLOT_CHECK (BIT(1))
+#define EMAC_ADVANCE_SLOT_CHECK_M (BIT(1))
+#define EMAC_ADVANCE_SLOT_CHECK_V 1
 #define EMAC_ADVANCE_SLOT_CHECK_S 1
 #define EMAC_ENABLE_SLOT_COMPARISON (BIT(0))
+#define EMAC_ENABLE_SLOT_COMPARISON_M (BIT(0))
+#define EMAC_ENABLE_SLOT_COMPARISON_V 1
 #define EMAC_ENABLE_SLOT_COMPARISON_S 0
 
 #define EMAC_DMACHANNELCTRL_REG (REG_EMAC_BASE + 0x0160)
 #define EMAC_AVERAGE_BITS_PER_SLOT_INTERRUPT_ENABLE (BIT(17))
+#define EMAC_AVERAGE_BITS_PER_SLOT_INTERRUPT_ENABLE_M (BIT(17))
+#define EMAC_AVERAGE_BITS_PER_SLOT_INTERRUPT_ENABLE_V 1
 #define EMAC_AVERAGE_BITS_PER_SLOT_INTERRUPT_ENABLE_S 17
 #define EMAC_SLOT_COUNT 0x00000007
+#define EMAC_SLOT_COUNT_M (EMAC_SLOT_COUNT_V << EMAC_SLOT_COUNT_S)
+#define EMAC_SLOT_COUNT_V 0x00000007
 #define EMAC_SLOT_COUNT_S 4
 #define EMAC_CREDIT_CONTROL (BIT(1))
+#define EMAC_CREDIT_CONTROL_M (BIT(1))
+#define EMAC_CREDIT_CONTROL_V 1
 #define EMAC_CREDIT_CONTROL_S 1
 #define EMAC_CREDIT_BASED_SHAPER_DISABLE (BIT(0))
+#define EMAC_CREDIT_BASED_SHAPER_DISABLE_M (BIT(0))
+#define EMAC_CREDIT_BASED_SHAPER_DISABLE_V 1
 #define EMAC_CREDIT_BASED_SHAPER_DISABLE_S 0
 
 #define EMAC_DMACHANNELAVSTS_REG (REG_EMAC_BASE + 0x0064)
 #define EMAC_ABS_UPDATED (BIT(17))
+#define EMAC_ABS_UPDATED_M (BIT(17))
+#define EMAC_ABS_UPDATED_V 1
 #define EMAC_ABS_UPDATED_S 17
 #define EMAC_AVERAGE_BITS_PER_SLOT 0x0001FFFF
+#define EMAC_AVERAGE_BITS_PER_SLOT_M (EMAC_AVERAGE_BITS_PER_SLOT_V << EMAC_AVERAGE_BITS_PER_SLOT_S)
+#define EMAC_AVERAGE_BITS_PER_SLOT_V 0x0001FFFF
 #define EMAC_AVERAGE_BITS_PER_SLOT_S 0
 
 #define EMAC_DMAIDLESLOPECREDIT_REG (REG_EMAC_BASE + 0x0068)
 #define EMAC_IDLESLOPECREDIT 0x00003FFF
+#define EMAC_IDLESLOPECREDIT_M (EMAC_IDLESLOPECREDIT_V << EMAC_IDLESLOPECREDIT_S)
+#define EMAC_IDLESLOPECREDIT_V 0x00003FFF
 #define EMAC_IDLESLOPECREDIT_S 0
 
 #define EMAC_DMASENDSLOPECREDIT_REG (REG_EMAC_BASE + 0x006C)
 #define EMAC_SENDSLOPECREDIT 0x00003FFF
+#define EMAC_SENDSLOPECREDIT_M (EMAC_SENDSLOPECREDIT_V << EMAC_SENDSLOPECREDIT_S)
+#define EMAC_SENDSLOPECREDIT_V 0x00003FFF
 #define EMAC_SENDSLOPECREDIT_S 0
 
 #define EMAC_DMAHIGHCREDIT_REG (REG_EMAC_BASE + 0x0070)
 #define EMAC_HICREDIT 0x1FFFFFFF
+#define EMAC_HICREDIT_M (EMAC_HICREDIT_V << EMAC_HICREDIT_S)
+#define EMAC_HICREDIT_V 0x1FFFFFFF
 #define EMAC_HICREDIT_S 0
 
 #define EMAC_DMALOCREDIT_REG (REG_EMAC_BASE + 0x0074)
 #define EMAC_LOCREDIT 0x1FFFFFFF
+#define EMAC_LOCREDIT_M (EMAC_LOCREDIT_V << EMAC_LOCREDIT_S)
+#define EMAC_LOCREDIT_V 0x1FFFFFFF
 #define EMAC_LOCREDIT_S 0
 
 #define EMAC_GMACCONFIG_REG (REG_EMAC_BASE + 0x1000)
 #define EMAC_SOURCE_ADDRESS_INSERTION_REPLACEMENT_CONTROL 0x00000007
+#define EMAC_SOURCE_ADDRESS_INSERTION_REPLACEMENT_CONTROL_M (EMAC_SOURCE_ADDRESS_INSERTION_REPLACEMENT_CONTROL_V << EMAC_SOURCE_ADDRESS_INSERTION_REPLACEMENT_CONTROL_S)
+#define EMAC_SOURCE_ADDRESS_INSERTION_REPLACEMENT_CONTROL_V 0x00000007
 #define EMAC_SOURCE_ADDRESS_INSERTION_REPLACEMENT_CONTROL_S 28
 #define EMAC_AS_SUPPORT_2K_PACKETS (BIT(27))
+#define EMAC_AS_SUPPORT_2K_PACKETS_M (BIT(27))
+#define EMAC_AS_SUPPORT_2K_PACKETS_V 1
 #define EMAC_AS_SUPPORT_2K_PACKETS_S 27
 #define EMAC_SMII_FORCE_TRANSMIT_ERROR (BIT(26))
+#define EMAC_SMII_FORCE_TRANSMIT_ERROR_M (BIT(26))
+#define EMAC_SMII_FORCE_TRANSMIT_ERROR_V 1
 #define EMAC_SMII_FORCE_TRANSMIT_ERROR_S 26
 #define EMAC_CRC_STRIPPING_TYPE_FRAMES (BIT(25))
+#define EMAC_CRC_STRIPPING_TYPE_FRAMES_M (BIT(25))
+#define EMAC_CRC_STRIPPING_TYPE_FRAMES_V 1
 #define EMAC_CRC_STRIPPING_TYPE_FRAMES_S 25
 #define EMAC_TRANSMIT_CONFIGURATION (BIT(24))
+#define EMAC_TRANSMIT_CONFIGURATION_M (BIT(24))
+#define EMAC_TRANSMIT_CONFIGURATION_V 1
 #define EMAC_TRANSMIT_CONFIGURATION_S 24
 #define EMAC_GMACWATCHDOG (BIT(23))
+#define EMAC_GMACWATCHDOG_M (BIT(23))
+#define EMAC_GMACWATCHDOG_V 1
 #define EMAC_GMACWATCHDOG_S 23
 #define EMAC_GMACJABBER (BIT(22))
+#define EMAC_GMACJABBER_M (BIT(22))
+#define EMAC_GMACJABBER_V 1
 #define EMAC_GMACJABBER_S 22
 #define EMAC_GMACFRAMEBURST (BIT(21))
+#define EMAC_GMACFRAMEBURST_M (BIT(21))
+#define EMAC_GMACFRAMEBURST_V 1
 #define EMAC_GMACFRAMEBURST_S 21
 #define EMAC_GMACJUMBOFRAME (BIT(20))
+#define EMAC_GMACJUMBOFRAME_M (BIT(20))
+#define EMAC_GMACJUMBOFRAME_V 1
 #define EMAC_GMACJUMBOFRAME_S 20
 #define EMAC_GMACINTERFRAMEGAP 0x00000007
+#define EMAC_GMACINTERFRAMEGAP_M (EMAC_GMACINTERFRAMEGAP_V << EMAC_GMACINTERFRAMEGAP_S)
+#define EMAC_GMACINTERFRAMEGAP_V 0x00000007
 #define EMAC_GMACINTERFRAMEGAP_S 17
 #define EMAC_GMACDISABLECRS (BIT(16))
+#define EMAC_GMACDISABLECRS_M (BIT(16))
+#define EMAC_GMACDISABLECRS_V 1
 #define EMAC_GMACDISABLECRS_S 16
 #define EMAC_GMACMIIGMII (BIT(15))
+#define EMAC_GMACMIIGMII_M (BIT(15))
+#define EMAC_GMACMIIGMII_V 1
 #define EMAC_GMACMIIGMII_S 15
 #define EMAC_GMACFESPEED (BIT(14))
+#define EMAC_GMACFESPEED_M (BIT(14))
+#define EMAC_GMACFESPEED_V 1
 #define EMAC_GMACFESPEED_S 14
 #define EMAC_GMACRXOWN (BIT(13))
+#define EMAC_GMACRXOWN_M (BIT(13))
+#define EMAC_GMACRXOWN_V 1
 #define EMAC_GMACRXOWN_S 13
 #define EMAC_GMACLOOPBACK (BIT(12))
+#define EMAC_GMACLOOPBACK_M (BIT(12))
+#define EMAC_GMACLOOPBACK_V 1
 #define EMAC_GMACLOOPBACK_S 12
 #define EMAC_GMACDUPLEX (BIT(11))
+#define EMAC_GMACDUPLEX_M (BIT(11))
+#define EMAC_GMACDUPLEX_V 1
 #define EMAC_GMACDUPLEX_S 11
 #define EMAC_GMACRXIPCOFFLOAD (BIT(10))
+#define EMAC_GMACRXIPCOFFLOAD_M (BIT(10))
+#define EMAC_GMACRXIPCOFFLOAD_V 1
 #define EMAC_GMACRXIPCOFFLOAD_S 10
 #define EMAC_GMACRETRY (BIT(9))
+#define EMAC_GMACRETRY_M (BIT(9))
+#define EMAC_GMACRETRY_V 1
 #define EMAC_GMACRETRY_S 9
 #define EMAC_GMACLINK (BIT(8))
+#define EMAC_GMACLINK_M (BIT(8))
+#define EMAC_GMACLINK_V 1
 #define EMAC_GMACLINK_S 8
 #define EMAC_GMACPADCRCSTRIP (BIT(7))
+#define EMAC_GMACPADCRCSTRIP_M (BIT(7))
+#define EMAC_GMACPADCRCSTRIP_V 1
 #define EMAC_GMACPADCRCSTRIP_S 7
 #define EMAC_GMACBACKOFFLIMIT 0x00000003
+#define EMAC_GMACBACKOFFLIMIT_M (EMAC_GMACBACKOFFLIMIT_V << EMAC_GMACBACKOFFLIMIT_S)
+#define EMAC_GMACBACKOFFLIMIT_V 0x00000003
 #define EMAC_GMACBACKOFFLIMIT_S 5
 #define EMAC_GMACDEFERRALCHECK (BIT(4))
+#define EMAC_GMACDEFERRALCHECK_M (BIT(4))
+#define EMAC_GMACDEFERRALCHECK_V 1
 #define EMAC_GMACDEFERRALCHECK_S 4
 #define EMAC_GMACTX (BIT(3))
+#define EMAC_GMACTX_M (BIT(3))
+#define EMAC_GMACTX_V 1
 #define EMAC_GMACTX_S 3
 #define EMAC_GMACRX (BIT(2))
+#define EMAC_GMACRX_M (BIT(2))
+#define EMAC_GMACRX_V 1
 #define EMAC_GMACRX_S 2
 #define EMAC_PREAMBLE_LENGTH_TRANSMIT_FRAMES 0x00000003
+#define EMAC_PREAMBLE_LENGTH_TRANSMIT_FRAMES_M (EMAC_PREAMBLE_LENGTH_TRANSMIT_FRAMES_V << EMAC_PREAMBLE_LENGTH_TRANSMIT_FRAMES_S)
+#define EMAC_PREAMBLE_LENGTH_TRANSMIT_FRAMES_V 0x00000003
 #define EMAC_PREAMBLE_LENGTH_TRANSMIT_FRAMES_S 0
 
 #define EMAC_GMACFRAMEFILTER_REG (REG_EMAC_BASE + 0x1004)
 #define EMAC_RECEIVEALL (BIT(31))
+#define EMAC_RECEIVEALL_M (BIT(31))
+#define EMAC_RECEIVEALL_V 1
 #define EMAC_RECEIVEALL_S 31
 #define EMAC_DROP_NON_TCP_UDP_IP_FRAMES (BIT(21))
+#define EMAC_DROP_NON_TCP_UDP_IP_FRAMES_M (BIT(21))
+#define EMAC_DROP_NON_TCP_UDP_IP_FRAMES_V 1
 #define EMAC_DROP_NON_TCP_UDP_IP_FRAMES_S 21
 #define EMAC_LAYER_3_AND_LAYER_4_FILTER_ENABLE (BIT(20))
+#define EMAC_LAYER_3_AND_LAYER_4_FILTER_ENABLE_M (BIT(20))
+#define EMAC_LAYER_3_AND_LAYER_4_FILTER_ENABLE_V 1
 #define EMAC_LAYER_3_AND_LAYER_4_FILTER_ENABLE_S 20
 #define EMAC_VLAN_TAG_FILTER_ENABLE (BIT(16))
+#define EMAC_VLAN_TAG_FILTER_ENABLE_M (BIT(16))
+#define EMAC_VLAN_TAG_FILTER_ENABLE_V 1
 #define EMAC_VLAN_TAG_FILTER_ENABLE_S 16
 #define EMAC_HASH_OR_PERFECT_FILTE (BIT(10))
+#define EMAC_HASH_OR_PERFECT_FILTE_M (BIT(10))
+#define EMAC_HASH_OR_PERFECT_FILTE_V 1
 #define EMAC_HASH_OR_PERFECT_FILTE_S 10
 #define EMAC_SOURCE_ADDRESS_FILTER_ENABLE (BIT(9))
+#define EMAC_SOURCE_ADDRESS_FILTER_ENABLE_M (BIT(9))
+#define EMAC_SOURCE_ADDRESS_FILTER_ENABLE_V 1
 #define EMAC_SOURCE_ADDRESS_FILTER_ENABLE_S 9
 #define EMAC_SA_INVERSE_FILTERING (BIT(8))
+#define EMAC_SA_INVERSE_FILTERING_M (BIT(8))
+#define EMAC_SA_INVERSE_FILTERING_V 1
 #define EMAC_SA_INVERSE_FILTERING_S 8
 #define EMAC_PASS_CONTROL_FRAMES 0x00000003
+#define EMAC_PASS_CONTROL_FRAMES_M (EMAC_PASS_CONTROL_FRAMES_V << EMAC_PASS_CONTROL_FRAMES_S)
+#define EMAC_PASS_CONTROL_FRAMES_V 0x00000003
 #define EMAC_PASS_CONTROL_FRAMES_S 6
 #define EMAC_DISABLE_BROADCAST_FRAMES (BIT(5))
+#define EMAC_DISABLE_BROADCAST_FRAMES_M (BIT(5))
+#define EMAC_DISABLE_BROADCAST_FRAMES_V 1
 #define EMAC_DISABLE_BROADCAST_FRAMES_S 5
 #define EMAC_PASS_ALL_MULTICAST (BIT(4))
+#define EMAC_PASS_ALL_MULTICAST_M (BIT(4))
+#define EMAC_PASS_ALL_MULTICAST_V 1
 #define EMAC_PASS_ALL_MULTICAST_S 4
 #define EMAC_DA_INVERSE_FILTERING (BIT(3))
+#define EMAC_DA_INVERSE_FILTERING_M (BIT(3))
+#define EMAC_DA_INVERSE_FILTERING_V 1
 #define EMAC_DA_INVERSE_FILTERING_S 3
 #define EMAC_HASH_MULTICAST (BIT(2))
+#define EMAC_HASH_MULTICAST_M (BIT(2))
+#define EMAC_HASH_MULTICAST_V 1
 #define EMAC_HASH_MULTICAST_S 2
 #define EMAC_HASH_UNICAST (BIT(1))
+#define EMAC_HASH_UNICAST_M (BIT(1))
+#define EMAC_HASH_UNICAST_V 1
 #define EMAC_HASH_UNICAST_S 1
 #define EMAC_PROMISCUOUS_MODE (BIT(0))
+#define EMAC_PROMISCUOUS_MODE_M (BIT(0))
+#define EMAC_PROMISCUOUS_MODE_V 1
 #define EMAC_PROMISCUOUS_MODE_S 0
 
 #define EMAC_GMACHASHHIGH_REG (REG_EMAC_BASE + 0x1008)
 #define EMAC_HASH_TABLE_HIGH 0xFFFFFFFF
+#define EMAC_HASH_TABLE_HIGH_M (EMAC_HASH_TABLE_HIGH_V << EMAC_HASH_TABLE_HIGH_S)
+#define EMAC_HASH_TABLE_HIGH_V 0xFFFFFFFF
 #define EMAC_HASH_TABLE_HIGH_S 0
 
 #define EMAC_GMACHASHLOW_REG (REG_EMAC_BASE + 0x100C)
 #define EMAC_HASH_TABLE_LOW 0xFFFFFFFF
+#define EMAC_HASH_TABLE_LOW_M (EMAC_HASH_TABLE_LOW_V << EMAC_HASH_TABLE_LOW_S)
+#define EMAC_HASH_TABLE_LOW_V 0xFFFFFFFF
 #define EMAC_HASH_TABLE_LOW_S 0
 
 #define EMAC_GMACGMIIADDR_REG (REG_EMAC_BASE + 0x1010)
 #define EMAC_GMIIDEV 0x0000001F
+#define EMAC_GMIIDEV_M (EMAC_GMIIDEV_V << EMAC_GMIIDEV_S)
+#define EMAC_GMIIDEV_V 0x0000001F
 #define EMAC_GMIIDEV_S 11
 #define EMAC_GMIIREG 0x0000001F
+#define EMAC_GMIIREG_M (EMAC_GMIIREG_V << EMAC_GMIIREG_S)
+#define EMAC_GMIIREG_V 0x0000001F
 #define EMAC_GMIIREG_S 6
 #define EMAC_GMIICSRCLK 0x0000000F
+#define EMAC_GMIICSRCLK_M (EMAC_GMIICSRCLK_V << EMAC_GMIICSRCLK_S)
+#define EMAC_GMIICSRCLK_V 0x0000000F
 #define EMAC_GMIICSRCLK_S 2
 #define EMAC_GMIIWRITE (BIT(1))
+#define EMAC_GMIIWRITE_M (BIT(1))
+#define EMAC_GMIIWRITE_V 1
 #define EMAC_GMIIWRITE_S 1
 #define EMAC_GMIIBUSY (BIT(0))
+#define EMAC_GMIIBUSY_M (BIT(0))
+#define EMAC_GMIIBUSY_V 1
 #define EMAC_GMIIBUSY_S 0
 
 #define EMAC_GMACGMIIDATA_REG (REG_EMAC_BASE + 0x1014)
 #define EMAC_GMII_DATA 0x0000FFFF
+#define EMAC_GMII_DATA_M (EMAC_GMII_DATA_V << EMAC_GMII_DATA_S)
+#define EMAC_GMII_DATA_V 0x0000FFFF
 #define EMAC_GMII_DATA_S 0
 
 #define EMAC_GMACFLOWCONTROL_REG (REG_EMAC_BASE + 0x1018)
 #define EMAC_PAUSE_TIME 0x0000FFFF
+#define EMAC_PAUSE_TIME_M (EMAC_PAUSE_TIME_V << EMAC_PAUSE_TIME_S)
+#define EMAC_PAUSE_TIME_V 0x0000FFFF
 #define EMAC_PAUSE_TIME_S 16
 #define EMAC_DISABLE_ZERO_QUANTA_PAUSE (BIT(7))
+#define EMAC_DISABLE_ZERO_QUANTA_PAUSE_M (BIT(7))
+#define EMAC_DISABLE_ZERO_QUANTA_PAUSE_V 1
 #define EMAC_DISABLE_ZERO_QUANTA_PAUSE_S 7
 #define EMAC_PAUSE_LOW_THRESHOLD 0x00000003
+#define EMAC_PAUSE_LOW_THRESHOLD_M (EMAC_PAUSE_LOW_THRESHOLD_V << EMAC_PAUSE_LOW_THRESHOLD_S)
+#define EMAC_PAUSE_LOW_THRESHOLD_V 0x00000003
 #define EMAC_PAUSE_LOW_THRESHOLD_S 4
 #define EMAC_UNICAST_PAUSE_FRAME_DETECT (BIT(3))
+#define EMAC_UNICAST_PAUSE_FRAME_DETECT_M (BIT(3))
+#define EMAC_UNICAST_PAUSE_FRAME_DETECT_V 1
 #define EMAC_UNICAST_PAUSE_FRAME_DETECT_S 3
 #define EMAC_RECEIVE_FLOW_CONTROL_ENABLE (BIT(2))
+#define EMAC_RECEIVE_FLOW_CONTROL_ENABLE_M (BIT(2))
+#define EMAC_RECEIVE_FLOW_CONTROL_ENABLE_V 1
 #define EMAC_RECEIVE_FLOW_CONTROL_ENABLE_S 2
 #define EMAC_TRANSMIT_FLOW_CONTROL_ENABLE (BIT(1))
+#define EMAC_TRANSMIT_FLOW_CONTROL_ENABLE_M (BIT(1))
+#define EMAC_TRANSMIT_FLOW_CONTROL_ENABLE_V 1
 #define EMAC_TRANSMIT_FLOW_CONTROL_ENABLE_S 1
 #define EMAC_FLOW_CONTROL_BUSY_BACKPRESSURE_ACTIVATE (BIT(0))
+#define EMAC_FLOW_CONTROL_BUSY_BACKPRESSURE_ACTIVATE_M (BIT(0))
+#define EMAC_FLOW_CONTROL_BUSY_BACKPRESSURE_ACTIVATE_V 1
 #define EMAC_FLOW_CONTROL_BUSY_BACKPRESSURE_ACTIVATE_S 0
 
 #define EMAC_GMACVLAN_REG (REG_EMAC_BASE + 0x101C)
 #define EMAC_VLAN_TAG_HASH_TABLE_MATCH_ENABLE (BIT(19))
+#define EMAC_VLAN_TAG_HASH_TABLE_MATCH_ENABLE_M (BIT(19))
+#define EMAC_VLAN_TAG_HASH_TABLE_MATCH_ENABLE_V 1
 #define EMAC_VLAN_TAG_HASH_TABLE_MATCH_ENABLE_S 19
 #define EMAC_ENABLE_S_VLAN (BIT(18))
+#define EMAC_ENABLE_S_VLAN_M (BIT(18))
+#define EMAC_ENABLE_S_VLAN_V 1
 #define EMAC_ENABLE_S_VLAN_S 18
 #define EMAC_VLAN_TAG_INVERSE_MATCH_ENABLE (BIT(17))
+#define EMAC_VLAN_TAG_INVERSE_MATCH_ENABLE_M (BIT(17))
+#define EMAC_VLAN_TAG_INVERSE_MATCH_ENABLE_V 1
 #define EMAC_VLAN_TAG_INVERSE_MATCH_ENABLE_S 17
 #define EMAC_ENABLE_VLAN_TAG_COMPARISON (BIT(16))
+#define EMAC_ENABLE_VLAN_TAG_COMPARISON_M (BIT(16))
+#define EMAC_ENABLE_VLAN_TAG_COMPARISON_V 1
 #define EMAC_ENABLE_VLAN_TAG_COMPARISON_S 16
 #define EMAC_VLAN_TAG_IDENTIFIER_RECEIVE_FRAMES 0x0000FFFF
+#define EMAC_VLAN_TAG_IDENTIFIER_RECEIVE_FRAMES_M (EMAC_VLAN_TAG_IDENTIFIER_RECEIVE_FRAMES_V << EMAC_VLAN_TAG_IDENTIFIER_RECEIVE_FRAMES_S)
+#define EMAC_VLAN_TAG_IDENTIFIER_RECEIVE_FRAMES_V 0x0000FFFF
 #define EMAC_VLAN_TAG_IDENTIFIER_RECEIVE_FRAMES_S 0
 
 #define EMAC_GMACVERSION_REG (REG_EMAC_BASE + 0x1020)
 #define EMAC_USERVER 0x000000FF
+#define EMAC_USERVER_M (EMAC_USERVER_V << EMAC_USERVER_S)
+#define EMAC_USERVER_V 0x000000FF
 #define EMAC_USERVER_S 8
 #define EMAC_SNPSVER 0x000000FF
+#define EMAC_SNPSVER_M (EMAC_SNPSVER_V << EMAC_SNPSVER_S)
+#define EMAC_SNPSVER_V 0x000000FF
 #define EMAC_SNPSVER_S 0
 
 #define EMAC_GMACDEBUG_REG (REG_EMAC_BASE + 0x1024)
 #define EMAC_MTL_TXSTATUS_FIFO_FULL_STATUS (BIT(25))
+#define EMAC_MTL_TXSTATUS_FIFO_FULL_STATUS_M (BIT(25))
+#define EMAC_MTL_TXSTATUS_FIFO_FULL_STATUS_V 1
 #define EMAC_MTL_TXSTATUS_FIFO_FULL_STATUS_S 25
 #define EMAC_MTL_TX_FIFO_NOT_EMPTY_STATUS (BIT(24))
+#define EMAC_MTL_TX_FIFO_NOT_EMPTY_STATUS_M (BIT(24))
+#define EMAC_MTL_TX_FIFO_NOT_EMPTY_STATUS_V 1
 #define EMAC_MTL_TX_FIFO_NOT_EMPTY_STATUS_S 24
 #define EMAC_MTL_TX_FIFO_WRITE_CONTROLLER_STATUS (BIT(22))
+#define EMAC_MTL_TX_FIFO_WRITE_CONTROLLER_STATUS_M (BIT(22))
+#define EMAC_MTL_TX_FIFO_WRITE_CONTROLLER_STATUS_V 1
 #define EMAC_MTL_TX_FIFO_WRITE_CONTROLLER_STATUS_S 22
 #define EMAC_MTL_TX_FIFO_READ_CONTROLLER_STATUS 0x00000003
+#define EMAC_MTL_TX_FIFO_READ_CONTROLLER_STATUS_M (EMAC_MTL_TX_FIFO_READ_CONTROLLER_STATUS_V << EMAC_MTL_TX_FIFO_READ_CONTROLLER_STATUS_S)
+#define EMAC_MTL_TX_FIFO_READ_CONTROLLER_STATUS_V 0x00000003
 #define EMAC_MTL_TX_FIFO_READ_CONTROLLER_STATUS_S 20
 #define EMAC_MAC_TRANSMITTER_PAUSE (BIT(19))
+#define EMAC_MAC_TRANSMITTER_PAUSE_M (BIT(19))
+#define EMAC_MAC_TRANSMITTER_PAUSE_V 1
 #define EMAC_MAC_TRANSMITTER_PAUSE_S 19
 #define EMAC_MAC_TRANSMIT_FRAME_CONTROLLER_STATUS 0x00000003
+#define EMAC_MAC_TRANSMIT_FRAME_CONTROLLER_STATUS_M (EMAC_MAC_TRANSMIT_FRAME_CONTROLLER_STATUS_V << EMAC_MAC_TRANSMIT_FRAME_CONTROLLER_STATUS_S)
+#define EMAC_MAC_TRANSMIT_FRAME_CONTROLLER_STATUS_V 0x00000003
 #define EMAC_MAC_TRANSMIT_FRAME_CONTROLLER_STATUS_S 17
 #define EMAC_MAC_TRANSMIT_PROTOCOL_ENGINE_STATUS (BIT(16))
+#define EMAC_MAC_TRANSMIT_PROTOCOL_ENGINE_STATUS_M (BIT(16))
+#define EMAC_MAC_TRANSMIT_PROTOCOL_ENGINE_STATUS_V 1
 #define EMAC_MAC_TRANSMIT_PROTOCOL_ENGINE_STATUS_S 16
 #define EMAC_MTL_RXFIFO_FILL_LEVEL_STATUS 0x00000003
+#define EMAC_MTL_RXFIFO_FILL_LEVEL_STATUS_M (EMAC_MTL_RXFIFO_FILL_LEVEL_STATUS_V << EMAC_MTL_RXFIFO_FILL_LEVEL_STATUS_S)
+#define EMAC_MTL_RXFIFO_FILL_LEVEL_STATUS_V 0x00000003
 #define EMAC_MTL_RXFIFO_FILL_LEVEL_STATUS_S 8
 #define EMAC_MTL_RXFIFO_READ_CONTROLLER_STATE 0x00000003
+#define EMAC_MTL_RXFIFO_READ_CONTROLLER_STATE_M (EMAC_MTL_RXFIFO_READ_CONTROLLER_STATE_V << EMAC_MTL_RXFIFO_READ_CONTROLLER_STATE_S)
+#define EMAC_MTL_RXFIFO_READ_CONTROLLER_STATE_V 0x00000003
 #define EMAC_MTL_RXFIFO_READ_CONTROLLER_STATE_S 5
 #define EMAC_MTL_RX_FIFO_WRITE_CONTROLLER_ACTIVE_STATUS (BIT(4))
+#define EMAC_MTL_RX_FIFO_WRITE_CONTROLLER_ACTIVE_STATUS_M (BIT(4))
+#define EMAC_MTL_RX_FIFO_WRITE_CONTROLLER_ACTIVE_STATUS_V 1
 #define EMAC_MTL_RX_FIFO_WRITE_CONTROLLER_ACTIVE_STATUS_S 4
 #define EMAC_MAC_RECEIVE_FRAME_FIFO_CONTROLLER_STATUS 0x00000003
+#define EMAC_MAC_RECEIVE_FRAME_FIFO_CONTROLLER_STATUS_M (EMAC_MAC_RECEIVE_FRAME_FIFO_CONTROLLER_STATUS_V << EMAC_MAC_RECEIVE_FRAME_FIFO_CONTROLLER_STATUS_S)
+#define EMAC_MAC_RECEIVE_FRAME_FIFO_CONTROLLER_STATUS_V 0x00000003
 #define EMAC_MAC_RECEIVE_FRAME_FIFO_CONTROLLER_STATUS_S 1
 #define EMAC_MAC_RECEIVE_PROTOCOL_ENGINE_STATUS (BIT(0))
+#define EMAC_MAC_RECEIVE_PROTOCOL_ENGINE_STATUS_M (BIT(0))
+#define EMAC_MAC_RECEIVE_PROTOCOL_ENGINE_STATUS_V 1
 #define EMAC_MAC_RECEIVE_PROTOCOL_ENGINE_STATUS_S 0
 
 #define EMAC_GMACLPITIMERSCONTROL_REG (REG_EMAC_BASE + 0x1034)
 #define EMAC_LPI_LS_TIMER 0x000003FF
+#define EMAC_LPI_LS_TIMER_M (EMAC_LPI_LS_TIMER_V << EMAC_LPI_LS_TIMER_S)
+#define EMAC_LPI_LS_TIMER_V 0x000003FF
 #define EMAC_LPI_LS_TIMER_S 16
 #define EMAC_LPI_TW_TIMER 0x0000FFFF
+#define EMAC_LPI_TW_TIMER_M (EMAC_LPI_TW_TIMER_V << EMAC_LPI_TW_TIMER_S)
+#define EMAC_LPI_TW_TIMER_V 0x0000FFFF
 #define EMAC_LPI_TW_TIMER_S 0
 
 #define EMAC_GMACINTERRUPTSTATUS_REG (REG_EMAC_BASE + 0x1038)
 #define EMAC_GPI_INTERRUPT_STATUS (BIT(11))
+#define EMAC_GPI_INTERRUPT_STATUS_M (BIT(11))
+#define EMAC_GPI_INTERRUPT_STATUS_V 1
 #define EMAC_GPI_INTERRUPT_STATUS_S 11
 #define EMAC_LPI_INTERRUPT_STATUS (BIT(10))
+#define EMAC_LPI_INTERRUPT_STATUS_M (BIT(10))
+#define EMAC_LPI_INTERRUPT_STATUS_V 1
 #define EMAC_LPI_INTERRUPT_STATUS_S 10
 #define EMAC_TIMESTAMP_INTERRUP_STATUS (BIT(9))
+#define EMAC_TIMESTAMP_INTERRUP_STATUS_M (BIT(9))
+#define EMAC_TIMESTAMP_INTERRUP_STATUS_V 1
 #define EMAC_TIMESTAMP_INTERRUP_STATUS_S 9
 #define EMAC_MMC_RECEIVE_CHECKSUM_OFFLOAD_INTERRUPT_STATUS (BIT(7))
+#define EMAC_MMC_RECEIVE_CHECKSUM_OFFLOAD_INTERRUPT_STATUS_M (BIT(7))
+#define EMAC_MMC_RECEIVE_CHECKSUM_OFFLOAD_INTERRUPT_STATUS_V 1
 #define EMAC_MMC_RECEIVE_CHECKSUM_OFFLOAD_INTERRUPT_STATUS_S 7
 #define EMAC_MMC_TRANSMIT_INTERRUPT_STATUS (BIT(6))
+#define EMAC_MMC_TRANSMIT_INTERRUPT_STATUS_M (BIT(6))
+#define EMAC_MMC_TRANSMIT_INTERRUPT_STATUS_V 1
 #define EMAC_MMC_TRANSMIT_INTERRUPT_STATUS_S 6
 #define EMAC_MMC_RECEIVE_INTERRUPT_STATUS (BIT(5))
+#define EMAC_MMC_RECEIVE_INTERRUPT_STATUS_M (BIT(5))
+#define EMAC_MMC_RECEIVE_INTERRUPT_STATUS_V 1
 #define EMAC_MMC_RECEIVE_INTERRUPT_STATUS_S 5
 #define EMAC_MMC_INTERRUPT_STATUS (BIT(4))
+#define EMAC_MMC_INTERRUPT_STATUS_M (BIT(4))
+#define EMAC_MMC_INTERRUPT_STATUS_V 1
 #define EMAC_MMC_INTERRUPT_STATUS_S 4
 #define EMAC_PMT_INTERRUPT_STATUS (BIT(3))
+#define EMAC_PMT_INTERRUPT_STATUS_M (BIT(3))
+#define EMAC_PMT_INTERRUPT_STATUS_V 1
 #define EMAC_PMT_INTERRUPT_STATUS_S 3
 #define EMAC_PCS_AUTO_NEGOTIATION_COMPLETE (BIT(2))
+#define EMAC_PCS_AUTO_NEGOTIATION_COMPLETE_M (BIT(2))
+#define EMAC_PCS_AUTO_NEGOTIATION_COMPLETE_V 1
 #define EMAC_PCS_AUTO_NEGOTIATION_COMPLETE_S 2
 #define EMAC_PCS_LINK_STATUS_CHANGED (BIT(1))
+#define EMAC_PCS_LINK_STATUS_CHANGED_M (BIT(1))
+#define EMAC_PCS_LINK_STATUS_CHANGED_V 1
 #define EMAC_PCS_LINK_STATUS_CHANGED_S 1
 #define EMAC_INTERRUPT_STATUS (BIT(0))
+#define EMAC_INTERRUPT_STATUS_M (BIT(0))
+#define EMAC_INTERRUPT_STATUS_V 1
 #define EMAC_INTERRUPT_STATUS_S 0
 
 #define EMAC_GMACINTERRUPTMASK_REG (REG_EMAC_BASE + 0x103C)
 #define EMAC_LPI_INTERRUPT_MASK (BIT(10))
+#define EMAC_LPI_INTERRUPT_MASK_M (BIT(10))
+#define EMAC_LPI_INTERRUPT_MASK_V 1
 #define EMAC_LPI_INTERRUPT_MASK_S 10
 #define EMAC_TIMESTAMP_INTERRUPT_MASK (BIT(9))
+#define EMAC_TIMESTAMP_INTERRUPT_MASK_M (BIT(9))
+#define EMAC_TIMESTAMP_INTERRUPT_MASK_V 1
 #define EMAC_TIMESTAMP_INTERRUPT_MASK_S 9
 #define EMAC_PMT_INTERRUPT_MASK (BIT(3))
+#define EMAC_PMT_INTERRUPT_MASK_M (BIT(3))
+#define EMAC_PMT_INTERRUPT_MASK_V 1
 #define EMAC_PMT_INTERRUPT_MASK_S 3
 #define EMAC_PCS_AN_COMPLETION_INTERRUPT_MASK (BIT(2))
+#define EMAC_PCS_AN_COMPLETION_INTERRUPT_MASK_M (BIT(2))
+#define EMAC_PCS_AN_COMPLETION_INTERRUPT_MASK_V 1
 #define EMAC_PCS_AN_COMPLETION_INTERRUPT_MASK_S 2
 #define EMAC_PCS_LINK_STATUS_INTERRUPT_MASK (BIT(1))
+#define EMAC_PCS_LINK_STATUS_INTERRUPT_MASK_M (BIT(1))
+#define EMAC_PCS_LINK_STATUS_INTERRUPT_MASK_V 1
 #define EMAC_PCS_LINK_STATUS_INTERRUPT_MASK_S 1
 #define EMAC_INTERRUPT_MASK (BIT(0))
+#define EMAC_INTERRUPT_MASK_M (BIT(0))
+#define EMAC_INTERRUPT_MASK_V 1
 #define EMAC_INTERRUPT_MASK_S 0
 
 #define EMAC_GMACADDR0HIGH_REG (REG_EMAC_BASE + 0x1040)
 #define EMAC_ADDRESS_ENABLE0 (BIT(31))
+#define EMAC_ADDRESS_ENABLE0_M (BIT(31))
+#define EMAC_ADDRESS_ENABLE0_V 1
 #define EMAC_ADDRESS_ENABLE0_S 31
 #define EMAC_MAC_ADDRESS0_HI 0x0000FFFF
+#define EMAC_MAC_ADDRESS0_HI_M (EMAC_MAC_ADDRESS0_HI_V << EMAC_MAC_ADDRESS0_HI_S)
+#define EMAC_MAC_ADDRESS0_HI_V 0x0000FFFF
 #define EMAC_MAC_ADDRESS0_HI_S 0
 
 #define EMAC_GMACADDR0LOW_REG (REG_EMAC_BASE + 0x1044)
 #define EMAC_MAC_ADDRESS0_LOW 0xFFFFFFFF
+#define EMAC_MAC_ADDRESS0_LOW_M (EMAC_MAC_ADDRESS0_LOW_V << EMAC_MAC_ADDRESS0_LOW_S)
+#define EMAC_MAC_ADDRESS0_LOW_V 0xFFFFFFFF
 #define EMAC_MAC_ADDRESS0_LOW_S 0
 
 #define EMAC_GMACADDR1HIGH_REG (REG_EMAC_BASE + 0x1048)
 #define EMAC_ADDRESS_ENABLE1 (BIT(31))
+#define EMAC_ADDRESS_ENABLE1_M (BIT(31))
+#define EMAC_ADDRESS_ENABLE1_V 1
 #define EMAC_ADDRESS_ENABLE1_S 31
 #define EMAC_SOURCE_ADDRESS (BIT(30))
+#define EMAC_SOURCE_ADDRESS_M (BIT(30))
+#define EMAC_SOURCE_ADDRESS_V 1
 #define EMAC_SOURCE_ADDRESS_S 30
 #define EMAC_MASK_BYTE_CONTROL 0x0000003F
+#define EMAC_MASK_BYTE_CONTROL_M (EMAC_MASK_BYTE_CONTROL_V << EMAC_MASK_BYTE_CONTROL_S)
+#define EMAC_MASK_BYTE_CONTROL_V 0x0000003F
 #define EMAC_MASK_BYTE_CONTROL_S 24
 #define EMAC_MAC_ADDRESS1_HI 0x0000FFFF
+#define EMAC_MAC_ADDRESS1_HI_M (EMAC_MAC_ADDRESS1_HI_V << EMAC_MAC_ADDRESS1_HI_S)
+#define EMAC_MAC_ADDRESS1_HI_V 0x0000FFFF
 #define EMAC_MAC_ADDRESS1_HI_S 0
 
 #define EMAC_GMACADDR1LOW_REG (REG_EMAC_BASE + 0x104C)
 #define EMAC_MAC_ADDRESS1_LOW 0xFFFFFFFF
+#define EMAC_MAC_ADDRESS1_LOW_M (EMAC_MAC_ADDRESS1_LOW_V << EMAC_MAC_ADDRESS1_LOW_S)
+#define EMAC_MAC_ADDRESS1_LOW_V 0xFFFFFFFF
 #define EMAC_MAC_ADDRESS1_LOW_S 0
 
 #define EMAC_GMAC_AN_CONTROL_REG (REG_EMAC_BASE + 0x10C0)
 #define EMAC_SGMII_RAL_CONTROL (BIT(18))
+#define EMAC_SGMII_RAL_CONTROL_M (BIT(18))
+#define EMAC_SGMII_RAL_CONTROL_V 1
 #define EMAC_SGMII_RAL_CONTROL_S 18
 #define EMAC_LOCK_REFERENCE (BIT(17))
+#define EMAC_LOCK_REFERENCE_M (BIT(17))
+#define EMAC_LOCK_REFERENCE_V 1
 #define EMAC_LOCK_REFERENCE_S 17
 #define EMAC_ENABLE_COMMA_DETECT (BIT(16))
+#define EMAC_ENABLE_COMMA_DETECT_M (BIT(16))
+#define EMAC_ENABLE_COMMA_DETECT_V 1
 #define EMAC_ENABLE_COMMA_DETECT_S 16
 #define EMAC_EXTERNAL_LOOPBACK_ENABLE (BIT(14))
+#define EMAC_EXTERNAL_LOOPBACK_ENABLE_M (BIT(14))
+#define EMAC_EXTERNAL_LOOPBACK_ENABLE_V 1
 #define EMAC_EXTERNAL_LOOPBACK_ENABLE_S 14
 #define EMAC_AUTO_NEGOTIATION_ENABLE (BIT(12))
+#define EMAC_AUTO_NEGOTIATION_ENABLE_M (BIT(12))
+#define EMAC_AUTO_NEGOTIATION_ENABLE_V 1
 #define EMAC_AUTO_NEGOTIATION_ENABLE_S 12
 #define EMAC_RESTART_AUTO_NEGOTIATION (BIT(9))
+#define EMAC_RESTART_AUTO_NEGOTIATION_M (BIT(9))
+#define EMAC_RESTART_AUTO_NEGOTIATION_V 1
 #define EMAC_RESTART_AUTO_NEGOTIATION_S 9
 
 #define EMAC_GMAC_AN_STATUS_REG (REG_EMAC_BASE + 0x10C4)
 #define EMAC_EXTENDED_STATUS (BIT(8))
+#define EMAC_EXTENDED_STATUS_M (BIT(8))
+#define EMAC_EXTENDED_STATUS_V 1
 #define EMAC_EXTENDED_STATUS_S 8
 #define EMAC_AUTO_NEGOTIATION_COMPLETE (BIT(5))
+#define EMAC_AUTO_NEGOTIATION_COMPLETE_M (BIT(5))
+#define EMAC_AUTO_NEGOTIATION_COMPLETE_V 1
 #define EMAC_AUTO_NEGOTIATION_COMPLETE_S 5
 #define EMAC_AUTO_NEGOTIATION_ABILITY (BIT(3))
+#define EMAC_AUTO_NEGOTIATION_ABILITY_M (BIT(3))
+#define EMAC_AUTO_NEGOTIATION_ABILITY_V 1
 #define EMAC_AUTO_NEGOTIATION_ABILITY_S 3
 #define EMAC_LINK_AN_STATUS (BIT(2))
+#define EMAC_LINK_AN_STATUS_M (BIT(2))
+#define EMAC_LINK_AN_STATUS_V 1
 #define EMAC_LINK_AN_STATUS_S 2
 
 #define EMAC_GMAC_AUTO_NEGOTIATION_ADVERTISEMENT_REG (REG_EMAC_BASE + 0x10C8)
 #define EMAC_ADV_NEXT_PAGE_SUPPORT (BIT(15))
+#define EMAC_ADV_NEXT_PAGE_SUPPORT_M (BIT(15))
+#define EMAC_ADV_NEXT_PAGE_SUPPORT_V 1
 #define EMAC_ADV_NEXT_PAGE_SUPPORT_S 15
 #define EMAC_ADV_REMOTE_FAULT_ENCODING 0x00000003
+#define EMAC_ADV_REMOTE_FAULT_ENCODING_M (EMAC_ADV_REMOTE_FAULT_ENCODING_V << EMAC_ADV_REMOTE_FAULT_ENCODING_S)
+#define EMAC_ADV_REMOTE_FAULT_ENCODING_V 0x00000003
 #define EMAC_ADV_REMOTE_FAULT_ENCODING_S 12
 #define EMAC_ADV_PAUSE_ENCODING 0x00000003
+#define EMAC_ADV_PAUSE_ENCODING_M (EMAC_ADV_PAUSE_ENCODING_V << EMAC_ADV_PAUSE_ENCODING_S)
+#define EMAC_ADV_PAUSE_ENCODING_V 0x00000003
 #define EMAC_ADV_PAUSE_ENCODING_S 7
 #define EMAC_ADV_HALF_DUPLEX (BIT(6))
+#define EMAC_ADV_HALF_DUPLEX_M (BIT(6))
+#define EMAC_ADV_HALF_DUPLEX_V 1
 #define EMAC_ADV_HALF_DUPLEX_S 6
 #define EMAC_ADV_FULL_DUPLEX (BIT(5))
+#define EMAC_ADV_FULL_DUPLEX_M (BIT(5))
+#define EMAC_ADV_FULL_DUPLEX_V 1
 #define EMAC_ADV_FULL_DUPLEX_S 5
 
 #define EMAC_GMAC_AUTO_NEGOTIATION_LINK_PARTNER_ABILITY_REG (REG_EMAC_BASE + 0x10CC)
 #define EMAC_LINK_NEXT_PAGE_SUPPORT (BIT(15))
+#define EMAC_LINK_NEXT_PAGE_SUPPORT_M (BIT(15))
+#define EMAC_LINK_NEXT_PAGE_SUPPORT_V 1
 #define EMAC_LINK_NEXT_PAGE_SUPPORT_S 15
 #define EMAC_LINK_ACKNOWLEDGE (BIT(14))
+#define EMAC_LINK_ACKNOWLEDGE_M (BIT(14))
+#define EMAC_LINK_ACKNOWLEDGE_V 1
 #define EMAC_LINK_ACKNOWLEDGE_S 14
 #define EMAC_LINK_REMOTE_FAULT_ENCODING 0x00000003
+#define EMAC_LINK_REMOTE_FAULT_ENCODING_M (EMAC_LINK_REMOTE_FAULT_ENCODING_V << EMAC_LINK_REMOTE_FAULT_ENCODING_S)
+#define EMAC_LINK_REMOTE_FAULT_ENCODING_V 0x00000003
 #define EMAC_LINK_REMOTE_FAULT_ENCODING_S 12
 #define EMAC_LINK_PAUSE_ENCODING 0x00000003
+#define EMAC_LINK_PAUSE_ENCODING_M (EMAC_LINK_PAUSE_ENCODING_V << EMAC_LINK_PAUSE_ENCODING_S)
+#define EMAC_LINK_PAUSE_ENCODING_V 0x00000003
 #define EMAC_LINK_PAUSE_ENCODING_S 7
 #define EMAC_LINK_HALF_DUPLEX (BIT(6))
+#define EMAC_LINK_HALF_DUPLEX_M (BIT(6))
+#define EMAC_LINK_HALF_DUPLEX_V 1
 #define EMAC_LINK_HALF_DUPLEX_S 6
 #define EMAC_LINK_FULL_DUPLEX (BIT(5))
+#define EMAC_LINK_FULL_DUPLEX_M (BIT(5))
+#define EMAC_LINK_FULL_DUPLEX_V 1
 #define EMAC_LINK_FULL_DUPLEX_S 5
 
 #define EMAC_GMAC_AUTO_NEGOTIATION_EXPANSION_REG (REG_EMAC_BASE + 0x10D0)
 #define EMAC_NEXT_PAGE_ABILITY (BIT(2))
+#define EMAC_NEXT_PAGE_ABILITY_M (BIT(2))
+#define EMAC_NEXT_PAGE_ABILITY_V 1
 #define EMAC_NEXT_PAGE_ABILITY_S 2
 #define EMAC_NEW_PAGE_RECEIVED (BIT(1))
+#define EMAC_NEW_PAGE_RECEIVED_M (BIT(1))
+#define EMAC_NEW_PAGE_RECEIVED_V 1
 #define EMAC_NEW_PAGE_RECEIVED_S 1
 
 #define EMAC_GMAC_TBI_EXTENDED_STATUS_REG (REG_EMAC_BASE + 0x10D4)
 #define EMAC_1000BASE_X_FULL_DUPLEX_CAPABLE (BIT(15))
+#define EMAC_1000BASE_X_FULL_DUPLEX_CAPABLE_M (BIT(15))
+#define EMAC_1000BASE_X_FULL_DUPLEX_CAPABLE_V 1
 #define EMAC_1000BASE_X_FULL_DUPLEX_CAPABLE_S 15
 #define EMAC_1000BASE_X_HALF_DUPLEX_CAPABLE (BIT(14))
+#define EMAC_1000BASE_X_HALF_DUPLEX_CAPABLE_M (BIT(14))
+#define EMAC_1000BASE_X_HALF_DUPLEX_CAPABLE_V 1
 #define EMAC_1000BASE_X_HALF_DUPLEX_CAPABLE_S 14
 
 #define EMAC_GMAC_CONTROL_STATUS_REG (REG_EMAC_BASE + 0x10D8)
 #define EMAC_SMIDRXS (BIT(16))
+#define EMAC_SMIDRXS_M (BIT(16))
+#define EMAC_SMIDRXS_V 1
 #define EMAC_SMIDRXS_S 16
 #define EMAC_FALSE_CARRIER_DETECTED (BIT(5))
+#define EMAC_FALSE_CARRIER_DETECTED_M (BIT(5))
+#define EMAC_FALSE_CARRIER_DETECTED_V 1
 #define EMAC_FALSE_CARRIER_DETECTED_S 5
 #define EMAC_JABBER_TIMEOUT (BIT(4))
+#define EMAC_JABBER_TIMEOUT_M (BIT(4))
+#define EMAC_JABBER_TIMEOUT_V 1
 #define EMAC_JABBER_TIMEOUT_S 4
 #define EMAC_LINK_STATUS (BIT(3))
+#define EMAC_LINK_STATUS_M (BIT(3))
+#define EMAC_LINK_STATUS_V 1
 #define EMAC_LINK_STATUS_S 3
 #define EMAC_LINK_SPEED 0x00000003
+#define EMAC_LINK_SPEED_M (EMAC_LINK_SPEED_V << EMAC_LINK_SPEED_S)
+#define EMAC_LINK_SPEED_V 0x00000003
 #define EMAC_LINK_SPEED_S 1
 #define EMAC_LINK_MODE (BIT(0))
+#define EMAC_LINK_MODE_M (BIT(0))
+#define EMAC_LINK_MODE_V 1
 #define EMAC_LINK_MODE_S 0
 
 #define EMAC_GMAC_WATCHDOG_TIMEOUT_REG (REG_EMAC_BASE + 0x10DC)
 #define EMAC_PROGRAMMABLE_WATCHDOG_ENABLE (BIT(16))
+#define EMAC_PROGRAMMABLE_WATCHDOG_ENABLE_M (BIT(16))
+#define EMAC_PROGRAMMABLE_WATCHDOG_ENABLE_V 1
 #define EMAC_PROGRAMMABLE_WATCHDOG_ENABLE_S 16
 #define EMAC_WATCHDOG_TIMEOUT 0x00003FFF
+#define EMAC_WATCHDOG_TIMEOUT_M (EMAC_WATCHDOG_TIMEOUT_V << EMAC_WATCHDOG_TIMEOUT_S)
+#define EMAC_WATCHDOG_TIMEOUT_V 0x00003FFF
 #define EMAC_WATCHDOG_TIMEOUT_S 0
 
 #define EMAC_GMAC_GENERAL_PURPOSE_IO_REG (REG_EMAC_BASE + 0x10E0)
 #define EMAC_GPI_TYPE 0x0000000F
+#define EMAC_GPI_TYPE_M (EMAC_GPI_TYPE_V << EMAC_GPI_TYPE_S)
+#define EMAC_GPI_TYPE_V 0x0000000F
 #define EMAC_GPI_TYPE_S 24
 #define EMAC_GPI_INTERRUPT_ENABLE 0x0000000F
+#define EMAC_GPI_INTERRUPT_ENABLE_M (EMAC_GPI_INTERRUPT_ENABLE_V << EMAC_GPI_INTERRUPT_ENABLE_S)
+#define EMAC_GPI_INTERRUPT_ENABLE_V 0x0000000F
 #define EMAC_GPI_INTERRUPT_ENABLE_S 16
 #define EMAC_GENERAL_PURPOSE_OUTPUT 0x0000000F
+#define EMAC_GENERAL_PURPOSE_OUTPUT_M (EMAC_GENERAL_PURPOSE_OUTPUT_V << EMAC_GENERAL_PURPOSE_OUTPUT_S)
+#define EMAC_GENERAL_PURPOSE_OUTPUT_V 0x0000000F
 #define EMAC_GENERAL_PURPOSE_OUTPUT_S 8
 #define EMAC_GENERAL_PURPOSE_INPUT_STATUS 0x0000000F
+#define EMAC_GENERAL_PURPOSE_INPUT_STATUS_M (EMAC_GENERAL_PURPOSE_INPUT_STATUS_V << EMAC_GENERAL_PURPOSE_INPUT_STATUS_S)
+#define EMAC_GENERAL_PURPOSE_INPUT_STATUS_V 0x0000000F
 #define EMAC_GENERAL_PURPOSE_INPUT_STATUS_S 0
 
 #define EMAC_GMAC_LAYER3_LAYER4_CONTROL0_REG (REG_EMAC_BASE + 0x1400)
 #define EMAC_LAYER4_DESTINATION_PORT_INVERSE_MATCH_ENABLE (BIT(21))
+#define EMAC_LAYER4_DESTINATION_PORT_INVERSE_MATCH_ENABLE_M (BIT(21))
+#define EMAC_LAYER4_DESTINATION_PORT_INVERSE_MATCH_ENABLE_V 1
 #define EMAC_LAYER4_DESTINATION_PORT_INVERSE_MATCH_ENABLE_S 21
 #define EMAC_LAYER4_DESTINATION_PORT_MATCH_ENABLE (BIT(20))
+#define EMAC_LAYER4_DESTINATION_PORT_MATCH_ENABLE_M (BIT(20))
+#define EMAC_LAYER4_DESTINATION_PORT_MATCH_ENABLE_V 1
 #define EMAC_LAYER4_DESTINATION_PORT_MATCH_ENABLE_S 20
 #define EMAC_LAYER4_SOURCE_PORT_INVERSE_MATCH_ENABLE (BIT(19))
+#define EMAC_LAYER4_SOURCE_PORT_INVERSE_MATCH_ENABLE_M (BIT(19))
+#define EMAC_LAYER4_SOURCE_PORT_INVERSE_MATCH_ENABLE_V 1
 #define EMAC_LAYER4_SOURCE_PORT_INVERSE_MATCH_ENABLE_S 19
 #define EMAC_LAYER4_SOURCE_PORT_MATCH_ENABLE (BIT(18))
+#define EMAC_LAYER4_SOURCE_PORT_MATCH_ENABLE_M (BIT(18))
+#define EMAC_LAYER4_SOURCE_PORT_MATCH_ENABLE_V 1
 #define EMAC_LAYER4_SOURCE_PORT_MATCH_ENABLE_S 18
 #define EMAC_LAYER4_PROTOCOL_ENABLE (BIT(16))
+#define EMAC_LAYER4_PROTOCOL_ENABLE_M (BIT(16))
+#define EMAC_LAYER4_PROTOCOL_ENABLE_V 1
 #define EMAC_LAYER4_PROTOCOL_ENABLE_S 16
 #define EMAC_LAYER3_IP_DA_HIGHER_BITS_MATCH 0x0000001F
+#define EMAC_LAYER3_IP_DA_HIGHER_BITS_MATCH_M (EMAC_LAYER3_IP_DA_HIGHER_BITS_MATCH_V << EMAC_LAYER3_IP_DA_HIGHER_BITS_MATCH_S)
+#define EMAC_LAYER3_IP_DA_HIGHER_BITS_MATCH_V 0x0000001F
 #define EMAC_LAYER3_IP_DA_HIGHER_BITS_MATCH_S 11
 #define EMAC_LAYER3_IP_SA_HIGHER_BITS_MATCH 0x0000001F
+#define EMAC_LAYER3_IP_SA_HIGHER_BITS_MATCH_M (EMAC_LAYER3_IP_SA_HIGHER_BITS_MATCH_V << EMAC_LAYER3_IP_SA_HIGHER_BITS_MATCH_S)
+#define EMAC_LAYER3_IP_SA_HIGHER_BITS_MATCH_V 0x0000001F
 #define EMAC_LAYER3_IP_SA_HIGHER_BITS_MATCH_S 6
 #define EMAC_LAYER3_IP_DA_INVERSE_MATCH_ENABLE (BIT(5))
+#define EMAC_LAYER3_IP_DA_INVERSE_MATCH_ENABLE_M (BIT(5))
+#define EMAC_LAYER3_IP_DA_INVERSE_MATCH_ENABLE_V 1
 #define EMAC_LAYER3_IP_DA_INVERSE_MATCH_ENABLE_S 5
 #define EMAC_LAYER3_IP_DA_MATCH_ENABLE (BIT(4))
+#define EMAC_LAYER3_IP_DA_MATCH_ENABLE_M (BIT(4))
+#define EMAC_LAYER3_IP_DA_MATCH_ENABLE_V 1
 #define EMAC_LAYER3_IP_DA_MATCH_ENABLE_S 4
 #define EMAC_LAYER3_IP_SA_INVERSE_MATCH_ENABLE (BIT(3))
+#define EMAC_LAYER3_IP_SA_INVERSE_MATCH_ENABLE_M (BIT(3))
+#define EMAC_LAYER3_IP_SA_INVERSE_MATCH_ENABLE_V 1
 #define EMAC_LAYER3_IP_SA_INVERSE_MATCH_ENABLE_S 3
 #define EMAC_LAYER3_IP_SA_MATCH_ENABLE (BIT(2))
+#define EMAC_LAYER3_IP_SA_MATCH_ENABLE_M (BIT(2))
+#define EMAC_LAYER3_IP_SA_MATCH_ENABLE_V 1
 #define EMAC_LAYER3_IP_SA_MATCH_ENABLE_S 2
 #define EMAC_LAYER3_PROTOCOL_ENABLE (BIT(0))
+#define EMAC_LAYER3_PROTOCOL_ENABLE_M (BIT(0))
+#define EMAC_LAYER3_PROTOCOL_ENABLE_V 1
 #define EMAC_LAYER3_PROTOCOL_ENABLE_S 0
 
 #define EMAC_GMAC_LAYER4_ADDRESS0_REG (REG_EMAC_BASE + 0x1404)
 #define EMAC_LAYER4_DESTINATION_PORT_NUMBER_FIELD 0x0000FFFF
+#define EMAC_LAYER4_DESTINATION_PORT_NUMBER_FIELD_M (EMAC_LAYER4_DESTINATION_PORT_NUMBER_FIELD_V << EMAC_LAYER4_DESTINATION_PORT_NUMBER_FIELD_S)
+#define EMAC_LAYER4_DESTINATION_PORT_NUMBER_FIELD_V 0x0000FFFF
 #define EMAC_LAYER4_DESTINATION_PORT_NUMBER_FIELD_S 16
 #define EMAC_LAYER4_SOURCE_PORT_NUMBER_FIELD 0x0000FFFF
+#define EMAC_LAYER4_SOURCE_PORT_NUMBER_FIELD_M (EMAC_LAYER4_SOURCE_PORT_NUMBER_FIELD_V << EMAC_LAYER4_SOURCE_PORT_NUMBER_FIELD_S)
+#define EMAC_LAYER4_SOURCE_PORT_NUMBER_FIELD_V 0x0000FFFF
 #define EMAC_LAYER4_SOURCE_PORT_NUMBER_FIELD_S 0
 
 #define EMAC_GMAC_LAYER3_ADDRESS0_REG (REG_EMAC_BASE + 0x1410)
 #define EMAC_LAYER3_ADDRESS0_FIELD 0xFFFFFFFF
+#define EMAC_LAYER3_ADDRESS0_FIELD_M (EMAC_LAYER3_ADDRESS0_FIELD_V << EMAC_LAYER3_ADDRESS0_FIELD_S)
+#define EMAC_LAYER3_ADDRESS0_FIELD_V 0xFFFFFFFF
 #define EMAC_LAYER3_ADDRESS0_FIELD_S 0
 
 #define EMAC_GMAC_LAYER3_ADDRESS1_REG (REG_EMAC_BASE + 0x1414)
 #define EMAC_LAYER3_ADDRESS1_FIELD 0xFFFFFFFF
+#define EMAC_LAYER3_ADDRESS1_FIELD_M (EMAC_LAYER3_ADDRESS1_FIELD_V << EMAC_LAYER3_ADDRESS1_FIELD_S)
+#define EMAC_LAYER3_ADDRESS1_FIELD_V 0xFFFFFFFF
 #define EMAC_LAYER3_ADDRESS1_FIELD_S 0
 
 #define EMAC_GMAC_LAYER3_ADDRESS2_REG (REG_EMAC_BASE + 0x1418)
 #define EMAC_LAYER3_ADDRESS2_FIELD 0xFFFFFFFF
+#define EMAC_LAYER3_ADDRESS2_FIELD_M (EMAC_LAYER3_ADDRESS2_FIELD_V << EMAC_LAYER3_ADDRESS2_FIELD_S)
+#define EMAC_LAYER3_ADDRESS2_FIELD_V 0xFFFFFFFF
 #define EMAC_LAYER3_ADDRESS2_FIELD_S 0
 
 #define EMAC_GMAC_LAYER3_ADDRESS3_REG (REG_EMAC_BASE + 0x141C)
 #define EMAC_LAYER3_ADDRESS3_FIELD 0xFFFFFFFF
+#define EMAC_LAYER3_ADDRESS3_FIELD_M (EMAC_LAYER3_ADDRESS3_FIELD_V << EMAC_LAYER3_ADDRESS3_FIELD_S)
+#define EMAC_LAYER3_ADDRESS3_FIELD_V 0xFFFFFFFF
 #define EMAC_LAYER3_ADDRESS3_FIELD_S 0
 
 #define EMAC_GMAC_HASH_TABLE0_REG (REG_EMAC_BASE + 0x1500)
 #define EMAC_FIRST32_BITS_HASH_TABLE 0xFFFFFFFF
+#define EMAC_FIRST32_BITS_HASH_TABLE_M (EMAC_FIRST32_BITS_HASH_TABLE_V << EMAC_FIRST32_BITS_HASH_TABLE_S)
+#define EMAC_FIRST32_BITS_HASH_TABLE_V 0xFFFFFFFF
 #define EMAC_FIRST32_BITS_HASH_TABLE_S 0
 
 #define EMAC_GMAC_VLAN_TAG_INCLUSION_REPLACEMENT_REG (REG_EMAC_BASE + 0x1584)
 #define EMAC_VLAN_C_VLAN_S_VLAN (BIT(19))
+#define EMAC_VLAN_C_VLAN_S_VLAN_M (BIT(19))
+#define EMAC_VLAN_C_VLAN_S_VLAN_V 1
 #define EMAC_VLAN_C_VLAN_S_VLAN_S 19
 #define EMAC_VLAN_PRIORITY_CONTROL (BIT(18))
+#define EMAC_VLAN_PRIORITY_CONTROL_M (BIT(18))
+#define EMAC_VLAN_PRIORITY_CONTROL_V 1
 #define EMAC_VLAN_PRIORITY_CONTROL_S 18
 #define EMAC_VLAN_TAG_CONTROL_TRANSMIT_FRAMES 0x00000003
+#define EMAC_VLAN_TAG_CONTROL_TRANSMIT_FRAMES_M (EMAC_VLAN_TAG_CONTROL_TRANSMIT_FRAMES_V << EMAC_VLAN_TAG_CONTROL_TRANSMIT_FRAMES_S)
+#define EMAC_VLAN_TAG_CONTROL_TRANSMIT_FRAMES_V 0x00000003
 #define EMAC_VLAN_TAG_CONTROL_TRANSMIT_FRAMES_S 16
 #define EMAC_VLAN_TAG_TRANSMIT_FRAMES 0x0000FFFF
+#define EMAC_VLAN_TAG_TRANSMIT_FRAMES_M (EMAC_VLAN_TAG_TRANSMIT_FRAMES_V << EMAC_VLAN_TAG_TRANSMIT_FRAMES_S)
+#define EMAC_VLAN_TAG_TRANSMIT_FRAMES_V 0x0000FFFF
 #define EMAC_VLAN_TAG_TRANSMIT_FRAMES_S 0
 
 #define EMAC_GMAC_VLAN_HASH_TABLE_REG (REG_EMAC_BASE + 0x1588)
 #define EMAC_VLAN_HASH_TABLE 0x0000FFFF
+#define EMAC_VLAN_HASH_TABLE_M (EMAC_VLAN_HASH_TABLE_V << EMAC_VLAN_HASH_TABLE_S)
+#define EMAC_VLAN_HASH_TABLE_V 0x0000FFFF
 #define EMAC_VLAN_HASH_TABLE_S 0
 
 #ifdef __cplusplus
diff --git a/tools/sdk/include/soc/soc/fe_reg.h b/tools/sdk/include/soc/soc/fe_reg.h
index f8c2ce58f19..7705586d7c3 100644
--- a/tools/sdk/include/soc/soc/fe_reg.h
+++ b/tools/sdk/include/soc/soc/fe_reg.h
@@ -22,12 +22,20 @@
 
 #define FE_GEN_CTRL (DR_REG_FE_BASE + 0x0090)
 #define FE_IQ_EST_FORCE_PU (BIT(5))
+#define FE_IQ_EST_FORCE_PU_M (BIT(5))
+#define FE_IQ_EST_FORCE_PU_V 1
 #define FE_IQ_EST_FORCE_PU_S 5
 #define FE_IQ_EST_FORCE_PD (BIT(4))
+#define FE_IQ_EST_FORCE_PD_M (BIT(4))
+#define FE_IQ_EST_FORCE_PD_V 1
 #define FE_IQ_EST_FORCE_PD_S 4
 
 #define FE2_TX_INTERP_CTRL (DR_REG_FE2_BASE + 0x00f0)
 #define FE2_TX_INF_FORCE_PU (BIT(10))
+#define FE2_TX_INF_FORCE_PU_M (BIT(10))
+#define FE2_TX_INF_FORCE_PU_V 1
 #define FE2_TX_INF_FORCE_PU_S 10
 #define FE2_TX_INF_FORCE_PD (BIT(9))
+#define FE2_TX_INF_FORCE_PD_M (BIT(9))
+#define FE2_TX_INF_FORCE_PD_V 1
 #define FE2_TX_INF_FORCE_PD_S 9
diff --git a/tools/sdk/include/soc/soc/io_mux_reg.h b/tools/sdk/include/soc/soc/io_mux_reg.h
index 459a97009cd..be07c6bcd55 100644
--- a/tools/sdk/include/soc/soc/io_mux_reg.h
+++ b/tools/sdk/include/soc/soc/io_mux_reg.h
@@ -1,9 +1,9 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -16,20 +16,63 @@
 
 #include "soc.h"
 
+/* The following are the bit fields for PERIPHS_IO_MUX_x_U registers */
+/* Output enable in sleep mode */
 #define SLP_OE (BIT(0))
+#define SLP_OE_M (BIT(0))
+#define SLP_OE_V 1
+#define SLP_OE_S 0
+/* Pin used for wakeup from sleep */
 #define SLP_SEL (BIT(1))
+#define SLP_SEL_M (BIT(1))
+#define SLP_SEL_V 1
+#define SLP_SEL_S 1
+/* Pulldown enable in sleep mode */
 #define SLP_PD (BIT(2))
+#define SLP_PD_M (BIT(2))
+#define SLP_PD_V 1
+#define SLP_PD_S 2
+/* Pullup enable in sleep mode */
 #define SLP_PU (BIT(3))
+#define SLP_PU_M (BIT(3))
+#define SLP_PU_V 1
+#define SLP_PU_S 3
+/* Input enable in sleep mode */
 #define SLP_IE (BIT(4))
+#define SLP_IE_M (BIT(4))
+#define SLP_IE_V 1
+#define SLP_IE_S 4
+/* Drive strength in sleep mode */
 #define SLP_DRV 0x3
+#define SLP_DRV_M (SLP_DRV_V << SLP_DRV_S)
+#define SLP_DRV_V 0x3
 #define SLP_DRV_S 5
+/* Pulldown enable */
 #define FUN_PD (BIT(7))
+#define FUN_PD_M (BIT(7))
+#define FUN_PD_V 1
+#define FUN_PD_S 7
+/* Pullup enable */
 #define FUN_PU (BIT(8))
+#define FUN_PU_M (BIT(8))
+#define FUN_PU_V 1
+#define FUN_PU_S 8
+/* Input enable */
 #define FUN_IE (BIT(9))
+#define FUN_IE_M (FUN_IE_V << FUN_IE_S)
+#define FUN_IE_V 1
+#define FUN_IE_S 9
+/* Drive strength */
 #define FUN_DRV 0x3
+#define FUN_DRV_M (FUN_DRV_V << FUN_DRV_S)
+#define FUN_DRV_V 0x3
 #define FUN_DRV_S 10
+/* Function select (possible values are defined for each pin as FUNC_pinname_function below) */
 #define MCU_SEL 0x7
+#define MCU_SEL_M (MCU_SEL_V << MCU_SEL_S)
+#define MCU_SEL_V 0x7
 #define MCU_SEL_S 12
+#define MCU_SEL_V 0x7
 
 #define PIN_INPUT_ENABLE(PIN_NAME)               SET_PERI_REG_MASK(PIN_NAME,FUN_IE)
 #define PIN_INPUT_DISABLE(PIN_NAME)              CLEAR_PERI_REG_MASK(PIN_NAME,FUN_IE)
diff --git a/tools/sdk/include/soc/soc/nrx_reg.h b/tools/sdk/include/soc/soc/nrx_reg.h
index cd13319c96f..ca338b89ab3 100644
--- a/tools/sdk/include/soc/soc/nrx_reg.h
+++ b/tools/sdk/include/soc/soc/nrx_reg.h
@@ -22,18 +22,34 @@
 
 #define NRXPD_CTRL (DR_REG_NRX_BASE + 0x00d4)
 #define NRX_CHAN_EST_FORCE_PU (BIT(7))
+#define NRX_CHAN_EST_FORCE_PU_M (BIT(7))
+#define NRX_CHAN_EST_FORCE_PU_V 1
 #define NRX_CHAN_EST_FORCE_PU_S 7
 #define NRX_CHAN_EST_FORCE_PD (BIT(6))
+#define NRX_CHAN_EST_FORCE_PD_M (BIT(6))
+#define NRX_CHAN_EST_FORCE_PD_V 1
 #define NRX_CHAN_EST_FORCE_PD_S 6
 #define NRX_RX_ROT_FORCE_PU (BIT(5))
+#define NRX_RX_ROT_FORCE_PU_M (BIT(5))
+#define NRX_RX_ROT_FORCE_PU_V 1
 #define NRX_RX_ROT_FORCE_PU_S 5
 #define NRX_RX_ROT_FORCE_PD (BIT(4))
+#define NRX_RX_ROT_FORCE_PD_M (BIT(4))
+#define NRX_RX_ROT_FORCE_PD_V 1
 #define NRX_RX_ROT_FORCE_PD_S 4
 #define NRX_VIT_FORCE_PU (BIT(3))
+#define NRX_VIT_FORCE_PU_M (BIT(3))
+#define NRX_VIT_FORCE_PU_V 1
 #define NRX_VIT_FORCE_PU_S 3
 #define NRX_VIT_FORCE_PD (BIT(2))
+#define NRX_VIT_FORCE_PD_M (BIT(2))
+#define NRX_VIT_FORCE_PD_V 1
 #define NRX_VIT_FORCE_PD_S 2
 #define NRX_DEMAP_FORCE_PU (BIT(1))
+#define NRX_DEMAP_FORCE_PU_M (BIT(1))
+#define NRX_DEMAP_FORCE_PU_V 1
 #define NRX_DEMAP_FORCE_PU_S 1
 #define NRX_DEMAP_FORCE_PD (BIT(0))
+#define NRX_DEMAP_FORCE_PD_M (BIT(0))
+#define NRX_DEMAP_FORCE_PD_V 1
 #define NRX_DEMAP_FORCE_PD_S 0
diff --git a/tools/sdk/include/soc/soc/rtc.h b/tools/sdk/include/soc/soc/rtc.h
index aecf76becf0..a85265fdc17 100644
--- a/tools/sdk/include/soc/soc/rtc.h
+++ b/tools/sdk/include/soc/soc/rtc.h
@@ -92,6 +92,9 @@ typedef enum {
     RTC_FAST_FREQ_8M = 1,       //!< Internal 8 MHz RC oscillator
 } rtc_fast_freq_t;
 
+/* With the default value of CK8M_DFREQ, 8M clock frequency is 8.5 MHz +/- 7% */
+#define RTC_FAST_CLK_FREQ_APPROX 8500000
+
 /**
  * @brief Clock source to be calibrated using rtc_clk_cal function
  */
@@ -165,6 +168,15 @@ void rtc_clk_32k_enable(bool en);
  */
 bool rtc_clk_32k_enabled();
 
+/**
+ * @brief Enable 32k oscillator, configuring it for fast startup time.
+ * Note: to achieve higher frequency stability, rtc_clk_32k_enable function
+ * must be called one the 32k XTAL oscillator has started up. This function
+ * will initially disable the 32k XTAL oscillator, so it should not be called
+ * when the system is using 32k XTAL as RTC_SLOW_CLK.
+ */
+void rtc_clk_32k_bootstrap();
+
 /**
  * @brief Enable or disable 8 MHz internal oscillator
  *
@@ -226,6 +238,20 @@ void rtc_clk_slow_freq_set(rtc_slow_freq_t slow_freq);
  */
 rtc_slow_freq_t rtc_clk_slow_freq_get();
 
+/**
+ * @brief Get the approximate frequency of RTC_SLOW_CLK, in Hz
+ *
+ * - if RTC_SLOW_FREQ_RTC is selected, returns ~150000
+ * - if RTC_SLOW_FREQ_32K_XTAL is selected, returns 32768
+ * - if RTC_SLOW_FREQ_8MD256 is selected, returns ~33000
+ *
+ * rtc_clk_cal function can be used to get more precise value by comparing
+ * RTC_SLOW_CLK frequency to the frequency of main XTAL.
+ *
+ * @return RTC_SLOW_CLK frequency, in Hz
+ */
+uint32_t rtc_clk_slow_freq_get_hz();
+
 /**
  * @brief Select source for RTC_FAST_CLK
  * @param fast_freq clock source (one of rtc_fast_freq_t values)
@@ -307,6 +333,15 @@ uint32_t rtc_clk_apb_freq_get();
  */
 uint32_t rtc_clk_cal(rtc_cal_sel_t cal_clk, uint32_t slow_clk_cycles);
 
+/**
+ * @brief Measure ratio between XTAL frequency and RTC slow clock frequency
+ * @param cal_clk slow clock to be measured
+ * @param slow_clk_cycles number of slow clock cycles to average
+ * @return average ratio between XTAL frequency and slow clock frequency,
+ *         Q13.19 fixed point format, or 0 if calibration has timed out.
+ */
+uint32_t rtc_clk_cal_ratio(rtc_cal_sel_t cal_clk, uint32_t slow_clk_cycles);
+
 /**
  * @brief Convert time interval from microseconds to RTC_SLOW_CLK cycles
  * @param time_in_us Time interval in microseconds
diff --git a/tools/sdk/include/soc/soc/rtc_cntl_reg.h b/tools/sdk/include/soc/soc/rtc_cntl_reg.h
index 067f2296fe6..efb53ec1471 100644
--- a/tools/sdk/include/soc/soc/rtc_cntl_reg.h
+++ b/tools/sdk/include/soc/soc/rtc_cntl_reg.h
@@ -239,9 +239,6 @@
 #define RTC_CNTL_TIME_VALID_V  0x1
 #define RTC_CNTL_TIME_VALID_S  30
 
-/* frequency of RTC slow clock, Hz */
-#define RTC_CNTL_SLOWCLK_FREQ   150000
-
 #define RTC_CNTL_TIME0_REG          (DR_REG_RTCCNTL_BASE + 0x10)
 /* RTC_CNTL_TIME_LO : RO ;bitpos:[31:0] ;default: 32'h0 ; */
 /*description: RTC timer low 32 bits*/
diff --git a/tools/sdk/include/soc/soc/rtc_io_reg.h b/tools/sdk/include/soc/soc/rtc_io_reg.h
index f6d0dac7696..5a3ce10d422 100644
--- a/tools/sdk/include/soc/soc/rtc_io_reg.h
+++ b/tools/sdk/include/soc/soc/rtc_io_reg.h
@@ -511,6 +511,7 @@
 #define RTC_IO_DEBUG_SEL0_M  ((RTC_IO_DEBUG_SEL0_V)<<(RTC_IO_DEBUG_SEL0_S))
 #define RTC_IO_DEBUG_SEL0_V  0x1F
 #define RTC_IO_DEBUG_SEL0_S  0
+#define RTC_IO_DEBUG_SEL0_8M       1
 #define RTC_IO_DEBUG_SEL0_32K_XTAL 4
 #define RTC_IO_DEBUG_SEL0_150K_OSC 5
 
diff --git a/tools/sdk/include/soc/soc/soc.h b/tools/sdk/include/soc/soc/soc.h
index bcb49a66c69..1df888ce7ce 100644
--- a/tools/sdk/include/soc/soc/soc.h
+++ b/tools/sdk/include/soc/soc/soc.h
@@ -1,9 +1,9 @@
-// Copyright 2010-2016 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2010-2017 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -65,8 +65,9 @@
 #define BIT(nr)                 (1UL << (nr))
 #else
 #define BIT(nr)                 (1 << (nr))
-#endif //__ASSEMBLER__
+#endif
 
+#ifndef __ASSEMBLER__
 //write value to register
 #define REG_WRITE(_r, _v)    (*(volatile uint32_t *)(_r)) = (_v)
 
@@ -88,8 +89,8 @@
 //get field from register, uses field _S & _V to determine mask
 #define REG_GET_FIELD(_r, _f) ((REG_READ(_r) >> (_f##_S)) & (_f##_V))
 
-//set field to register, used when _f is not left shifted by _f##_S
-#define REG_SET_FIELD(_r, _f, _v) (REG_WRITE((_r),((REG_READ(_r) & ~((_f) << (_f##_S)))|(((_v) & (_f))<<(_f##_S)))))
+//set field of a register from variable, uses field _S & _V to determine mask
+#define REG_SET_FIELD(_r, _f, _v) (REG_WRITE((_r),((REG_READ(_r) & ~((_f##_V) << (_f##_S)))|(((_v) & (_f##_V))<<(_f##_S)))))
 
 //get field value from a variable, used when _f is not left shifted by _f##_S
 #define VALUE_GET_FIELD(_r, _f) (((_r) >> (_f##_S)) & (_f))
@@ -134,6 +135,8 @@
 #define GET_PERI_REG_BITS2(reg, mask,shift)      ((READ_PERI_REG(reg)>>(shift))&(mask))
 //}}
 
+#endif /* !__ASSEMBLER__ */
+
 //Periheral Clock {{
 #define  APB_CLK_FREQ_ROM                            ( 26*1000000 )
 #define  CPU_CLK_FREQ_ROM                            APB_CLK_FREQ_ROM
@@ -146,6 +149,16 @@
 #define  TICKS_PER_US_ROM                            26              // CPU is 80MHz
 //}}
 
+/* Overall memory map */
+#define SOC_IROM_LOW    0x400D0000
+#define SOC_IROM_HIGH   0x40400000
+#define SOC_DROM_LOW    0x3F400000
+#define SOC_DROM_HIGH   0x3F800000
+#define SOC_RTC_IRAM_LOW  0x400C0000
+#define SOC_RTC_IRAM_HIGH 0x400C2000
+#define SOC_RTC_DATA_LOW  0x50000000
+#define SOC_RTC_DATA_HIGH 0x50002000
+
 #define DR_REG_DPORT_BASE                       0x3ff00000
 #define DR_REG_RSA_BASE                         0x3ff02000
 #define DR_REG_SHA_BASE                         0x3ff03000
@@ -273,14 +286,14 @@
 /*************************************************************************************************************
  *      Intr num                Level           Type                    PRO CPU usage           APP CPU uasge
  *      0                       1               extern level            WMAC                    Reserved
- *      1                       1               extern level            BT/BLE Host VHCI        Reserved
+ *      1                       1               extern level            BT/BLE Host HCI DMA     BT/BLE Host HCI DMA
  *      2                       1               extern level
  *      3                       1               extern level
  *      4                       1               extern level            WBB
- *      5                       1               extern level            BT/BLE Controller
+ *      5                       1               extern level            BT/BLE Controller       BT/BLE Controller
  *      6                       1               timer                   FreeRTOS Tick(L1)       FreeRTOS Tick(L1)
- *      7                       1               software                Reserved                Reserved
- *      8                       1               extern level            BT/BLE BB(RX/TX)
+ *      7                       1               software                BT/BLE VHCI             BT/BLE VHCI
+ *      8                       1               extern level            BT/BLE BB(RX/TX)        BT/BLE BB(RX/TX)
  *      9                       1               extern level
  *      10                      1               extern edge             Internal Timer
  *      11                      3               profiling
@@ -297,7 +310,7 @@
  *      22                      3               extern edge             FRC1 timer
  *      23                      3               extern level
  *      24                      4               extern level            TG1_WDT
- *      25                      4               extern level            Reserved                Reserved
+ *      25                      4               extern level            CACHEERR
  *      26                      5               extern level            Reserved                Reserved
  *      27                      3               extern level            Reserved                Reserved
  *      28                      4               extern edge             
@@ -314,6 +327,7 @@
 #define ETS_TG0_T1_INUM                         10 /**< use edge interrupt*/
 #define ETS_FRC1_INUM                           22
 #define ETS_T1_WDT_INUM                         24
+#define ETS_CACHEERR_INUM                       25
 
 //CPU0 Interrupt number used in ROM, should be cancelled in SDK
 #define ETS_SLC_INUM                            1
diff --git a/tools/sdk/include/wear_levelling/wear_levelling.h b/tools/sdk/include/wear_levelling/wear_levelling.h
new file mode 100644
index 00000000000..60f252e9caf
--- /dev/null
+++ b/tools/sdk/include/wear_levelling/wear_levelling.h
@@ -0,0 +1,136 @@
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _wear_levelling_H_
+#define _wear_levelling_H_
+
+#include "esp_log.h"
+#include "esp_partition.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+* @brief wear levelling handle
+*/
+typedef int32_t wl_handle_t;
+
+#define WL_INVALID_HANDLE -1
+
+/**
+* @brief Mount WL for defined partition
+*
+* @param partition that will be used for access
+* @param out_handle handle of the WL instance
+*
+* @return
+*       - ESP_OK, if the allocation was successfully;
+*       - ESP_ERR_INVALID_ARG, if WL allocation was unsuccessful;
+*       - ESP_ERR_NO_MEM, if there was no memory to allocate WL components;
+*/
+esp_err_t wl_mount(const esp_partition_t *partition, wl_handle_t *out_handle);
+
+/**
+* @brief Unmount WL for defined partition
+*
+* @param handle WL partition handle
+*
+* @return
+*       - ESP_OK, if the operation completed successfully;
+*       - or one of error codes from lower-level flash driver.
+*/
+esp_err_t wl_unmount(wl_handle_t handle);
+
+/**
+* @brief Erase part of the WL storage
+*
+* @param handle WL handle that are related to the partition
+* @param start_addr Address where erase operation should start. Must be aligned
+*                   to the result of function wl_sector_size(...).
+* @param size Size of the range which should be erased, in bytes.
+*                   Must be divisible by result of function wl_sector_size(...)..
+*
+* @return
+*       - ESP_OK, if the range was erased successfully;
+*       - ESP_ERR_INVALID_ARG, if iterator or dst are NULL;
+*       - ESP_ERR_INVALID_SIZE, if erase would go out of bounds of the partition;
+*       - or one of error codes from lower-level flash driver.
+*/
+esp_err_t wl_erase_range(wl_handle_t handle, size_t start_addr, size_t size);
+
+/**
+* @brief Write data to the WL storage
+*
+* Before writing data to flash, corresponding region of flash needs to be erased.
+* This can be done using wl_erase_range function.
+*
+* @param handle WL handle that are related to the partition
+* @param dest_addr Address where the data should be written, relative to the
+*                   beginning of the partition.
+* @param src Pointer to the source buffer.  Pointer must be non-NULL and
+*            buffer must be at least 'size' bytes long.
+* @param size Size of data to be written, in bytes.
+*
+* @note Prior to writing to WL storage, make sure it has been erased with
+*       wl_erase_range call.
+*
+* @return
+*       - ESP_OK, if data was written successfully;
+*       - ESP_ERR_INVALID_ARG, if dst_offset exceeds partition size;
+*       - ESP_ERR_INVALID_SIZE, if write would go out of bounds of the partition;
+*       - or one of error codes from lower-level flash driver.
+*/
+esp_err_t wl_write(wl_handle_t handle, size_t dest_addr, const void *src, size_t size);
+
+/**
+* @brief Read data from the WL storage
+*
+* @param handle WL module instance that was initialized before
+* @param dest Pointer to the buffer where data should be stored.
+*            Pointer must be non-NULL and buffer must be at least 'size' bytes long.
+* @param src_addr Address of the data to be read, relative to the
+*                   beginning of the partition.
+* @param size Size of data to be read, in bytes.
+*
+* @return
+*       - ESP_OK, if data was read successfully;
+*       - ESP_ERR_INVALID_ARG, if src_offset exceeds partition size;
+*       - ESP_ERR_INVALID_SIZE, if read would go out of bounds of the partition;
+*       - or one of error codes from lower-level flash driver.
+*/
+esp_err_t wl_read(wl_handle_t handle, size_t src_addr, void *dest, size_t size);
+
+/**
+* @brief Get size of the WL storage
+*
+* @param handle WL module handle that was initialized before
+* @return usable size, in bytes
+*/
+size_t wl_size(wl_handle_t handle);
+
+/**
+* @brief Get sector size of the WL instance
+*
+* @param handle WL module handle that was initialized before
+* @return sector size, in bytes
+*/
+size_t wl_sector_size(wl_handle_t handle);
+
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // _wear_levelling_H_
diff --git a/tools/sdk/ld/esp32.common.ld b/tools/sdk/ld/esp32.common.ld
index 5c1dba68c6c..48e31d1ea0c 100644
--- a/tools/sdk/ld/esp32.common.ld
+++ b/tools/sdk/ld/esp32.common.ld
@@ -86,16 +86,11 @@ SECTIONS
     *libesp32.a:panic.o(.literal .text .literal.* .text.*)
     *libesp32.a:core_dump.o(.literal .text .literal.* .text.*)
     *libesp32.a:heap_alloc_caps.o(.literal .text .literal.* .text.*)
+    *libesp32.a:app_trace.o(.literal .text .literal.* .text.*)
     *libphy.a:(.literal .text .literal.* .text.*)
     *librtc.a:(.literal .text .literal.* .text.*)
     *libsoc.a:(.literal .text .literal.* .text.*)
-    *libpp.a:pp.o(.literal .text .literal.* .text.*)
-    *libpp.a:lmac.o(.literal .text .literal.* .text.*)
-    *libpp.a:wdev.o(.literal .text .literal.* .text.*)
-    *libcore.a:ets_timer.o(.literal .text .literal.* .text.*)
-    *libnet80211.a:ieee80211_misc.o(.literal .text .literal.* .text.*)
     *libhal.a:(.literal .text .literal.* .text.*)
-    *libcoexist.a:(.literal .text .literal.* .text.*)
     *libspi_flash.a:spi_flash_rom_patch.o(.literal .text .literal.* .text.*)
     _iram_text_end = ABSOLUTE(.);
   } > iram0_0_seg
@@ -116,6 +111,8 @@ SECTIONS
     KEEP(*(.jcr))
     *(.dram1 .dram1.*)
     *libesp32.a:panic.o(.rodata .rodata.*)
+    *libesp32.a:app_trace.o(.rodata .rodata.*)
+    *libphy.a:(.rodata .rodata.*)
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
   } >dram0_0_seg
diff --git a/tools/sdk/ld/esp32.rom.ld b/tools/sdk/ld/esp32.rom.ld
index 6529e31dfa9..97588fb637e 100644
--- a/tools/sdk/ld/esp32.rom.ld
+++ b/tools/sdk/ld/esp32.rom.ld
@@ -743,6 +743,90 @@ PROVIDE ( r_lc_util_get_offset_clke = 0x4002f538 );
 PROVIDE ( r_lc_util_get_offset_clkn = 0x4002f51c );
 PROVIDE ( r_lc_util_set_loc_trans_coll = 0x4002f500 );
 PROVIDE ( r_lc_version = 0x40020a30 );
+PROVIDE ( lmp_accepted_ext_handler = 0x40027290 );
+PROVIDE ( lmp_not_accepted_ext_handler = 0x40029c54 );
+PROVIDE ( lmp_clk_adj_handler = 0x40027468 );
+PROVIDE ( lmp_clk_adj_ack_handler = 0x400274f4 );
+PROVIDE ( lmp_clk_adj_req_handler = 0x4002751c );
+PROVIDE ( lmp_feats_res_ext_handler = 0x4002cac4 );
+PROVIDE ( lmp_feats_req_ext_handler = 0x4002ccb0 );
+PROVIDE ( lmp_pkt_type_tbl_req_handler = 0x40027574 );
+PROVIDE ( lmp_esco_link_req_handler = 0x40027610 );
+PROVIDE ( lmp_rmv_esco_link_req_handler = 0x400276e8 );
+PROVIDE ( lmp_ch_class_req_handler = 0x40027730 );
+PROVIDE ( lmp_ch_class_handler = 0x4002ca18 );
+PROVIDE ( lmp_ssr_req_handler = 0x4002780c );
+PROVIDE ( lmp_ssr_res_handler = 0x40027900 );
+PROVIDE ( lmp_pause_enc_aes_req_handler = 0x400279a4 );
+PROVIDE ( lmp_pause_enc_req_handler = 0x4002df90 );
+PROVIDE ( lmp_resume_enc_req_handler = 0x4002e084 );
+PROVIDE ( lmp_num_comparison_fail_handler = 0x40027a74 );
+PROVIDE ( lmp_passkey_fail_handler = 0x40027aec );
+PROVIDE ( lmp_keypress_notif_handler = 0x4002c5c8 );
+PROVIDE ( lmp_pwr_ctrl_req_handler = 0x400263bc );
+PROVIDE ( lmp_pwr_ctrl_res_handler = 0x40026480 );
+PROVIDE ( lmp_auto_rate_handler = 0x40026548 );
+PROVIDE ( lmp_pref_rate_handler = 0x4002657c );
+PROVIDE ( lmp_name_req_handler = 0x40025050 );
+PROVIDE ( lmp_name_res_handler = 0x400250bc );
+PROVIDE ( lmp_not_accepted_handler = 0x400251d0 );
+PROVIDE ( lmp_accepted_handler = 0x4002e894 );
+PROVIDE ( lmp_clk_off_req_handler = 0x40025a44 );
+PROVIDE ( lmp_clk_off_res_handler = 0x40025ab8 );
+PROVIDE ( lmp_detach_handler = 0x40025b74 );
+PROVIDE ( lmp_tempkey_handler = 0x4002b6b0 );
+PROVIDE ( lmp_temprand_handler = 0x4002b74c );
+PROVIDE ( lmp_sres_handler = 0x4002b840 );
+PROVIDE ( lmp_aurand_handler = 0x4002bda0 );
+PROVIDE ( lmp_unitkey_handler = 0x4002c13c );
+PROVIDE ( lmp_combkey_handler = 0x4002c234 );
+PROVIDE ( lmp_inrand_handler = 0x4002c414 );
+PROVIDE ( lmp_oob_fail_handler = 0x40027b84 );
+PROVIDE ( lmp_ping_req_handler = 0x40027c08 );
+PROVIDE ( lmp_ping_res_handler = 0x40027c5c );
+PROVIDE ( lmp_enc_mode_req_handler = 0x40025c60 );
+PROVIDE ( lmp_enc_key_size_req_handler = 0x40025e54 );
+PROVIDE ( lmp_switch_req_handler = 0x40025f84 );
+PROVIDE ( lmp_start_enc_req_handler = 0x4002e124 );
+PROVIDE ( lmp_stop_enc_req_handler = 0x4002de30 );
+PROVIDE ( lmp_sniff_req_handler = 0x400260c8 );
+PROVIDE ( lmp_unsniff_req_handler = 0x400261e0 );
+PROVIDE ( lmp_incr_pwr_req_handler = 0x4002629c );
+PROVIDE ( lmp_decr_pwr_req_handler = 0x400262f8 );
+PROVIDE ( lmp_max_pwr_handler = 0x40026354 );
+PROVIDE ( lmp_min_pwr_handler = 0x40026388 );
+PROVIDE ( lmp_ver_req_handler = 0x400265f0 );
+PROVIDE ( lmp_ver_res_handler = 0x40026670 );
+PROVIDE ( lmp_qos_handler = 0x40026790 );
+PROVIDE ( lmp_qos_req_handler = 0x40026844 );
+PROVIDE ( lmp_sco_link_req_handler = 0x40026930 );
+PROVIDE ( lmp_rmv_sco_link_req_handler = 0x40026a10 );
+PROVIDE ( lmp_max_slot_handler = 0x40026a54 );
+PROVIDE ( lmp_max_slot_req_handler = 0x40026aac );
+PROVIDE ( lmp_timing_accu_req_handler = 0x40026b54 );
+PROVIDE ( lmp_timing_accu_res_handler = 0x40026bcc );
+PROVIDE ( lmp_setup_cmp_handler = 0x40026c84 );
+PROVIDE ( lmp_feats_res_handler = 0x4002b548 );
+PROVIDE ( lmp_feats_req_handler = 0x4002b620 );
+PROVIDE ( lmp_host_con_req_handler = 0x4002b3d8 );
+PROVIDE ( lmp_use_semi_perm_key_handler = 0x4002b4c4 );
+PROVIDE ( lmp_slot_off_handler = 0x40026cc8 );
+PROVIDE ( lmp_page_mode_req_handler = 0x40026d0c );
+PROVIDE ( lmp_page_scan_mode_req_handler = 0x40026d4c );
+PROVIDE ( lmp_supv_to_handler = 0x40026d94 );
+PROVIDE ( lmp_test_activate_handler = 0x40026e7c );
+PROVIDE ( lmp_test_ctrl_handler = 0x40026ee4 );
+PROVIDE ( lmp_enc_key_size_mask_req_handler = 0x40027038 );
+PROVIDE ( lmp_enc_key_size_mask_res_handler = 0x400270a4 );
+PROVIDE ( lmp_set_afh_handler = 0x4002b2e4 );
+PROVIDE ( lmp_encaps_hdr_handler = 0x40027120 );
+PROVIDE ( lmp_encaps_payl_handler = 0x4002e590 );
+PROVIDE ( lmp_sp_nb_handler = 0x4002acf0 );
+PROVIDE ( lmp_sp_cfm_handler = 0x4002b170 );
+PROVIDE ( lmp_dhkey_chk_handler = 0x4002ab48 );
+PROVIDE ( lmp_pause_enc_aes_req_handler = 0x400279a4 );
+PROVIDE ( lmp_io_cap_res_handler = 0x4002c670 );
+PROVIDE ( lmp_io_cap_req_handler = 0x4002c7a4 );
 PROVIDE ( r_ld_acl_active_hop_types_get = 0x40036e10 );
 PROVIDE ( r_ld_acl_afh_confirm = 0x40036d40 );
 PROVIDE ( r_ld_acl_afh_prepare = 0x40036c84 );
@@ -1537,6 +1621,7 @@ PROVIDE ( esp_rom_spiflash_read_user_cmd = 0x400621b0 );
 PROVIDE ( esp_rom_spiflash_write_encrypted_disable = 0x40062e60 );
 PROVIDE ( esp_rom_spiflash_write_encrypted_enable = 0x40062df4 );
 PROVIDE ( esp_rom_spiflash_prepare_encrypted_data = 0x40062e1c );
+PROVIDE ( esp_rom_spiflash_select_qio_pins = 0x40061ddc );
 PROVIDE ( g_rom_spiflash_chip = 0x3ffae270 );
 
 /* 
@@ -1771,5 +1856,7 @@ PROVIDE ( ld_sched_params = 0x3ffb96c0 );
 PROVIDE ( ld_sco_env = 0x3ffb824c );
 PROVIDE ( ld_sscan_env = 0x3ffb832c );
 PROVIDE ( ld_strain_env = 0x3ffb8330 );
+PROVIDE ( LM_Sniff = 0x3ffb8230 );
+PROVIDE ( LM_SniffSubRate = 0x3ffb8214 );
 /* Above are static data, but can be used, not generated by script >>>>> btdm data */
 
diff --git a/tools/sdk/ld/esp32.rom.spiflash.ld b/tools/sdk/ld/esp32.rom.spiflash.ld
index 64af6a4b9e1..709b3581144 100644
--- a/tools/sdk/ld/esp32.rom.spiflash.ld
+++ b/tools/sdk/ld/esp32.rom.spiflash.ld
@@ -10,7 +10,7 @@ PROVIDE ( esp_rom_spiflash_erase_chip = 0x40062c14 );
 PROVIDE ( esp_rom_spiflash_erase_sector = 0x40062ccc );
 PROVIDE ( esp_rom_spiflash_lock = 0x400628f0 );
 PROVIDE ( esp_rom_spiflash_read = 0x40062ed8 );
-PROVIDE ( esp_rom_spiflash_config_readmode = 0x40062944 );
+PROVIDE ( esp_rom_spiflash_config_readmode = 0x40062b64 ); /* SPIMasterReadModeCnfig */
 PROVIDE ( esp_rom_spiflash_read_status = 0x4006226c );
 PROVIDE ( esp_rom_spiflash_read_statushigh = 0x40062448 );
 PROVIDE ( esp_rom_spiflash_write = 0x40062d50 );
diff --git a/tools/sdk/lib/libapp_update.a b/tools/sdk/lib/libapp_update.a
index 40af8532458..36ad5d1d122 100644
Binary files a/tools/sdk/lib/libapp_update.a and b/tools/sdk/lib/libapp_update.a differ
diff --git a/tools/sdk/lib/libbootloader_support.a b/tools/sdk/lib/libbootloader_support.a
index 79fe9dcdf72..6247d970580 100644
Binary files a/tools/sdk/lib/libbootloader_support.a and b/tools/sdk/lib/libbootloader_support.a differ
diff --git a/tools/sdk/lib/libbt.a b/tools/sdk/lib/libbt.a
index f5fa06d32f0..b1740c78c15 100644
Binary files a/tools/sdk/lib/libbt.a and b/tools/sdk/lib/libbt.a differ
diff --git a/tools/sdk/lib/libbtdm_app.a b/tools/sdk/lib/libbtdm_app.a
index 4150f046e1b..635d454754a 100644
Binary files a/tools/sdk/lib/libbtdm_app.a and b/tools/sdk/lib/libbtdm_app.a differ
diff --git a/tools/sdk/lib/libcoap.a b/tools/sdk/lib/libcoap.a
index 5a05874c2dc..91c84f095d9 100644
Binary files a/tools/sdk/lib/libcoap.a and b/tools/sdk/lib/libcoap.a differ
diff --git a/tools/sdk/lib/libcoexist.a b/tools/sdk/lib/libcoexist.a
index 285847d3639..d8f2a448c5b 100644
Binary files a/tools/sdk/lib/libcoexist.a and b/tools/sdk/lib/libcoexist.a differ
diff --git a/tools/sdk/lib/libcore.a b/tools/sdk/lib/libcore.a
index 060f5c8762f..9645ec81208 100644
Binary files a/tools/sdk/lib/libcore.a and b/tools/sdk/lib/libcore.a differ
diff --git a/tools/sdk/lib/libcxx.a b/tools/sdk/lib/libcxx.a
index c33de2c3f17..20c5afcce80 100644
Binary files a/tools/sdk/lib/libcxx.a and b/tools/sdk/lib/libcxx.a differ
diff --git a/tools/sdk/lib/libdriver.a b/tools/sdk/lib/libdriver.a
index 5193edbce78..8730f316d34 100644
Binary files a/tools/sdk/lib/libdriver.a and b/tools/sdk/lib/libdriver.a differ
diff --git a/tools/sdk/lib/libesp32.a b/tools/sdk/lib/libesp32.a
index 9b0b78382db..0a3cbc615d0 100644
Binary files a/tools/sdk/lib/libesp32.a and b/tools/sdk/lib/libesp32.a differ
diff --git a/tools/sdk/lib/libethernet.a b/tools/sdk/lib/libethernet.a
index 02c2aaf3359..70a1d0a3364 100644
Binary files a/tools/sdk/lib/libethernet.a and b/tools/sdk/lib/libethernet.a differ
diff --git a/tools/sdk/lib/libexpat.a b/tools/sdk/lib/libexpat.a
index 171c1636fc6..cff52a9e116 100644
Binary files a/tools/sdk/lib/libexpat.a and b/tools/sdk/lib/libexpat.a differ
diff --git a/tools/sdk/lib/libfatfs.a b/tools/sdk/lib/libfatfs.a
index 9643f9008ae..ff7373e6b03 100644
Binary files a/tools/sdk/lib/libfatfs.a and b/tools/sdk/lib/libfatfs.a differ
diff --git a/tools/sdk/lib/libfreertos.a b/tools/sdk/lib/libfreertos.a
index f8773da71c7..6fc0220a3ec 100644
Binary files a/tools/sdk/lib/libfreertos.a and b/tools/sdk/lib/libfreertos.a differ
diff --git a/tools/sdk/lib/libjsmn.a b/tools/sdk/lib/libjsmn.a
index b1142da20f7..7e8e33a463a 100644
Binary files a/tools/sdk/lib/libjsmn.a and b/tools/sdk/lib/libjsmn.a differ
diff --git a/tools/sdk/lib/libjson.a b/tools/sdk/lib/libjson.a
index 47e87376a5c..13e020fbc91 100644
Binary files a/tools/sdk/lib/libjson.a and b/tools/sdk/lib/libjson.a differ
diff --git a/tools/sdk/lib/liblog.a b/tools/sdk/lib/liblog.a
index aa462242b91..653aff9bd16 100644
Binary files a/tools/sdk/lib/liblog.a and b/tools/sdk/lib/liblog.a differ
diff --git a/tools/sdk/lib/liblwip.a b/tools/sdk/lib/liblwip.a
index a2f0bedcb62..c145b1f85fe 100644
Binary files a/tools/sdk/lib/liblwip.a and b/tools/sdk/lib/liblwip.a differ
diff --git a/tools/sdk/lib/libmbedtls.a b/tools/sdk/lib/libmbedtls.a
index f5bc9863c3f..17b97ffe580 100644
Binary files a/tools/sdk/lib/libmbedtls.a and b/tools/sdk/lib/libmbedtls.a differ
diff --git a/tools/sdk/lib/libmdns.a b/tools/sdk/lib/libmdns.a
index 81a73b12ddb..42fc81c5fbe 100644
Binary files a/tools/sdk/lib/libmdns.a and b/tools/sdk/lib/libmdns.a differ
diff --git a/tools/sdk/lib/libmicro-ecc.a b/tools/sdk/lib/libmicro-ecc.a
index 5c1837e6306..12b97b0401a 100644
Binary files a/tools/sdk/lib/libmicro-ecc.a and b/tools/sdk/lib/libmicro-ecc.a differ
diff --git a/tools/sdk/lib/libnet80211.a b/tools/sdk/lib/libnet80211.a
index 14f8fed9bd1..980f4888728 100644
Binary files a/tools/sdk/lib/libnet80211.a and b/tools/sdk/lib/libnet80211.a differ
diff --git a/tools/sdk/lib/libnewlib.a b/tools/sdk/lib/libnewlib.a
index e097378a13b..8c013d6c9a4 100644
Binary files a/tools/sdk/lib/libnewlib.a and b/tools/sdk/lib/libnewlib.a differ
diff --git a/tools/sdk/lib/libnghttp.a b/tools/sdk/lib/libnghttp.a
index 748dc21c2e6..1e915170f1f 100644
Binary files a/tools/sdk/lib/libnghttp.a and b/tools/sdk/lib/libnghttp.a differ
diff --git a/tools/sdk/lib/libnvs_flash.a b/tools/sdk/lib/libnvs_flash.a
index c2b4e442357..ac00f9e259a 100644
Binary files a/tools/sdk/lib/libnvs_flash.a and b/tools/sdk/lib/libnvs_flash.a differ
diff --git a/tools/sdk/lib/libopenssl.a b/tools/sdk/lib/libopenssl.a
index 6e8a09de8c7..df89c3caf7b 100644
Binary files a/tools/sdk/lib/libopenssl.a and b/tools/sdk/lib/libopenssl.a differ
diff --git a/tools/sdk/lib/libpp.a b/tools/sdk/lib/libpp.a
index b238e25e9d5..a82fdcf5d85 100644
Binary files a/tools/sdk/lib/libpp.a and b/tools/sdk/lib/libpp.a differ
diff --git a/tools/sdk/lib/libsdmmc.a b/tools/sdk/lib/libsdmmc.a
index b9c55aa4644..64c0ee326c2 100644
Binary files a/tools/sdk/lib/libsdmmc.a and b/tools/sdk/lib/libsdmmc.a differ
diff --git a/tools/sdk/lib/libsmartconfig.a b/tools/sdk/lib/libsmartconfig.a
index aea13ce0c07..077fed62583 100644
Binary files a/tools/sdk/lib/libsmartconfig.a and b/tools/sdk/lib/libsmartconfig.a differ
diff --git a/tools/sdk/lib/libsoc.a b/tools/sdk/lib/libsoc.a
index 9463cb8c2c6..7db5b7dc3c4 100644
Binary files a/tools/sdk/lib/libsoc.a and b/tools/sdk/lib/libsoc.a differ
diff --git a/tools/sdk/lib/libspi_flash.a b/tools/sdk/lib/libspi_flash.a
index 040afd0ec09..243d52baa09 100644
Binary files a/tools/sdk/lib/libspi_flash.a and b/tools/sdk/lib/libspi_flash.a differ
diff --git a/tools/sdk/lib/libtcpip_adapter.a b/tools/sdk/lib/libtcpip_adapter.a
index 5f0add0c17b..7147302524b 100644
Binary files a/tools/sdk/lib/libtcpip_adapter.a and b/tools/sdk/lib/libtcpip_adapter.a differ
diff --git a/tools/sdk/lib/libulp.a b/tools/sdk/lib/libulp.a
index fdaecfb9f71..b3ca95bc70c 100644
Binary files a/tools/sdk/lib/libulp.a and b/tools/sdk/lib/libulp.a differ
diff --git a/tools/sdk/lib/libvfs.a b/tools/sdk/lib/libvfs.a
index ba37e5ba61e..ec76039b687 100644
Binary files a/tools/sdk/lib/libvfs.a and b/tools/sdk/lib/libvfs.a differ
diff --git a/tools/sdk/lib/libwear_levelling.a b/tools/sdk/lib/libwear_levelling.a
new file mode 100644
index 00000000000..c3e254ac67d
Binary files /dev/null and b/tools/sdk/lib/libwear_levelling.a differ
diff --git a/tools/sdk/lib/libwpa.a b/tools/sdk/lib/libwpa.a
index 5e65e2c707b..77438ea3187 100644
Binary files a/tools/sdk/lib/libwpa.a and b/tools/sdk/lib/libwpa.a differ
diff --git a/tools/sdk/lib/libwpa2.a b/tools/sdk/lib/libwpa2.a
index fda8866b192..5b75c989c01 100644
Binary files a/tools/sdk/lib/libwpa2.a and b/tools/sdk/lib/libwpa2.a differ
diff --git a/tools/sdk/lib/libwpa_supplicant.a b/tools/sdk/lib/libwpa_supplicant.a
index b0177cbf8a6..bcbc927d35c 100644
Binary files a/tools/sdk/lib/libwpa_supplicant.a and b/tools/sdk/lib/libwpa_supplicant.a differ
diff --git a/tools/sdk/lib/libwps.a b/tools/sdk/lib/libwps.a
index af6d8ea9865..fd981007080 100644
Binary files a/tools/sdk/lib/libwps.a and b/tools/sdk/lib/libwps.a differ
diff --git a/tools/sdk/lib/libxtensa-debug-module.a b/tools/sdk/lib/libxtensa-debug-module.a
index e0086dea963..d0f63551d81 100644
Binary files a/tools/sdk/lib/libxtensa-debug-module.a and b/tools/sdk/lib/libxtensa-debug-module.a differ
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
index 3bb26f1e94c..274f5d231dc 100644
--- a/variants/lolin32/pins_arduino.h
+++ b/variants/lolin32/pins_arduino.h
@@ -11,10 +11,10 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
-static const uint8_t LED_BUILTIN = 2;
+static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 
-static const uint8_t KEY_BUILTIN = 0;
+
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;