Merge branch 'master' of https://github.com/bluekitchen/btstack

chipset-cc256x/bt_control_cc256x.c

@@ -86,12 +86,21 @@ static uint32_t init_script_offset  = 0;
 static int16_t  init_power_in_dB    = 13; // 13 dBm
 static int      init_ehcill_enabled = 0;
 
+static int      init_send_route_sco_over_hci = 0;
 
 static int bt_control_cc256x_on(void *config){
 	init_script_offset = 0;
+#ifdef HAVE_SCO_OVER_HCI
+    init_send_route_sco_over_hci = 1;
+#endif
 	return 0;
 }
 
+// route SCO over HCI (connection type=1, tx buffer size = 0x00 (don't change), tx buffer max latency=0x0000(don't chnage)), accept packets - 0)
+static const uint8_t hci_route_sco_over_hci[] = {
+    0x10, 0xfe, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
 // UART Baud Rate control from: http://e2e.ti.com/support/low_power_rf/f/660/p/134850/484763.aspx
 static int cc256x_baudrate_cmd(void * config, uint32_t baudrate, uint8_t *hci_cmd_buffer){
     hci_cmd_buffer[0] = 0x36;
@@ -213,6 +222,12 @@ static int bt_control_cc256x_update_command(uint8_t *hci_cmd_buffer){
 static int bt_control_cc256x_next_cmd(void *config, uint8_t *hci_cmd_buffer){
 
     if (init_script_offset >= cc256x_init_script_size) {
+        // append send route SCO over HCI if requested
+        if (init_send_route_sco_over_hci){
+            init_send_route_sco_over_hci = 0;
+            memcpy(hci_cmd_buffer, hci_route_sco_over_hci, sizeof(hci_route_sco_over_hci));
+            return 1;
+        }
         return 0;
     }
     

platforms/posix-csr/.gitignore

@@ -0,0 +1,27 @@
+ancs_client
+ancs_client.h
+ble_central_test
+ble_peripheral
+ble_peripheral_sm_minimal
+bnep_test
+classic_test
+gap_dedicated_bonding
+gap_inquiry
+gap_inquiry_and_bond
+gatt_battery_query
+gatt_browser
+hsp_ag_test
+hsp_hs_test
+l2cap_test
+profile.h
+sdp_bnep_query
+sdp_general_query
+sdp_rfcomm_query
+spp_and_le_counter
+spp_and_le_counter.h
+spp_counter
+spp_streamer
+led_counter
+le_counter.h
+ble_peripheral_test
+le_counter

platforms/posix-csr/Makefile

@@ -0,0 +1,38 @@
+# Makefile for libusb based examples
+BTSTACK_ROOT = ../..
+POSIX_ROOT= ${BTSTACK_ROOT}/platforms/posix
+
+CORE += main.c stdin_support.c bt_control_csr.c
+
+COMMON += hci_transport_h4.c run_loop_posix.c remote_device_db_fs.c
+
+include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
+
+CFLAGS += -I$(BTSTACK_ROOT)/chipset-csr
+
+CFLAGS  += -g -Wall 
+
+# 
+# CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror
+
+VPATH += ${BTSTACK_ROOT}/platforms/posix/src
+VPATH += ${BTSTACK_ROOT}/chipset-csr
+
+ifeq ($(OS),Windows_NT)
+LDFLAGS += -lws2_32
+# assume libusb was installed into /usr/local
+CFLAGS  += -I/usr/local/include/libusb-1.0
+LDFLAGS += -L/usr/local/lib -lusb-1.0
+else
+# use pkg-config
+CFLAGS  += $(shell pkg-config libusb-1.0 --cflags)
+LDFLAGS += $(shell pkg-config libusb-1.0 --libs)
+endif
+
+# Command Line examples require porting to win32, so only build on other unix-ish hosts
+ifneq ($(OS),Windows_NT)
+EXAMPLES += ${EXAMPLES_CLI}
+CFLAGS += -I${POSIX_ROOT}/src
+endif
+
+all: ${BTSTACK_ROOT}/include/btstack/version.h ${EXAMPLES}

platforms/posix-csr/btstack-config.h

@@ -0,0 +1,25 @@
+// config.h created by configure for BTstack  Tue Jun 4 23:10:20 CEST 2013
+
+#ifndef __BTSTACK_CONFIG
+#define __BTSTACK_CONFIG
+
+#define ENABLE_LOG_ERROR
+#define ENABLE_LOG_INFO 
+#define HAVE_BLE
+#define HAVE_BZERO
+#define HAVE_HCI_DUMP
+#define HAVE_MALLOC
+#define HAVE_RFCOMM
+#define HAVE_SDP
+#define HAVE_SO_NOSIGPIPE
+#define HAVE_TIME
+#define HAVE_SCO
+#define HAVE_SCO_OVER_HCI
+#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
+#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
+#define REMOTE_DEVICE_DB remote_device_db_iphone
+#define SDP_DES_DUMP
+#define SDP_DES_DUMP
+#define USE_POSIX_RUN_LOOP
+
+#endif

platforms/posix-csr/main.c

@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2014 BlueKitchen GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ * 4. Any redistribution, use, or modification is done solely for
+ *    personal benefit and not for any commercial purpose or for
+ *    monetary gain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS
+ * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Please inquire about commercial licensing options at 
+ * contact@bluekitchen-gmbh.com
+ *
+ */
+
+// *****************************************************************************
+//
+// minimal setup for HCI code
+//
+// *****************************************************************************
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include "btstack-config.h"
+
+#include <btstack/run_loop.h>
+
+#include "debug.h"
+#include "btstack_memory.h"
+#include "hci.h"
+#include "hci_dump.h"
+#include "stdin_support.h"
+#include <btstack/hal_led.h>
+#include "bt_control_csr.h"
+
+int btstack_main(int argc, const char * argv[]);
+
+static hci_uart_config_t hci_uart_config_cc256x = {
+    NULL,
+    115200,
+    921600
+};
+
+static void sigint_handler(int param){
+
+#ifndef _WIN32
+    // reset anyway
+    btstack_stdin_reset();
+#endif
+
+    log_info(" <= SIGINT received, shutting down..\n");   
+    hci_power_control(HCI_POWER_OFF);
+    hci_close();
+    log_info("Good bye, see you.\n");    
+    exit(0);
+}
+
+static int led_state = 0;
+void hal_led_toggle(void){
+    led_state = 1 - led_state;
+    printf("LED State %u\n", led_state);
+}
+
+int main(int argc, const char * argv[]){
+
+	/// GET STARTED with BTstack ///
+	btstack_memory_init();
+    run_loop_init(RUN_LOOP_POSIX);
+	    
+#if 0
+    // Ubuntu
+
+    // use logger: format HCI_DUMP_PACKETLOGGER, HCI_DUMP_BLUEZ or HCI_DUMP_STDOUT
+    hci_dump_open("hci_dump.pklg", HCI_DUMP_PACKETLOGGER);
+
+    // pick serial port
+    hci_uart_config_cc256x.device_name = "/dev/ttyUSB0";
+#else
+    // OS X
+
+    // use logger: format HCI_DUMP_PACKETLOGGER, HCI_DUMP_BLUEZ or HCI_DUMP_STDOUT
+    hci_dump_open("/tmp/hci_dump.pklg", HCI_DUMP_PACKETLOGGER);
+
+    // pick serial port
+    hci_uart_config_cc256x.device_name = "/dev/tty.usbserial-A900K0VK";
+#endif
+
+    // init HCI
+	hci_transport_t    * transport = hci_transport_h4_instance();
+	bt_control_t       * control   = bt_control_csr_instance();
+    remote_device_db_t * remote_db = (remote_device_db_t *) &remote_device_db_fs;
+        
+	hci_init(transport, (void*) &hci_uart_config_cc256x, control, remote_db);
+    
+    // handle CTRL-c
+    signal(SIGINT, sigint_handler);
+
+    // setup app
+    btstack_main(argc, argv);
+
+    // go
+    run_loop_execute();    
+
+    return 0;
+}

src/hci.c

@@ -848,6 +848,11 @@ static void hci_initialization_timeout_handler(timer_source_t * ds){
         case HCI_INIT_W4_SEND_BAUD_CHANGE:
             log_info("Local baud rate change to %"PRIu32, ((hci_uart_config_t *)hci_stack->config)->baudrate_main);
             hci_stack->hci_transport->set_baudrate(((hci_uart_config_t *)hci_stack->config)->baudrate_main);
+            // For CSR, HCI Reset is sent on new baud rate
+            if (hci_stack->manufacturer == 0x000a){
+                hci_stack->substate = HCI_INIT_SEND_RESET_CSR_WARM_BOOT;
+                hci_run();
+            }
             break;
         default:
             break;
@@ -932,7 +937,16 @@ static void hci_initializing_run(void){
                             run_loop_set_timer(&hci_stack->timeout, 100);
                             run_loop_set_timer_handler(&hci_stack->timeout, hci_initialization_timeout_handler);
                             run_loop_add_timer(&hci_stack->timeout);
-                            hci_stack->substate = HCI_INIT_W4_CUSTOM_INIT_CSR_WARM_BOOT;
+                            if (hci_stack->manufacturer == 0x000a
+                                && hci_stack->config
+                                && hci_stack->control
+                                // && hci_stack->control->baudrate_cmd -- there's no such command
+                                && hci_stack->hci_transport->set_baudrate
+                                && ((hci_uart_config_t *)hci_stack->config)->baudrate_main){
+                                hci_stack->substate = HCI_INIT_W4_SEND_BAUD_CHANGE;
+                            } else {
+                               hci_stack->substate = HCI_INIT_W4_CUSTOM_INIT_CSR_WARM_BOOT;
+                            }
                             break;
                     }
                     hci_stack->hci_transport->send_packet(HCI_COMMAND_DATA_PACKET, hci_stack->hci_packet_buffer, size);