Repair compilability of code

kernel/drivers/timer/timer.c

@@ -14,28 +14,40 @@
  */
 
 #include <aarch64/aarch64.h>
-#include <aarch64/bcm2837.h>
+#include <drivers/soc/bcm2837/bcm2837.h>
+#include <leos/log.h>
 #include "timer.h"
-#include "log.h"
 
 const unsigned int m_interval = 200000;
 unsigned int m_current = 0;
 
+#ifndef CONFIG_ARM_TIMER
+#define CONFIG_ARM_TIMER 1
+#endif
+
 void
-k_timer_init(void)
+Timer_init(void)
 {
+#if CONFIG_ARM_TIMER == 1
+#else
 	m_current = aarch64_get32r(TIMER_CLO);
 	m_current += m_interval;
 	aarch64_set32r(TIMER_C1, m_current);
+#endif
 }
 
 void
-k_timer_irq_handler(void)
+Timer_incFromISR(void)
 {
+#if CONFIG_ARM_TIMER == 1
+
+#else
 	m_current += m_interval;
 	aarch64_set32r(TIMER_C1, m_current);
 	aarch64_set32r(TIMER_CS, TIMER_CS_M1);
-	k_logs("Timer: ");
-	k_logu(m_current, 10);
-	k_logs("\r\n");
+#endif
+	Log_putS("Timer: ");
+	Log_putI(m_current, 10);
+	Log_putS("\r\n");
 }
+

kernel/drivers/timer/timer.h

@@ -17,9 +17,9 @@
 #define TIMER_H_8D327261_47D6_4832_8DC5_31BF1614A21F
 
 void
-k_timer_init(void);
+Timer_init(void);
 
 void
-k_timer_irq_handler(void);
+Timer_incFromISR(void);
 
 #endif /* !TIMER_H */