Skip to content

Commit 85b3d20

Browse files
author
Arto Kinnunen
committed
802.15.4 MCR20A RF driver update
Sync with master version v1.0.9
1 parent 34273a4 commit 85b3d20

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*!
22
* Copyright (c) 2015, Freescale Semiconductor, Inc.
33
* All rights reserved.
4+
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* \file MCR20Drv.c
67
*
@@ -114,9 +115,7 @@ void MCR20Drv_Init
114115
xcvr_spi_configure_speed(gXcvrSpiInstance_c, 8000000);
115116

116117
gXcvrDeassertCS_d();
117-
#if !defined(TARGET_KW24D)
118118
MCR20Drv_RST_B_Deassert();
119-
#endif
120119
RF_IRQ_Init();
121120
RF_IRQ_Disable();
122121
mPhyIrqDisableCnt = 1;
@@ -639,7 +638,6 @@ void MCR20Drv_RESET
639638
void
640639
)
641640
{
642-
#if !defined(TARGET_KW24D)
643641
volatile uint32_t delay = 1000;
644642
//assert RST_B
645643
MCR20Drv_RST_B_Assert();
@@ -648,7 +646,6 @@ void MCR20Drv_RESET
648646

649647
//deassert RST_B
650648
MCR20Drv_RST_B_Deassert();
651-
#endif
652649
}
653650

654651
/*---------------------------------------------------------------------------

components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*!
22
* Copyright (c) 2015, Freescale Semiconductor, Inc.
33
* All rights reserved.
4+
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* \file MCR20Drv.h
67
*

components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*!
22
* Copyright (c) 2015, Freescale Semiconductor, Inc.
33
* All rights reserved.
4+
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* \file MCR20Overwrites.h
67
* Description: Overwrites header file for MCR20 Register values

components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*!
22
* Copyright (c) 2015, Freescale Semiconductor, Inc.
33
* All rights reserved.
4+
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* \file MCR20reg.h
67
* MCR20 Registers

components/802.15.4_RF/mcr20a-rf-driver/source/NanostackRfPhyMcr20a.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ extern "C" {
6161
#define gCcaCCA_MODE1_c 1
6262

6363
#define gXcvrRunState_d gXcvrPwrAutodoze_c
64-
#if !defined(TARGET_KW24D)
6564
#define gXcvrLowPowerState_d gXcvrPwrHibernate_c
66-
#else
67-
#define gXcvrLowPowerState_d gXcvrPwrAutodoze_c
68-
#endif
6965

7066
namespace {
7167

@@ -504,9 +500,7 @@ static void rf_init(void)
504500
/* Disable Tristate on MISO for SPI reads */
505501
MCR20Drv_IndirectAccessSPIWrite(MISC_PAD_CTRL, 0x02);
506502
/* Set XCVR clock output settings */
507-
#if !defined(TARGET_KW24D)
508503
MCR20Drv_Set_CLK_OUT_Freq(gMCR20_ClkOutFreq_d);
509-
#endif
510504
/* Set default XCVR power state */
511505
rf_set_power_state(gXcvrRunState_d);
512506

@@ -1758,7 +1752,7 @@ void NanostackRfPhyMcr20a::_pins_clear()
17581752
irq_thread = NULL;
17591753
}
17601754

1761-
#if MBED_CONF_MCR20A_PROVIDE_DEFAULT || TARGET_KW24D
1755+
#if MBED_CONF_MCR20A_PROVIDE_DEFAULT
17621756

17631757
NanostackRfPhy &NanostackRfPhy::get_default_instance()
17641758
{

components/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*!
22
* Copyright (c) 2015, Freescale Semiconductor, Inc.
33
* All rights reserved.
4+
* SPDX-License-Identifier: BSD-3-Clause
45
*
56
* \file XcvrSpi.h
67
*

0 commit comments

Comments
 (0)