2021-10-25 20:18:02 +00:00
|
|
|
/*
|
|
|
|
DingusPPC - The Experimental PowerPC Macintosh emulator
|
2022-02-23 21:23:02 +00:00
|
|
|
Copyright (C) 2018-22 divingkatae and maximum
|
2021-10-25 20:18:02 +00:00
|
|
|
(theweirdo) spatium
|
|
|
|
|
|
|
|
(Contact divingkatae#1017 or powermax#2286 on Discord for more info)
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/** @file Enhanced Serial Communications Controller (ESCC) emulation. */
|
|
|
|
|
2022-07-11 23:01:43 +00:00
|
|
|
#include <devices/deviceregistry.h>
|
2022-05-07 19:38:27 +00:00
|
|
|
#include <devices/serial/chario.h>
|
|
|
|
#include <devices/serial/escc.h>
|
2021-10-25 20:18:02 +00:00
|
|
|
#include <loguru.hpp>
|
2022-05-07 19:38:27 +00:00
|
|
|
#include <machines/machineproperties.h>
|
2021-10-25 20:18:02 +00:00
|
|
|
|
|
|
|
#include <cinttypes>
|
|
|
|
#include <memory>
|
2022-05-07 19:38:27 +00:00
|
|
|
#include <string>
|
2022-07-11 23:01:43 +00:00
|
|
|
#include <vector>
|
2021-10-25 20:18:02 +00:00
|
|
|
|
2022-05-02 22:16:09 +00:00
|
|
|
/** Remap the compatible addressing scheme to MacRISC one. */
|
|
|
|
const uint8_t compat_to_macrisc[6] = {
|
|
|
|
EsccReg::Port_B_Cmd, EsccReg::Port_A_Cmd,
|
|
|
|
EsccReg::Port_B_Data, EsccReg::Port_A_Data,
|
|
|
|
EsccReg::Enh_Reg_B, EsccReg::Enh_Reg_A
|
|
|
|
};
|
|
|
|
|
2021-10-25 20:18:02 +00:00
|
|
|
EsccController::EsccController()
|
|
|
|
{
|
2022-05-07 19:38:27 +00:00
|
|
|
// allocate channels
|
2021-10-25 20:18:02 +00:00
|
|
|
this->ch_a = std::unique_ptr<EsccChannel> (new EsccChannel("A"));
|
|
|
|
this->ch_b = std::unique_ptr<EsccChannel> (new EsccChannel("B"));
|
|
|
|
|
2022-05-07 19:38:27 +00:00
|
|
|
// attach backends
|
|
|
|
std::string backend_name = GET_STR_PROP("serial_backend");
|
|
|
|
|
|
|
|
this->ch_a->attach_backend(
|
Add socket type for serial_backend
With the option --serial_backend=socket, input and output to a serial port will use a SOCK_STREAM type UNIX domain socket. This allows you to do Open Firmware in one window, while the first window can be used for dingusppc debugger.
Other fixes:
- Added SIGTERM handler so that if the user force quits dingusppc, the terminal settings are properly restored. A user needs to force quit when --serial_backend=stdio and Open Firmware is taking input from ttya. If terminal settings are not restored, then running dingusppc after a force quit will cause Control-C to not work when --serial_backend is not stdio.
- Added a couple numbers to rcv_char_available - 15 is the number of consecutive characters that can processed. 400 is the total number of calls to rcv_char_available after 15 consecutive characters have been read before additional characters can be read. This delay in processing additional characters allows pasting arbitrarily large amounts of text into Open Firmware. A real serial port terminal app might have a text pacing option to limit the number of output characters per second but that is not an option since the emulator is not limiting character data to a baud rate.
Related Notes:
The socket file is created when dingusppc starts.
The socket file is named dingusppcsocket and is created in the current working directory (usually where the executable is located and where the dingusppc.log, nvram.bin, and pram.bin files are created).
The socket file is not visible in the Finder. You can see it in the terminal using the ls command.
The socket file can be used with the following command in a new terminal window:
socat UNIX-CLIENT:dingussocket -,cs8,parenb=0,echo=0,icanon=0,isig=0,icrnl=0
When dingusppc quits, the socat command ends.
Other notes:
The dingusppc --debugger option causes dingusppc to enter the debugger before Open Firmware outputs anything. You can connect to the socket while dingusppc is in the debugger. Then enter the go command to leave the debugger and start Open Firmware. However, since the startup sound takes a long time, you can probably connect to the socket before Open Firmware starts even without the --debugger option. It's like with a real Power Mac - you have a few seconds to hold Command-Option-O-F except in this case you have a few seconds to press the up arrow and press enter (for executing the last command from the terminal command history) and if you do it too late you'll still get into Open Firmware if auto-boot? was previously set to false using the dingusppc debugger which is actually the only way to get into Open Firmware since a keyboard is currently not emulated?).
To set ttya as the input and output device in Open Firmware, you can use the setenv command in the dingusppc debugger. The device path needs to be longer than the current device path (because code for handling shortening of the paths is currently not implemented). For example, ttya can replace kbd for the input-device, but to replace screen for the output-device you need to add some extra characters like this: ttya,11 (I think the number is for baud but we're not using a real serial port so baud doesn't matter).
Future ideas:
- Have dingusppc execute the socat command for you so that it opens a terminal window before Open Firmware starts.
- Add another --serial_backend for the printer port (ttyb) since now we have more than one type of serial backend. If both serial ports use socket backend, then a different name for the second socket is required.
- Have an option to make dingusppc block until something connects to the socket (this means calling accept after listen instead of after select).
- Test compatibility with serial port socket created by Parallels Desktop virtual machines in macOS.
- Find a solution that works with Windows.
- Test with Linux.
- Create a serial_backend type for tty devices. I suppose maybe socat can pipe the file socket to tty but a direct connection might be easier to setup.
- Allow using a socket created by some other app (for example, socat UNIX-LISTEN). This means dingusppc will assume the client role and will call connect instead of accept.
2022-08-14 13:48:16 +00:00
|
|
|
(backend_name == "stdio") ? CHARIO_BE_STDIO :
|
|
|
|
#ifdef _WIN32
|
|
|
|
#else
|
|
|
|
(backend_name == "socket") ? CHARIO_BE_SOCKET :
|
|
|
|
#endif
|
|
|
|
CHARIO_BE_NULL
|
|
|
|
);
|
2022-05-07 19:38:27 +00:00
|
|
|
this->ch_b->attach_backend(CHARIO_BE_NULL);
|
|
|
|
|
2021-10-25 20:18:02 +00:00
|
|
|
this->reg_ptr = 0;
|
|
|
|
}
|
|
|
|
|
2022-02-23 21:23:02 +00:00
|
|
|
void EsccController::reset()
|
|
|
|
{
|
|
|
|
this->master_int_cntrl &= 0xFC;
|
|
|
|
this->master_int_cntrl |= 0xC0;
|
|
|
|
|
|
|
|
this->ch_a->reset(true);
|
|
|
|
this->ch_b->reset(true);
|
|
|
|
}
|
|
|
|
|
2021-10-25 20:18:02 +00:00
|
|
|
uint8_t EsccController::read(uint8_t reg_offset)
|
|
|
|
{
|
2022-02-26 09:55:30 +00:00
|
|
|
uint8_t result = 0;
|
|
|
|
|
2021-10-25 20:18:02 +00:00
|
|
|
switch(reg_offset) {
|
|
|
|
case EsccReg::Port_B_Cmd:
|
|
|
|
LOG_F(9, "ESCC: reading Port B register RR%d", this->reg_ptr);
|
2022-02-26 09:55:30 +00:00
|
|
|
if (this->reg_ptr == 2) {
|
|
|
|
// TODO: implement interrupt vector modifications
|
|
|
|
result = this->int_vec;
|
|
|
|
} else {
|
|
|
|
result = this->ch_b->read_reg(this->reg_ptr);
|
|
|
|
}
|
2021-10-25 20:18:02 +00:00
|
|
|
this->reg_ptr = 0;
|
|
|
|
break;
|
|
|
|
case EsccReg::Port_A_Cmd:
|
|
|
|
LOG_F(9, "ESCC: reading Port A register RR%d", this->reg_ptr);
|
2022-02-26 09:55:30 +00:00
|
|
|
if (this->reg_ptr == 2) {
|
|
|
|
return this->int_vec;
|
|
|
|
} else {
|
|
|
|
return this->ch_a->read_reg(this->reg_ptr);
|
|
|
|
}
|
2021-10-25 20:18:02 +00:00
|
|
|
this->reg_ptr = 0;
|
|
|
|
break;
|
2022-02-26 09:55:30 +00:00
|
|
|
case EsccReg::Port_B_Data:
|
|
|
|
return this->ch_b->receive_byte();
|
|
|
|
case EsccReg::Port_A_Data:
|
|
|
|
return this->ch_a->receive_byte();
|
2021-10-25 20:18:02 +00:00
|
|
|
default:
|
2022-08-22 10:09:52 +00:00
|
|
|
LOG_F(9, "ESCC: reading from unimplemented register 0x%x", reg_offset);
|
2021-10-25 20:18:02 +00:00
|
|
|
}
|
|
|
|
|
2022-02-26 09:55:30 +00:00
|
|
|
return result;
|
2021-10-25 20:18:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void EsccController::write(uint8_t reg_offset, uint8_t value)
|
|
|
|
{
|
|
|
|
switch(reg_offset) {
|
|
|
|
case EsccReg::Port_B_Cmd:
|
|
|
|
this->write_internal(this->ch_b.get(), value);
|
|
|
|
break;
|
|
|
|
case EsccReg::Port_A_Cmd:
|
|
|
|
this->write_internal(this->ch_a.get(), value);
|
|
|
|
break;
|
2022-02-26 09:55:30 +00:00
|
|
|
case EsccReg::Port_B_Data:
|
|
|
|
this->ch_b->send_byte(value);
|
|
|
|
break;
|
|
|
|
case EsccReg::Port_A_Data:
|
|
|
|
this->ch_a->send_byte(value);
|
|
|
|
break;
|
2021-10-25 20:18:02 +00:00
|
|
|
default:
|
2022-08-22 10:09:52 +00:00
|
|
|
LOG_F(9, "ESCC: writing 0x%X to unimplemented register 0x%x", value, reg_offset);
|
2021-10-25 20:18:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void EsccController::write_internal(EsccChannel *ch, uint8_t value)
|
|
|
|
{
|
|
|
|
if (this->reg_ptr) {
|
2022-02-23 21:23:02 +00:00
|
|
|
// chip-specific registers
|
|
|
|
if (this->reg_ptr == 9) {
|
|
|
|
// see if some reset is requested
|
|
|
|
switch(value & 0xC0) {
|
|
|
|
case RESET_CH_B:
|
|
|
|
this->master_int_cntrl &= 0xDF;
|
|
|
|
this->ch_b->reset(false);
|
|
|
|
break;
|
|
|
|
case RESET_CH_A:
|
|
|
|
this->master_int_cntrl &= 0xDF;
|
|
|
|
this->ch_a->reset(false);
|
|
|
|
break;
|
|
|
|
case RESET_ESCC:
|
|
|
|
this->reset();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
this->master_int_cntrl = value & 0x3F;
|
|
|
|
} else if (this->reg_ptr == 2) {
|
|
|
|
this->int_vec = value;
|
|
|
|
} else { // channel-specific registers
|
|
|
|
ch->write_reg(this->reg_ptr, value);
|
|
|
|
}
|
2021-10-25 20:18:02 +00:00
|
|
|
this->reg_ptr = 0;
|
|
|
|
} else {
|
|
|
|
this->reg_ptr = value & 7;
|
|
|
|
switch(value >> 3) {
|
|
|
|
case WR0Cmd::Point_High:
|
|
|
|
this->reg_ptr |= 8;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-23 21:23:02 +00:00
|
|
|
// ======================== ESCC Channel methods ==============================
|
2022-05-07 19:38:27 +00:00
|
|
|
void EsccChannel::attach_backend(int id)
|
|
|
|
{
|
|
|
|
switch(id) {
|
|
|
|
case CHARIO_BE_NULL:
|
|
|
|
this->chario = std::unique_ptr<CharIoBackEnd> (new CharIoNull);
|
|
|
|
break;
|
|
|
|
case CHARIO_BE_STDIO:
|
|
|
|
this->chario = std::unique_ptr<CharIoBackEnd> (new CharIoStdin);
|
|
|
|
break;
|
Add socket type for serial_backend
With the option --serial_backend=socket, input and output to a serial port will use a SOCK_STREAM type UNIX domain socket. This allows you to do Open Firmware in one window, while the first window can be used for dingusppc debugger.
Other fixes:
- Added SIGTERM handler so that if the user force quits dingusppc, the terminal settings are properly restored. A user needs to force quit when --serial_backend=stdio and Open Firmware is taking input from ttya. If terminal settings are not restored, then running dingusppc after a force quit will cause Control-C to not work when --serial_backend is not stdio.
- Added a couple numbers to rcv_char_available - 15 is the number of consecutive characters that can processed. 400 is the total number of calls to rcv_char_available after 15 consecutive characters have been read before additional characters can be read. This delay in processing additional characters allows pasting arbitrarily large amounts of text into Open Firmware. A real serial port terminal app might have a text pacing option to limit the number of output characters per second but that is not an option since the emulator is not limiting character data to a baud rate.
Related Notes:
The socket file is created when dingusppc starts.
The socket file is named dingusppcsocket and is created in the current working directory (usually where the executable is located and where the dingusppc.log, nvram.bin, and pram.bin files are created).
The socket file is not visible in the Finder. You can see it in the terminal using the ls command.
The socket file can be used with the following command in a new terminal window:
socat UNIX-CLIENT:dingussocket -,cs8,parenb=0,echo=0,icanon=0,isig=0,icrnl=0
When dingusppc quits, the socat command ends.
Other notes:
The dingusppc --debugger option causes dingusppc to enter the debugger before Open Firmware outputs anything. You can connect to the socket while dingusppc is in the debugger. Then enter the go command to leave the debugger and start Open Firmware. However, since the startup sound takes a long time, you can probably connect to the socket before Open Firmware starts even without the --debugger option. It's like with a real Power Mac - you have a few seconds to hold Command-Option-O-F except in this case you have a few seconds to press the up arrow and press enter (for executing the last command from the terminal command history) and if you do it too late you'll still get into Open Firmware if auto-boot? was previously set to false using the dingusppc debugger which is actually the only way to get into Open Firmware since a keyboard is currently not emulated?).
To set ttya as the input and output device in Open Firmware, you can use the setenv command in the dingusppc debugger. The device path needs to be longer than the current device path (because code for handling shortening of the paths is currently not implemented). For example, ttya can replace kbd for the input-device, but to replace screen for the output-device you need to add some extra characters like this: ttya,11 (I think the number is for baud but we're not using a real serial port so baud doesn't matter).
Future ideas:
- Have dingusppc execute the socat command for you so that it opens a terminal window before Open Firmware starts.
- Add another --serial_backend for the printer port (ttyb) since now we have more than one type of serial backend. If both serial ports use socket backend, then a different name for the second socket is required.
- Have an option to make dingusppc block until something connects to the socket (this means calling accept after listen instead of after select).
- Test compatibility with serial port socket created by Parallels Desktop virtual machines in macOS.
- Find a solution that works with Windows.
- Test with Linux.
- Create a serial_backend type for tty devices. I suppose maybe socat can pipe the file socket to tty but a direct connection might be easier to setup.
- Allow using a socket created by some other app (for example, socat UNIX-LISTEN). This means dingusppc will assume the client role and will call connect instead of accept.
2022-08-14 13:48:16 +00:00
|
|
|
#ifdef _WIN32
|
|
|
|
#else
|
|
|
|
case CHARIO_BE_SOCKET:
|
|
|
|
this->chario = std::unique_ptr<CharIoBackEnd> (new CharIoSocket);
|
|
|
|
break;
|
|
|
|
#endif
|
2022-05-07 19:38:27 +00:00
|
|
|
default:
|
|
|
|
LOG_F(ERROR, "ESCC: unknown backend ID %d, using NULL instead", id);
|
|
|
|
this->chario = std::unique_ptr<CharIoBackEnd> (new CharIoNull);
|
|
|
|
}
|
|
|
|
}
|
2022-02-23 21:23:02 +00:00
|
|
|
|
|
|
|
void EsccChannel::reset(bool hw_reset)
|
|
|
|
{
|
2022-05-07 19:38:27 +00:00
|
|
|
this->chario->rcv_disable();
|
|
|
|
|
2022-02-23 21:23:02 +00:00
|
|
|
this->write_regs[1] &= 0x24;
|
|
|
|
this->write_regs[3] &= 0xFE;
|
|
|
|
this->write_regs[4] |= 0x04;
|
|
|
|
this->write_regs[5] &= 0x61;
|
|
|
|
this->write_regs[15] = 0xF8;
|
|
|
|
|
|
|
|
this->read_regs[0] &= 0x3C;
|
|
|
|
this->read_regs[0] |= 0x44;
|
|
|
|
this->read_regs[1] = 0x06;
|
|
|
|
this->read_regs[3] = 0x00;
|
|
|
|
this->read_regs[10] = 0x00;
|
|
|
|
|
2022-02-26 09:55:30 +00:00
|
|
|
// initialize DPLL
|
|
|
|
this->dpll_active = 0;
|
|
|
|
this->dpll_mode = DpllMode::NRZI;
|
|
|
|
this->dpll_clock_src = 0;
|
|
|
|
|
|
|
|
// initialize Baud Rate Generator (BRG)
|
|
|
|
this->brg_active = 0;
|
|
|
|
this->brg_clock_src = 0;
|
|
|
|
|
2022-02-23 21:23:02 +00:00
|
|
|
if (hw_reset) {
|
|
|
|
this->write_regs[10] = 0;
|
|
|
|
this->write_regs[11] = 8;
|
|
|
|
this->write_regs[14] &= 0xC0;
|
|
|
|
this->write_regs[14] |= 0x20;
|
|
|
|
} else {
|
|
|
|
this->write_regs[10] &= 0x60;
|
|
|
|
this->write_regs[14] &= 0xC3;
|
|
|
|
this->write_regs[14] |= 0x20;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-25 20:18:02 +00:00
|
|
|
void EsccChannel::write_reg(int reg_num, uint8_t value)
|
|
|
|
{
|
2022-02-26 09:55:30 +00:00
|
|
|
switch (reg_num) {
|
|
|
|
case 3:
|
2022-05-07 19:38:27 +00:00
|
|
|
if ((this->write_regs[3] ^ value) & 0x10) {
|
|
|
|
this->write_regs[3] |= 0x10;
|
|
|
|
this->read_regs[0] |= 0x10; // set SYNC_HUNT flag
|
|
|
|
LOG_F(9, "ESCC: Hunt mode entered.");
|
|
|
|
}
|
|
|
|
if ((this->write_regs[3] ^ value) & 1) {
|
2022-02-26 09:55:30 +00:00
|
|
|
if (value & 1) {
|
|
|
|
this->write_regs[3] |= 0x1;
|
2022-05-07 19:38:27 +00:00
|
|
|
this->chario->rcv_enable();
|
2022-02-26 09:55:30 +00:00
|
|
|
LOG_F(9, "ESCC: receiver enabled.");
|
2022-05-07 19:38:27 +00:00
|
|
|
} else {
|
|
|
|
this->write_regs[3] ^= 0x1;
|
|
|
|
this->chario->rcv_disable();
|
|
|
|
LOG_F(9, "ESCC: receiver disabled.");
|
|
|
|
this->write_regs[3] |= 0x10; // enter HUNT mode
|
|
|
|
this->read_regs[0] |= 0x10; // set SYNC_HUNT flag
|
2022-02-26 09:55:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
this->write_regs[3] = (this->write_regs[3] & 0x11) | (value & 0xEE);
|
|
|
|
return;
|
|
|
|
case 7:
|
|
|
|
if (this->write_regs[15] & 1) {
|
|
|
|
this->wr7_enh = value;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 14:
|
|
|
|
switch (value >> 5) {
|
2022-05-07 19:38:27 +00:00
|
|
|
case DPLL_NULL_CMD:
|
|
|
|
break;
|
2022-02-26 09:55:30 +00:00
|
|
|
case DPLL_ENTER_SRC_MODE:
|
|
|
|
this->dpll_active = 1;
|
|
|
|
this->read_regs[10] &= 0x3F;
|
|
|
|
break;
|
|
|
|
case DPLL_DISABLE:
|
|
|
|
this->dpll_active = 0;
|
|
|
|
// fallthrough
|
|
|
|
case DPLL_RST_MISSING_CLK:
|
|
|
|
this->read_regs[10] &= 0x3F;
|
|
|
|
break;
|
|
|
|
case DPLL_SET_SRC_BGR:
|
|
|
|
this->dpll_clock_src = 0;
|
|
|
|
break;
|
|
|
|
case DPLL_SET_SRC_RTXC:
|
|
|
|
this->dpll_clock_src = 1;
|
|
|
|
break;
|
|
|
|
case DPLL_SET_FM_MODE:
|
|
|
|
this->dpll_mode = DpllMode::FM;
|
|
|
|
break;
|
|
|
|
case DPLL_SET_NRZI_MODE:
|
|
|
|
this->dpll_mode = DpllMode::NRZI;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
LOG_F(WARNING, "ESCC: unimplemented DPLL command %d", value >> 5);
|
|
|
|
}
|
|
|
|
if (value & 0x1C) { // Local Loopback, Auto Echo DTR/REQ bits set
|
|
|
|
LOG_F(WARNING, "ESCC: unexpected value in WR14 = 0x%X", value);
|
|
|
|
}
|
|
|
|
if (this->brg_active ^ (value & 1)) {
|
|
|
|
this->brg_active = value & 1;
|
|
|
|
LOG_F(9, "ESCC: BRG %s", this->brg_active ? "enabled" : "disabled");
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2021-10-25 20:18:02 +00:00
|
|
|
this->write_regs[reg_num] = value;
|
2022-02-26 09:55:30 +00:00
|
|
|
}
|
2022-02-23 21:23:02 +00:00
|
|
|
|
2022-02-26 09:55:30 +00:00
|
|
|
uint8_t EsccChannel::read_reg(int reg_num)
|
|
|
|
{
|
2022-05-07 19:38:27 +00:00
|
|
|
if (!reg_num) {
|
|
|
|
if (this->chario->rcv_char_available()) {
|
|
|
|
this->read_regs[0] |= 1;
|
|
|
|
}
|
|
|
|
}
|
2022-02-26 09:55:30 +00:00
|
|
|
return this->read_regs[reg_num];
|
|
|
|
}
|
2022-02-23 21:23:02 +00:00
|
|
|
|
2022-02-26 09:55:30 +00:00
|
|
|
void EsccChannel::send_byte(uint8_t value)
|
|
|
|
{
|
2022-05-07 19:38:27 +00:00
|
|
|
// TODO: put one byte into the Data FIFO
|
|
|
|
|
|
|
|
this->chario->xmit_char(value);
|
2022-02-23 21:23:02 +00:00
|
|
|
}
|
|
|
|
|
2022-02-26 09:55:30 +00:00
|
|
|
uint8_t EsccChannel::receive_byte()
|
2022-02-23 21:23:02 +00:00
|
|
|
{
|
2022-05-07 19:38:27 +00:00
|
|
|
// TODO: remove one byte from the Receive FIFO
|
|
|
|
|
|
|
|
uint8_t c;
|
|
|
|
|
|
|
|
this->chario->rcv_char(&c);
|
|
|
|
this->read_regs[0] &= ~1;
|
|
|
|
return c;
|
2021-10-25 20:18:02 +00:00
|
|
|
}
|
2022-07-11 23:01:43 +00:00
|
|
|
|
Add socket type for serial_backend
With the option --serial_backend=socket, input and output to a serial port will use a SOCK_STREAM type UNIX domain socket. This allows you to do Open Firmware in one window, while the first window can be used for dingusppc debugger.
Other fixes:
- Added SIGTERM handler so that if the user force quits dingusppc, the terminal settings are properly restored. A user needs to force quit when --serial_backend=stdio and Open Firmware is taking input from ttya. If terminal settings are not restored, then running dingusppc after a force quit will cause Control-C to not work when --serial_backend is not stdio.
- Added a couple numbers to rcv_char_available - 15 is the number of consecutive characters that can processed. 400 is the total number of calls to rcv_char_available after 15 consecutive characters have been read before additional characters can be read. This delay in processing additional characters allows pasting arbitrarily large amounts of text into Open Firmware. A real serial port terminal app might have a text pacing option to limit the number of output characters per second but that is not an option since the emulator is not limiting character data to a baud rate.
Related Notes:
The socket file is created when dingusppc starts.
The socket file is named dingusppcsocket and is created in the current working directory (usually where the executable is located and where the dingusppc.log, nvram.bin, and pram.bin files are created).
The socket file is not visible in the Finder. You can see it in the terminal using the ls command.
The socket file can be used with the following command in a new terminal window:
socat UNIX-CLIENT:dingussocket -,cs8,parenb=0,echo=0,icanon=0,isig=0,icrnl=0
When dingusppc quits, the socat command ends.
Other notes:
The dingusppc --debugger option causes dingusppc to enter the debugger before Open Firmware outputs anything. You can connect to the socket while dingusppc is in the debugger. Then enter the go command to leave the debugger and start Open Firmware. However, since the startup sound takes a long time, you can probably connect to the socket before Open Firmware starts even without the --debugger option. It's like with a real Power Mac - you have a few seconds to hold Command-Option-O-F except in this case you have a few seconds to press the up arrow and press enter (for executing the last command from the terminal command history) and if you do it too late you'll still get into Open Firmware if auto-boot? was previously set to false using the dingusppc debugger which is actually the only way to get into Open Firmware since a keyboard is currently not emulated?).
To set ttya as the input and output device in Open Firmware, you can use the setenv command in the dingusppc debugger. The device path needs to be longer than the current device path (because code for handling shortening of the paths is currently not implemented). For example, ttya can replace kbd for the input-device, but to replace screen for the output-device you need to add some extra characters like this: ttya,11 (I think the number is for baud but we're not using a real serial port so baud doesn't matter).
Future ideas:
- Have dingusppc execute the socat command for you so that it opens a terminal window before Open Firmware starts.
- Add another --serial_backend for the printer port (ttyb) since now we have more than one type of serial backend. If both serial ports use socket backend, then a different name for the second socket is required.
- Have an option to make dingusppc block until something connects to the socket (this means calling accept after listen instead of after select).
- Test compatibility with serial port socket created by Parallels Desktop virtual machines in macOS.
- Find a solution that works with Windows.
- Test with Linux.
- Create a serial_backend type for tty devices. I suppose maybe socat can pipe the file socket to tty but a direct connection might be easier to setup.
- Allow using a socket created by some other app (for example, socat UNIX-LISTEN). This means dingusppc will assume the client role and will call connect instead of accept.
2022-08-14 13:48:16 +00:00
|
|
|
static const vector<string> CharIoBackends = {"null", "stdio", "socket"};
|
2022-07-11 23:01:43 +00:00
|
|
|
|
|
|
|
static const PropMap Escc_Properties = {
|
|
|
|
{"serial_backend", new StrProperty("null", CharIoBackends)},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const DeviceDescription Escc_Descriptor = {
|
|
|
|
EsccController::create, {}, Escc_Properties
|
|
|
|
};
|
|
|
|
|
|
|
|
REGISTER_DEVICE(Escc, Escc_Descriptor);
|