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

arch/arm/src/tiva: Fix some errors in macro names.

Browse Source
This commit is contained in:
Gregory Nutt 2019-01-12 16:30:21 -06:00
parent 7369105daf
commit 7ed340c9a1
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/tiva/cc13xx/cc13x0_trim.c
View File

@ -148,7 +148,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
* -Configure XOSC.
*/
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupAfterColdResetWakeupFromShutDownCfg2(fcfg1_revision,
ccfg_modeconf);
#else
@ -208,7 +208,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
* -Configure HPOSC. -Setup the LF clock.
*/
#if ( CCFG_BASE == CCFG_BASE_DEFAULT )
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
#else
NOROM_SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
@ -307,7 +307,7 @@ void cc13xx_trim_device(void)
/* Select correct CACHE mode and set correct CACHE configuration */
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupSetCacheModeAccordingToCcfgSetting();
#else
NOROM_SetupSetCacheModeAccordingToCcfgSetting();

6
arch/arm/src/tiva/cc13xx/cc13x2_v1_trim.c
View File

@ -256,7 +256,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
* -Configure XOSC.
*/
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupAfterColdResetWakeupFromShutDownCfg2(fcfg1_revision,
ccfg_modeconf);
#else
@ -448,7 +448,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
* -Configure HPOSC. -Setup the LF clock.
*/
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
#else
NOROM_SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
@ -524,7 +524,7 @@ void cc13xx_trim_device(void)
/* Select correct CACHE mode and set correct CACHE configuration */
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupSetCacheModeAccordingToCcfgSetting();
#else
NOROM_SetupSetCacheModeAccordingToCcfgSetting();

6
arch/arm/src/tiva/cc13xx/cc13x2_v2_trim.c
View File

@ -151,7 +151,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
* -Configure XOSC.
*/
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupAfterColdResetWakeupFromShutDownCfg2(fcfg1_revision,
ccfg_ModeConfReg);
#else
@ -211,7 +211,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
* -Configure HPOSC. -Setup the LF clock.
*/
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_ModeConfReg);
#else
NOROM_SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_ModeConfReg);
@ -289,7 +289,7 @@ void cc13xx_trim_device(void)
/* Select correct CACHE mode and set correct CACHE configuration */
#if CCFG_BASE == CCFG_BASE_DEFAULT
#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
SetupSetCacheModeAccordingToCcfgSetting();
#else
NOROM_SetupSetCacheModeAccordingToCcfgSetting();

2
arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h
View File

@ -103,7 +103,7 @@
#define TIVA_FLASH_CFG_BASE 0x50000000 /* CC26_DUMMY_COMP */
#define TIVA_FCFG1_BASE 0x50001000 /* FCFG1 */
#define TIVA_FCFG2_BASE 0x50002000 /* FCFG2 */
#ifndef CCFG_BASE
#ifndef TIVA_CCFG_BASE
# define TIVA_CCFG_BASE 0x50003000 /* CCFG */
#endif
#define TIVA_CCFG_BASE_DEFAULT 0x50003000 /* CCFG */

2
arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_memorymap.h
View File

@ -113,7 +113,7 @@
#define TIVA_FLASH_CFG_BASE 0x50000000 /* CC26_DUMMY_COMP */
#define TIVA_FCFG1_BASE 0x50001000 /* FCFG1 */
#define TIVA_FCFG2_BASE 0x50002000 /* FCFG2 */
#ifndef CCFG_BASE
#ifndef TIVA_CCFG_BASE
# define TIVA_CCFG_BASE 0x50003000 /* CCFG */
#endif
#define TIVA_CCFG_BASE_DEFAULT 0x50003000 /* CCFG */