From e4945b30d27dd5c748085d1fad457350dc692a44 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 27 Feb 2016 04:52:13 -0800 Subject: [PATCH] sbi and cbi are deprecated --- Marlin/Marlin.h | 7 ------- Marlin/MarlinSerial.cpp | 12 ++++++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 5315a2182..42f8af2c6 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -45,13 +45,6 @@ typedef unsigned long millis_t; #include "MarlinSerial.h" -#ifndef cbi - #define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif -#ifndef sbi - #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - #include "WString.h" #ifdef USBCON diff --git a/Marlin/MarlinSerial.cpp b/Marlin/MarlinSerial.cpp index f750c04e9..2333e6bfc 100644 --- a/Marlin/MarlinSerial.cpp +++ b/Marlin/MarlinSerial.cpp @@ -91,15 +91,15 @@ void MarlinSerial::begin(long baud) { M_UBRRxH = baud_setting >> 8; M_UBRRxL = baud_setting; - sbi(M_UCSRxB, M_RXENx); - sbi(M_UCSRxB, M_TXENx); - sbi(M_UCSRxB, M_RXCIEx); + SBI(M_UCSRxB, M_RXENx); + SBI(M_UCSRxB, M_TXENx); + SBI(M_UCSRxB, M_RXCIEx); } void MarlinSerial::end() { - cbi(M_UCSRxB, M_RXENx); - cbi(M_UCSRxB, M_TXENx); - cbi(M_UCSRxB, M_RXCIEx); + CBI(M_UCSRxB, M_RXENx); + CBI(M_UCSRxB, M_TXENx); + CBI(M_UCSRxB, M_RXCIEx); }