lowenware/os-core
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Repair compilability of code

Browse Source
This commit is contained in:
elias
2020-01-17 10:13:01 +01:00
parent a0c215e954
commit a93f257f2e
14 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/timer/timer.c
+19 -7
View File
@@ -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
+2 -2
View File
@@ -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 */
kernel/drivers/uart/uart_mini.c
+4 -4
View File
@@ -14,9 +14,9 @@
*/
#include <aarch64/aarch64.h>
#include <aarch64/bcm2837.h>
#include <drivers/soc/bcm2837/bcm2837.h>
#include "UARTMini.h"
#include "uart_mini.h"
int
@@ -49,9 +49,9 @@ UARTMini_init(void)
AArch64_setReg32(GPFSEL1, sel);
AArch64_setReg32(GPPUD, 0);
AArch64_delay(150);
AArch64_idle(150);
AArch64_setReg32(GPPUDCLK0, (1 << 14) | (1 << 15));
AArch64_delay(150);
AArch64_idle(150);
AArch64_setReg32(GPPUDCLK0, 0);
/* Enable TX and RX */