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

Tidying

Browse Source
This commit is contained in:
Nav
2021-06-05 22:43:03 +01:00
parent a7d3e44436
commit 02446116df
6 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
View File

@@ -415,17 +415,3 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
return $failures; return $failures;
} }
} }
//$j = new Avr8TargetDescriptionFile(
// "/home/nav/Projects/Bloom/build/resources/TargetDescriptionFiles/AVR/AVR8/MEGAAVR/ATMEGA48P.xml"
//);
//
//$h = new Avr8TargetDescriptionFile(
// "/home/nav/Projects/Bloom/build/resources/TargetDescriptionFiles/AVR/AVR8_XMEGA/AVR_XMEGA/ATXMEGA16C4.xml"
//);
//
//$jj = $j->validate();
//
//$hh = $h->validate();
//
//echo "Done\n";

16
build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
View File

@@ -317,16 +317,16 @@ class TargetDescriptionFile
} }
if (empty($this->variants)) { if (empty($this->variants)) {
// $failures[] = 'Missing target variants'; $failures[] = 'Missing target variants';
} }
// foreach ($this->variants as $variant) { foreach ($this->variants as $variant) {
// $variantValidationFailures = $variant->validate(); $variantValidationFailures = $variant->validate();
//
// if (!empty($variantValidationFailures)) { if (!empty($variantValidationFailures)) {
// $failures[] = 'Variant validation failures: ' . implode(", ", $variantValidationFailures); $failures[] = 'Variant validation failures: ' . implode(", ", $variantValidationFailures);
// } }
// } }
return $failures; return $failures;
} }

1
build/scripts/ValidateAvr8TargetDescriptionFiles.php
View File

@@ -4,6 +4,7 @@ namespace Bloom\BuildScripts;
require_once __DIR__ . "/TargetDescriptionFiles/Factory.php"; require_once __DIR__ . "/TargetDescriptionFiles/Factory.php";
print "Loading AVR8 target description files.\n";
$avr8Tdfs = TargetDescriptionFiles\Factory::loadAvr8Tdfs(); $avr8Tdfs = TargetDescriptionFiles\Factory::loadAvr8Tdfs();
$failedValidationCount = 0; $failedValidationCount = 0;

9
src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
View File

@@ -119,9 +119,10 @@ void GdbRspDebugServer::serve() {
if (!this->clientConnection.has_value()) { if (!this->clientConnection.has_value()) {
Logger::info("Waiting for GDB RSP connection"); Logger::info("Waiting for GDB RSP connection");
while (!this->clientConnection.has_value()) { do {
this->waitForConnection(); this->waitForConnection();
}
} while (!this->clientConnection.has_value());
this->clientConnection->accept(this->serverSocketFileDescriptor); this->clientConnection->accept(this->serverSocketFileDescriptor);
Logger::info("Accepted GDP RSP connection from " + this->clientConnection->getIpAddress()); Logger::info("Accepted GDP RSP connection from " + this->clientConnection->getIpAddress());
@@ -334,8 +335,8 @@ void GdbRspDebugServer::handleGdbPacket(CommandPackets::WriteGeneralRegisters& p
try { try {
auto registerDescriptor = this->getRegisterDescriptorFromNumber(packet.registerNumber); auto registerDescriptor = this->getRegisterDescriptorFromNumber(packet.registerNumber);
this->targetControllerConsole.writeGeneralRegisters({ this->targetControllerConsole.writeGeneralRegisters({
TargetRegister(registerDescriptor, packet.registerValue) TargetRegister(registerDescriptor, packet.registerValue)
}); });
this->clientConnection->writePacket(ResponsePacket({'O', 'K'})); this->clientConnection->writePacket(ResponsePacket({'O', 'K'}));
} catch (const Exception& exception) { } catch (const Exception& exception) {

2
src/Targets/Microchip/AVR/AVR8/Avr8.hpp
View File

@@ -21,7 +21,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
class Avr8: public Target class Avr8: public Target
{ {
protected: protected:
DebugToolDrivers::TargetInterfaces::Microchip::Avr::Avr8::Avr8Interface* avr8Interface; DebugToolDrivers::TargetInterfaces::Microchip::Avr::Avr8::Avr8Interface* avr8Interface = nullptr;
std::string name = ""; std::string name = "";
std::optional<Family> family; std::optional<Family> family;
std::optional<TargetDescription::TargetDescriptionFile> targetDescriptionFile; std::optional<TargetDescription::TargetDescriptionFile> targetDescriptionFile;

2
src/Targets/Target.hpp
View File

@@ -162,7 +162,7 @@ namespace Bloom::Targets
* Once at least one of the above conditions are met, the TargetController will break out of the loop and use * Once at least one of the above conditions are met, the TargetController will break out of the loop and use
* the last promoted target instance from there onwards. * the last promoted target instance from there onwards.
* *
* See TargetController::startup() for more on this. * See TargetController::acquireHardware() for more on this.
* *
* @return * @return
*/ */