mirror of
https://github.com/TomHarte/CLK.git
synced 2024-11-23 03:32:32 +00:00
Added a platform-neutral route for feeding ROMs to machines, in a platform-dependant fashion; implemented for the CPC.
This commit is contained in:
parent
512e877d06
commit
0116d7f071
@ -923,6 +923,24 @@ class ConcreteMachine:
|
|||||||
roms_[static_cast<int>(type)] = data;
|
roms_[static_cast<int>(type)] = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Obtains the system ROMs.
|
||||||
|
bool install_roms(const std::function<std::unique_ptr<std::vector<uint8_t>>(const std::string &machine, const std::string &name)> &rom_with_name) override {
|
||||||
|
const char *os_files[] = {
|
||||||
|
"os464.rom", "basic464.rom",
|
||||||
|
"os664.rom", "basic664.rom",
|
||||||
|
"os6128.rom", "basic6128.rom",
|
||||||
|
"amsdos.rom"
|
||||||
|
};
|
||||||
|
|
||||||
|
for(size_t index = 0; index < sizeof(os_files) / sizeof(*os_files); ++index) {
|
||||||
|
auto data = rom_with_name("AmstradCPC", os_files[index]);
|
||||||
|
if(!data) return false;
|
||||||
|
set_rom(static_cast<ROMType>(index), *data);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void set_component_is_sleeping(void *component, bool is_sleeping) override final {
|
void set_component_is_sleeping(void *component, bool is_sleeping) override final {
|
||||||
fdc_is_sleeping_ = fdc_.is_sleeping();
|
fdc_is_sleeping_ = fdc_.is_sleeping();
|
||||||
tape_player_is_sleeping_ = tape_player_.is_sleeping();
|
tape_player_is_sleeping_ = tape_player_.is_sleeping();
|
||||||
|
@ -36,6 +36,11 @@ class Machine {
|
|||||||
*/
|
*/
|
||||||
virtual void close_output() = 0;
|
virtual void close_output() = 0;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Provides the machine with a way to obtain such ROMs as it needs.
|
||||||
|
*/
|
||||||
|
virtual bool install_roms(const std::function<std::unique_ptr<std::vector<uint8_t>>(const std::string &machine, const std::string &name)> &rom_with_name) { return true; }
|
||||||
|
|
||||||
/// @returns The CRT this machine is drawing to. Should not be @c nullptr.
|
/// @returns The CRT this machine is drawing to. Should not be @c nullptr.
|
||||||
virtual std::shared_ptr<Outputs::CRT::CRT> get_crt() = 0;
|
virtual std::shared_ptr<Outputs::CRT::CRT> get_crt() = 0;
|
||||||
|
|
||||||
|
@ -46,11 +46,21 @@ template<typename T> class TypedDynamicMachine: public ::Machine::DynamicMachine
|
|||||||
::Machine::DynamicMachine *::Machine::MachineForTarget(const StaticAnalyser::Target &target) {
|
::Machine::DynamicMachine *::Machine::MachineForTarget(const StaticAnalyser::Target &target) {
|
||||||
switch(target.machine) {
|
switch(target.machine) {
|
||||||
case StaticAnalyser::Target::AmstradCPC: return new TypedDynamicMachine<AmstradCPC::Machine>(AmstradCPC::Machine::AmstradCPC());
|
case StaticAnalyser::Target::AmstradCPC: return new TypedDynamicMachine<AmstradCPC::Machine>(AmstradCPC::Machine::AmstradCPC());
|
||||||
// case StaticAnalyser::Target::Atari2600: return new TypedDynamicMachine(Atari2600::Machine::Atari2600());
|
case StaticAnalyser::Target::Atari2600: return new TypedDynamicMachine<Atari2600::Machine>(Atari2600::Machine::Atari2600());
|
||||||
// case StaticAnalyser::Target::Electron: return new TypedDynamicMachine(Electron::Machine::Electron());
|
case StaticAnalyser::Target::Electron: return new TypedDynamicMachine<Electron::Machine>(Electron::Machine::Electron());
|
||||||
// case StaticAnalyser::Target::Oric: return new TypedDynamicMachine(Oric::Machine::Oric());
|
case StaticAnalyser::Target::Oric: return new TypedDynamicMachine<Oric::Machine>(Oric::Machine::Oric());
|
||||||
// case StaticAnalyser::Target::Vic20: return new TypedDynamicMachine(Commodore::Vic20::Machine::Vic20());
|
case StaticAnalyser::Target::Vic20: return new TypedDynamicMachine<Commodore::Vic20::Machine>(Commodore::Vic20::Machine::Vic20());
|
||||||
// case StaticAnalyser::Target::ZX8081: return new TypedDynamicMachine(ZX8081::Machine::ZX8081(target));
|
case StaticAnalyser::Target::ZX8081: return new TypedDynamicMachine<ZX8081::Machine>(ZX8081::Machine::ZX8081(target));
|
||||||
default: return nullptr;
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string Machine::NameForTarget(const StaticAnalyser::Target &target) {
|
||||||
|
switch(target.machine) {
|
||||||
|
case StaticAnalyser::Target::AmstradCPC: return "AmstradCPC";
|
||||||
|
case StaticAnalyser::Target::Atari2600: return "Atari2600";
|
||||||
|
case StaticAnalyser::Target::Electron: return "Electron";
|
||||||
|
case StaticAnalyser::Target::Oric: return "Oric";
|
||||||
|
case StaticAnalyser::Target::Vic20: return "Vic20";
|
||||||
|
case StaticAnalyser::Target::ZX8081: return "ZX8081";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,8 @@
|
|||||||
#include "../JoystickMachine.hpp"
|
#include "../JoystickMachine.hpp"
|
||||||
#include "../KeyboardMachine.hpp"
|
#include "../KeyboardMachine.hpp"
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
namespace Machine {
|
namespace Machine {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@ -36,6 +38,13 @@ struct DynamicMachine {
|
|||||||
*/
|
*/
|
||||||
DynamicMachine *MachineForTarget(const StaticAnalyser::Target &target);
|
DynamicMachine *MachineForTarget(const StaticAnalyser::Target &target);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Returns a short string name for the machine identified by the target,
|
||||||
|
which is guaranteed not to have any spaces or other potentially
|
||||||
|
filesystem-bothering contents.
|
||||||
|
*/
|
||||||
|
std::string NameForTarget(const StaticAnalyser::Target &target);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* MachineForTarget_hpp */
|
#endif /* MachineForTarget_hpp */
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <cstdio>
|
||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
|
|
||||||
#include "../../StaticAnalyser/StaticAnalyser.hpp"
|
#include "../../StaticAnalyser/StaticAnalyser.hpp"
|
||||||
@ -65,8 +67,8 @@ int main(int argc, char *argv[]) {
|
|||||||
|
|
||||||
// Create and configure a machine.
|
// Create and configure a machine.
|
||||||
std::unique_ptr<::Machine::DynamicMachine> machine(::Machine::MachineForTarget(targets.front()));
|
std::unique_ptr<::Machine::DynamicMachine> machine(::Machine::MachineForTarget(targets.front()));
|
||||||
machine->configuration_target()->configure_as_target(targets.front());
|
|
||||||
|
|
||||||
|
updater.set_clock_rate(machine->crt_machine()->get_clock_rate());
|
||||||
crt_delegate.best_effort_updater = &updater;
|
crt_delegate.best_effort_updater = &updater;
|
||||||
best_effort_updater_delegate.machine = machine.get();
|
best_effort_updater_delegate.machine = machine.get();
|
||||||
|
|
||||||
@ -99,8 +101,49 @@ int main(int argc, char *argv[]) {
|
|||||||
SDL_GLContext gl_context = SDL_GL_CreateContext(window);
|
SDL_GLContext gl_context = SDL_GL_CreateContext(window);
|
||||||
SDL_GL_MakeCurrent(window, gl_context);
|
SDL_GL_MakeCurrent(window, gl_context);
|
||||||
|
|
||||||
|
// Create an audio pipe.
|
||||||
|
// SDL_AudioSpec desired_audio_spec;
|
||||||
|
// SDL_AudioSpec obtained_audio_spec;
|
||||||
|
// desired_audio_spec.freq = 192000; // An arbitrary high number.
|
||||||
|
// desired_audio_spec.format = AUDIO_S16;
|
||||||
|
// desired_audio_spec.channels = 1;
|
||||||
|
|
||||||
// Setup output, assuming a CRT machine for now, and prepare a best-effort updater.
|
// Setup output, assuming a CRT machine for now, and prepare a best-effort updater.
|
||||||
machine->crt_machine()->setup_output(4.0 / 3.0);
|
machine->crt_machine()->setup_output(4.0 / 3.0);
|
||||||
|
machine->crt_machine()->get_crt()->set_output_gamma(2.2f);
|
||||||
|
|
||||||
|
// For vanilla SDL purposes, assume system ROMs can be found in one of:
|
||||||
|
//
|
||||||
|
// /usr/local/share/CLK/[system]; or
|
||||||
|
// /usr/share/CLK/[system]
|
||||||
|
machine->crt_machine()->install_roms( [] (const std::string &machine, const std::string &name) -> std::unique_ptr<std::vector<uint8_t>> {
|
||||||
|
std::string local_path = "/usr/local/share/CLK/" + machine + "/" + name;
|
||||||
|
FILE *file = fopen(local_path.c_str(), "r");
|
||||||
|
if(!file) {
|
||||||
|
std::string path = "/usr/share/CLK/" + machine + "/" + name;
|
||||||
|
file = fopen(path.c_str(), "r");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!file) return nullptr;
|
||||||
|
|
||||||
|
std::unique_ptr<std::vector<uint8_t>> data(new std::vector<uint8_t>);
|
||||||
|
|
||||||
|
fseek(file, 0, SEEK_END);
|
||||||
|
data->resize(ftell(file));
|
||||||
|
fseek(file, 0, SEEK_SET);
|
||||||
|
fread(data->data(), 1, data->size(), file);
|
||||||
|
fclose(file);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
});
|
||||||
|
|
||||||
|
machine->configuration_target()->configure_as_target(targets.front());
|
||||||
|
|
||||||
|
// For now, lie about audio output intentions.
|
||||||
|
auto speaker = machine->crt_machine()->get_speaker();
|
||||||
|
if(speaker) {
|
||||||
|
speaker->set_output_rate(44100, 1024);
|
||||||
|
}
|
||||||
|
|
||||||
// Run the main event loop until the OS tells us to quit.
|
// Run the main event loop until the OS tells us to quit.
|
||||||
bool should_quit = false;
|
bool should_quit = false;
|
||||||
@ -109,7 +152,7 @@ int main(int argc, char *argv[]) {
|
|||||||
SDL_Event event;
|
SDL_Event event;
|
||||||
while(SDL_PollEvent(&event)) {
|
while(SDL_PollEvent(&event)) {
|
||||||
switch(event.type) {
|
switch(event.type) {
|
||||||
default: std::cout << "Unhandled " << event.type << std::endl; break;
|
// default: std::cout << "Unhandled " << event.type << std::endl; break;
|
||||||
case SDL_QUIT: should_quit = true; break;
|
case SDL_QUIT: should_quit = true; break;
|
||||||
|
|
||||||
case SDL_KEYDOWN:
|
case SDL_KEYDOWN:
|
||||||
@ -123,7 +166,7 @@ int main(int argc, char *argv[]) {
|
|||||||
updater.update();
|
updater.update();
|
||||||
int width, height;
|
int width, height;
|
||||||
SDL_GetWindowSize(window, &width, &height);
|
SDL_GetWindowSize(window, &width, &height);
|
||||||
machine->crt_machine()->get_crt()->draw_frame(static_cast<unsigned int>(width), static_cast<unsigned int>(height), true);
|
machine->crt_machine()->get_crt()->draw_frame(static_cast<unsigned int>(width), static_cast<unsigned int>(height), false);
|
||||||
SDL_GL_SwapWindow(window);
|
SDL_GL_SwapWindow(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user