fix(sw): cleanup timer software

- remove unused software sub directories and files
IObundle · Jan 11, 2024 · 178999e · 178999e
1 parent 7176975
commit 178999e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 42 deletions.
diff --git a/software/embedded/embedded.mk b/software/embedded/embedded.mk
diff --git a/software/esrc/.empty b/software/esrc/.empty
diff --git a/software/example_firmware.c b/software/example_firmware.c
@@ -17,7 +17,7 @@ int main()
 
   //read current timer count, compute elapsed time
   elapsed  = timer_get_count();
-  elapsedu = timer_time_us();
+  elapsedu = elapsed/(FREQ/1000000);
 
   printf("\nExecution time: %d clock cycles\n", (unsigned int) elapsed);
   printf("\nExecution time: %dus @%dMHz\n\n", elapsedu, FREQ/1000000);

diff --git a/software/pc-emul/pc-emul.mk b/software/pc-emul/pc-emul.mk
diff --git a/software/software.mk b/software/software.mk
diff --git a/software/src/iob-timer.c b/software/src/iob-timer.c
@@ -19,7 +19,11 @@ uint64_t timer_get_count() {
   // sample timer counter
   IOB_TIMER_SET_SAMPLE(1);
   IOB_TIMER_SET_SAMPLE(0);
-  return (*( (volatile uint64_t *) ( base ) ) );
-}
 
+  uint64_t count = (uint64_t) IOB_TIMER_GET_DATA_HIGH();
+  count <<= IOB_TIMER_DATA_LOW_W;
+  count |= (uint64_t) IOB_TIMER_GET_DATA_LOW();
+
+  return count;
+}
 
diff --git a/software/pc-emul/iob_timer_swreg_pc_emul.c → software/src/iob_timer_swreg_pc_emul.c b/software/pc-emul/iob_timer_swreg_pc_emul.c → software/src/iob_timer_swreg_pc_emul.c