From f68fa5ab60f4f463c02f66334f0561dcbba3745d Mon Sep 17 00:00:00 2001
From: Allen Hill <allenofthehills@gmail.com>
Date: Fri, 15 May 2026 22:27:09 +0000
Subject: [PATCH] Manually inline sbi/cbi macros

---
 src/avclandrv.c | 12 ++++++------
 src/avclandrv.h |  3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/avclandrv.c b/src/avclandrv.c
index 636cc1b..4e0efca 100644
--- a/src/avclandrv.c
+++ b/src/avclandrv.c
@@ -176,15 +176,15 @@ uint8_t cdloading_resp[] = {dev_CD_CHANGER,
 /* Disable serial and periodic interrupts during AVCLAN reads.
   Not using cli() because AVCLAN reads depend on other interrupts. */
 static inline void stopEvent() {
-  cbi(RTC.PITINTCTRL, RTC_PI_bp);
-  cbi(USART0.CTRLA, USART_RXCIE_bp);
+  RTC.PITINTCTRL &= ~(1 << RTC_PI_bp);
+  USART0.CTRLA &= ~(1 << USART_RXCIE_bp);
 }
 
 // Re-enable serial and periodic interrupts.
 static inline void startEvent() {
   if (AVCLAN_isPlaying()) // Reenable PIT interrupt if currently playing
-    sbi(RTC.PITINTCTRL, RTC_PI_bp);
-  sbi(USART0.CTRLA, USART_RXCIE_bp);
+    RTC.PITINTCTRL |= (1 << RTC_PI_bp);
+  USART0.CTRLA |= (1 << USART_RXCIE_bp);
 }
 
 // clang-format off
@@ -237,7 +237,7 @@ void AVCLAN_startPlaying() {
   ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
     loop_until_bit_is_clear(RTC_PITSTATUS, RTC_CNTBUSY_bp);
     RTC.CNT = 0;
-    sbi(RTC.PITINTCTRL, RTC_PI_bp);
+    RTC.PITINTCTRL |= (1 << RTC_PI_bp);
   }
 }
 
@@ -245,7 +245,7 @@ void AVCLAN_startPlaying() {
 // 1 sec)
 void AVCLAN_stopPlaying() {
   CD_Mode = stStop;
-  cbi(RTC.PITINTCTRL, RTC_PI_bp);
+  RTC.PITINTCTRL &= ~(1 << RTC_PI_bp);
 }
 
 void AVCLAN_init() {
diff --git a/src/avclandrv.h b/src/avclandrv.h
index bbc98bf..46363c0 100644
--- a/src/avclandrv.h
+++ b/src/avclandrv.h
@@ -28,9 +28,6 @@
 // PA7 AINN1 -
 #define BUS_IS_IDLE (bit_is_clear(AC2_STATUS, AC_STATE_bp))
 
-#define sbi(port, bit) (port) |= (1 << (bit))  // Set bit (i.e. to 1)
-#define cbi(port, bit) (port) &= ~(1 << (bit)) // Clear bit (i.e. set bit to 0)
-
 #define MAXMSGLEN 32
 
 #define DEVICE_ADDR 0x360 // CD Changer address