folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

select file or nbd

Browse source
This commit is contained in:
folkert van heusden 2024-04-26 15:08:39 +02:00
parent 8caad6ae37
commit d86fd2690e
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
debugger.cpp
View file

@ -196,50 +196,32 @@ bool save_disk_configuration(const std::string & nbd_host, const int nbd_port, c
} }
#endif #endif
#if 0
#if !defined(BUILD_FOR_RP2040) #if !defined(BUILD_FOR_RP2040)
std::optional<std::tuple<std::vector<disk_backend *>, std::vector<disk_backend *>, std::string> > select_nbd_server(console *const c) std::optional<disk_backend *> select_nbd_server(console *const cnsl)
{ {
c->flush_input(); cnsl->flush_input();
std::string hostname = c->read_line("Enter hostname (or empty to abort): "); std::string hostname = cnsl->read_line("Enter hostname (or empty to abort): ");
if (hostname.empty()) if (hostname.empty())
return { }; return { };
std::string port_str = c->read_line("Enter port number (or empty to abort): "); std::string port_str = cnsl->read_line("Enter port number (or empty to abort): ");
if (port_str.empty()) if (port_str.empty())
return { }; return { };
auto disk_type = select_disk_type(c);
if (disk_type.has_value() == false)
return { };
disk_backend *d = new disk_backend_nbd(hostname, atoi(port_str.c_str())); disk_backend *d = new disk_backend_nbd(hostname, atoi(port_str.c_str()));
if (d->begin(false) == false) { if (d->begin(false) == false) {
c->put_string_lf("Cannot initialize NBD client"); cnsl->put_string_lf("Cannot initialize NBD client");
delete d; delete d;
return { }; return { };
} }
if (save_disk_configuration(hostname, atoi(port_str.c_str()), { }, disk_type.value(), c)) return d;
c->put_string_lf("NBD disk configuration saved");
else
c->put_string_lf("NBD disk configuration NOT saved");
if (disk_type.value() == DT_RK05)
return { { { d }, { }, "" } };
if (disk_type.value() == DT_RL02)
return { { { }, { d }, "" } };
return { };
} }
#endif #endif
#endif
// disk image files // disk image files
std::optional<disk_backend *> select_disk_file(console *const c) std::optional<disk_backend *> select_disk_file(console *const c)
@ -379,6 +361,25 @@ int wait_for_key(const std::string & title, console *const cnsl, const std::vect
return ch; return ch;
} }
std::optional<disk_backend *> select_disk_backend(console *const cnsl)
{
#if defined(BUILD_FOR_RP2040)
return select_disk_file(cnsl);
#else
int ch = wait_for_key("1. local disk, 2. network disk (NBD), 9. abort", cnsl, { '1', '2', '9' });
if (ch == '9')
return { };
if (ch == '1')
return select_disk_file(cnsl);
if (ch == '2')
return select_nbd_server(cnsl);
return { };
#endif
}
void configure_disk(bus *const b, console *const cnsl) void configure_disk(bus *const b, console *const cnsl)
{ {
// TODO tape // TODO tape
@ -415,7 +416,7 @@ void configure_disk(bus *const b, console *const cnsl)
break; break;
if (ch == '1') { if (ch == '1') {
auto image_file = select_disk_file(cnsl); auto image_file = select_disk_backend(cnsl);
if (image_file.has_value()) { if (image_file.has_value()) {
cartridge_slots->push_back(image_file.value()); cartridge_slots->push_back(image_file.value());
@ -437,7 +438,7 @@ void configure_disk(bus *const b, console *const cnsl)
break; break;
if (ch == '1') { if (ch == '1') {
auto image_file = select_disk_file(cnsl); auto image_file = select_disk_backend(cnsl);
if (image_file.has_value()) { if (image_file.has_value()) {
delete cartridge_slots->at(slot); delete cartridge_slots->at(slot);
@ -1152,7 +1153,7 @@ void debugger(console *const cnsl, bus *const b, std::atomic_uint32_t *const sto
"bl - set bootload (rl02 or rk05)", "bl - set bootload (rl02 or rk05)",
#if IS_POSIX #if IS_POSIX
"ser - serialize state to a file", "ser - serialize state to a file",
"dser - deserialize state from a file", // "dser - deserialize state from a file",
#endif #endif
#if defined(ESP32) #if defined(ESP32)
"cfgnet - configure network (e.g. WiFi)", "cfgnet - configure network (e.g. WiFi)",