mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

port/zephyr: fixed lc3 build, cleaned up CMakeLists.txt and fixed main signature warning

Browse Source
This commit is contained in:
Dirk Helbig 2023-06-28 15:07:22 +02:00
parent 2c84eaa351
commit b51b065ce0
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
port/zephyr/CMakeLists.txt
View File

@ -36,9 +36,6 @@ list(APPEND INCLUDES_PATH 3rd-party/rijndael)
list(APPEND INCLUDES_PATH 3rd-party/yxml) list(APPEND INCLUDES_PATH 3rd-party/yxml)
list(APPEND INCLUDES_PATH 3rd-party/tinydir) list(APPEND INCLUDES_PATH 3rd-party/tinydir)
list(APPEND INCLUDES_PATH src) list(APPEND INCLUDES_PATH src)
#list(APPEND INCLUDES_PATH chipset/realtek)
#list(APPEND INCLUDES_PATH chipset/zephyr)
#list(APPEND INCLUDES_PATH platform/posix)
list(APPEND INCLUDES_PATH platform/embedded) list(APPEND INCLUDES_PATH platform/embedded)
list(APPEND INCLUDES_PATH platform/lwip) list(APPEND INCLUDES_PATH platform/lwip)
list(APPEND INCLUDES_PATH platform/lwip/port) list(APPEND INCLUDES_PATH platform/lwip/port)
@ -48,8 +45,6 @@ include_directories( ${INCLUDES_PATH} )
file(GLOB SOURCES_SRC "${BTSTACK_ROOT}/src/*.c" ) #"${BTSTACK_ROOT}/example/sco_demo_util.c") file(GLOB SOURCES_SRC "${BTSTACK_ROOT}/src/*.c" ) #"${BTSTACK_ROOT}/example/sco_demo_util.c")
#message("${SOURCES_SRC}")
file(GLOB SOURCES_BLE "${BTSTACK_ROOT}/src/ble/*.c") file(GLOB SOURCES_BLE "${BTSTACK_ROOT}/src/ble/*.c")
file(GLOB SOURCES_GATT "${BTSTACK_ROOT}/src/ble/gatt-service/*.c") file(GLOB SOURCES_GATT "${BTSTACK_ROOT}/src/ble/gatt-service/*.c")
file(GLOB SOURCES_CLASSIC "${BTSTACK_ROOT}/src/classic/*.c") file(GLOB SOURCES_CLASSIC "${BTSTACK_ROOT}/src/classic/*.c")
@ -61,10 +56,7 @@ file(GLOB SOURCES_YXML "${BTSTACK_ROOT}/3rd-party/yxml/yxml.c")
file(GLOB SOURCES_HXCMOD "${BTSTACK_ROOT}/3rd-party/hxcmod-player/*.c" "../../3rd-party/hxcmod-player/mods/*.c") file(GLOB SOURCES_HXCMOD "${BTSTACK_ROOT}/3rd-party/hxcmod-player/*.c" "../../3rd-party/hxcmod-player/mods/*.c")
file(GLOB SOURCES_RIJNDAEL "${BTSTACK_ROOT}/3rd-party/rijndael/rijndael.c") file(GLOB SOURCES_RIJNDAEL "${BTSTACK_ROOT}/3rd-party/rijndael/rijndael.c")
file(GLOB SOURCES_EMBEDDED "${BTSTACK_ROOT}/platform/embedded/*.c") file(GLOB SOURCES_EMBEDDED "${BTSTACK_ROOT}/platform/embedded/*.c")
#file(GLOB SOURCES_ZEPHYR "${CMAKE_SOURCE_DIR}/src/main.c") file(GLOB SOURCES_LC3_GOOGLE "${BTSTACK_ROOT}/3rd-party/lc3-google/src/*.c")
#file(GLOB SOURCES_ZEPHYR "${BTSTACK_ROOT}/chipset/zephyr/*.c")
#file(GLOB SOURCES_REALTEK "${BTSTACK_ROOT}/chipset/realtek/*.c")
#file(GLOB SOURCES_LC3_GOOGLE "${BTSTACK_ROOT}/3rd-party/lc3-google/src/*.c")
set(LWIP_CORE_SRC set(LWIP_CORE_SRC
3rd-party/lwip/core/src/core/def.c 3rd-party/lwip/core/src/core/def.c
@ -125,12 +117,7 @@ set(SOURCES
${SOURCES_SRC} ${SOURCES_SRC}
${SOURCES_BLE} ${SOURCES_BLE}
${SOURCES_GATT} ${SOURCES_GATT}
# ${SOURCES_MESH}
# ${SOURCES_CLASSIC}
${SOURCES_UECC} ${SOURCES_UECC}
# ${SOURCES_HXCMOD}
# ${SOURCES_REALTEK}
# ${SOURCES_ZEPHYR}
) )
list(SORT SOURCES) list(SORT SOURCES)
@ -162,6 +149,7 @@ string( REGEX REPLACE "\\$<TARGET_PROPERTY:compiler,imacros>\\$<SEMICOLON>([^\\$
_all_options ${external_project_cflags} ) _all_options ${external_project_cflags} )
target_compile_options( btstack PUBLIC ${_all_options}) target_compile_options( btstack PUBLIC ${_all_options})
target_compile_options( btstack PUBLIC -std=c11 )
set(EXAMPLES "gatt_counter" ) set(EXAMPLES "gatt_counter" )
if(DEFINED ENV{EXAMPLE}) if(DEFINED ENV{EXAMPLE})
@ -206,8 +194,6 @@ foreach(EXAMPLE ${EXAMPLES})
else() else()
message("example ${EXAMPLE}") message("example ${EXAMPLE}")
endif() endif()
# add_executable(${EXAMPLE} ${SOURCES_EXAMPLE} )
target_sources( app PRIVATE ${SOURCES_EXAMPLE} ) target_sources( app PRIVATE ${SOURCES_EXAMPLE} )
# target_link_libraries(${EXAMPLE} btstack)
target_link_libraries( app PRIVATE btstack ) target_link_libraries( app PRIVATE btstack )
endforeach(EXAMPLE) endforeach(EXAMPLE)

1
port/zephyr/prj.conf
View File

@ -7,6 +7,7 @@ CONFIG_USE_SEGGER_RTT=y
#CONFIG_GPIO=y #CONFIG_GPIO=y
#CONFIG_SERIAL=y #CONFIG_SERIAL=y
#CONFIG_UART_INTERRUPT_DRIVEN=y #CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_REQUIRES_FULL_LIBC=y
CONFIG_I2C=n CONFIG_I2C=n
CONFIG_WATCHDOG=n CONFIG_WATCHDOG=n

3
port/zephyr/src/main.c
View File

@ -227,7 +227,7 @@ void bt_ctlr_assert_handle(char *file, uint32_t line)
} }
#endif /* CONFIG_BT_CTLR_ASSERT_HANDLER */ #endif /* CONFIG_BT_CTLR_ASSERT_HANDLER */
void main(void) int main(void)
{ {
// configure console UART by replacing CONFIG_UART_NRF5_BAUD_RATE with 115200 in uart_console.c // configure console UART by replacing CONFIG_UART_NRF5_BAUD_RATE with 115200 in uart_console.c
@ -268,4 +268,5 @@ void main(void)
btstack_run_loop_execute(); btstack_run_loop_execute();
while (1){}; while (1){};
return 0;
} }