From 343c015d0b96dce2ed03f2b64a4c1ab6b2064b63 Mon Sep 17 00:00:00 2001
From: "matthias.ringwald"
 <matthias.ringwald@1a0a8af8-31b5-11de-8e0c-53a27eea117e>
Date: Sun, 5 Jun 2011 09:56:19 +0000
Subject: [PATCH] update to use baudrate_init

---
 src/bt_control_iphone.m | 25 ++++++++++++-------------
 src/hci_transport_h4.c  |  4 ++--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/bt_control_iphone.m b/src/bt_control_iphone.m
index 86ed663f0..752dc1974 100644
--- a/src/bt_control_iphone.m
+++ b/src/bt_control_iphone.m
@@ -422,8 +422,8 @@ static int iphone_on (void *transport_config){
 #endif
     
     // if baud == 0 use system default
-    if (hci_uart_config->baudrate == 0) {
-        hci_uart_config->baudrate = transport_speed;
+    if (hci_uart_config->baudrate_init == 0) {
+        hci_uart_config->baudrate_init = transport_speed;
     }
     
 #ifdef USE_BLUETOOL
@@ -493,17 +493,17 @@ static int iphone_on (void *transport_config){
     }
     
     // advanced config - use custom baud rate
-    if (hci_uart_config->baudrate != transport_speed) {
+    if (hci_uart_config->baudrate_init != transport_speed) {
         FILE * outputFile = popen(bluetool, "r+");
         setvbuf(outputFile, NULL, _IONBF, 0);
         int output = fileno(outputFile);
         
         if (os4x) {
             // 4.x - send custom config
-            iphone_write_configscript(output, hci_uart_config->baudrate);
+            iphone_write_configscript(output, hci_uart_config->baudrate_init);
         } else {
             // 3.x - modify original script on the fly
-            iphone_write_initscript(output, hci_uart_config->baudrate);
+            iphone_write_initscript(output, hci_uart_config->baudrate_init);
         }
         
         // log output
@@ -679,15 +679,14 @@ void iphone_register_for_power_notifications(void (*cb)(POWER_NOTIFICATION_t eve
 
 // single instance
 bt_control_t bt_control_iphone = {
-    iphone_on,
-    iphone_off,
-    iphone_sleep,
-    iphone_wake,
-    iphone_valid,
-    iphone_name,
-    NULL,   // custom init sequence
+    .on     = iphone_on,
+    .off    = iphone_off,
+    .sleep  = iphone_sleep,
+    .wake   = iphone_wake,
+    .valid  = iphone_valid,
+    .name   = iphone_name,
 #ifdef IOKIT
-    iphone_register_for_power_notifications
+    .register_for_power_notifications = iphone_register_for_power_notifications
 #else
     NULL    // register_for_power_notifications
 #endif
diff --git a/src/hci_transport_h4.c b/src/hci_transport_h4.c
index 9fb2cf14a..bc9f54650 100644
--- a/src/hci_transport_h4.c
+++ b/src/hci_transport_h4.c
@@ -113,8 +113,8 @@ static int    h4_open(void *transport_config){
         perror("init_serialport: Couldn't get term attributes");
         return -1;
     }
-    speed_t brate = hci_uart_config->baudrate; // let you override switch below if needed
-    switch(hci_uart_config->baudrate) {
+    speed_t brate = hci_uart_config->baudrate_init; // let you override switch below if needed
+    switch(hci_uart_config->baudrate_init) {
         case 57600:  brate=B57600;  break;
         case 115200: brate=B115200; break;
 #ifdef B230400