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
+2 -2
View File
@@ -177,7 +177,7 @@ void tm4c_led_initialize(void);
int tm4c_bringup(void); int tm4c_bringup(void);
/**************************************************************************** /****************************************************************************
* Name: tiva_timer_initialize * Name: tiva_timer_configure
* *
* Description: * Description:
* Configure the timer driver * Configure the timer driver
@@ -185,7 +185,7 @@ int tm4c_bringup(void);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DK_TM4C129X_TIMER #ifdef CONFIG_DK_TM4C129X_TIMER
int tiva_timer_initialize(void); int tiva_timer_configure(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -181,7 +181,7 @@ int tm4c_bringup(void)
#ifdef HAVE_TIMER #ifdef HAVE_TIMER
/* Initialize the timer driver */ /* Initialize the timer driver */
ret = tiva_timer_initialize(); ret = tiva_timer_configure();
if (ret < 0) if (ret < 0)
{ {
dbg("ERROR: Failed to initialize timer driver: %d\n", ret); dbg("ERROR: Failed to initialize timer driver: %d\n", ret);
+2 -2
View File
@@ -91,14 +91,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: tiva_timer_initialize * Name: tiva_timer_configure
* *
* Description: * Description:
* Configure the timer driver * Configure the timer driver
* *
****************************************************************************/ ****************************************************************************/
int tiva_timer_initialize(void) int tiva_timer_configure(void)
{ {
int ret; int ret;
@@ -226,7 +226,7 @@ int tm4c_at24_automount(int minor);
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: tiva_timer_initialize * Name: tiva_timer_configure
* *
* Description: * Description:
* Configure the timer driver * Configure the timer driver
@@ -234,7 +234,7 @@ int tm4c_at24_automount(int minor);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_TIVA_TIMER #ifdef CONFIG_TIVA_TIMER
int tiva_timer_initialize(void); int tiva_timer_configure(void);
#endif #endif
/************************************************************************************ /************************************************************************************
@@ -77,10 +77,10 @@ int tm4c_bringup(void)
#ifdef CONFIG_TIVA_TIMER #ifdef CONFIG_TIVA_TIMER
/* Initialize the timer driver */ /* Initialize the timer driver */
ret = tiva_timer_initialize(); ret = tiva_timer_configure();
if (ret < 0) 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; return ret;
} }
#endif /* CONFIG_TIVA_TIMER */ #endif /* CONFIG_TIVA_TIMER */
+2 -2
View File
@@ -62,14 +62,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: tiva_timer_initialize * Name: tiva_timer_configure
* *
* Description: * Description:
* Configure the timer driver for the timer example application. * Configure the timer driver for the timer example application.
* *
****************************************************************************/ ****************************************************************************/
int tiva_timer_initialize(void) int tiva_timer_configure(void)
{ {
static bool initialized = false; static bool initialized = false;
int ret = OK; int ret = OK;
@@ -166,7 +166,7 @@ void tm4c_led_initialize(void);
int tm4c_bringup(void); int tm4c_bringup(void);
/**************************************************************************** /****************************************************************************
* Name: tiva_timer_initialize * Name: tiva_timer_configure
* *
* Description: * Description:
* Configure the timer driver * Configure the timer driver
@@ -174,7 +174,7 @@ int tm4c_bringup(void);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_TM4C1294_LAUNCHPAD_TIMER #ifdef CONFIG_TM4C1294_LAUNCHPAD_TIMER
int tiva_timer_initialize(void); int tiva_timer_configure(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
@@ -161,7 +161,7 @@ int tm4c_bringup(void)
#ifdef HAVE_TIMER #ifdef HAVE_TIMER
/* Initialize the timer driver */ /* Initialize the timer driver */
ret = tiva_timer_initialize(); ret = tiva_timer_configure();
if (ret < 0) if (ret < 0)
{ {
dbg("ERROR: Failed to initialize timer driver: %d\n", ret); dbg("ERROR: Failed to initialize timer driver: %d\n", ret);
+2 -2
View File
@@ -90,14 +90,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: tiva_timer_initialize * Name: tiva_timer_configure
* *
* Description: * Description:
* Configure the timer driver * Configure the timer driver
* *
****************************************************************************/ ****************************************************************************/
int tiva_timer_initialize(void) int tiva_timer_configure(void)
{ {
int ret; int ret;