Skip to content

Commit

Permalink
Renaming rs911x to rs9116
Browse files Browse the repository at this point in the history
  • Loading branch information
KishorSilabs committed Feb 3, 2023
1 parent c194983 commit 60d426a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions examples/platform/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ import("${silabs_common_plat_dir}/efr32/args.gni")

# Sanity check
assert(!(chip_enable_wifi && chip_enable_openthread))
assert(!(use_rs911x && chip_enable_openthread))
assert(!(use_rs9116 && chip_enable_openthread))
assert(!(use_rs9117 && chip_enable_openthread))
assert(!(use_wf200 && chip_enable_openthread))

if (chip_enable_wifi) {
assert(use_rs911x || use_wf200 || use_rs9117)
assert(use_rs9116 || use_wf200 || use_rs9117)
enable_openthread_cli = false
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")

if (use_rs911x) {
if (use_rs9116) {
wiseconnect_sdk_root =
"${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
import("rs911x/rs911x.gni")
Expand Down Expand Up @@ -257,7 +257,7 @@ source_set("efr32-common") {
}

if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli ||
use_wf200 || use_rs911x) {
use_wf200 || use_rs9116) {
sources += [ "uart.cpp" ]
}

Expand Down Expand Up @@ -288,7 +288,7 @@ source_set("efr32-common") {
}

if (chip_enable_wifi) {
if (use_rs911x) {
if (use_rs9116) {
sources += rs911x_src_plat

# All the stuff from wiseconnect
Expand Down
8 changes: 4 additions & 4 deletions scripts/examples/gn_efr32_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ else
case $1 in
--wifi)
if [ -z "$2" ]; then
echo "--wifi requires rs911x or rs9117 or wf200"
echo "--wifi requires rs9116 or rs9117 or wf200"
exit 1
fi
if [ "$2" = "rs911x" ]; then
optArgs+="use_rs911x=true "
if [ "$2" = "rs9116" ]; then
optArgs+="use_rs9116=true "
elif [ "$2" = "rs9117" ]; then
optArgs+="use_rs9117=true "
elif [ "$2" = "wf200" ]; then
Expand Down Expand Up @@ -178,7 +178,7 @@ else
shift
;;
*)
if [ "$1" =~ *"use_rs911x=true"* ] || [ "$1" =~ *"use_rs9117=true"* ] || [ "$1" =~ *"use_wf200=true"* ]; then
if [ "$1" =~ *"use_rs9116=true"* ] || [ "$1" =~ *"use_rs9117=true"* ] || [ "$1" =~ *"use_wf200=true"* ]; then
USE_WIFI=true
fi

Expand Down
2 changes: 1 addition & 1 deletion src/platform/silabs/EFR32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ config("efr32-platform-wifi-config") {
include_dirs = [ "wifi" ]
defines = []

if (use_rs911x && use_rs911x_sockets) {
if (use_rs9116 && use_rs911x_sockets) {
include_dirs += [ "wifi/rsi-sockets" ]
defines += [
"RS911X_SOCKETS",
Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/efr32_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ template("efr32_sdk") {
]

if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) {
if (use_rs911x) {
if (use_rs9116) {
defines += [
"SL_HEAP_SIZE=32768",
"SL_WIFI=1",
Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/silabs_board.gni
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ declare_args() {

# WIFI rcp boards options for wifi apps.
use_wf200 = false
use_rs911x = false
use_rs9116 = false
use_rs9117 = false
use_rs911x_sockets = false
}
Expand Down

0 comments on commit 60d426a

Please sign in to comment.