Skip to content

Commit 3d4d326

Browse files
0xc01700xc0170
authored
Merge pull request #14565 from artokin/nanostack_release_13_0_0_for_5_15_branch
[mbed-os-5.15] Nanostack release v13.0.0
2 parents 7f25b2c + d361b7b commit 3d4d326

File tree

111 files changed

+3206
-1061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+3206
-1061
lines changed

‎components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ static void rf_handle_cca_ed_done(void)
619619
backup_time = 0;
620620
}
621621
rf_backup_timer_start(0, backup_time + PACKET_PROCESSING_TIME);
622-
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL, 0, 0);
622+
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL_RX, 0, 0);
623623
return;
624624
}
625625
if ((cca_enabled == true) && (((int8_t) rf_read_rf_register(RF_EDV, rf_module) > cca_threshold))) {
@@ -997,7 +997,7 @@ static void rf_backup_timer_interrupt(void)
997997
}
998998
if ((rf_state == RF_CSMA_STARTED) || (rf_state == RF_CSMA_WHILE_RX)) {
999999
TEST_CSMA_DONE
1000-
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL, 0, 0);
1000+
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL_RX, 0, 0);
10011001
}
10021002
TEST_TX_DONE
10031003
TEST_RX_DONE

‎components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,11 @@ static void rf_cca_timer_interrupt(void)
848848
rf_flush_tx_fifo();
849849
tx_finnish_time = rf_get_timestamp();
850850
if (device_driver.phy_tx_done_cb) {
851-
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL, 0, 0);
851+
if (rf_state == RF_RX_STARTED) {
852+
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL_RX, 0, 0);
853+
} else {
854+
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL, 0, 0);
855+
}
852856
}
853857
} else {
854858
if (status == PHY_RESTART_CSMA) {
@@ -1143,7 +1147,7 @@ static void rf_irq_task_process_irq(void)
11431147
tx_finnish_time = rf_get_timestamp();
11441148
rf_update_tx_active_time();
11451149
TEST_TX_DONE
1146-
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL, 1, 0);
1150+
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL_RX, 1, 0);
11471151
rf_send_command(S2LP_CMD_SABORT);
11481152
rf_poll_state_change(S2LP_STATE_READY);
11491153
rf_send_command(S2LP_CMD_FLUSHTXFIFO);

‎features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015 ARM. All rights reserved.
2+
* Copyright (c) 2015 ARM Limited. All rights reserved.
33
*/
44

55
#include "CppUTest/CommandLineTestRunner.h"

‎features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/randlibtest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM. All rights reserved.
2+
* Copyright (c) 2016 ARM Limited. All rights reserved.
33
*/
44
#include "CppUTest/TestHarness.h"
55
#include "test_randlib.h"

‎features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM. All rights reserved.
2+
* Copyright (c) 2016 ARM Limited. All rights reserved.
33
*/
44
#include "test_randlib.h"
55
#include <string.h>

‎features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM. All rights reserved.
2+
* Copyright (c) 2016 ARM Limited. All rights reserved.
33
*/
44
#ifndef TEST_RANDLIB_H
55
#define TEST_RANDLIB_H

‎features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/open_stub.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*
2+
* Copyright (c) 2016 ARM Limited. All rights reserved.
3+
*/
14
#include <stdbool.h>
25
#include <sys/types.h>
36
#include <sys/stat.h>

‎features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/random_stub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, ARM Limited, All Rights Reserved
2+
* Copyright (c) 2016 ARM Limited. All rights reserved.
33
*/
44

55
#include "ns_types.h"

‎features/frameworks/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
// ----------------------------------------------------------------------------
2-
// Copyright 2016-2017 ARM Ltd.
3-
//
4-
// SPDX-License-Identifier: Apache-2.0
5-
//
6-
// Licensed under the Apache License, Version 2.0 (the "License");
7-
// you may not use this file except in compliance with the License.
8-
// You may obtain a copy of the License at
9-
//
10-
// http://www.apache.org/licenses/LICENSE-2.0
11-
//
12-
// Unless required by applicable law or agreed to in writing, software
13-
// distributed under the License is distributed on an "AS IS" BASIS,
14-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
// See the License for the specific language governing permissions and
16-
// limitations under the License.
17-
// ----------------------------------------------------------------------------
1+
/*
2+
* Copyright (c) 2016-2017 ARM Limited. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
* Licensed under the Apache License, Version 2.0 (the License); you may
5+
* not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1816

1917
/**
2018
* NanoStack NVM helper functions to read, write and delete key-value pairs to platform NVM.

‎features/frameworks/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
// ----------------------------------------------------------------------------
2-
// Copyright 2016-2017 ARM Ltd.
3-
//
4-
// SPDX-License-Identifier: Apache-2.0
5-
//
6-
// Licensed under the Apache License, Version 2.0 (the "License");
7-
// you may not use this file except in compliance with the License.
8-
// You may obtain a copy of the License at
9-
//
10-
// http://www.apache.org/licenses/LICENSE-2.0
11-
//
12-
// Unless required by applicable law or agreed to in writing, software
13-
// distributed under the License is distributed on an "AS IS" BASIS,
14-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
// See the License for the specific language governing permissions and
16-
// limitations under the License.
17-
// ----------------------------------------------------------------------------
1+
/*
2+
* Copyright (c) 2016-2017 ARM Limited. All rights reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
* Licensed under the Apache License, Version 2.0 (the License); you may
5+
* not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1816

1917
#include <string.h>
2018
#include <ns_types.h>

0 commit comments

Comments
 (0)