6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 01:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Implements multi-sector read/write.

Browse Source 
This once again unblocks Apple HD SC Setup. Progress!
This commit is contained in:
Thomas Harte 2019-09-16 22:20:42 -04:00
parent 210129c3a1
commit 2ce1f0a3b1
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Components/5380/ncr5380.cpp
View File

@ -27,6 +27,8 @@ void NCR5380::write(int address, uint8_t value, bool dma_acknowledge) {
data_bus_ = value;
if(dma_request_ && dma_operation_ == DMAOperation::Send) {
if(value)
printf("!");
printf("w %02x\n", value);
dma_acknowledge_ = true;
dma_request_ = false;

22
Storage/MassStorage/SCSI/DirectAccessDevice.cpp
View File

@ -18,7 +18,15 @@ void DirectAccessDevice::set_storage(const std::shared_ptr<Storage::MassStorage:
bool DirectAccessDevice::read(const Target::CommandState &state, Target::Responder &responder) {
if(!device_) return false;
responder.send_data(device_->get_block(state.address()), [] (const Target::CommandState &state, Target::Responder &responder) {
const auto specs = state.read_write_specs();
std::vector<uint8_t> output = device_->get_block(specs.address);
for(uint32_t offset = 1; offset < specs.number_of_blocks; ++offset) {
const auto next_block = device_->get_block(specs.address + offset);
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.terminate_command(Target::Responder::Status::Good);
});
@ -28,8 +36,16 @@ bool DirectAccessDevice::read(const Target::CommandState &state, Target::Respond
bool DirectAccessDevice::write(const Target::CommandState &state, Target::Responder &responder) {
if(!device_) return false;
responder.receive_data(device_->get_block_size(), [this] (const Target::CommandState &state, Target::Responder &responder) {
this->device_->set_block(state.address(), state.received_data());
const auto specs = state.read_write_specs();
responder.receive_data(device_->get_block_size() * specs.number_of_blocks, [this, specs] (const Target::CommandState &state, Target::Responder &responder) {
const auto received_data = state.received_data();
const auto block_size = device_->get_block_size();
for(uint32_t offset = 0; offset < specs.number_of_blocks; ++offset) {
// TODO: clean up this gross inefficiency when std::span is standard.
std::vector<uint8_t> sub_vector(received_data.begin() + size_t(offset)*block_size, received_data.begin() + size_t(offset+1)*block_size);
this->device_->set_block(specs.address + offset, sub_vector);
}
responder.terminate_command(Target::Responder::Status::Good);
});

9
Storage/MassStorage/SCSI/Target.cpp
View File

@ -40,6 +40,15 @@ uint16_t CommandState::number_of_blocks() const {
}
}
CommandState::ReadWrite CommandState::read_write_specs() const {
ReadWrite specs;
specs.address = address();
specs.number_of_blocks = number_of_blocks();
return specs;
}
size_t CommandState::allocated_inquiry_bytes() const {
// 0 means 256 bytes allocated for inquiry.
return size_t(((data_[4] - 1) & 0xff) + 1);

9
Storage/MassStorage/SCSI/Target.hpp
View File

@ -26,8 +26,11 @@ class CommandState {
CommandState(const std::vector<uint8_t> &command, const std::vector<uint8_t> &received);
// For read and write commands.
uint32_t address() const;
uint16_t number_of_blocks() const;
struct ReadWrite {
uint32_t address;
uint16_t number_of_blocks;
};
ReadWrite read_write_specs() const;
// For inquiry commands.
size_t allocated_inquiry_bytes() const;
@ -73,6 +76,8 @@ class CommandState {
}
private:
uint32_t address() const;
uint16_t number_of_blocks() const;
const std::vector<uint8_t> &data_;
const std::vector<uint8_t> &received_;
};