From cfb83b435875a0439ce13eca5137b07fdb258b37 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 22 Feb 2025 19:48:39 +0000
Subject: [PATCH] Fixed another regression in the AVR8 target driver
 Breakpoints were being cleared after the OCDEN fuse bit had been cleared.

---
 .../Microchip/Protocols/Edbg/Avr/EdbgAvr8Interface.cpp          | 2 --
 src/Targets/Microchip/Avr8/Avr8.cpp                             | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/DebugToolDrivers/Microchip/Protocols/Edbg/Avr/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Microchip/Protocols/Edbg/Avr/EdbgAvr8Interface.cpp
index 3036a8d4..4e031b23 100644
--- a/src/DebugToolDrivers/Microchip/Protocols/Edbg/Avr/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Microchip/Protocols/Edbg/Avr/EdbgAvr8Interface.cpp
@@ -255,8 +255,6 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
 
     void EdbgAvr8Interface::deactivate() {
         if (this->targetAttached) {
-            this->clearAllBreakpoints();
-
             if (
                 this->session.targetConfig.physicalInterface == TargetPhysicalInterface::DEBUG_WIRE
                 && this->session.targetConfig.disableDebugWireOnDeactivate
diff --git a/src/Targets/Microchip/Avr8/Avr8.cpp b/src/Targets/Microchip/Avr8/Avr8.cpp
index eb65bcb6..c51dd862 100644
--- a/src/Targets/Microchip/Avr8/Avr8.cpp
+++ b/src/Targets/Microchip/Avr8/Avr8.cpp
@@ -236,6 +236,7 @@ namespace Targets::Microchip::Avr8
             }
 
             this->stop();
+            this->avr8DebugInterface->clearAllBreakpoints();
 
             if (
                 this->targetConfig.physicalInterface == TargetPhysicalInterface::JTAG