From 460ecf074d133cbe026cbddb7cf5fad1180c9831 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Fri, 28 May 2021 15:17:20 +0200
Subject: Set loop/wakeup/ostream either via .config or via app/commandline

---
 src/arch/atmega2560/arch.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/arch/atmega2560/arch.cc')

diff --git a/src/arch/atmega2560/arch.cc b/src/arch/atmega2560/arch.cc
index 9d7e101..763a920 100644
--- a/src/arch/atmega2560/arch.cc
+++ b/src/arch/atmega2560/arch.cc
@@ -19,7 +19,7 @@ void Arch::setup(void)
 #error Unsupported F_CPU
 #endif
 
-#if defined(WITH_LOOP) || defined(TIMER_S)
+#if defined(CONFIG_loop) || defined(TIMER_S)
 	TCCR1A = 0;
 	TCCR1B = _BV(WGM12) | _BV(CS12) | _BV(CS10); // /1024
 	OCR1A = F_CPU / 1024;
@@ -29,17 +29,17 @@ void Arch::setup(void)
 	sei();
 }
 
-#ifdef WITH_WAKEUP
+#ifdef CONFIG_wakeup
 void wakeup();
 #endif
 
-#if defined(WITH_LOOP) || defined(TIMER_S)
+#if defined(CONFIG_loop) || defined(TIMER_S)
 
 #include "driver/uptime.h"
 
 #endif
 
-#if defined(WITH_LOOP)
+#if defined(CONFIG_loop)
 extern void loop();
 volatile char run_loop = 0;
 #endif
@@ -51,13 +51,13 @@ void Arch::idle_loop(void)
 		asm("sleep");
 		SMCR = 0;
 		asm("wdr");
-#ifdef WITH_LOOP
+#ifdef CONFIG_loop
 		if (run_loop) {
 			loop();
 			run_loop = 0;
 		}
 #endif
-#ifdef WITH_WAKEUP
+#ifdef CONFIG_wakeup
 		wakeup();
 #endif
 	}
@@ -87,12 +87,12 @@ void Arch::delay_ms(unsigned int const ms)
 
 Arch arch;
 
-#if defined(WITH_LOOP) || defined(TIMER_S)
+#if defined(CONFIG_loop) || defined(TIMER_S)
 
 #ifndef __acweaving
 ISR(TIMER1_COMPA_vect)
 {
-#ifdef WITH_LOOP
+#ifdef CONFIG_loop
 	run_loop = 1;
 #endif
 #ifdef TIMER_S
-- 
cgit v1.2.3