Merge branch 'develop' into windows-h4

example/Makefile.inc

@@ -77,15 +77,15 @@ include ${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/Makefile.inc
 include ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/Makefile.inc
 
 SBC_DECODER += \
-	${BTSTACK_ROOT}/src/classic/btstack_sbc_plc.c \
-	${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
+	btstack_sbc_plc.c \
+	btstack_sbc_bludroid.c \
 
 SBC_ENCODER += \
-	${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
-	${BTSTACK_ROOT}/src/classic/hfp_msbc.c \
+	btstack_sbc_bludroid.c \
+	hfp_msbc.c \
 
 CVSD_PLC = \
-	${BTSTACK_ROOT}/src/classic/btstack_cvsd_plc.c \
+	btstack_cvsd_plc.c \
 
 
 EXAMPLES = 					\

example/hfp_ag_demo.c

@@ -335,7 +335,7 @@ static void show_usage(void){
 }
 
 static void stdin_process(btstack_data_source_t *ds, btstack_data_source_callback_type_t callback_type){
-    read(ds->fd, &cmd, 1);
+    cmd = btstack_stdin_read();
     switch (cmd){
         case 'a':
             log_info("USER:\'%c\'", cmd);

example/hfp_hf_demo.c

@@ -152,7 +152,8 @@ static void show_usage(void){
 }
 
 static void stdin_process(btstack_data_source_t *ds, btstack_data_source_callback_type_t callback_type){
-    read(ds->fd, &cmd, 1);
+
+    cmd = btstack_stdin_read();
 
     if (cmd >= '0' && cmd <= '9'){
         printf("DTMF Code: %c\n", cmd);

example/hsp_ag_demo.c

@@ -121,8 +121,8 @@ static void show_usage(void){
 
 #ifdef HAVE_POSIX_STDIN
 static void stdin_process(btstack_data_source_t *ds, btstack_data_source_callback_type_t callback_type){
-    char buffer;
-    read(ds->fd, &buffer, 1);
+
+    char buffer = btstack_stdin_read();
 
     switch (buffer){
         case 'c':

example/hsp_hs_demo.c

@@ -121,8 +121,8 @@ static void show_usage(void){
 
 #ifdef HAVE_POSIX_STDIN
 static void stdin_process(btstack_data_source_t *ds, btstack_data_source_callback_type_t callback_type){
-    char buffer;
-    read(ds->fd, &buffer, 1);
+
+    char buffer = btstack_stdin_read();
 
     switch (buffer){
         case 'c':

platform/posix/stdin_support.c

@@ -37,6 +37,8 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
+
 #include "btstack_run_loop.h"
 #include <stdlib.h>
 
@@ -89,6 +91,7 @@ void btstack_stdin_reset(void){
 #endif
 }
 
+#if 0
 static int getstring(char *line, int size)
 {
     int i = 0;
@@ -109,20 +112,12 @@ static int getstring(char *line, int size)
     line[i] = 0;
     return i;
 }
+#endif
 
-uint32_t btstack_stdin_query_int(const char * fieldName){
-    printf("Please enter new int value for %s:\n", fieldName);
-    char buffer[80];
-    getstring(buffer, sizeof(buffer));
-    return atoi(buffer);
-}
-
-uint32_t btstack_stdin_query_hex(const char * fieldName){
-    printf("Please enter new hex value for %s:\n", fieldName);
-    char buffer[80];
-    getstring(buffer, sizeof(buffer));
-    uint32_t value;
-    sscanf(buffer, "%x", &value);
-    return value;
+// read single byte after data source callback was triggered
+char btstack_stdin_read(void){
+    char buffer;
+    read(stdin_source.fd, &buffer, 1);
+    return buffer;
 }
 

platform/posix/stdin_support.h

@@ -47,13 +47,12 @@ extern "C" {
 // setup handler for command line interface
 void btstack_stdin_setup(void (*stdin_handler)(btstack_data_source_t *_ds, btstack_data_source_callback_type_t callback_type));
 
+// read single byte after data source callback was triggered
+char btstack_stdin_read(void);
+
 // gets called by main.c
 void btstack_stdin_reset(void);
 
-// 
-uint32_t btstack_stdin_query_int(const char * fieldName);
-uint32_t btstack_stdin_query_hex(const char * fieldName);
-
 #if defined __cplusplus
 }
 #endif