OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Tiva boards: Fix a naming collision, rename board-specific function from tiva_timer_initialize() to tiva_timer_configure() to remove conflict

This commit is contained in:
Gregory Nutt 2016-05-23 08:26:46 -06:00
parent eb11e662db
commit c019c270d5
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/dk-tm4c129x/src/dk-tm4c129x.h
View File

@ -177,7 +177,7 @@ void tm4c_led_initialize(void);
int tm4c_bringup(void);
/****************************************************************************
* Name: tiva_timer_initialize
* Name: tiva_timer_configure
*
* Description:
* Configure the timer driver
@ -185,7 +185,7 @@ int tm4c_bringup(void);
****************************************************************************/
#ifdef CONFIG_DK_TM4C129X_TIMER
int tiva_timer_initialize(void);
int tiva_timer_configure(void);
#endif
#endif /* __ASSEMBLY__ */

2
configs/dk-tm4c129x/src/tm4c_bringup.c
View File

@ -181,7 +181,7 @@ int tm4c_bringup(void)
#ifdef HAVE_TIMER
/* Initialize the timer driver */
ret = tiva_timer_initialize();
ret = tiva_timer_configure();
if (ret < 0)
{
dbg("ERROR: Failed to initialize timer driver: %d\n", ret);

4
configs/dk-tm4c129x/src/tm4c_timer.c
View File

@ -91,14 +91,14 @@
****************************************************************************/
/****************************************************************************
* Name: tiva_timer_initialize
* Name: tiva_timer_configure
*
* Description:
* Configure the timer driver
*
****************************************************************************/
int tiva_timer_initialize(void)
int tiva_timer_configure(void)
{
int ret;

4
configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
View File

@ -226,7 +226,7 @@ int tm4c_at24_automount(int minor);
#endif
/****************************************************************************
* Name: tiva_timer_initialize
* Name: tiva_timer_configure
*
* Description:
* Configure the timer driver
@ -234,7 +234,7 @@ int tm4c_at24_automount(int minor);
****************************************************************************/
#ifdef CONFIG_TIVA_TIMER
int tiva_timer_initialize(void);
int tiva_timer_configure(void);
#endif
/************************************************************************************

4
configs/tm4c123g-launchpad/src/tm4c_bringup.c
View File

@ -77,10 +77,10 @@ int tm4c_bringup(void)
#ifdef CONFIG_TIVA_TIMER
/* Initialize the timer driver */
ret = tiva_timer_initialize();
ret = tiva_timer_configure();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: tiva_timer_initialize failed: %d\n", ret);
syslog(LOG_ERR, "ERROR: tiva_timer_configure failed: %d\n", ret);
return ret;
}
#endif /* CONFIG_TIVA_TIMER */

4
configs/tm4c123g-launchpad/src/tm4c_timer.c
View File

@ -62,14 +62,14 @@
****************************************************************************/
/****************************************************************************
* Name: tiva_timer_initialize
* Name: tiva_timer_configure
*
* Description:
* Configure the timer driver for the timer example application.
*
****************************************************************************/
int tiva_timer_initialize(void)
int tiva_timer_configure(void)
{
static bool initialized = false;
int ret = OK;

4
configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
View File

@ -166,7 +166,7 @@ void tm4c_led_initialize(void);
int tm4c_bringup(void);
/****************************************************************************
* Name: tiva_timer_initialize
* Name: tiva_timer_configure
*
* Description:
* Configure the timer driver
@ -174,7 +174,7 @@ int tm4c_bringup(void);
****************************************************************************/
#ifdef CONFIG_TM4C1294_LAUNCHPAD_TIMER
int tiva_timer_initialize(void);
int tiva_timer_configure(void);
#endif
#endif /* __ASSEMBLY__ */

2
configs/tm4c1294-launchpad/src/tm4c_bringup.c
View File

@ -161,7 +161,7 @@ int tm4c_bringup(void)
#ifdef HAVE_TIMER
/* Initialize the timer driver */
ret = tiva_timer_initialize();
ret = tiva_timer_configure();
if (ret < 0)
{
dbg("ERROR: Failed to initialize timer driver: %d\n", ret);

4
configs/tm4c1294-launchpad/src/tm4c_timer.c
View File

@ -90,14 +90,14 @@
****************************************************************************/
/****************************************************************************
* Name: tiva_timer_initialize
* Name: tiva_timer_configure
*
* Description:
* Configure the timer driver
*
****************************************************************************/
int tiva_timer_initialize(void)
int tiva_timer_configure(void)
{
int ret;