Skip to content

[draft] implemented rom switch by IO_CONTROL, debug print now a switch #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mk2s wants to merge 3 commits into
base: feat/fujinet
Choose a base branch
from
Open

[draft] implemented rom switch by IO_CONTROL, debug print now a switch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81f63e8
implemented row switch by IO_CONTROL, removed debug print
mk2s Feb 21, 2026
80eda68
adding new fujinet-config.rom
mk2s Feb 21, 2026
b0244eb
made fujinet_debug a setting that can be toggled from console at runtime
mk2s Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified share/extensions/fujinet-config.rom
View file
Open in desktop
Binary file not shown.
111 changes: 80 additions & 31 deletions src/serial/FujiNet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#undef UNUSED
#include "FujiNet.hh"
#include "FujiBusPacket.h"
#include "Timer.hh"
Expand Down Expand Up @@ -25,10 +26,14 @@ FujiNet::FujiNet(DeviceConfig& config)
: MSXDevice(config)
, rom(getName() + " ROM", "rom", config)
, userRom(0)
, debugMode(
getCommandController(), "fujinet_debug",
"Enable FujiNet debug logging", false)
{
thread = std::thread(&FujiNet::readSocket, this);
stopReading = false;
userRomEnabled = false;
userRomLoaded = false;
}

FujiNet::~FujiNet()
Expand All @@ -52,7 +57,9 @@ void FujiNet::close()

void FujiNet::readSocket()
{
getCliComm().printInfo("FujiNet: Start read loop");
if (debugMode.getBoolean()) {
getCliComm().printInfo("FujiNet: Start read loop");
}
char buf[MAX_BUF_LEN];

while (!stopReading) {
Expand Down Expand Up @@ -86,9 +93,11 @@ void FujiNet::readSocket()
continue;
}
else if (n > 0) {
getCliComm().printInfo("FujiNet: Read ", n, " bytes from pty");
std::string str(buf, n);
getCliComm().printInfo(str);
if (debugMode.getBoolean()) {
getCliComm().printInfo("FujiNet: Read ", n, " bytes from pty");
std::string str(buf, n);
getCliComm().printInfo(str);
}
std::lock_guard lock(mtx);
for (auto i : xrange(std::min<size_t>(n, MAX_BUF_LEN - rxBuffer.size()))) {
rxBuffer.push_back(buf[i]);
Expand All @@ -113,20 +122,26 @@ void FujiNet::handleDBCCommand(std::unique_ptr<FujiBusPacket> packet)

switch (packet->command()) {
case FUJICMD_OPEN:
getCliComm().printInfo("FUJICMD_OPEN");
if (debugMode.getBoolean()) {
getCliComm().printInfo("FUJICMD_OPEN");
}
clearUserROM();
fujiBusAck();
break;
case FUJICMD_WRITE:
getCliComm().printInfo("FUJICMD_WRITE");
if (debugMode.getBoolean()) {
getCliComm().printInfo("FUJICMD_WRITE");
}
if (packet->data())
writeUserROM(*(packet->data()));
fujiBusAck();
break;
case FUJICMD_CLOSE:
getCliComm().printInfo("FUJICMD_CLOSE");
if (debugMode.getBoolean()) {
getCliComm().printInfo("FUJICMD_CLOSE");
}
if (userRom.size())
enableUserROM();
readyUserROM();
fujiBusAck();
break;
default:
Expand Down Expand Up @@ -155,6 +170,7 @@ void FujiNet::fujiBusAck()

void FujiNet::clearUserROM()
{
userRomLoaded = false;
userRom.clear();
}

Expand All @@ -165,6 +181,11 @@ void FujiNet::writeUserROM(std::span<unsigned const char> data)
}
}

void FujiNet::readyUserROM()
{
userRomLoaded = true;
}

void FujiNet::enableUserROM()
{
userRomEnabled = true;
Expand All @@ -182,37 +203,48 @@ void FujiNet::reset(EmuTime /*time*/)

uint8_t FujiNet::readMem(uint16_t address, EmuTime time)
{
getCliComm().printInfo("FujiNet: readMem() ", address);
if (debugMode.getBoolean()) {
getCliComm().printInfo("FujiNet: readMem() ", address);
}
auto value = peekMem(address, time);
switch (address) {
case IO_GETC_ADDR:
if (!rxBuffer.empty()) {
std::lock_guard lock(mtx);
rxBuffer.pop_front();
char formatted[16];
if (value > 31 && value < 127) {
sprintf(formatted, "$%02X %c", value, value);
} else {
sprintf(formatted, "$%02X", value);
}
getCliComm().printInfo("FujiNet: GETC -> ", formatted);
if (debugMode.getBoolean()) {
char formatted[16];
if (value > 31 && value < 127) {
sprintf(formatted, "$%02X %c", value, value);
} else {
sprintf(formatted, "$%02X", value);
}
getCliComm().printInfo("FujiNet: GETC -> ", formatted);
}
} else {
getCliComm().printInfo("FujiNet: GETC -> empty!");
if (debugMode.getBoolean()) {
getCliComm().printInfo("FujiNet: GETC -> empty!");
}
}
break;
case IO_STATUS_ADDR:
if (value == 0b10000000) {
getCliComm().printInfo("FujiNet: STAT -> data available");
} else {
getCliComm().printInfo("FujiNet: STAT -> no data");
}
if (debugMode.getBoolean()) {
if (value == 0b10000000) {
getCliComm().printInfo("FujiNet: STAT -> data available");
} else {
getCliComm().printInfo("FujiNet: STAT -> no data");
}
}
;
}
return value;
}

uint8_t FujiNet::peekMem(uint16_t address, EmuTime /*time*/) const
{
getCliComm().printInfo("FujiNet: peekMem() ", address);
if (debugMode.getBoolean()) {
getCliComm().printInfo("FujiNet: peekMem() ", address);
}
switch (address) {
case IO_GETC_ADDR: {
std::lock_guard lock(mtx);
Expand All @@ -222,11 +254,15 @@ uint8_t FujiNet::peekMem(uint16_t address, EmuTime /*time*/) const
return 0x00;
}
case IO_STATUS_ADDR: {
// bit 7 when 1 means data available
// bit 6 when 1 means user rom is ready
// bit 6 when 0 means user rom is not ready
std::lock_guard lock(mtx);
uint8_t status = (userRomLoaded ? 0x40 : 0x00);
if (!rxBuffer.empty()) {
return 0x80; // data available
status |= 0x80;
}
return 0x00;
return status;
}
default:
if (address < 0x4000 || 0xC000 <= address) return 0xFF;
Expand All @@ -241,12 +277,14 @@ void FujiNet::writeMem(uint16_t address, uint8_t value, EmuTime /*time*/)
switch (address) {
case IO_PUTC_ADDR: // IO_PUTC
if (sock != OPENMSX_INVALID_SOCKET) {
char formatted[16];
if (value > 31 && value < 127)
sprintf(formatted, "$%02X %c", value, value);
else
sprintf(formatted, "$%02X", value);
// getCliComm().printInfo("FujiNet: PUTC ", formatted);
if (debugMode.getBoolean()) {
char formatted[16];
if (value > 31 && value < 127)
sprintf(formatted, "$%02X %c", value, value);
else
sprintf(formatted, "$%02X", value);
getCliComm().printInfo("FujiNet: PUTC ", formatted);
}

// txBuffer.push_back(value);
// if (value == SLIP_END) {
Expand Down Expand Up @@ -277,6 +315,17 @@ void FujiNet::writeMem(uint16_t address, uint8_t value, EmuTime /*time*/)
(void)res; // ignore error
}
return;
case IO_CONTROL_ADDR:
// when writing if bit 7 is high that signals "switch rom to bank"
// bits 6~1 is reserved and must be 0
// when bit 0 is 1 that means switching to user rom
// when bit 0 is 0 that means switching to config rom
if (value == 0x81) {
enableUserROM();
} else if (value == 0x80){
disableUserROM();
}
return;
default:
break;
}
Expand Down
4 changes: 4 additions & 0 deletions src/serial/FujiNet.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "Socket.hh"
#include "Rom.hh"
#include "Poller.hh"
#include "BooleanSetting.hh"

#include "circular_buffer.hh"

Expand Down Expand Up @@ -44,12 +45,15 @@ private:

void clearUserROM();
void writeUserROM(std::span<unsigned const char> data);
void readyUserROM();
void enableUserROM();
void disableUserROM();

Rom rom;
std::vector<std::uint8_t> userRom;
bool userRomEnabled;
bool userRomLoaded;
BooleanSetting debugMode;
std::thread thread; // receiving thread (reads from pty)
Poller poller; // to abort read-thread in a portable way
mutable std::mutex mtx; // to protect shared data between emulation and receiving thread
Expand Down