From d9ccc51f58b1cf23884fae2370838303f64b6849 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Tue, 9 Jun 2015 07:02:21 +0900 Subject: [PATCH] Fix TI driver API to ROM_xxx --- IDE/IAR-EWARM/Projects/benchmark/current_time.c | 2 +- wolfcrypt/src/port/ti/ti-aes.c | 2 +- wolfcrypt/src/port/ti/ti-ccm.c | 2 +- wolfcrypt/src/port/ti/ti-des3.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IDE/IAR-EWARM/Projects/benchmark/current_time.c b/IDE/IAR-EWARM/Projects/benchmark/current_time.c index 7d42cfc02..9a21fd740 100644 --- a/IDE/IAR-EWARM/Projects/benchmark/current_time.c +++ b/IDE/IAR-EWARM/Projects/benchmark/current_time.c @@ -38,7 +38,7 @@ #include "driverlib/timer.h" void InitTimer(void) { - uint32_t ui32SysClock = SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ | + uint32_t ui32SysClock = ROM_SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ | SYSCTL_OSC_MAIN | SYSCTL_USE_PLL | SYSCTL_CFG_VCO_480), 120000000); diff --git a/wolfcrypt/src/port/ti/ti-aes.c b/wolfcrypt/src/port/ti/ti-aes.c index 8ca83385c..d38e7a3cb 100644 --- a/wolfcrypt/src/port/ti/ti-aes.c +++ b/wolfcrypt/src/port/ti/ti-aes.c @@ -89,7 +89,7 @@ static int AesAlign16(Aes* aes, byte* out, const byte* in, word32 sz, word32 di ROM_AESReset(AES_BASE); ROM_AESConfigSet(AES_BASE, (aes->keylen | dir | (mode==AES_CFG_MODE_CTR_NOCTR ? AES_CFG_MODE_CTR : mode))); - AESIVSet(AES_BASE, aes->reg); + ROM_AESIVSet(AES_BASE, aes->reg); ROM_AESKey1Set(AES_BASE, aes->key, aes->keylen); if((dir == AES_CFG_DIR_DECRYPT)&& (mode == AES_CFG_MODE_CBC)) /* if input and output same will overwrite input iv */ diff --git a/wolfcrypt/src/port/ti/ti-ccm.c b/wolfcrypt/src/port/ti/ti-ccm.c index 801cc9bb5..73f464d6f 100644 --- a/wolfcrypt/src/port/ti/ti-ccm.c +++ b/wolfcrypt/src/port/ti/ti-ccm.c @@ -48,7 +48,7 @@ bool wolfSSL_TI_CCMInit(void) if(ccm_init)return true ; ccm_init = true ; - SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ | + ROM_SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ | SYSCTL_OSC_MAIN | SYSCTL_USE_PLL | SYSCTL_CFG_VCO_480), 120000000); diff --git a/wolfcrypt/src/port/ti/ti-des3.c b/wolfcrypt/src/port/ti/ti-des3.c index d51c48e1a..21c61d310 100644 --- a/wolfcrypt/src/port/ti/ti-des3.c +++ b/wolfcrypt/src/port/ti/ti-des3.c @@ -74,7 +74,7 @@ static int DesCbcAlign16(Des* des, byte* out, const byte* in, word32 sz, word32 wolfSSL_TI_lockCCM() ; ROM_DESReset(DES_BASE); ROM_DESConfigSet(DES_BASE, (dir | DES_CFG_MODE_CBC | tri)); - DESIVSet(DES_BASE, des->reg); + ROM_DESIVSet(DES_BASE, des->reg); ROM_DESKeySet(DES_BASE, des->key); if(dir == DES_CFG_DIR_DECRYPT) /* if input and output same will overwrite input iv */