Skip to content

Commit

Permalink
Revert "fix(BLE): ME18 PHY + PAL UART + clean.cordio (#1080)"
Browse files Browse the repository at this point in the history 
This reverts commit b47c56e.
  • Loading branch information
EricB-ADI committed Aug 21, 2024
1 parent eb56d05 commit 86bc8b7
Show file tree
Hide file tree
Showing 27 changed files with 275 additions and 142 deletions.
16 changes: 16 additions & 0 deletions Examples/MAX32655/Bluetooth/BLE_FreeRTOS/stack_dats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,22 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT_IRQHandler(void)
{
MXC_WUT_IntClear(MXC_WUT0);
NVIC_ClearPendingIRQ(WUT_IRQn);
MXC_WUT_Handler(MXC_WUT0);
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32655/Bluetooth/BLE_datc/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT_IRQHandler(void)
{
MXC_WUT_Handler(MXC_WUT0);
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32655/Bluetooth/BLE_dats/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT_IRQHandler(void)
{
MXC_WUT_Handler(MXC_WUT0);
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32655/Bluetooth/BLE_fit/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT_IRQHandler(void)
{
MXC_WUT_Handler(MXC_WUT0);
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
16 changes: 16 additions & 0 deletions Examples/MAX32655/Bluetooth/BLE_fit_FreeRTOS/bt_stack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,22 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT_IRQHandler(void)
{
MXC_WUT_IntClear(MXC_WUT0);
NVIC_ClearPendingIRQ(WUT_IRQn);
MXC_WUT_Handler(MXC_WUT0);
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32655/Bluetooth/BLE_otac/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT_IRQHandler(void)
{
MXC_WUT_Handler(MXC_WUT0);
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32655/Bluetooth/BLE_otas/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT_IRQHandler(void)
{
MXC_WUT_Handler(MXC_WUT0);
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
16 changes: 16 additions & 0 deletions Examples/MAX32690/Bluetooth/BLE_FreeRTOS/stack_dats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,22 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT0_IRQHandler(void)
{
MXC_WUT_IntClear();
NVIC_ClearPendingIRQ(WUT0_IRQn);
MXC_WUT_Handler();
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32690/Bluetooth/BLE_datc/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT0_IRQHandler(void)
{
MXC_WUT_Handler();
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32690/Bluetooth/BLE_dats/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT0_IRQHandler(void)
{
MXC_WUT_Handler();
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32690/Bluetooth/BLE_fit/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT0_IRQHandler(void)
{
MXC_WUT_Handler();
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32690/Bluetooth/BLE_otac/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT0_IRQHandler(void)
{
MXC_WUT_Handler();
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
14 changes: 14 additions & 0 deletions Examples/MAX32690/Bluetooth/BLE_otas/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,20 @@ static void mainWsfInit(void)
#endif
}

/*************************************************************************************************/
/*!
* \fn WUT_IRQHandler
*
* \brief WUY interrupt handler.
*
* \return None.
*/
/*************************************************************************************************/
void WUT0_IRQHandler(void)
{
MXC_WUT_Handler();
}

/*************************************************************************************************/
/*!
* \fn wutTrimCb
Expand Down
Binary file modified Libraries/BlePhy/MAX32690/libphy.a
View file
Binary file not shown.
Binary file modified Libraries/BlePhy/MAX32690/libphy_hard.a
View file
Binary file not shown.
6 changes: 2 additions & 4 deletions Libraries/CMSIS/Device/Maxim/MAX32655/Source/GCC/startup_max32655.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,7 @@ Reset_Handler:
def_irq_handler BTLE_RX_AES_IRQHandler /* 0x42 0x0108 66: BTLE RX AES Done */
def_irq_handler BTLE_INV_APB_ADDR_IRQHandler /* 0x43 0x010C 67: BTLE Invalid APB Address*/
def_irq_handler BTLE_IQ_DATA_VALID_IRQHandler/* 0x44 0x0110 68: BTLE IQ Data Valid */
#ifndef __CORDIO__
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*/
#endif
def_irq_handler WUT0_IRQHandler /* 0x45 0x0114 69: Wake up timer */
def_irq_handler GPIOWAKE_IRQHandler /* 0x46 0x0118 70: GPIO Wakeup */
def_irq_handler RSV55_IRQHandler /* 0x47 0x011C 71: Reserved */
def_irq_handler SPI0_IRQHandler /* 0x48 0x0120 72: SPI0 */
Expand Down Expand Up @@ -459,4 +457,4 @@ Reset_Handler:
def_irq_handler RSV123_IRQHandler /* 0x7B 0x01EC 123: Reserved */
def_irq_handler RSV124_IRQHandler /* 0x7C 0x01F0 124: Reserved */
def_irq_handler WUT1_IRQHandler /* 0x7D 0x01F4 125: Wakeup Timer 1 */
.end
.end
17 changes: 5 additions & 12 deletions Libraries/Cordio/controller/sources/ble/init/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,10 @@ void LlInitLlInit(void)
#endif

#if (BT_VER >= LL_VER_BT_CORE_SPEC_5_0)
#if defined(INIT_CENTRAL)

#if defined(INIT_EXTENDED)
LlExtScanMasterInit();
LlExtInitMasterInit();
LlPhyMasterInit();
#endif

#ifdef INIT_CENTRAL
LlExtScanMasterInit();
LlExtInitMasterInit();
LlPhyMasterInit();
#if (BT_VER >= LL_VER_BT_CORE_SPEC_5_2)
LlCisMasterInit();
LlBisMasterInit();
Expand All @@ -169,11 +165,8 @@ void LlInitLlInit(void)
#endif
#endif

#if defined(INIT_PERIPHERAL)

#if defined(INIT_EXTENDED)
#ifdef INIT_PERIPHERAL
LlExtAdvSlaveInit();
#endif
LlPhySlaveInit();
#if (BT_VER >= LL_VER_BT_CORE_SPEC_5_2)
LlCisSlaveInit();
Expand Down
Loading

0 comments on commit 86bc8b7

Please sign in to comment.