From c7d3427cb5e932ff8c99d04eee15ac67d949bfbc Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Sun, 23 Jul 2017 18:52:36 +0200
Subject: [PATCH] atwilc3000: use high baudrate for firmware upload

---
 .../atwilc3000/btstack_chipset_atwilc3000.c   | 34 +++++++++++++++++--
 .../atwilc3000/btstack_chipset_atwilc3000.h   |  3 +-
 port/posix-h4-atwilc3000/main.c               |  2 +-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/chipset/atwilc3000/btstack_chipset_atwilc3000.c b/chipset/atwilc3000/btstack_chipset_atwilc3000.c
index be2c48400..c0f8e5e17 100644
--- a/chipset/atwilc3000/btstack_chipset_atwilc3000.c
+++ b/chipset/atwilc3000/btstack_chipset_atwilc3000.c
@@ -67,6 +67,8 @@ static void atwilc3000_w4_command_complete_read_local_version_information(void);
 static void atwilc3000_write_memory(void);
 static void atwilc3000_vendor_specific_reset(void);
 static void atwilc3000_done(void);
+static void atwilc3000_update_uart_params(void);
+static void atwilc3000_w4_baudrate_update(void);
 
 // globals
 static void (*download_complete)(int result);
@@ -78,6 +80,7 @@ static uint8_t command_buffer[260];
 static const uint8_t * fw_data;
 static uint32_t        fw_size;
 static uint32_t        fw_offset;
+static uint32_t        fw_baudrate;
 
 static void atwilc3000_send_command(const uint8_t * data, uint16_t len){
     hci_dump_packet(HCI_COMMAND_DATA_PACKET, 0, (uint8_t *) &data[1], len - 1);
@@ -121,10 +124,32 @@ static void atwilc3000_w4_command_complete_read_local_version_information(void){
         return;
     }
     log_info("Running from ROM, start firmware download");
-    // TODO: check if  firmware download can be skipped
+    if (fw_baudrate){
+        atwilc3000_update_uart_params();
+    } else {
+        atwilc3000_write_memory();
+    }
+}
+
+static void atwilc3000_update_uart_params(void){
+    command_buffer[0] = 1;
+    command_buffer[1] = 0x53;
+    command_buffer[2] = 0xfc;
+    command_buffer[3] = 5;
+    little_endian_store_32(command_buffer, 4, fw_baudrate);
+    command_buffer[8] = 0;  // No flow control
+    the_uart_driver->receive_block(&event_buffer[0], 7);
+    the_uart_driver->set_block_received(&atwilc3000_w4_baudrate_update);
+    atwilc3000_send_command(&command_buffer[0], 9);
+}
+
+static void atwilc3000_w4_baudrate_update(void){
+    atwilc3000_log_event();
+    the_uart_driver->set_baudrate(fw_baudrate);
     atwilc3000_write_memory();
 }
 
+
 static void atwilc3000_write_memory(void){
     atwilc3000_log_event();
 
@@ -164,16 +189,21 @@ static void atwilc3000_vendor_specific_reset(void){
 
 static void atwilc3000_done(void){
     log_info("done");
+    // reset baud rate
+    if (fw_baudrate){
+        the_uart_driver->set_baudrate(115200);
+    }
     download_complete(0);
 }
 
-void btstack_chipset_atwilc3000_download_firmware(const btstack_uart_block_t * uart_driver, const uint8_t * da_fw_data, uint32_t da_fw_size, void (*done)(int result)){
+void btstack_chipset_atwilc3000_download_firmware(const btstack_uart_block_t * uart_driver, uint32_t baudrate, const uint8_t * da_fw_data, uint32_t da_fw_size, void (*done)(int result)){
 
 	the_uart_driver   = uart_driver;
     download_complete = done;
     fw_data = da_fw_data;
     fw_size = da_fw_size;
     fw_offset = 0;
+    fw_baudrate = baudrate;
 
     int res = the_uart_driver->open();
 
diff --git a/chipset/atwilc3000/btstack_chipset_atwilc3000.h b/chipset/atwilc3000/btstack_chipset_atwilc3000.h
index 6abb9b543..0f6014380 100644
--- a/chipset/atwilc3000/btstack_chipset_atwilc3000.h
+++ b/chipset/atwilc3000/btstack_chipset_atwilc3000.h
@@ -60,9 +60,10 @@ const btstack_chipset_t * btstack_chipset_atwilc3000_instance(void);
 /**
  * @brief Download firmware via uart_driver
  * @param uart_driver -- already initialized
+ * @param baudrate for firmware update
  * @param done callback. 0 = Success
  */
-void btstack_chipset_atwilc3000_download_firmware(const btstack_uart_block_t * uart_driver, const uint8_t * fw, uint32_t fw_size, void (*done)(int result));
+void btstack_chipset_atwilc3000_download_firmware(const btstack_uart_block_t * uart_driver, uint32_t baudrate, const uint8_t * fw, uint32_t fw_size, void (*done)(int result));
 
 #if defined __cplusplus
 }
diff --git a/port/posix-h4-atwilc3000/main.c b/port/posix-h4-atwilc3000/main.c
index 4631c80dd..e64d3304e 100644
--- a/port/posix-h4-atwilc3000/main.c
+++ b/port/posix-h4-atwilc3000/main.c
@@ -168,7 +168,7 @@ int main(int argc, const char * argv[]){
     printf("Phase 1: Download firmware\n");
 
     // phase #2 start main app
-    btstack_chipset_atwilc3000_download_firmware(uart_driver, atwilc3000_fw_data, atwilc3000_fw_size, &phase2);
+    btstack_chipset_atwilc3000_download_firmware(uart_driver, 921600, atwilc3000_fw_data, atwilc3000_fw_size, &phase2);
     // phase2(0);
 
     // go