6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-14 13:33:42 +00:00
Code Issues Projects Releases Wiki Activity

Resolved failure to open disks that arrive through analysis.

Browse Source
This commit is contained in:
Thomas Harte 2016-09-17 18:11:58 -04:00
parent cc66e1973f
commit 142254a478
2 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Machines/Commodore/Vic-20/Vic20.cpp
View File

@ -272,29 +272,26 @@ void Machine::set_rom(ROMSlot slot, size_t length, const uint8_t *data)
} }
} }
void Machine::set_prg(const char *file_name, size_t length, const uint8_t *data) //void Machine::set_prg(const char *file_name, size_t length, const uint8_t *data)
{ //{
// TEST! // if(length > 2)
StaticAnalyser::GetTargets(file_name); // {
// _rom_address = (uint16_t)(data[0] | (data[1] << 8));
if(length > 2) // _rom_length = (uint16_t)(length - 2);
{ //
_rom_address = (uint16_t)(data[0] | (data[1] << 8)); // // install in the ROM area if this looks like a ROM; otherwise put on tape and throw into that mechanism
_rom_length = (uint16_t)(length - 2); // if(_rom_address == 0xa000)
// {
// install in the ROM area if this looks like a ROM; otherwise put on tape and throw into that mechanism // _rom = new uint8_t[0x2000];
if(_rom_address == 0xa000) // memcpy(_rom, &data[2], length - 2);
{ // write_to_map(_processorReadMemoryMap, _rom, _rom_address, 0x2000);
_rom = new uint8_t[0x2000]; // }
memcpy(_rom, &data[2], length - 2); // else
write_to_map(_processorReadMemoryMap, _rom, _rom_address, 0x2000); // {
} // set_tape(std::shared_ptr<Storage::Tape::Tape>(new Storage::Tape::PRG(file_name)));
else // }
{ // }
set_tape(std::shared_ptr<Storage::Tape::Tape>(new Storage::Tape::PRG(file_name))); //}
}
}
}
#pragma mar - Tape #pragma mar - Tape
@ -305,6 +302,21 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target)
_tape.set_tape(target.tapes.front()); _tape.set_tape(target.tapes.front());
} }
if(target.disks.size())
{
// construct the 1540
_c1540.reset(new ::Commodore::C1540::Machine);
// attach it to the serial bus
_c1540->set_serial_bus(_serialBus);
// hand it the disk
_c1540->set_disk(target.disks.front());
// install the ROM if it was previously set
install_disk_rom();
}
if(_should_automatically_load_media) if(_should_automatically_load_media)
{ {
if(target.loadingCommand.length()) // TODO: and automatic loading option enabled if(target.loadingCommand.length()) // TODO: and automatic loading option enabled
@ -327,11 +339,11 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target)
} }
} }
void Machine::set_tape(std::shared_ptr<Storage::Tape::Tape> tape) //void Machine::set_tape(std::shared_ptr<Storage::Tape::Tape> tape)
{ //{
// _tape.set_tape(tape); // _tape.set_tape(tape);
// if(_should_automatically_load_media) set_typer_for_string("LOAD\nRUN\n"); // if(_should_automatically_load_media) set_typer_for_string("LOAD\nRUN\n");
} //}
void Machine::tape_did_change_input(Tape *tape) void Machine::tape_did_change_input(Tape *tape)
{ {
@ -340,7 +352,7 @@ void Machine::tape_did_change_input(Tape *tape)
#pragma mark - Disc #pragma mark - Disc
void Machine::set_disk(std::shared_ptr<Storage::Disk::Disk> disk) /*void Machine::set_disk(std::shared_ptr<Storage::Disk::Disk> disk)
{ {
// construct the 1540 // construct the 1540
_c1540.reset(new ::Commodore::C1540::Machine); _c1540.reset(new ::Commodore::C1540::Machine);
@ -355,7 +367,7 @@ void Machine::set_disk(std::shared_ptr<Storage::Disk::Disk> disk)
install_disk_rom(); install_disk_rom();
if(_should_automatically_load_media) set_typer_for_string("LOAD\"*\",8,1\nRUN\n"); if(_should_automatically_load_media) set_typer_for_string("LOAD\"*\",8,1\nRUN\n");
} }*/
void Machine::install_disk_rom() void Machine::install_disk_rom()
{ {

6
Machines/Commodore/Vic-20/Vic20.hpp
View File

@ -263,9 +263,9 @@ class Machine:
void set_rom(ROMSlot slot, size_t length, const uint8_t *data); void set_rom(ROMSlot slot, size_t length, const uint8_t *data);
void configure_as_target(const StaticAnalyser::Target &target); void configure_as_target(const StaticAnalyser::Target &target);
void set_prg(const char *file_name, size_t length, const uint8_t *data); // void set_prg(const char *file_name, size_t length, const uint8_t *data);
void set_tape(std::shared_ptr<Storage::Tape::Tape> tape); // void set_tape(std::shared_ptr<Storage::Tape::Tape> tape);
void set_disk(std::shared_ptr<Storage::Disk::Disk> disk); // void set_disk(std::shared_ptr<Storage::Disk::Disk> disk);
void set_key_state(Key key, bool isPressed) { _keyboardVIA->set_key_state(key, isPressed); } void set_key_state(Key key, bool isPressed) { _keyboardVIA->set_key_state(key, isPressed); }
void clear_all_keys() { _keyboardVIA->clear_all_keys(); } void clear_all_keys() { _keyboardVIA->clear_all_keys(); }