From 1c702227fe8c3887fb0cc84c5fb0da7a12657b35 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sun, 2 Jun 2024 21:30:11 +0100
Subject: [PATCH] Tidying

---
 .../AVR8/Services/ValidationService.php       | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
index 427b5708..7be36bba 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
@@ -22,46 +22,31 @@ class ValidationService extends \Targets\TargetDescriptionFiles\Services\Validat
     {
         $failures = parent::validateTdf($tdf);
 
-        if ($tdf->getMemorySegment('prog', 'internal_program_memory') === null) {
+        if ($tdf->getProgramMemorySegment() === null) {
             $failures[] = 'Missing "internal_program_memory" memory segment';
         }
 
-        if ($tdf->getMemorySegment('data', 'internal_ram') === null) {
+        if ($tdf->getRamSegment() === null) {
             $failures[] = 'Missing "internal_ram" memory segment';
         }
 
-        if (
-            $tdf->getMemorySegment('data', 'internal_eeprom') === null
-            && $tdf->getMemorySegment('eeprom', 'internal_eeprom') === null
-        ) {
+        if ($tdf->getEepromSegment() === null) {
             $failures[] = 'Missing "internal_eeprom" memory segment';
         }
 
-        if (
-            $tdf->getMemorySegment('data', 'gp_registers') === null
-            && $tdf->getMemorySegment('register_file', 'gp_registers') === null
-        ) {
+        if ($tdf->getGpRegistersMemorySegment() === null) {
             $failures[] = 'Missing "gp_registers" memory segment';
         }
 
-        if (
-            $tdf->getMemorySegment('data', 'io') === null
-            && $tdf->getMemorySegment('data', 'mapped_io') === null
-        ) {
+        if ($tdf->getIoMemorySegment() === null) {
             $failures[] = 'Missing IO memory segment';
         }
 
-        if (
-            $tdf->getMemorySegment('data', 'signatures') === null
-            && $tdf->getMemorySegment('signatures', 'signatures') === null
-        ) {
+        if ($tdf->getSignaturesMemorySegment() === null) {
             $failures[] = 'Missing "signatures" memory segment';
         }
 
-        if (
-            $tdf->getMemorySegment('data', 'fuses') === null
-            && $tdf->getMemorySegment('fuses', 'fuses') === null
-        ) {
+        if ($tdf->getFusesMemorySegment() === null) {
             $failures[] = 'Missing "fuses" memory segment';
         }