Skip to content

Commit

Permalink
Move ncs pal includes to pal folder
Browse files Browse the repository at this point in the history
Signed-off-by: Krzysztof Taborowski <[email protected]>
  • Loading branch information
ktaborowski authored and MarGasiorek committed Jul 29, 2022
1 parent ca03645 commit caba816
Show file tree
Hide file tree
Showing 32 changed files with 19 additions and 20 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ zephyr_compile_definitions_ifndef(CONFIG_SIDEWALK_ASSERT SID_PAL_ASSERT_DISABLED
zephyr_include_directories(
include
hal/include
common
pal/include
lib/include
)

add_subdirectory(pal)
Expand Down
6 changes: 2 additions & 4 deletions Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,8 @@ endif # SIDEWALK_BLE

config SIDEWALK_THREAD_STACK_SIZE
int "Stack size for the Sidewalk thread"
range 8192 131072 if SIDEWALK_LINK_MASK_BLE
range 512 131072
default 8192 if SIDEWALK_LINK_MASK_BLE
default 512
range 8192 131072
default 8192
help
Set the internal stack size for Sidewalk thread.

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions tests/unit_tests/pal_ble_adapter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(sidewalk_test_ble_adapter)

cmock_handle(${ZEPHYR_BASE}/include/zephyr/settings/settings.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_ble_advert.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_ble_connection.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_ble_adapter_callbacks.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_ble_service.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_ble_advert.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_ble_connection.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_ble_adapter_callbacks.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_ble_service.h)

# add test file
target_sources(app PRIVATE src/main.c)
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/sid_ble_connection/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(sidewalk_test_sid_ble_connection)

target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/include)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/pal/include)
target_sources(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/pal/src/sid_ble_connection.c)

cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_ble_adapter_callbacks.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_ble_adapter_callbacks.h)

# add test file
target_sources(app PRIVATE src/main.c)
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/sid_ble_service/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(sidewalk_test_sid_ble_service)

target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/include)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/pal/include)
target_sources(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/pal/src/sid_ble_service.c)

cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_ble_adapter_callbacks.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_ble_adapter_callbacks.h)

# add test file
target_sources(app PRIVATE src/main.c)
Expand Down
6 changes: 3 additions & 3 deletions tests/unit_tests/sid_pal_gpio/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ add_definitions(-DNRF52840_XXAA)
cmock_handle($ENV{ZEPHYR_BASE}/../zephyr/include/zephyr/drivers/gpio.h drivers)
cmock_handle(${ZEPHYR_BASE}/../modules/hal/nordic/nrfx/mdk/nrf52840_peripherals.h)
cmock_handle(${ZEPHYR_BASE}/../modules/hal/nordic/nrfx/mdk/nrf_peripherals.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_gpio_utils.h drivers)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_gpio_irq.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_gpio_irq_handler.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_gpio_utils.h drivers)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_gpio_irq.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_gpio_irq_handler.h)

FILE(GLOB app_sources src/*.c $ENV{ZEPHYR_BASE}/../sidewalk/pal/src/sid_gpio.c)
set(SOURCES ${app_sources})
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/sid_pal_gpio_irq/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ project(sidewalk_test_gpio_irq)
add_definitions(-DNRF52840_XXAA)

cmock_handle($ENV{ZEPHYR_BASE}/../zephyr/include/zephyr/drivers/gpio.h drivers)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_gpio_utils.h drivers)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_gpio_irq_handler.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_gpio_utils.h drivers)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_gpio_irq_handler.h)

target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../modules/hal/nordic/nrfx/mdk)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/include)
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/sid_pal_gpio_irq_handler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(sidewalk_test_gpio_irq_handler)
add_definitions(-DNRF52840_XXAA)

cmock_handle(${ZEPHYR_BASE}/../sidewalk/include/sid_gpio_utils.h)
cmock_handle(${ZEPHYR_BASE}/../sidewalk/pal/include/sid_gpio_utils.h)

target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../modules/hal/nordic/nrfx/mdk)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/include)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../sidewalk/pal/include)
FILE(GLOB app_sources src/*.c $ENV{ZEPHYR_BASE}/../sidewalk/pal/src/sid_gpio_irq_handler.c)
set(SOURCES ${app_sources})

Expand Down

0 comments on commit caba816

Please sign in to comment.