Skip to content

Commit 0fcda05

Browse files
EricB-ADIkevin-gillespie
authored and
EricB-ADI
committed
fix(BLE): ME18 PHY + PAL UART + clean.cordio (#1080)
Co-authored-by: Kevin Gillespie <[email protected]> Co-authored-by: EricB-ADI <[email protected]>
1 parent 93db0c3 commit 0fcda05

File tree

26 files changed

+178
-276
lines changed

26 files changed

+178
-276
lines changed

‎Examples/MAX32655/Bluetooth/BLE_FreeRTOS/stack_dats.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,6 @@ static void mainWsfInit(void)
187187
#endif
188188
}
189189

190-
/*************************************************************************************************/
191-
/*!
192-
* \fn WUT_IRQHandler
193-
*
194-
* \brief WUY interrupt handler.
195-
*
196-
* \return None.
197-
*/
198-
/*************************************************************************************************/
199-
void WUT_IRQHandler(void)
200-
{
201-
MXC_WUT_IntClear(MXC_WUT0);
202-
NVIC_ClearPendingIRQ(WUT_IRQn);
203-
MXC_WUT_Handler(MXC_WUT0);
204-
}
205-
206190
/*************************************************************************************************/
207191
/*!
208192
* \fn wutTrimCb

‎Examples/MAX32655/Bluetooth/BLE_datc/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,6 @@ static void mainWsfInit(void)
128128
#endif
129129
}
130130

131-
/*************************************************************************************************/
132-
/*!
133-
* \fn WUT_IRQHandler
134-
*
135-
* \brief WUY interrupt handler.
136-
*
137-
* \return None.
138-
*/
139-
/*************************************************************************************************/
140-
void WUT_IRQHandler(void)
141-
{
142-
MXC_WUT_Handler(MXC_WUT0);
143-
}
144-
145131
/*************************************************************************************************/
146132
/*!
147133
* \fn wutTrimCb

‎Examples/MAX32655/Bluetooth/BLE_dats/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,6 @@ static void mainWsfInit(void)
128128
#endif
129129
}
130130

131-
/*************************************************************************************************/
132-
/*!
133-
* \fn WUT_IRQHandler
134-
*
135-
* \brief WUY interrupt handler.
136-
*
137-
* \return None.
138-
*/
139-
/*************************************************************************************************/
140-
void WUT_IRQHandler(void)
141-
{
142-
MXC_WUT_Handler(MXC_WUT0);
143-
}
144-
145131
/*************************************************************************************************/
146132
/*!
147133
* \fn wutTrimCb

‎Examples/MAX32655/Bluetooth/BLE_fit/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,6 @@ static void mainWsfInit(void)
128128
#endif
129129
}
130130

131-
/*************************************************************************************************/
132-
/*!
133-
* \fn WUT_IRQHandler
134-
*
135-
* \brief WUY interrupt handler.
136-
*
137-
* \return None.
138-
*/
139-
/*************************************************************************************************/
140-
void WUT_IRQHandler(void)
141-
{
142-
MXC_WUT_Handler(MXC_WUT0);
143-
}
144-
145131
/*************************************************************************************************/
146132
/*!
147133
* \fn wutTrimCb

‎Examples/MAX32655/Bluetooth/BLE_fit_FreeRTOS/bt_stack.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,6 @@ static void mainWsfInit(void)
187187
#endif
188188
}
189189

190-
/*************************************************************************************************/
191-
/*!
192-
* \fn WUT_IRQHandler
193-
*
194-
* \brief WUY interrupt handler.
195-
*
196-
* \return None.
197-
*/
198-
/*************************************************************************************************/
199-
void WUT_IRQHandler(void)
200-
{
201-
MXC_WUT_IntClear(MXC_WUT0);
202-
NVIC_ClearPendingIRQ(WUT_IRQn);
203-
MXC_WUT_Handler(MXC_WUT0);
204-
}
205-
206190
/*************************************************************************************************/
207191
/*!
208192
* \fn wutTrimCb

‎Examples/MAX32655/Bluetooth/BLE_otac/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,6 @@ static void mainWsfInit(void)
129129
#endif
130130
}
131131

132-
/*************************************************************************************************/
133-
/*!
134-
* \fn WUT_IRQHandler
135-
*
136-
* \brief WUY interrupt handler.
137-
*
138-
* \return None.
139-
*/
140-
/*************************************************************************************************/
141-
void WUT_IRQHandler(void)
142-
{
143-
MXC_WUT_Handler(MXC_WUT0);
144-
}
145-
146132
/*************************************************************************************************/
147133
/*!
148134
* \fn wutTrimCb

‎Examples/MAX32655/Bluetooth/BLE_otas/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,6 @@ static void mainWsfInit(void)
139139
#endif
140140
}
141141

142-
/*************************************************************************************************/
143-
/*!
144-
* \fn WUT_IRQHandler
145-
*
146-
* \brief WUY interrupt handler.
147-
*
148-
* \return None.
149-
*/
150-
/*************************************************************************************************/
151-
void WUT_IRQHandler(void)
152-
{
153-
MXC_WUT_Handler(MXC_WUT0);
154-
}
155-
156142
/*************************************************************************************************/
157143
/*!
158144
* \fn wutTrimCb

‎Examples/MAX32690/Bluetooth/BLE_FreeRTOS/stack_dats.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,6 @@ static void mainWsfInit(void)
187187
#endif
188188
}
189189

190-
/*************************************************************************************************/
191-
/*!
192-
* \fn WUT_IRQHandler
193-
*
194-
* \brief WUY interrupt handler.
195-
*
196-
* \return None.
197-
*/
198-
/*************************************************************************************************/
199-
void WUT0_IRQHandler(void)
200-
{
201-
MXC_WUT_IntClear();
202-
NVIC_ClearPendingIRQ(WUT0_IRQn);
203-
MXC_WUT_Handler();
204-
}
205-
206190
/*************************************************************************************************/
207191
/*!
208192
* \fn wutTrimCb

‎Examples/MAX32690/Bluetooth/BLE_datc/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,6 @@ static void mainWsfInit(void)
128128
#endif
129129
}
130130

131-
/*************************************************************************************************/
132-
/*!
133-
* \fn WUT_IRQHandler
134-
*
135-
* \brief WUY interrupt handler.
136-
*
137-
* \return None.
138-
*/
139-
/*************************************************************************************************/
140-
void WUT0_IRQHandler(void)
141-
{
142-
MXC_WUT_Handler();
143-
}
144-
145131
/*************************************************************************************************/
146132
/*!
147133
* \fn wutTrimCb

‎Examples/MAX32690/Bluetooth/BLE_dats/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,6 @@ static void mainWsfInit(void)
128128
#endif
129129
}
130130

131-
/*************************************************************************************************/
132-
/*!
133-
* \fn WUT_IRQHandler
134-
*
135-
* \brief WUY interrupt handler.
136-
*
137-
* \return None.
138-
*/
139-
/*************************************************************************************************/
140-
void WUT0_IRQHandler(void)
141-
{
142-
MXC_WUT_Handler();
143-
}
144-
145131
/*************************************************************************************************/
146132
/*!
147133
* \fn wutTrimCb

‎Examples/MAX32690/Bluetooth/BLE_fit/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,6 @@ static void mainWsfInit(void)
128128
#endif
129129
}
130130

131-
/*************************************************************************************************/
132-
/*!
133-
* \fn WUT_IRQHandler
134-
*
135-
* \brief WUY interrupt handler.
136-
*
137-
* \return None.
138-
*/
139-
/*************************************************************************************************/
140-
void WUT0_IRQHandler(void)
141-
{
142-
MXC_WUT_Handler();
143-
}
144-
145131
/*************************************************************************************************/
146132
/*!
147133
* \fn wutTrimCb

‎Examples/MAX32690/Bluetooth/BLE_otac/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,6 @@ static void mainWsfInit(void)
129129
#endif
130130
}
131131

132-
/*************************************************************************************************/
133-
/*!
134-
* \fn WUT_IRQHandler
135-
*
136-
* \brief WUY interrupt handler.
137-
*
138-
* \return None.
139-
*/
140-
/*************************************************************************************************/
141-
void WUT0_IRQHandler(void)
142-
{
143-
MXC_WUT_Handler();
144-
}
145-
146132
/*************************************************************************************************/
147133
/*!
148134
* \fn wutTrimCb

‎Examples/MAX32690/Bluetooth/BLE_otas/main.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,6 @@ static void mainWsfInit(void)
129129
#endif
130130
}
131131

132-
/*************************************************************************************************/
133-
/*!
134-
* \fn WUT_IRQHandler
135-
*
136-
* \brief WUY interrupt handler.
137-
*
138-
* \return None.
139-
*/
140-
/*************************************************************************************************/
141-
void WUT0_IRQHandler(void)
142-
{
143-
MXC_WUT_Handler();
144-
}
145-
146132
/*************************************************************************************************/
147133
/*!
148134
* \fn wutTrimCb

‎Libraries/BlePhy/MAX32690/libphy_hard.a

454 KB
Binary file not shown.

‎Libraries/CMSIS/Device/Maxim/MAX32655/Source/GCC/startup_max32655.S

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,9 @@ Reset_Handler:
431431
def_irq_handler BTLE_RX_AES_IRQHandler /* 0x42 0x0108 66: BTLE RX AES Done */
432432
def_irq_handler BTLE_INV_APB_ADDR_IRQHandler /* 0x43 0x010C 67: BTLE Invalid APB Address*/
433433
def_irq_handler BTLE_IQ_DATA_VALID_IRQHandler/* 0x44 0x0110 68: BTLE IQ Data Valid */
434-
def_irq_handler WUT0_IRQHandler /* 0x45 0x0114 69: Wake up timer */
434+
#ifndef __CORDIO__
435+
def_irq_handler WUT0_IRQHandler /* 0x45 0x0114 69: Wake up timer, The PAL layer has a weak declaration. This avoids the situation of double weak*/
436+
#endif
435437
def_irq_handler GPIOWAKE_IRQHandler /* 0x46 0x0118 70: GPIO Wakeup */
436438
def_irq_handler RSV55_IRQHandler /* 0x47 0x011C 71: Reserved */
437439
def_irq_handler SPI0_IRQHandler /* 0x48 0x0120 72: SPI0 */
@@ -488,4 +490,4 @@ Reset_Handler:
488490
def_irq_handler RSV123_IRQHandler /* 0x7B 0x01EC 123: Reserved */
489491
def_irq_handler RSV124_IRQHandler /* 0x7C 0x01F0 124: Reserved */
490492
def_irq_handler WUT1_IRQHandler /* 0x7D 0x01F4 125: Wakeup Timer 1 */
491-
.end
493+
.end

‎Libraries/Cordio/controller/sources/ble/init/init.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,14 @@ void LlInitLlInit(void)
147147
#endif
148148

149149
#if (BT_VER >= LL_VER_BT_CORE_SPEC_5_0)
150-
#ifdef INIT_CENTRAL
151-
LlExtScanMasterInit();
152-
LlExtInitMasterInit();
153-
LlPhyMasterInit();
150+
#if defined(INIT_CENTRAL)
151+
152+
#if defined(INIT_EXTENDED)
153+
LlExtScanMasterInit();
154+
LlExtInitMasterInit();
155+
LlPhyMasterInit();
156+
#endif
157+
154158
#if (BT_VER >= LL_VER_BT_CORE_SPEC_5_2)
155159
LlCisMasterInit();
156160
LlBisMasterInit();
@@ -165,8 +169,11 @@ void LlInitLlInit(void)
165169
#endif
166170
#endif
167171

168-
#ifdef INIT_PERIPHERAL
172+
#if defined(INIT_PERIPHERAL)
173+
174+
#if defined(INIT_EXTENDED)
169175
LlExtAdvSlaveInit();
176+
#endif
170177
LlPhySlaveInit();
171178
#if (BT_VER >= LL_VER_BT_CORE_SPEC_5_2)
172179
LlCisSlaveInit();

0 commit comments

Comments
 (0)