Skip to content

Commit e8bf06a

Browse files
author
Arto Kinnunen
committed
Squashed 'connectivity/drivers/802.15.4_RF/atmel-rf-driver/' changes from b1a8186d75..834c5357c6
834c5357c6 Update copyright (ARMmbed#107) 49bc608cea Merge pull request ARMmbed#106 from PelionIoT/IOTTHD-4607 19fed95972 Use CCA fail RX event when RX ongoing git-subtree-dir: connectivity/drivers/802.15.4_RF/atmel-rf-driver git-subtree-split: 834c5357c6c4c19da8da521707a4958957871341
1 parent 61315d1 commit e8bf06a

File tree

8 files changed

+58
-50
lines changed

8 files changed

+58
-50
lines changed

atmel-rf-driver/NanostackRfPhyAtmel.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2018, 2020, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

source/AT86RF215Reg.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2020 ARM Limited. All rights reserved.
2+
* Copyright (c) 2020, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

source/AT86RFReg.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2017, 2020, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

source/NanostackRfPhyAT86RF215.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2020 ARM Limited. All rights reserved.
2+
* Copyright (c) 2020-2021, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/
@@ -619,7 +620,7 @@ static void rf_handle_cca_ed_done(void)
619620
backup_time = 0;
620621
}
621622
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);
623+
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL_RX, 0, 0);
623624
return;
624625
}
625626
if ((cca_enabled == true) && (((int8_t) rf_read_rf_register(RF_EDV, rf_module) > cca_threshold))) {
@@ -997,7 +998,7 @@ static void rf_backup_timer_interrupt(void)
997998
}
998999
if ((rf_state == RF_CSMA_STARTED) || (rf_state == RF_CSMA_WHILE_RX)) {
9991000
TEST_CSMA_DONE
1000-
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL, 0, 0);
1001+
device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL_RX, 0, 0);
10011002
}
10021003
TEST_TX_DONE
10031004
TEST_RX_DONE

source/NanostackRfPhyAtmel.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2020, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

source/at24mac.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2016-2016 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2018, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

source/at24mac.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2018, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

source/rfbits.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2020 ARM Limited. All rights reserved.
2+
* Copyright (c) 2020, Pelion and affiliates.
33
* 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.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* 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.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

0 commit comments

Comments
 (0)