From cdf8ab295c7906baf4a193bf8dd5136eb3294d24 Mon Sep 17 00:00:00 2001
From: Takashi Kojo <kojo@wolfssl.com>
Date: Tue, 6 May 2014 11:16:43 +0900
Subject: [PATCH] current_time, generic to CortexM

---
 .../Projects/CryptBenchmark/CryptBenchmark.uvoptx        | 4 ++--
 .../Projects/CryptBenchmark/CryptBenchmark.uvprojx       | 4 ++--
 .../{time-STM32F2xx.c => time-CortexM3-4.c}              | 9 ++++++++-
 IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx     | 4 ++--
 IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx    | 4 ++--
 .../CyaSSL-Full/{time-STM32F2xx.c => time-CortexM3-4.c}  | 9 ++++++++-
 6 files changed, 24 insertions(+), 10 deletions(-)
 rename IDE/MDK5-ARM/Projects/CryptBenchmark/{time-STM32F2xx.c => time-CortexM3-4.c} (74%)
 rename IDE/MDK5-ARM/Projects/CyaSSL-Full/{time-STM32F2xx.c => time-CortexM3-4.c} (74%)

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 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>.\time-STM32F2xx.c</PathWithFileName>
-      <FilenameWithoutPath>time-STM32F2xx.c</FilenameWithoutPath>
+      <PathWithFileName>.\time-CortexM3-4.c</PathWithFileName>
+      <FilenameWithoutPath>time-CortexM3-4.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
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 @@
           <GroupName>Devices</GroupName>
           <Files>
             <File>
-              <FileName>time-STM32F2xx.c</FileName>
+              <FileName>time-CortexM3-4.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\time-STM32F2xx.c</FilePath>
+              <FilePath>.\time-CortexM3-4.c</FilePath>
             </File>
             <File>
               <FileName>time-dummy.c</FileName>
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 <config.h>
 #endif
 
-#include "stm32f2xx.h"
+
+#include <stdint.h>       
+#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 @@
       <TopLine>44</TopLine>
       <CurrentLine>90</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>.\time-STM32F2xx.c</PathWithFileName>
-      <FilenameWithoutPath>time-STM32F2xx.c</FilenameWithoutPath>
+      <PathWithFileName>.\time-CortexM3-4.c</PathWithFileName>
+      <FilenameWithoutPath>time-CortexM3-4.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
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 @@
           <GroupName>Devices</GroupName>
           <Files>
             <File>
-              <FileName>time-STM32F2xx.c</FileName>
+              <FileName>time-CortexM3-4.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\time-STM32F2xx.c</FilePath>
+              <FilePath>.\time-CortexM3-4.c</FilePath>
             </File>
             <File>
               <FileName>time-dummy.c</FileName>
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 <config.h>
 #endif
 
-#include "stm32f2xx.h"
+
+#include <stdint.h>       
+#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 ;