sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove all implementatinos of up_wdginitialize(). It is no longer used.

Browse Source
This commit is contained in:
Gregory Nutt 2016-05-18 19:48:42 -06:00
parent c364faeefc
commit 8ace1e3be2
18 changed files with 24 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/cloudctrl/src/Makefile
View File

@ -73,10 +73,6 @@ ifeq ($(CONFIG_ADC),y)
CSRCS += stm32_adc.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_STM32_PHYINIT),y)
CSRCS += stm32_phyinit.c
endif

4
configs/fire-stm32v2/src/Makefile
View File

@ -72,8 +72,4 @@ ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
CSRCS += stm32_composite.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
include $(TOPDIR)/configs/Board.mk

4
configs/hymini-stm32v/src/Makefile
View File

@ -59,8 +59,4 @@ ifeq ($(CONFIG_USBMSC),y)
CSRCS += stm32_usbmsc.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
include $(TOPDIR)/configs/Board.mk

4
configs/maple/src/Makefile
View File

@ -52,10 +52,6 @@ endif
ifeq ($(CONFIG_USBMSC),y)
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif

4
configs/mikroe-stm32f4/src/Makefile
View File

@ -58,10 +58,6 @@ ifeq ($(CONFIG_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif

18
configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
View File

@ -1,7 +1,7 @@
/************************************************************************************
* configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
* Bob Doiron
*
@ -229,5 +229,21 @@ int sam_timerinitialize(void);
# define sam_timerinitialize() (0)
#endif
/****************************************************************************
* Name: sam_watchdog_initialize()
*
* Description:
* Perform architecture-specific initialization of the Watchdog hardware.
*
* Input parameters:
* None
*
* Returned Value:
* Zero on success; a negated errno value on failure.
*
****************************************************************************/
int sam_watchdog_initialize(void);
#endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H */

4
configs/sam4s-xplained-pro/src/sam_boot.c
View File

@ -1,7 +1,7 @@
/************************************************************************************
* configs/sam4s-xplained-pro/src/sam_boot.c
*
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -97,7 +97,7 @@ void board_initialize(void)
#if (defined(CONFIG_SAM34_WDT) && !defined(CONFIG_WDT_DISABLE_ON_RESET))
/* Configure watchdog timer and enable kicker kernel thread. */
DEBUGASSERT(up_wdginitialize() >= 0);
DEBUGASSERT(sam_watchdog_initialize() >= 0);
#endif
#ifndef CONFIG_ARCH_LEDS

6
configs/sam4s-xplained-pro/src/sam_wdt.c
View File

@ -1,7 +1,7 @@
/************************************************************************************
* configs/sam4s-xplained-pro/src/up_watchdog.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
* Bob Doiron
*
@ -164,7 +164,7 @@ errout:
#endif
/****************************************************************************
* Name: up_wdginitialize()
* Name: sam_watchdog_initialize()
*
* Description:
* Perform architecture-specific initialization of the Watchdog hardware.
@ -173,7 +173,7 @@ errout:
*
****************************************************************************/
int up_wdginitialize(void)
int sam_watchdog_initialize(void)
{
#if (defined(CONFIG_SAM34_WDT) && !defined(CONFIG_WDT_DISABLE_ON_RESET))
int fd;

4
configs/shenzhou/src/Makefile
View File

@ -80,10 +80,6 @@ ifeq ($(CONFIG_ADC),y)
CSRCS += stm32_adc.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
# NOTE: SSD1289 is not supported on the board
ifeq ($(CONFIG_LCD_SSD1289),y)

4
configs/spark/src/Makefile
View File

@ -69,10 +69,6 @@ ifeq ($(CONFIG_WL_CC3000),y)
CSRCS += stm32_wireless.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_CC3000_PROBES),)
CSRCS += stm32_io.c
endif

4
configs/stm3210e-eval/src/Makefile
View File

@ -68,10 +68,6 @@ ifeq ($(CONFIG_CAN),y)
CSRCS += stm32_can.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
CSRCS += stm32_pm.c
endif

4
configs/stm3220g-eval/src/Makefile
View File

@ -72,10 +72,6 @@ ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_INPUT_STMPE811),y)
CSRCS += stm32_stmpe811.c
endif

4
configs/stm3240g-eval/src/Makefile
View File

@ -77,10 +77,6 @@ ifeq ($(CONFIG_ARCH_FPU),y)
CSRCS += stm32_ostest.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_INPUT_STMPE811),y)
CSRCS += stm32_stmpe811.c
endif

4
configs/stm32_tiny/src/Makefile
View File

@ -51,8 +51,4 @@ ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
include $(TOPDIR)/configs/Board.mk

4
configs/stm32f3discovery/src/Makefile
View File

@ -60,10 +60,6 @@ ifeq ($(CONFIG_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif

4
configs/stm32f4discovery/src/Makefile
View File

@ -92,10 +92,6 @@ ifeq ($(CONFIG_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_NSH_LIBRARY),y)
CSRCS += stm32_appinit.c
endif

4
configs/stm32ldiscovery/src/Makefile
View File

@ -60,10 +60,6 @@ ifeq ($(CONFIG_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += stm32_appinit.c
endif

37
include/nuttx/timers/watchdog.h
View File

@ -203,9 +203,6 @@ extern "C"
#define EXTERN extern
#endif
/****************************************************************************
* "Upper-Half" Watchdog Driver Interfaces
****************************************************************************/
/****************************************************************************
* Name: watchdog_register
*
@ -217,9 +214,8 @@ extern "C"
* When this function is called, the "lower half" driver should be in the
* disabled state (as if the stop() method had already been called).
*
* NOTE: Normally, this function would not be called by application code.
* Rather it is called indirectly through the architecture-specific
* interface up_wdginitialize() described below.
* NOTE: This function would not be called by application code. Rather it is
* called indirectly through the architecture-specific interfaces.
*
* Input parameters:
* dev path - The full path to the driver to be registers in the NuttX
@ -256,35 +252,6 @@ FAR void *watchdog_register(FAR const char *path,
void watchdog_unregister(FAR void *handle);
/****************************************************************************
* Platform-Independent "Lower-Half" Watchdog Driver Interfaces
****************************************************************************/
/****************************************************************************
* Architecture-specific Application Interfaces
****************************************************************************/
/****************************************************************************
* Name: up_wdginitialize()
*
* Description:
* Perform architecture-specific initialization of the Watchdog hardware.
* This interface should be provided by all configurations using
* to avoid exposed platform-dependent logic.
*
* At a minimum, this function should call watchdog_register() which is
* described above.
*
* Input parameters:
* None
*
* Returned Value:
* Zero on success; a negated errno value on failure.
*
****************************************************************************/
int up_wdginitialize(void);
#undef EXTERN
#ifdef __cplusplus
}