mirror of
https://github.com/TomHarte/CLK.git
synced 2025-09-27 07:16:46 +00:00
Advances to actually completing a build.
Many more warnings to iron out, however.
This commit is contained in:
@@ -57,7 +57,7 @@ static std::vector<std::shared_ptr<Storage::Cartridge::Cartridge>>
|
|||||||
return acorn_cartridges;
|
return acorn_cartridges;
|
||||||
}
|
}
|
||||||
|
|
||||||
Analyser::Static::TargetList Analyser::Static::Acorn::GetTargets(const Media &media, const std::string &file_name, TargetPlatform::IntType potential_platforms) {
|
Analyser::Static::TargetList Analyser::Static::Acorn::GetTargets(const Media &media, const std::string &, TargetPlatform::IntType) {
|
||||||
auto target = std::make_unique<Target>();
|
auto target = std::make_unique<Target>();
|
||||||
target->confidence = 0.5; // TODO: a proper estimation
|
target->confidence = 0.5; // TODO: a proper estimation
|
||||||
target->has_dfs = false;
|
target->has_dfs = false;
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
#include "StaticAnalyser.hpp"
|
#include "StaticAnalyser.hpp"
|
||||||
#include "Target.hpp"
|
#include "Target.hpp"
|
||||||
|
|
||||||
Analyser::Static::TargetList Analyser::Static::AppleII::GetTargets(const Media &media, const std::string &file_name, TargetPlatform::IntType potential_platforms) {
|
Analyser::Static::TargetList Analyser::Static::AppleII::GetTargets(const Media &media, const std::string &, TargetPlatform::IntType) {
|
||||||
auto target = std::make_unique<Target>();
|
auto target = std::make_unique<Target>();
|
||||||
target->media = media;
|
target->media = media;
|
||||||
|
|
||||||
|
@@ -42,7 +42,7 @@ Analyser::Static::Target *OricTarget(const Storage::Encodings::AppleGCR::Sector
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Analyser::Static::TargetList Analyser::Static::DiskII::GetTargets(const Media &media, const std::string &file_name, TargetPlatform::IntType potential_platforms) {
|
Analyser::Static::TargetList Analyser::Static::DiskII::GetTargets(const Media &media, const std::string &, TargetPlatform::IntType) {
|
||||||
// This analyser can comprehend disks only.
|
// This analyser can comprehend disks only.
|
||||||
if(media.disks.empty()) return {};
|
if(media.disks.empty()) return {};
|
||||||
|
|
||||||
|
@@ -17,6 +17,8 @@ LIBS += -lz
|
|||||||
# deprecated API in order to know how to port your code away from it.
|
# deprecated API in order to know how to port your code away from it.
|
||||||
DEFINES += QT_DEPRECATED_WARNINGS
|
DEFINES += QT_DEPRECATED_WARNINGS
|
||||||
|
|
||||||
|
DEFINES += TARGET_QT
|
||||||
|
|
||||||
# You can also make your code fail to compile if it uses deprecated APIs.
|
# You can also make your code fail to compile if it uses deprecated APIs.
|
||||||
# In order to do so, uncomment the following line.
|
# In order to do so, uncomment the following line.
|
||||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
// Use the Accelerate framework to vectorise, unless this is a Qt build.
|
// Use the Accelerate framework to vectorise, unless this is a Qt build.
|
||||||
// Primarily that avoids gymnastics in the QMake file; it also eliminates
|
// Primarily that avoids gymnastics in the QMake file; it also eliminates
|
||||||
// a difference in the Qt build across platforms.
|
// a difference in the Qt build across platforms.
|
||||||
#if defined(__APPLE__) && !defined(QT_VERSION)
|
#if defined(__APPLE__) && !defined(TARGET_QT)
|
||||||
#include <Accelerate/Accelerate.h>
|
#include <Accelerate/Accelerate.h>
|
||||||
#define USE_ACCELERATE
|
#define USE_ACCELERATE
|
||||||
#endif
|
#endif
|
||||||
|
@@ -27,7 +27,7 @@ bool DirectAccessDevice::read(const Target::CommandState &state, Target::Respond
|
|||||||
std::copy(next_block.begin(), next_block.end(), std::back_inserter(output));
|
std::copy(next_block.begin(), next_block.end(), std::back_inserter(output));
|
||||||
}
|
}
|
||||||
|
|
||||||
responder.send_data(std::move(output), [] (const Target::CommandState &state, Target::Responder &responder) {
|
responder.send_data(std::move(output), [] (const Target::CommandState &, Target::Responder &responder) {
|
||||||
responder.terminate_command(Target::Responder::Status::Good);
|
responder.terminate_command(Target::Responder::Status::Good);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ bool DirectAccessDevice::write(const Target::CommandState &state, Target::Respon
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DirectAccessDevice::read_capacity(const Target::CommandState &state, Target::Responder &responder) {
|
bool DirectAccessDevice::read_capacity(const Target::CommandState &, Target::Responder &responder) {
|
||||||
const auto final_block = device_->get_number_of_blocks() - 1;
|
const auto final_block = device_->get_number_of_blocks() - 1;
|
||||||
const auto block_size = device_->get_block_size();
|
const auto block_size = device_->get_block_size();
|
||||||
std::vector<uint8_t> data = {
|
std::vector<uint8_t> data = {
|
||||||
@@ -68,7 +68,7 @@ bool DirectAccessDevice::read_capacity(const Target::CommandState &state, Target
|
|||||||
uint8_t(block_size >> 0),
|
uint8_t(block_size >> 0),
|
||||||
};
|
};
|
||||||
|
|
||||||
responder.send_data(std::move(data), [] (const Target::CommandState &state, Target::Responder &responder) {
|
responder.send_data(std::move(data), [] (const Target::CommandState &, Target::Responder &responder) {
|
||||||
responder.terminate_command(Target::Responder::Status::Good);
|
responder.terminate_command(Target::Responder::Status::Good);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@ Target::Executor::Inquiry DirectAccessDevice::inquiry_values() {
|
|||||||
return Inquiry("Apple", "ProFile", "1"); // All just guesses.
|
return Inquiry("Apple", "ProFile", "1"); // All just guesses.
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DirectAccessDevice::format_unit(const Target::CommandState &state, Target::Responder &responder) {
|
bool DirectAccessDevice::format_unit(const Target::CommandState &, Target::Responder &responder) {
|
||||||
// Formatting: immediate.
|
// Formatting: immediate.
|
||||||
responder.terminate_command(Target::Responder::Status::Good);
|
responder.terminate_command(Target::Responder::Status::Good);
|
||||||
return true;
|
return true;
|
||||||
|
Reference in New Issue
Block a user