Skip to content

Commit 2b83b69

Browse files
committed
Remove conflictinng system_reset() from Atmel drivers
1 parent 73b0546 commit 2b83b69

File tree

3 files changed

+0
-36
lines changed
  • targets/TARGET_Atmel/TARGET_SAM_CortexM0P/drivers/system/reset

3 files changed

+0
-36
lines changed

targets/TARGET_Atmel/TARGET_SAM_CortexM0P/drivers/system/reset/TARGET_SAMD21/reset.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,6 @@ enum system_reset_cause {
8383
* @{
8484
*/
8585

86-
/**
87-
* \brief Reset the MCU.
88-
*
89-
* Resets the MCU and all associated peripherals and registers, except RTC, all 32KHz sources,
90-
* WDT (if ALWAYSON is set) and GCLK (if WRTLOCK is set).
91-
*
92-
*/
93-
static inline void system_reset(void)
94-
{
95-
NVIC_SystemReset();
96-
}
97-
9886
/**
9987
* \brief Return the reset cause.
10088
*

targets/TARGET_Atmel/TARGET_SAM_CortexM0P/drivers/system/reset/TARGET_SAML21/reset.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,6 @@ enum system_wakeup_debounce_count {
121121
* @{
122122
*/
123123

124-
/**
125-
* \brief Reset the MCU.
126-
*
127-
* Resets the MCU and all associated peripherals and registers, except RTC,
128-
* OSC32KCTRL, RSTC, GCLK (if WRTLOCK is set), and I/O retention state of PM.
129-
*
130-
*/
131-
static inline void system_reset(void)
132-
{
133-
NVIC_SystemReset();
134-
}
135-
136124
/**
137125
* \brief Get the reset cause.
138126
*

targets/TARGET_Atmel/TARGET_SAM_CortexM0P/drivers/system/reset/TARGET_SAMR21/reset.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,6 @@ enum system_reset_cause {
8383
* @{
8484
*/
8585

86-
/**
87-
* \brief Reset the MCU.
88-
*
89-
* Resets the MCU and all associated peripherals and registers, except RTC, all 32KHz sources,
90-
* WDT (if ALWAYSON is set) and GCLK (if WRTLOCK is set).
91-
*
92-
*/
93-
static inline void system_reset(void)
94-
{
95-
NVIC_SystemReset();
96-
}
97-
9886
/**
9987
* \brief Return the reset cause.
10088
*

0 commit comments

Comments
 (0)