mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Remove conflictinng system_reset() from Atmel drivers
							parent
							
								
									73b054601d
								
							
						
					
					
						commit
						2b83b69f90
					
				| 
						 | 
				
			
			@ -83,18 +83,6 @@ enum system_reset_cause {
 | 
			
		|||
 * @{
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \brief Reset the MCU.
 | 
			
		||||
 *
 | 
			
		||||
 * Resets the MCU and all associated peripherals and registers, except RTC, all 32KHz sources,
 | 
			
		||||
 * WDT (if ALWAYSON is set) and GCLK (if WRTLOCK is set).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
static inline void system_reset(void)
 | 
			
		||||
{
 | 
			
		||||
    NVIC_SystemReset();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \brief Return the reset cause.
 | 
			
		||||
 *
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -121,18 +121,6 @@ enum system_wakeup_debounce_count {
 | 
			
		|||
 * @{
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \brief Reset the MCU.
 | 
			
		||||
 *
 | 
			
		||||
 * Resets the MCU and all associated peripherals and registers, except RTC,
 | 
			
		||||
 * OSC32KCTRL, RSTC, GCLK (if WRTLOCK is set), and I/O retention state of PM.
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
static inline void system_reset(void)
 | 
			
		||||
{
 | 
			
		||||
    NVIC_SystemReset();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \brief Get the reset cause.
 | 
			
		||||
 *
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -83,18 +83,6 @@ enum system_reset_cause {
 | 
			
		|||
 * @{
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \brief Reset the MCU.
 | 
			
		||||
 *
 | 
			
		||||
 * Resets the MCU and all associated peripherals and registers, except RTC, all 32KHz sources,
 | 
			
		||||
 * WDT (if ALWAYSON is set) and GCLK (if WRTLOCK is set).
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
static inline void system_reset(void)
 | 
			
		||||
{
 | 
			
		||||
    NVIC_SystemReset();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \brief Return the reset cause.
 | 
			
		||||
 *
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue