From 0bfd303a26a8aad77607e9cefb1039997952af09 Mon Sep 17 00:00:00 2001 From: BlackMark Date: Fri, 2 Aug 2019 17:41:14 +0200 Subject: [PATCH] Removed unneeded tx complete interrupt --- hardware.hpp | 3 +-- hardware0.hpp | 13 ------------- hardware1.hpp | 13 ------------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/hardware.hpp b/hardware.hpp index 369744e..786abfc 100644 --- a/hardware.hpp +++ b/hardware.hpp @@ -174,8 +174,7 @@ class Hardware { uint8_t interruptVal = 0; if (driven == Driven::INTERRUPT) - interruptVal |= (1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE) | (1 << CtrlFlagsB::RX_INT_ENABLE) | - (1 << CtrlFlagsB::TX_INT_ENABLE); + interruptVal |= (1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE) | (1 << CtrlFlagsB::RX_INT_ENABLE); return interruptVal; } diff --git a/hardware0.hpp b/hardware0.hpp index 2cfc727..941c190 100644 --- a/hardware0.hpp +++ b/hardware0.hpp @@ -61,7 +61,6 @@ constexpr int operator<<(const int &lhs, const ControlFlagsC0 &rhs) { return lhs static void (*fnRx0IntHandler)() = nullptr; static void (*fnDataReg0EmptyIntHandler)() = nullptr; -static void (*fnTx0IntHandler)() = nullptr; ISR(USART0_RX_vect) { @@ -75,12 +74,6 @@ ISR(USART0_UDRE_vect) fnDataReg0EmptyIntHandler(); } -ISR(USART0_TX_vect) -{ - if (fnTx0IntHandler) - fnTx0IntHandler(); -} - #else #error "This chip is not supported" #endif @@ -125,7 +118,6 @@ class Hardware0 { { detail::fnRx0IntHandler = rxIntHandler; detail::fnDataReg0EmptyIntHandler = dataRegEmptyIntHandler; - detail::fnTx0IntHandler = txIntHandler; HardwareImpl::init(); } @@ -186,11 +178,6 @@ class Hardware0 { } else HardwareImpl::disableDataRegEmptyInt(); } - - static void txIntHandler() - { - // TODO - } }; template diff --git a/hardware1.hpp b/hardware1.hpp index 2f94416..1cff4f1 100644 --- a/hardware1.hpp +++ b/hardware1.hpp @@ -61,7 +61,6 @@ constexpr int operator<<(const int &lhs, const ControlFlagsC1 &rhs) { return lhs static void (*fnRx1IntHandler)() = nullptr; static void (*fnDataReg1EmptyIntHandler)() = nullptr; -static void (*fnTx1IntHandler)() = nullptr; ISR(USART1_RX_vect) { @@ -75,12 +74,6 @@ ISR(USART1_UDRE_vect) fnDataReg1EmptyIntHandler(); } -ISR(USART1_TX_vect) -{ - if (fnTx1IntHandler) - fnTx1IntHandler(); -} - #define HAS_UART1 #else @@ -129,7 +122,6 @@ class Hardware1 { { detail::fnRx1IntHandler = rxIntHandler; detail::fnDataReg1EmptyIntHandler = dataRegEmptyIntHandler; - detail::fnTx1IntHandler = txIntHandler; HardwareImpl::init(); } @@ -190,11 +182,6 @@ class Hardware1 { } else HardwareImpl::disableDataRegEmptyInt(); } - - static void txIntHandler() - { - // TODO - } }; template