sbi and cbi are deprecated

9 years ago · e4945b30d2
2 changed files with 6 additions and 13 deletions
--- 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
--- 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);
 }