diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx index add0136ee..2058a1b4c 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx @@ -318,8 +318,8 @@ 0 0 0 - .\time-STM32F2xx.c - time-STM32F2xx.c + .\time-CortexM3-4.c + time-CortexM3-4.c 0 0 diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx index d250ee533..0f8527bf8 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx @@ -445,9 +445,9 @@ Devices - time-STM32F2xx.c + time-CortexM3-4.c 1 - .\time-STM32F2xx.c + .\time-CortexM3-4.c time-dummy.c diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/time-STM32F2xx.c b/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c similarity index 74% rename from IDE/MDK5-ARM/Projects/CryptBenchmark/time-STM32F2xx.c rename to IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c index 1d5870939..46712b34c 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/time-STM32F2xx.c +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c @@ -23,7 +23,14 @@ #include #endif -#include "stm32f2xx.h" + +#include +#define DWT ((DWT_Type *) (0xE0001000UL) ) +typedef struct +{ + uint32_t CTRL; /*!< Offset: 0x000 (R/W) Control Register */ + uint32_t CYCCNT; /*!< Offset: 0x004 (R/W) Cycle Count Register */ +} DWT_Type; extern uint32_t SystemCoreClock ; diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx index 654abbee1..308f52210 100644 --- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx +++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx @@ -474,8 +474,8 @@ 44 90 0 - .\time-STM32F2xx.c - time-STM32F2xx.c + .\time-CortexM3-4.c + time-CortexM3-4.c 0 0 diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx index b11415830..11b502fe0 100644 --- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx +++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx @@ -490,9 +490,9 @@ Devices - time-STM32F2xx.c + time-CortexM3-4.c 1 - .\time-STM32F2xx.c + .\time-CortexM3-4.c time-dummy.c diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/time-STM32F2xx.c b/IDE/MDK5-ARM/Projects/CyaSSL-Full/time-CortexM3-4.c similarity index 74% rename from IDE/MDK5-ARM/Projects/CyaSSL-Full/time-STM32F2xx.c rename to IDE/MDK5-ARM/Projects/CyaSSL-Full/time-CortexM3-4.c index 1d5870939..46712b34c 100644 --- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/time-STM32F2xx.c +++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/time-CortexM3-4.c @@ -23,7 +23,14 @@ #include #endif -#include "stm32f2xx.h" + +#include +#define DWT ((DWT_Type *) (0xE0001000UL) ) +typedef struct +{ + uint32_t CTRL; /*!< Offset: 0x000 (R/W) Control Register */ + uint32_t CYCCNT; /*!< Offset: 0x004 (R/W) Cycle Count Register */ +} DWT_Type; extern uint32_t SystemCoreClock ;