From b9580b17fd34c0e4979e79eb66f1c76d5ae8298a Mon Sep 17 00:00:00 2001 From: Merlijn Wajer Date: Fri, 8 Nov 2019 18:52:55 +0100 Subject: [PATCH] (HACK): virtual: initial implementation --- include/buzzer.h | 4 ++++ include/console.h | 2 ++ include/led.h | 2 ++ include/rtc.h | 1 + source/main.c | 1 + source/platform/usart.c | 18 ++++++++++++++++++ source/shell/alarm.c | 2 ++ source/shell/buzzer.c | 1 + source/shell/led.c | 2 ++ 9 files changed, 33 insertions(+) diff --git a/include/buzzer.h b/include/buzzer.h index 44ec07a..996add3 100644 --- a/include/buzzer.h +++ b/include/buzzer.h @@ -1,10 +1,14 @@ #pragma once +/* #include +*/ struct buzzer { uint32_t timer; + /* enum tim_oc_id channel; + */ }; void buzzer_init(struct buzzer *buzzer); diff --git a/include/console.h b/include/console.h index ad83fd0..3b0230b 100644 --- a/include/console.h +++ b/include/console.h @@ -1,6 +1,8 @@ #pragma once #include +#include +#include #if HAVE_SYS_TYPES_H #include diff --git a/include/led.h b/include/led.h index 3225d39..06934c1 100644 --- a/include/led.h +++ b/include/led.h @@ -1,5 +1,7 @@ #pragma once +#include + struct led { uint32_t port; uint32_t pin; diff --git a/include/rtc.h b/include/rtc.h index 02e66f4..c6e8bb1 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -1,6 +1,7 @@ #pragma once #include +#include #define SECS_PER_DAY (24 * 60 * 60) diff --git a/source/main.c b/source/main.c index d4fd660..e70e5ab 100644 --- a/source/main.c +++ b/source/main.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include diff --git a/source/platform/usart.c b/source/platform/usart.c index d3e1080..629ce28 100644 --- a/source/platform/usart.c +++ b/source/platform/usart.c @@ -1,7 +1,11 @@ #define _GNU_SOURCE +#include + +/* #include #include #include +*/ #include #include @@ -30,6 +34,7 @@ struct usart_console { static struct usart_console usart[2]; +#if 0 #ifdef STM32F0 #define USART_STOPBITS_1 USART_CR2_STOP_1_0BIT #endif @@ -37,9 +42,15 @@ static struct usart_console usart[2]; #ifdef STM32F1 #define USART_ISR_RXNE USART_SR_RXNE #endif +#endif + +void usart_send_blocking(uint32_t dev, char c) { + return; +} static void usart_isr(struct usart_console *console) { +#if 0 size_t i; if (!console) @@ -53,6 +64,7 @@ static void usart_isr(struct usart_console *console) if (i != console->cur) console->next = i; } +#endif } void usart1_isr(void) @@ -192,17 +204,20 @@ static int usart_get_irq_no(unsigned *irq_no, unsigned dev) if (!irq_no) return -1; +#if 0 switch (dev) { case USART1: *irq_no = NVIC_USART1_IRQ; break; case USART2: *irq_no = NVIC_USART2_IRQ; break; default: return -1; } +#endif return 0; } static int usart_init(struct usart_console *console) { +#if 0 if (usart_get_irq_no(&console->irq_no, console->dev) < 0) return -1; @@ -216,6 +231,7 @@ static int usart_init(struct usart_console *console) nvic_enable_irq(console->irq_no); usart_enable(console->dev); usart_enable_rx_interrupt(console->dev); +#endif return 0; } @@ -232,11 +248,13 @@ struct console *console_init(unsigned dev_id) console = usart + dev_id; +#if 0 switch (dev_id) { case 0: console->dev = USART1; break; case 1: console->dev = USART2; break; default: return NULL; } +#endif console->cur = 0; console->next = 0; diff --git a/source/shell/alarm.c b/source/shell/alarm.c index 6c4467e..4083312 100644 --- a/source/shell/alarm.c +++ b/source/shell/alarm.c @@ -2,7 +2,9 @@ #include #include +#if 0 #include +#endif #include #include diff --git a/source/shell/buzzer.c b/source/shell/buzzer.c index bc04f9c..8fcd36b 100644 --- a/source/shell/buzzer.c +++ b/source/shell/buzzer.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include diff --git a/source/shell/led.c b/source/shell/led.c index df1cb50..3409ffb 100644 --- a/source/shell/led.c +++ b/source/shell/led.c @@ -2,7 +2,9 @@ #include #include +#if 0 #include +#endif #include #include