From 41a6e0bbbd493ddeb78677879e1bb8293b556988 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 12 Dec 2023 23:25:29 +0000 Subject: [PATCH] Tidying --- build/scripts/GenerateTargetDescriptionFileMapping.php | 2 +- src/DebugServer/DebugServerComponent.cpp | 2 +- src/Targets/Microchip/AVR/AVR8/Avr8.cpp | 2 +- src/Targets/TargetFamily.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/scripts/GenerateTargetDescriptionFileMapping.php b/build/scripts/GenerateTargetDescriptionFileMapping.php index e888c0cb..7de5d00b 100644 --- a/build/scripts/GenerateTargetDescriptionFileMapping.php +++ b/build/scripts/GenerateTargetDescriptionFileMapping.php @@ -40,7 +40,7 @@ $xmlFiles = TargetDescriptionFiles\Factory::findXmlFiles(TDF_DIR_PATH); print count($xmlFiles) . ' target descriptions files found in ' . TDF_DIR_PATH . PHP_EOL . PHP_EOL; $targetFamiliesByArch = [ - TargetDescriptionFile::ARCHITECTURE_AVR8 => 'TargetFamily::AVR8', + TargetDescriptionFile::ARCHITECTURE_AVR8 => 'TargetFamily::AVR_8', ]; const MAP_ENTRY_TEMPLATE = '{"@CONFIG_VALUE@", {"@TARGET_NAME@", "@CONFIG_VALUE@", @TARGET_FAMILY@, "@TDF_PATH@"}}'; diff --git a/src/DebugServer/DebugServerComponent.cpp b/src/DebugServer/DebugServerComponent.cpp index 36ceb2c4..09680037 100644 --- a/src/DebugServer/DebugServerComponent.cpp +++ b/src/DebugServer/DebugServerComponent.cpp @@ -43,7 +43,7 @@ namespace DebugServer { "avr-gdb-rsp", [this] () -> std::unique_ptr { - if (this->targetDescriptor.family != Targets::TargetFamily::AVR8) { + if (this->targetDescriptor.family != Targets::TargetFamily::AVR_8) { throw Exceptions::Exception("The AVR GDB RSP server is only compatible with AVR8 targets."); } diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp index 67331f71..b3f34273 100644 --- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp +++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp @@ -268,7 +268,7 @@ namespace Targets::Microchip::Avr::Avr8Bit TargetDescriptor Avr8::getDescriptor() { auto descriptor = TargetDescriptor( this->signature.toHex(), - TargetFamily::AVR8, + TargetFamily::AVR_8, this->name, "Microchip", this->targetMemoryDescriptorsByType, diff --git a/src/Targets/TargetFamily.hpp b/src/Targets/TargetFamily.hpp index 19acf422..327d283e 100644 --- a/src/Targets/TargetFamily.hpp +++ b/src/Targets/TargetFamily.hpp @@ -6,7 +6,7 @@ namespace Targets { enum class TargetFamily: std::uint8_t { - AVR8, + AVR_8, RISC_V, }; }