Merge pull request #155 from sifive/fix-c99

Fix compliance with c99
sifive · Aug 14, 2019 · 1e49464 · 1e49464
2 parents ad2ed6b + b7d07f6
commit 1e49464
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/metal/time.h b/metal/time.h
@@ -6,11 +6,18 @@
 
 #include <time.h>
 
+#include <sys/types.h>
+
 /*!
  * @file time.h
  * @brief API for dealing with time
  */
 
+struct timeval {
+    time_t tv_sec;
+    suseconds_t tv_usec;
+};
+
 int metal_gettimeofday(struct timeval *tp, void *tzp);
 
 time_t metal_time(void);

diff --git a/src/drivers/riscv_cpu.c b/src/drivers/riscv_cpu.c
@@ -171,7 +171,7 @@ void __metal_exception_handler(void) {
 metal_vector_mode __metal_controller_interrupt_vector_mode(void) {
     uintptr_t val;
 
-    asm volatile("csrr %0, mtvec" : "=r"(val));
+    __asm__ volatile("csrr %0, mtvec" : "=r"(val));
     val &= METAL_MTVEC_MASK;
 
     switch (val) {

diff --git a/src/drivers/sifive_rtc0.c b/src/drivers/sifive_rtc0.c
@@ -133,3 +133,5 @@ __METAL_DEFINE_VTABLE(__metal_driver_vtable_sifive_rtc0) = {
 };
 
 #endif
+
+typedef int no_empty_translation_units;
diff --git a/src/time.c b/src/time.c
@@ -7,10 +7,12 @@
 int metal_gettimeofday(struct timeval *tp, void *tzp) {
     int rv;
     unsigned long long mcc, timebase;
-    if (rv = metal_timer_get_cyclecount(0, &mcc)) {
+    rv = metal_timer_get_cyclecount(0, &mcc);
+    if (rv != 0) {
         return -1;
     }
-    if (rv = metal_timer_get_timebase_frequency(0, &timebase)) {
+    rv = metal_timer_get_timebase_frequency(0, &timebase);
+    if (rv != 0) {
         return -1;
     }
     tp->tv_sec = mcc / timebase;