Skip to content

Commit

Permalink
Pull request project-chip#379: Added changes for the WiFi CCP BLE pac…
Browse files Browse the repository at this point in the history 
…kage

Merge in WMN_TOOLS/matter from cherry_pick/updated_CCP_BLE_pkg to RC_1.0.2-1.0

Squashed commit of the following:

commit 6da569a07080d1620446296446ec9de3f0967833
Merge: e209c407fb 7ec4b5b4e7
Author: shgutte <[email protected]>
Date:   Thu Dec 8 18:47:27 2022 +0530

    Merge branch 'RC_1.0.2-1.0' of https://stash.silabs.com/scm/wmn_tools/matter into cherry_pick/updated_CCP_BLE_pkg

commit e209c407fb3f4f4cb2bcb4ef9650da0c61b2a699
Author: shgutte <[email protected]>
Date:   Wed Dec 7 17:10:31 2022 +0530

    Removed all commented lines

commit 8e4ac7311239326992816bc5a922f3329dda6cc6
Author: shgutte <[email protected]>
Date:   Tue Dec 6 16:32:19 2022 +0530

    Added changes for the WiFi CCP BLE package

... and 2 more commits
  • Loading branch information
@shgutte @rerasool
shgutte authored and rerasool committed Dec 8, 2022
1 parent 719322e commit 11632e4
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 63 deletions.
1 change: 0 additions & 1 deletion src/platform/silabs/EFR32/BLEManagerImpl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ extern "C" {
#include "sl_bt_api.h"
#endif


namespace chip {
namespace DeviceLayer {
namespace Internal {
Expand Down
108 changes: 46 additions & 62 deletions third_party/silabs/SiWx917_sdk.gni
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) 2020 Project CHIP Authors
#

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand All @@ -24,7 +24,8 @@ declare_args() {
# Location of the efr32 SDK.
efr32_sdk_root = "${chip_root}/third_party/silabs/gecko_sdk"
sdk_support_root = "${chip_root}/third_party/silabs/matter_support"
wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
wisemcu_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917"

# Build openthread with prebuilt silabs lib
Expand Down Expand Up @@ -105,7 +106,6 @@ template("efr32_sdk") {
"USE_NVM3=1",
"RSI_ARM_CM4F",
"RSI_BLE_ENABLE=1",
# "WIFI_DEBUG_ENABLED = 1",
"BRD4325A",
"CHIP_9117",
"TINYCRYPT_PRIMITIVES",
Expand All @@ -123,29 +123,26 @@ template("efr32_sdk") {
"${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen",

### CCP includes ###
"${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/inc",
"${wiseconnect_sdk_root}/platforms/si91x/core/chip/inc",
"${wiseconnect_sdk_root}/platforms/si91x/core/config",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver/config",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/rom_driver/inc",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/inc",

"${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver/CMSIS/Driver/Include",
"${wiseconnect_sdk_root}/platforms/si91x/boards/brd4325a/inc",
"${wiseconnect_sdk_root}/platforms/si91x/core/cmsis",
"${wiseconnect_sdk_root}/third_party/freertos/include",
"${wiseconnect_sdk_root}/third_party/freertos/portable/GCC/ARM_CM4F",
"${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/inc",
"${wisemcu_sdk_root}/platforms/si91x/core/chip/inc",
"${wisemcu_sdk_root}/platforms/si91x/core/config",
"${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver/config",
"${wisemcu_sdk_root}/platforms/si91x/drivers/rom_driver/inc",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/inc",

"${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver",
"${wisemcu_sdk_root}/platforms/si91x/drivers/cmsis_driver/CMSIS/Driver/Include",
"${wisemcu_sdk_root}/platforms/si91x/boards/brd4325a/inc",
"${wisemcu_sdk_root}/platforms/si91x/core/cmsis",
"${wisemcu_sdk_root}/third_party/freertos/include",
"${wisemcu_sdk_root}/third_party/freertos/portable/GCC/ARM_CM4F",
"${examples_plat_dir}/device/inc",

#sample app
"${wiseconnect_sdk_root}/sapi/include",



"${chip_root}/examples/platform/SiWx917/SiWx917",
"${chip_root}/examples/platform/SiWx917/SiWx917/hal",
# "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk/sapi/include",
]

defines += board_defines
Expand Down Expand Up @@ -242,9 +239,7 @@ template("efr32_sdk") {
sources = [

#startup code laocation need to be changed
# "${examples_plat_dir}/device/src/startup_si917.c",
"${examples_plat_dir}/device/src/startup_RS1xxxx.c",
# "${wiseconnect_sdk_root}/platforms/si91x/core/chip/src/startup_RS1xxxx.c",
### nvm3 for ccp platform ###
"${sdk_support_root}/platform/emdrv/nvm3/src/nvm3_hal_flash_ccp.c",
"${sdk_support_root}/platform/emdrv/nvm3/src/nvm3_lock.c",
Expand All @@ -253,48 +248,37 @@ template("efr32_sdk") {
"${sdk_support_root}/platform/emdrv/nvm3/src/ccp_flash_dev.c",
"${sdk_support_root}/platform/emdrv/nvm3/src/ccp_flash_prg.c",

#"${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/gatt_db.c",
#"${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_bluetooth.c",
#"${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_board_default_init.c",
#"${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_device_init_clocks.c",
#"${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_event_handler.c",
#"${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_simple_button_instances.c",

######## CCP Platform #########
"${wiseconnect_sdk_root}/platforms/si91x/boards/brd4325a/src/rsi_board.c",
#"${wiseconnect_sdk_root}/platforms/si91x/boards/brd4325a/src/syscalls.c",
"${wiseconnect_sdk_root}/platforms/si91x/core/chip/src/rsi_deepsleep_commonflash.c",
"${wiseconnect_sdk_root}/platforms/si91x/core/chip/src/rsi_ps_ram_func.c",
"${wiseconnect_sdk_root}/platforms/si91x/core/chip/src/rsi_system_config.c",
"${wiseconnect_sdk_root}/platforms/si91x/core/chip/src/system_RS1xxxx.c",
#"${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver/UDMA.c",
#"${wiseconnect_sdk_root}/platforms/si91x/drivers/cmsis_driver/USART.c",

"${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/clock_update.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_egpio.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_udma_wrapper.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_udma.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_usart.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_ipmu.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_pll.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_power_save.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_rtc.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_temp_sensor.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_time_period.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_ulpss_clk.c",

"${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_comparator.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_processor_sensor.c",
"${wiseconnect_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_wwdt.c",
# "${wiseconnect_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_sio.c",
"${wiseconnect_sdk_root}/third_party/freertos/portable/GCC/ARM_CM4F/port.c",
"${wiseconnect_sdk_root}/third_party/freertos/croutine.c",
"${wiseconnect_sdk_root}/third_party/freertos/event_groups.c",
"${wiseconnect_sdk_root}/third_party/freertos/list.c",
"${wiseconnect_sdk_root}/third_party/freertos/queue.c",
"${wiseconnect_sdk_root}/third_party/freertos/stream_buffer.c",
"${wiseconnect_sdk_root}/third_party/freertos/tasks.c",
"${wiseconnect_sdk_root}/third_party/freertos/timers.c",
"${wisemcu_sdk_root}/platforms/si91x/boards/brd4325a/src/rsi_board.c",
"${wisemcu_sdk_root}/platforms/si91x/core/chip/src/rsi_deepsleep_commonflash.c",
"${wisemcu_sdk_root}/platforms/si91x/core/chip/src/rsi_ps_ram_func.c",
"${wisemcu_sdk_root}/platforms/si91x/core/chip/src/rsi_system_config.c",
"${wisemcu_sdk_root}/platforms/si91x/core/chip/src/system_RS1xxxx.c",

"${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/clock_update.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_egpio.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_udma_wrapper.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_udma.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_usart.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_ipmu.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_pll.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_power_save.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_rtc.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_temp_sensor.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_time_period.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_ulpss_clk.c",

"${wisemcu_sdk_root}/platforms/si91x/drivers/peripheral_drivers/src/rsi_comparator.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_processor_sensor.c",
"${wisemcu_sdk_root}/platforms/si91x/drivers/systemlevel/src/rsi_wwdt.c",
"${wisemcu_sdk_root}/third_party/freertos/portable/GCC/ARM_CM4F/port.c",
"${wisemcu_sdk_root}/third_party/freertos/croutine.c",
"${wisemcu_sdk_root}/third_party/freertos/event_groups.c",
"${wisemcu_sdk_root}/third_party/freertos/list.c",
"${wisemcu_sdk_root}/third_party/freertos/queue.c",
"${wisemcu_sdk_root}/third_party/freertos/stream_buffer.c",
"${wisemcu_sdk_root}/third_party/freertos/tasks.c",
"${wisemcu_sdk_root}/third_party/freertos/timers.c",


# Bluetooth
Expand Down
1 change: 1 addition & 0 deletions third_party/silabs/efr32_sdk.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ template("efr32_sdk") {
]
}


if (use_wstk_leds) {
sources += [
"${efr32_sdk_root}/platform/driver/leddrv/src/sl_led.c",
Expand Down

0 comments on commit 11632e4

Please sign in to comment.