nuttx: fix compilation with nuttx-10.2.0 and arm gcc9

Signed-off-by: Masayuki Ishikawa <[email protected]>

Author: MasayukiIshikawa

Makefile

@@ -33,16 +33,17 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
 
 # Btstack_Demo, World! built-in application info
 
-CONFIG_EXAMPLES_BTSTACK_PRIORITY ?= SCHED_PRIORITY_DEFAULT
+CONFIG_EXAMPLES_BTSTACK_PRIORITY  ?= SCHED_PRIORITY_DEFAULT
 CONFIG_EXAMPLES_BTSTACK_STACKSIZE ?= 2048
 
-APPNAME   = btapp
+PROGNAME  = panu_demo
 PRIORITY  = $(CONFIG_EXAMPLES_BTSTACK_PRIORITY)
 STACKSIZE = $(CONFIG_EXAMPLES_BTSTACK_STACKSIZE)
+MODULE    = $(CONFIG_EXAMPLES_BTSTACK)
 
 #
 
@@ -59,6 +60,7 @@ CFLAGS += -I${BTSTACK_ROOT}/platform/posix
 CFLAGS += -I${BTSTACK_ROOT}/platform/embedded
 CFLAGS += -I..
 CFLAGS += -DNUTTX -DCSR_ONLY -DCSR8811_PSKEYS
+CFLAGS += -Wno-format -Wno-undef -Wno-unused-function
 
 ASRCS   =
 
@@ -88,7 +90,4 @@ CSRCS  += ./example/panu_demo.c
 
 MAINSRC = port/posix-h4/main.c
 
-CONFIG_EXAMPLES_BTSTACK_PROGNAME ?= btapp$(EXEEXT)
-PROGNAME = $(CONFIG_EXAMPLES_BTSTACK_PROGNAME)
-
 include $(APPDIR)/Application.mk

chipset/csr/btstack_chipset_csr.c

@@ -62,14 +62,14 @@
 #include "btstack_util.h"
 #include "hci_transport.h"
 
-#ifdef OK
-#undef OK
-#endif
-
+#if 0
 enum update_result {
     OK,
     SKIP,
 };
+#else
+#define SKIP 1
+#endif
 
 // minimal CSR init script to configure PSKEYs and activate them. It uses store 0x0008 = psram.
 static const uint8_t init_script[] = { 
@@ -183,7 +183,7 @@ static void chipset_init(const void * config){
 
 // set requested baud rate
 // @return 0 = OK, 1 = SKIP, 2 = ..
-static enum update_result update_init_script_command(uint8_t *hci_cmd_buffer){
+static int update_init_script_command(uint8_t *hci_cmd_buffer){
     uint16_t varid = little_endian_read_16(hci_cmd_buffer, 10);
     if (varid != 0x7003) return OK;
     uint16_t key = little_endian_read_16(hci_cmd_buffer, 14);
@@ -232,7 +232,7 @@ static btstack_chipset_result_t chipset_next_command(uint8_t * hci_cmd_buffer){
         memcpy(&hci_cmd_buffer[3], (uint8_t *) &init_script[init_script_offset], payload_len);
 
         // support for on-the-fly configuration updates
-        enum update_result res = update_init_script_command(hci_cmd_buffer);
+        int res = update_init_script_command(hci_cmd_buffer);
         init_script_offset += payload_len;
 
         // support for skipping commands

example/panu_demo.c

@@ -70,9 +70,8 @@ static uint32_t sdp_bnep_remote_uuid    = 0;
 static uint8_t   attribute_value[1000];
 static const unsigned int attribute_value_buffer_size = sizeof(attribute_value);
 
-// MBP 2016
-static const char * remote_addr_string = "F4-0F-24-3B-1B-E1";
-// Wiko Sunny static const char * remote_addr_string = "A0:4C:5B:0F:B2:42";
+// Android Phone
+static const char * remote_addr_string = "9C-5C-F9-0C-5C-15";
 
 static bd_addr_t remote_addr;
 

port/posix-h4/main.c

@@ -97,8 +97,7 @@ static int csr_off(void){
   return 0;
 }
 
-static int csr_init(void){
-  return 0;
+static void csr_init(const void *arg){
 }
 
 static btstack_control_t hw_control = {
@@ -243,7 +242,7 @@ static void local_version_information_handler(uint8_t * packet){
 }
 
 #ifdef NUTTX
-int btapp_main(int argc, const char * argv[]){
+int panu_demo_main(int argc, const char * argv[]){
 #else
 int main(int argc, const char * argv[]){
 #endif