doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored physical interfaces in TDFs and TDF scripts

Browse Source
This commit is contained in:
Nav
2024-07-06 01:33:19 +01:00
parent 8aad5b9095
commit 4bb309a179
269 changed files with 632 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/scripts/Targets/TargetDescriptionFiles/Services/AtdfService.php
View File

@@ -10,7 +10,6 @@ use Targets\TargetDescriptionFiles\AVR8\Services\ValidationService;
use Targets\TargetDescriptionFiles\Services\StringService;
use Targets\TargetDescriptionFiles\Avr8\Avr8TargetDescriptionFile;
use Targets\TargetDescriptionFiles\Avr8\AvrFamily;
use Targets\TargetDescriptionFiles\Avr8\AvrPhysicalInterface;
use Targets\TargetDescriptionFiles\TargetFamily;
use Targets\TargetDescriptionFiles\PropertyGroup;
use Targets\TargetDescriptionFiles\Property;
@@ -31,6 +30,7 @@ use Targets\TargetDescriptionFiles\Pinout;
use Targets\TargetDescriptionFiles\PinoutType;
use Targets\TargetDescriptionFiles\Pin;
use Targets\TargetDescriptionFiles\Variant;
use Targets\TargetPhysicalInterface;
require_once __DIR__ . '/StringService.php';
require_once __DIR__ . '/../AVR8/Avr8TargetDescriptionFile.php';
@@ -187,7 +187,7 @@ class AtdfService
}
}
if (in_array(AvrPhysicalInterface::UPDI, $tdf->getSupportedDebugPhysicalInterfaces())) {
if (in_array(TargetPhysicalInterface::UPDI, $tdf->getSupportedDebugPhysicalInterfaces())) {
/*
* ATDFs for UPDI-enabled targets do not typically possess an `ocd_base_addr` property in the updi_interface
* property group. Bloom needs this property to configure EDBG debug tools, so we add it here.
@@ -598,10 +598,18 @@ class AtdfService
private function physicalInterfaceFromElement(DOMElement $element): PhysicalInterface
{
$physicalInterfacesByName = [
'isp' => TargetPhysicalInterface::ISP,
'debugwire' => TargetPhysicalInterface::DEBUG_WIRE,
'updi' => TargetPhysicalInterface::UPDI,
'pdi' => TargetPhysicalInterface::PDI,
'jtag' => TargetPhysicalInterface::JTAG,
];
$attributes = $this->getNodeAttributesByName($element);
return new PhysicalInterface(
$attributes['name'] ?? null,
$attributes['type'] ?? null,
$physicalInterfacesByName[strtolower($attributes['name'] ?? '')]?->value
?? (!empty($attributes['type']) ? strtolower($attributes['type']) : null)
);
}

5
build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
View File

@@ -189,10 +189,7 @@ class FromXmlService
public function physicalInterfaceFromElement(DOMElement $element): PhysicalInterface
{
$attributes = $this->getNodeAttributesByName($element);
return new PhysicalInterface(
$attributes['name'] ?? null,
$attributes['type'] ?? null,
);
return new PhysicalInterface($attributes['value'] ?? null);
}
public function moduleFromElement(DOMElement $element): Module

3
build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
View File

@@ -125,8 +125,7 @@ class ToXmlService
public function physicalInterfaceToXml(PhysicalInterface $physicalInterface, DOMDocument $document): DOMElement
{
$element = $document->createElement('physical-interface');
$element->setAttribute('name', $physicalInterface->name);
$element->setAttribute('type', $physicalInterface->type);
$element->setAttribute('value', $physicalInterface->value);
return $element;
}