Tidying low-level debug tool driver code:

- Use automatic objects for libusb/hidapi resources, where possible (to reduce manual resource management)
- Removed unused/redundant code
- Tidied HidInterface class
- Tidied debug tool initialisation code
- Other bits of tidying

src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.cpp

@@ -8,35 +8,35 @@ namespace Bloom::DebugToolDrivers
     using namespace Protocols::CmsisDap::Edbg::Avr;
     using namespace Bloom::Exceptions;
 
+    using Protocols::CmsisDap::Edbg::EdbgInterface;
     using Protocols::CmsisDap::Edbg::EdbgTargetPowerManagementInterface;
 
+    XplainedNano::XplainedNano()
+        : UsbDevice(XplainedNano::USB_VENDOR_ID, XplainedNano::USB_PRODUCT_ID)
+    {}
+
     void XplainedNano::init() {
         UsbDevice::init();
 
         // TODO: Move away from hard-coding the CMSIS-DAP/EDBG interface number
-        auto& usbHidInterface = this->getEdbgInterface().getUsbHidInterface();
-        usbHidInterface.setNumber(0);
-        usbHidInterface.setLibUsbDevice(this->libUsbDevice);
-        usbHidInterface.setLibUsbDeviceHandle(this->libUsbDeviceHandle);
-        usbHidInterface.setVendorId(this->vendorId);
-        usbHidInterface.setProductId(this->productId);
+        auto usbHidInterface = Usb::HidInterface(0, this->vendorId, this->productId);
 
-        if (!usbHidInterface.isInitialised()) {
-            usbHidInterface.detachKernelDriver();
-            usbHidInterface.init();
-        }
+        this->detachKernelDriverFromInterface(usbHidInterface.interfaceNumber);
+        usbHidInterface.init();
 
-        this->getEdbgInterface().setMinimumCommandTimeGap(std::chrono::milliseconds(35));
+        this->edbgInterface = std::make_unique<EdbgInterface>(std::move(usbHidInterface));
+
+        this->edbgInterface->setMinimumCommandTimeGap(std::chrono::milliseconds(35));
 
         if (!this->sessionStarted) {
             this->startSession();
         }
 
         this->targetPowerManagementInterface = std::make_unique<EdbgTargetPowerManagementInterface>(
-            this->edbgInterface
+            this->edbgInterface.get()
         );
 
-        this->edbgAvr8Interface = std::make_unique<EdbgAvr8Interface>(this->edbgInterface);
+        this->edbgAvr8Interface = std::make_unique<EdbgAvr8Interface>(this->edbgInterface.get());
         this->setInitialised(true);
     }
 
@@ -45,7 +45,7 @@ namespace Bloom::DebugToolDrivers
             this->endSession();
         }
 
-        this->getEdbgInterface().getUsbHidInterface().close();
+        this->edbgInterface->getUsbHidInterface().close();
         UsbDevice::close();
     }
 
@@ -53,7 +53,7 @@ namespace Bloom::DebugToolDrivers
         using namespace CommandFrames::Discovery;
         using ResponseFrames::Discovery::ResponseId;
 
-        auto response = this->getEdbgInterface().sendAvrCommandFrameAndWaitForResponseFrame(
+        auto response = this->edbgInterface->sendAvrCommandFrameAndWaitForResponseFrame(
             Query(QueryContext::SERIAL_NUMBER)
         );
 
@@ -63,7 +63,7 @@ namespace Bloom::DebugToolDrivers
             );
         }
 
-        auto data = response.getPayloadData();
+        const auto data = response.getPayloadData();
         return std::string(data.begin(), data.end());
     }
 
@@ -71,7 +71,7 @@ namespace Bloom::DebugToolDrivers
         using namespace CommandFrames::HouseKeeping;
         using ResponseFrames::HouseKeeping::ResponseId;
 
-        auto response = this->getEdbgInterface().sendAvrCommandFrameAndWaitForResponseFrame(
+        auto response = this->edbgInterface->sendAvrCommandFrameAndWaitForResponseFrame(
             StartSession()
         );
 
@@ -87,7 +87,7 @@ namespace Bloom::DebugToolDrivers
         using namespace CommandFrames::HouseKeeping;
         using ResponseFrames::HouseKeeping::ResponseId;
 
-        auto response = this->getEdbgInterface().sendAvrCommandFrameAndWaitForResponseFrame(
+        auto response = this->edbgInterface->sendAvrCommandFrameAndWaitForResponseFrame(
             EndSession()
         );
 

src/DebugToolDrivers/Microchip/XplainedNano/XplainedNano.hpp

@@ -34,16 +34,12 @@ namespace Bloom::DebugToolDrivers
         static const std::uint16_t USB_VENDOR_ID = 1003;
         static const std::uint16_t USB_PRODUCT_ID = 8517;
 
-        XplainedNano(): UsbDevice(XplainedNano::USB_VENDOR_ID, XplainedNano::USB_PRODUCT_ID) {}
+        XplainedNano();
 
         void init() override;
 
         void close() override;
 
-        Protocols::CmsisDap::Edbg::EdbgInterface& getEdbgInterface()  {
-            return this->edbgInterface;
-        }
-
         DebugToolDrivers::TargetInterfaces::TargetPowerManagementInterface* getTargetPowerManagementInterface() override {
             return this->targetPowerManagementInterface.get();
         }
@@ -54,7 +50,7 @@ namespace Bloom::DebugToolDrivers
 
         std::string getName() override {
             return "Xplained Nano";
-        };
+        }
 
         /**
          * Retrieves the device serial number via the Discovery Protocol.
@@ -74,7 +70,7 @@ namespace Bloom::DebugToolDrivers
         void endSession();
 
     private:
-        Protocols::CmsisDap::Edbg::EdbgInterface edbgInterface = Protocols::CmsisDap::Edbg::EdbgInterface();
+        std::unique_ptr<Protocols::CmsisDap::Edbg::EdbgInterface> edbgInterface = nullptr;
         std::unique_ptr<Protocols::CmsisDap::Edbg::Avr::EdbgAvr8Interface> edbgAvr8Interface = nullptr;
         std::unique_ptr<
             Protocols::CmsisDap::Edbg::EdbgTargetPowerManagementInterface