From f806cf30e5c79fde478b02742a313e1fd6ecaf6b Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Mon, 21 Apr 2025 00:46:57 +0200 Subject: [PATCH] Revert "added ifdefs guards for includes." This reverts commit 15199a17a5804f889ae4858261bea31d4fda7c69. --- avr/common/crc8.asm | 7 ------- avr/common/m_fixedbuffers.asm | 5 +---- avr/common/m_ringbuffer.asm | 5 ----- avr/common/m_ringbuffer_y.asm | 5 +---- avr/common/ringbuffer.asm | 5 ----- avr/common/ringbuffer_y.asm | 8 -------- avr/common/utils.asm | 6 ------ avr/common/utils_copy_from_flash.asm | 5 ----- avr/common/utils_copy_sdram.asm | 6 ------ avr/common/utils_wait.asm | 5 ----- avr/common/utils_wait_fixed.asm | 8 -------- avr/common/utils_wait_pin.asm | 6 ------ avr/common/watchdog.asm | 5 ----- avr/modules/basetimer/main.asm | 5 ----- 14 files changed, 2 insertions(+), 79 deletions(-) diff --git a/avr/common/crc8.asm b/avr/common/crc8.asm index 56e0794..76b0d2a 100644 --- a/avr/common/crc8.asm +++ b/avr/common/crc8.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_CRC8_H -#define COMMON_CRC8_H - .cseg @@ -47,7 +44,3 @@ crc8Calc_withoutPoly: ret ; @end - - -#endif ; COMMON_CRC8_H - diff --git a/avr/common/m_fixedbuffers.asm b/avr/common/m_fixedbuffers.asm index 364aa29..b2831e1 100644 --- a/avr/common/m_fixedbuffers.asm +++ b/avr/common/m_fixedbuffers.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_M_FIXEDBUFFERS_H -#define COMMON_M_FIXEDBUFFERS_H - ; --------------------------------------------------------------------------- ; @macro m_fixedbuf_init @@ -138,5 +135,5 @@ l_end: -#endif ; COMMON_M_FIXEDBUFFERS_H + diff --git a/avr/common/m_ringbuffer.asm b/avr/common/m_ringbuffer.asm index e19680a..343925a 100644 --- a/avr/common/m_ringbuffer.asm +++ b/avr/common/m_ringbuffer.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_M_RINGBUFFER_H -#define COMMON_M_RINGBUFFER_H - ; --------------------------------------------------------------------------- @@ -110,5 +107,3 @@ l_end: -#endif ; COMMON_M_RINGBUFFER_H - diff --git a/avr/common/m_ringbuffer_y.asm b/avr/common/m_ringbuffer_y.asm index 26095c4..8c32e50 100644 --- a/avr/common/m_ringbuffer_y.asm +++ b/avr/common/m_ringbuffer_y.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_M_RINGBUFFER_Y_H -#define COMMON_M_RINGBUFFER_Y_H - ; --------------------------------------------------------------------------- @@ -152,4 +149,4 @@ l_end: -#endif ; COMMON_M_RINGBUFFER_Y_H + diff --git a/avr/common/ringbuffer.asm b/avr/common/ringbuffer.asm index c3f9ba4..2695309 100644 --- a/avr/common/ringbuffer.asm +++ b/avr/common/ringbuffer.asm @@ -7,8 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_RINGBUFFER_H -#define COMMON_RINGBUFFER_H @@ -255,6 +253,3 @@ RINGBUFFER_END: .equ MODULE_SIZE_RINGBUFFER = RINGBUFFER_END-RINGBUFFER_BEGIN - -#endif ; COMMON_RINGBUFFER_H - diff --git a/avr/common/ringbuffer_y.asm b/avr/common/ringbuffer_y.asm index 7652456..7eba828 100644 --- a/avr/common/ringbuffer_y.asm +++ b/avr/common/ringbuffer_y.asm @@ -7,12 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_RINGBUFFER_Y_H -#define COMMON_RINGBUFFER_Y_H - -.include "common/m_ringbuffer_y.asm" - - .equ RINGBUFFERY_OFFS_MAXSIZE = 0 .equ RINGBUFFERY_OFFS_USED = 1 @@ -202,5 +196,3 @@ RingBufferY_WriteByteGuarded_error: -#endif ; COMMON_RINGBUFFER_Y_H - diff --git a/avr/common/utils.asm b/avr/common/utils.asm index ad9f87d..81ef3ea 100644 --- a/avr/common/utils.asm +++ b/avr/common/utils.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_UTILS_H -#define COMMON_UTILS_H - @@ -557,6 +554,3 @@ Utils_TranslateByTable_found: UTILS_END: .equ MODULE_SIZE_UTILS = UTILS_END-UTILS_BEGIN - -#endif ; COMMON_UTILS_H - diff --git a/avr/common/utils_copy_from_flash.asm b/avr/common/utils_copy_from_flash.asm index 6ce2dff..67b7b47 100644 --- a/avr/common/utils_copy_from_flash.asm +++ b/avr/common/utils_copy_from_flash.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_UTILS_COPYFROMFLASH_H -#define COMMON_UTILS_COPYFROMFLASH_H - ; *************************************************************************** ; code @@ -36,5 +33,3 @@ Utils_CopyFromFlash: ret - -#endif ; COMMON_UTILS_COPYFROMFLASH_H diff --git a/avr/common/utils_copy_sdram.asm b/avr/common/utils_copy_sdram.asm index 7ab2eeb..5a35681 100644 --- a/avr/common/utils_copy_sdram.asm +++ b/avr/common/utils_copy_sdram.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_UTILS_COPYSDRAM_H -#define COMMON_UTILS_COPYSDRAM_H - ; *************************************************************************** ; code @@ -35,6 +32,3 @@ Utils_Copy_SDRAM: ret - -#endif ; COMMON_UTILS_COPYSDRAM_H - diff --git a/avr/common/utils_wait.asm b/avr/common/utils_wait.asm index f9c5f76..095d143 100644 --- a/avr/common/utils_wait.asm +++ b/avr/common/utils_wait.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_UTILS_WAIT_H -#define COMMON_UTILS_WAIT_H - @@ -62,5 +59,3 @@ -#endif ; COMMON_UTILS_WAIT_H - diff --git a/avr/common/utils_wait_fixed.asm b/avr/common/utils_wait_fixed.asm index 82be877..9be3aba 100644 --- a/avr/common/utils_wait_fixed.asm +++ b/avr/common/utils_wait_fixed.asm @@ -7,12 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_UTILS_WAIT_FIXED_H -#define COMMON_UTILS_WAIT_FIXED_H - - -.include "common/utils_wait.asm" - @@ -60,5 +54,3 @@ Utils_WaitFor100MicroSecs: -#endif ; COMMON_UTILS_WAIT_FIXED_H - diff --git a/avr/common/utils_wait_pin.asm b/avr/common/utils_wait_pin.asm index d0d415a..e79741c 100644 --- a/avr/common/utils_wait_pin.asm +++ b/avr/common/utils_wait_pin.asm @@ -7,10 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_UTILS_WAIT_PIN_H -#define COMMON_UTILS_WAIT_PIN_H - - ; *************************************************************************** ; code @@ -56,5 +52,3 @@ com2WaitForDataState1ms_ret: -#endif ; COMMON_UTILS_WAIT_PIN_H - diff --git a/avr/common/watchdog.asm b/avr/common/watchdog.asm index 5bde7e1..26616c6 100644 --- a/avr/common/watchdog.asm +++ b/avr/common/watchdog.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef COMMON_WATCHDOG_H -#define COMMON_WATCHDOG_H - ; *************************************************************************** @@ -49,5 +46,3 @@ watchdogOff: -#endif ; COMMON_WATCHDOG_H - diff --git a/avr/modules/basetimer/main.asm b/avr/modules/basetimer/main.asm index d4c3ef8..7b83e17 100644 --- a/avr/modules/basetimer/main.asm +++ b/avr/modules/basetimer/main.asm @@ -7,9 +7,6 @@ ; * Please see toplevel file COPYING of that project for license details. * ; *************************************************************************** -#ifndef BASETIMER_MAIN_H -#define BASETIMER_MAIN_H - ; ; The base timer makes sure that "onSystemTimerTick" is called about every ; 100ms. @@ -201,5 +198,3 @@ BASETIMER_END: - -#endif ; BASETIMER_MAIN_H