From f8cb153519db6979e32f1d55b496db6a9ce5df6e Mon Sep 17 00:00:00 2001 From: fulivi Date: Wed, 7 Oct 2015 17:43:36 +0200 Subject: [PATCH 1/6] pty: first step of pseudo terminal implementation Conflicts: scripts/src/bus.lua --- scripts/src/bus.lua | 2 + scripts/src/emu.lua | 2 + src/devices/bus/rs232/rs232.c | 2 + src/emu/bus/rs232/pty.c | 148 ++++++++++++++++++++++++++++++++++ src/emu/bus/rs232/pty.h | 51 ++++++++++++ src/emu/dipty.c | 80 ++++++++++++++++++ src/emu/dipty.h | 46 +++++++++++ src/emu/emu.h | 1 + src/osd/osdcore.h | 19 +++++ src/osd/sdl/sdlfile.c | 19 +++++ src/osd/sdl/sdlfile.h | 1 + src/osd/sdl/sdlptty_unix.c | 116 ++++++++++++++++---------- 12 files changed, 443 insertions(+), 44 deletions(-) create mode 100644 src/emu/bus/rs232/pty.c create mode 100644 src/emu/bus/rs232/pty.h create mode 100644 src/emu/dipty.c create mode 100644 src/emu/dipty.h diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 643bf0e9101..064f8503156 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1531,6 +1531,8 @@ if (BUSES["RS232"]~=null) then MAME_DIR .. "src/devices/bus/rs232/printer.h", MAME_DIR .. "src/devices/bus/rs232/rs232.c", MAME_DIR .. "src/devices/bus/rs232/rs232.h", + MAME_DIR .. "src/devices/bus/rs232/pty.c", + MAME_DIR .. "src/devices/bus/rs232/pty.h", MAME_DIR .. "src/devices/bus/rs232/ser_mouse.c", MAME_DIR .. "src/devices/bus/rs232/ser_mouse.h", MAME_DIR .. "src/devices/bus/rs232/terminal.c", diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 547c57e2791..eccb515ad02 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -79,6 +79,8 @@ files { MAME_DIR .. "src/emu/dinvram.h", MAME_DIR .. "src/emu/dioutput.c", MAME_DIR .. "src/emu/dioutput.h", + MAME_DIR .. "src/emu/dipty.c", + MAME_DIR .. "src/emu/dipty.h", MAME_DIR .. "src/emu/dirtc.c", MAME_DIR .. "src/emu/dirtc.h", MAME_DIR .. "src/emu/diserial.c", diff --git a/src/devices/bus/rs232/rs232.c b/src/devices/bus/rs232/rs232.c index acc1af5dea3..cb2d1771a6e 100644 --- a/src/devices/bus/rs232/rs232.c +++ b/src/devices/bus/rs232/rs232.c @@ -103,6 +103,7 @@ device_rs232_port_interface::~device_rs232_port_interface() #include "null_modem.h" #include "printer.h" #include "terminal.h" +#include "pty.h" SLOT_INTERFACE_START( default_rs232_devices ) SLOT_INTERFACE("keyboard", SERIAL_KEYBOARD) @@ -110,4 +111,5 @@ SLOT_INTERFACE_START( default_rs232_devices ) SLOT_INTERFACE("null_modem", NULL_MODEM) SLOT_INTERFACE("printer", SERIAL_PRINTER) SLOT_INTERFACE("terminal", SERIAL_TERMINAL) + SLOT_INTERFACE("pty", PSEUDO_TERMINAL) SLOT_INTERFACE_END diff --git a/src/emu/bus/rs232/pty.c b/src/emu/bus/rs232/pty.c new file mode 100644 index 00000000000..d1ed6d7d24a --- /dev/null +++ b/src/emu/bus/rs232/pty.c @@ -0,0 +1,148 @@ +// license:BSD-3-Clause +// copyright-holders:F. Ulivi +// +#include +#include "pty.h" + +#define FU_TEST + +static const int TIMER_POLL = 1; + +pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__), + device_serial_interface(mconfig, *this), + device_rs232_port_interface(mconfig, *this), + device_pty_interface(mconfig, *this), + m_rs232_txbaud(*this, "RS232_TXBAUD"), + m_rs232_rxbaud(*this, "RS232_RXBAUD"), + m_rs232_startbits(*this, "RS232_STARTBITS"), + m_rs232_databits(*this, "RS232_DATABITS"), + m_rs232_parity(*this, "RS232_PARITY"), + m_rs232_stopbits(*this, "RS232_STOPBITS"), + m_input_count(0), + m_input_index(0) +{ +} + +WRITE_LINE_MEMBER(pseudo_terminal_device::update_serial) +{ + int startbits = convert_startbits(m_rs232_startbits->read()); + int databits = convert_databits(m_rs232_databits->read()); + parity_t parity = convert_parity(m_rs232_parity->read()); + stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read()); + + set_data_frame(startbits, databits, parity, stopbits); + + int txbaud = convert_baud(m_rs232_txbaud->read()); + set_tra_rate(txbaud); + + int rxbaud = convert_baud(m_rs232_rxbaud->read()); + set_rcv_rate(rxbaud); + + output_rxd(1); + + // TODO: make this configurable + output_dcd(0); + output_dsr(0); + output_cts(0); +} + +static INPUT_PORTS_START(pseudo_terminal) + MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial) + MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial) + MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial) + MCFG_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial) + MCFG_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial) + MCFG_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial) +INPUT_PORTS_END + +ioport_constructor pseudo_terminal_device::device_input_ports() const +{ + return INPUT_PORTS_NAME(pseudo_terminal); +} + +void pseudo_terminal_device::device_start() +{ + m_timer_poll = timer_alloc(TIMER_POLL); + + if (open()) { +#ifdef FU_TEST + printf("slave PTY = %s\n" , slave_name()); +#endif + } else { +#ifdef FU_TEST + puts("Opening PTY failed"); +#endif + } +} + +void pseudo_terminal_device::device_reset() +{ + update_serial(0); + queue(); +} + +void pseudo_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +{ + switch (id) + { + case TIMER_POLL: + queue(); + break; + + default: + device_serial_interface::device_timer(timer, id, param, ptr); + } +} + +void pseudo_terminal_device::tra_callback() +{ + output_rxd(transmit_register_get_data_bit()); +} + +void pseudo_terminal_device::tra_complete() +{ + queue(); +} + +void pseudo_terminal_device::rcv_complete() +{ + receive_register_extract(); + write(get_received_char()); +} + +void pseudo_terminal_device::queue(void) +{ + if (is_transmit_register_empty()) + { + if (m_input_index == m_input_count) + { + m_input_index = 0; + int tmp = read(m_input_buffer , sizeof(m_input_buffer)); + if (tmp > 0) { + m_input_count = tmp; + } else { + m_input_count = 0; + } +#ifdef FU_TEST + if (m_input_count) { + printf("read %u\n" , m_input_count); + } +#endif + } + + if (m_input_count != 0) + { + transmit_register_setup(m_input_buffer[ m_input_index++ ]); + + m_timer_poll->adjust(attotime::never); + } + else + { + int txbaud = convert_baud(m_rs232_txbaud->read()); + m_timer_poll->adjust(attotime::from_hz(txbaud)); + } + } +} + +const device_type PSEUDO_TERMINAL = &device_creator; diff --git a/src/emu/bus/rs232/pty.h b/src/emu/bus/rs232/pty.h new file mode 100644 index 00000000000..75a1c0c2f1a --- /dev/null +++ b/src/emu/bus/rs232/pty.h @@ -0,0 +1,51 @@ +// license:BSD-3-Clause +// copyright-holders:F. Ulivi +// +#ifndef _RS232_PTY_H_ +#define _RS232_PTY_H_ + +#include "rs232.h" + +class pseudo_terminal_device : public device_t, + public device_serial_interface, + public device_rs232_port_interface, + public device_pty_interface +{ +public: + pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + + virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { + device_serial_interface::rx_w(state); + } + + DECLARE_WRITE_LINE_MEMBER(update_serial); + +protected: + virtual ioport_constructor device_input_ports() const; + virtual void device_start(); + virtual void device_reset(); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + + virtual void tra_callback(); + virtual void tra_complete(); + virtual void rcv_complete(); + +private: + required_ioport m_rs232_txbaud; + required_ioport m_rs232_rxbaud; + required_ioport m_rs232_startbits; + required_ioport m_rs232_databits; + required_ioport m_rs232_parity; + required_ioport m_rs232_stopbits; + + UINT8 m_input_buffer[ 1024 ]; + UINT32 m_input_count; + UINT32 m_input_index; + emu_timer *m_timer_poll; + + void queue(void); +}; + +extern const device_type PSEUDO_TERMINAL; + +#endif /* _RS232_PTY_H_ */ diff --git a/src/emu/dipty.c b/src/emu/dipty.c new file mode 100644 index 00000000000..197d736b0ad --- /dev/null +++ b/src/emu/dipty.c @@ -0,0 +1,80 @@ +// license:BSD-3-Clause +// copyright-holders:F.Ulivi +/*************************************************************************** + + dipty.h + + Device PTY interface + +***************************************************************************/ + +#include "emu.h" +#include "osdcore.h" + +device_pty_interface::device_pty_interface(const machine_config &mconfig, device_t &device) + : device_interface(device, "pty"), + m_pty_master(NULL), + m_slave_name(), + m_opened(false) +{ +} + +device_pty_interface::~device_pty_interface() +{ +} + +bool device_pty_interface::open(void) +{ + if (!m_opened) { + char buffer[ 128 ]; + + if (osd_openpty(&m_pty_master , buffer , sizeof(buffer)) == FILERR_NONE) { + m_opened = true; + m_slave_name.assign(buffer); + } else { + m_opened = false; + m_pty_master = NULL; + } + } + + return m_opened; +} + +void device_pty_interface::close(void) +{ + if (m_opened) { + osd_close(m_pty_master); + m_opened = false; + } +} + +ssize_t device_pty_interface::read(UINT8 *rx_chars , size_t count) +{ + UINT32 actual_bytes; + + if (m_opened && osd_read(m_pty_master, rx_chars, 0, count, &actual_bytes) == FILERR_NONE) { + return actual_bytes; + } else { + return -1; + } +} + +void device_pty_interface::write(UINT8 tx_char) +{ + UINT32 actual_bytes; + + if (m_opened) { + osd_write(m_pty_master, &tx_char, 0, 1, &actual_bytes); + } +} + +bool device_pty_interface::is_slave_connected(void) const +{ + // TODO: really check for slave status + return m_opened; +} + +const char *device_pty_interface::slave_name(void) const +{ + return m_slave_name.c_str(); +} diff --git a/src/emu/dipty.h b/src/emu/dipty.h new file mode 100644 index 00000000000..cbb4a9cb725 --- /dev/null +++ b/src/emu/dipty.h @@ -0,0 +1,46 @@ +// license:BSD-3-Clause +// copyright-holders:F.Ulivi +/*************************************************************************** + + dipty.h + + Device PTY interface + +***************************************************************************/ + +#pragma once + +#ifndef __EMU_H__ +#error Dont include this file directly; include emu.h instead. +#endif + +#ifndef __DIPTY_H__ +#define __DIPTY_H__ + +class device_pty_interface : public device_interface +{ +public: + // construction/destruction + device_pty_interface(const machine_config &mconfig, device_t &device); + virtual ~device_pty_interface(); + + bool open(void); + void close(void); + + ssize_t read(UINT8 *rx_chars , size_t count); + void write(UINT8 tx_char); + + bool is_slave_connected(void) const; + + const char *slave_name(void) const; + +protected: + osd_file *m_pty_master; + std::string m_slave_name; + bool m_opened; +}; + +// iterator +typedef device_interface_iterator pty_interface_iterator; + +#endif /* __DIPTY_H__ */ diff --git a/src/emu/emu.h b/src/emu/emu.h index 93015100645..969ee94f50e 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -78,6 +78,7 @@ typedef device_t * (*machine_config_constructor)(machine_config &config, device_ #include "schedule.h" #include "timer.h" #include "dinetwork.h" +#include "dipty.h" // machine and driver configuration #include "mconfig.h" diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h index c7ae389db03..982cfbf2234 100644 --- a/src/osd/osdcore.h +++ b/src/osd/osdcore.h @@ -165,6 +165,25 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 length, -----------------------------------------------------------------------------*/ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual); +/*----------------------------------------------------------------------------- + osd_openpty: create a new PTY pair + + Parameters: + + file - pointer to an osd_file * to receive the handle of the master + side of the newly-created PTY; this is only valid if the function + returns FILERR_NONE + + name - pointer to memory where slave filename will be stored + + name_len - space allocated for name + + Return value: + + a file_error describing any error that occurred while creating the + PTY, or FILERR_NONE if no error occurred +-----------------------------------------------------------------------------*/ +file_error osd_openpty(osd_file **file, char *name, size_t name_len); /*----------------------------------------------------------------------------- osd_truncate: change the size of an open file diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c index 74779252641..a93d5623412 100644 --- a/src/osd/sdl/sdlfile.c +++ b/src/osd/sdl/sdlfile.c @@ -359,6 +359,25 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c } } +//============================================================ +// osd_openpty +//============================================================ + +file_error osd_openpty(osd_file **file, char *name, size_t name_len) +{ + file_error res; + UINT64 filesize; + + if ((res = osd_open(sdlfile_ptty_identifier , 0 , file , &filesize)) != FILERR_NONE) { + return res; + } + + if ((res = sdl_slave_name_ptty(*file , name , name_len)) != FILERR_NONE) { + osd_close(*file); + } + + return res; +} //============================================================ // osd_truncate diff --git a/src/osd/sdl/sdlfile.h b/src/osd/sdl/sdlfile.h index d5f72bfc2ca..4bd1b2a6292 100644 --- a/src/osd/sdl/sdlfile.h +++ b/src/osd/sdl/sdlfile.h @@ -46,5 +46,6 @@ file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UI file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual); file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual); file_error sdl_close_ptty(osd_file *file); +file_error sdl_slave_name_ptty(osd_file *file , char *name , size_t name_len); file_error error_to_file_error(UINT32 error); diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c index 804b0ddae3e..13cd3eb1034 100644 --- a/src/osd/sdl/sdlptty_unix.c +++ b/src/osd/sdl/sdlptty_unix.c @@ -28,6 +28,9 @@ #elif defined(SDLMAME_HAIKU) # include #endif +#if defined(SDLMAME_LINUX) +#include +#endif #include "sdlfile.h" @@ -39,68 +42,87 @@ const char *sdlfile_ptty_identifier = "/dev/pts"; file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UINT64 *filesize) { - int master; - int aslave; - char name[100]; + int master; + int aslave; + struct termios tios; + int oldflags; - if (openpty(&master, &aslave, name, NULL, NULL) >= 0) - { - printf("Slave of device %s is %s\n", path, name ); - fcntl(master, F_SETFL, O_NONBLOCK); - (*file)->handle = master; - *filesize = 0; - } - else - { - return FILERR_ACCESS_DENIED; - } + memset(&tios , 0 , sizeof(tios)); + cfmakeraw(&tios); - return FILERR_NONE; + if (openpty(&master, &aslave, NULL, &tios, NULL) >= 0) + { + oldflags = fcntl(master, F_GETFL, 0); + if (oldflags == -1) { + close(master); + return FILERR_FAILURE; + } + + fcntl(master, F_SETFL, oldflags | O_NONBLOCK); + close(aslave); + (*file)->handle = master; + *filesize = 0; + } + else + { + return FILERR_ACCESS_DENIED; + } + + return FILERR_NONE; } file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - ssize_t result; + ssize_t result; - result = read(file->handle, buffer, count); + result = read(file->handle, buffer, count); - if (result < 0) - { - return error_to_file_error(errno); - } + if (result < 0) + { + return error_to_file_error(errno); + } - if (actual != NULL ) - { - *actual = result; - } + if (actual != NULL ) + { + *actual = result; + } - return FILERR_NONE; + return FILERR_NONE; } file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - ssize_t result; - result = write(file->handle, buffer, count); + ssize_t result; + result = write(file->handle, buffer, count); - if (result < 0) - { - return error_to_file_error(errno); - } + if (result < 0) + { + return error_to_file_error(errno); + } - if (actual != NULL ) - { - *actual = result; - } + if (actual != NULL ) + { + *actual = result; + } - return FILERR_NONE; + return FILERR_NONE; } file_error sdl_close_ptty(osd_file *file) { - close(file->handle); - osd_free(file); + close(file->handle); + osd_free(file); - return FILERR_NONE; + return FILERR_NONE; +} + +file_error sdl_slave_name_ptty(osd_file *file , char *name , size_t name_len) +{ + if (ptsname_r(file->handle , name , name_len) < 0) { + return FILERR_INVALID_ACCESS; + } + + return FILERR_NONE; } #else @@ -110,21 +132,27 @@ const char *sdlfile_ptty_identifier = ""; file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UINT64 *filesize) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } file_error sdl_close_ptty(osd_file *file) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } + +file_error sdl_slave_name_ptty(osd_file *file) +{ + return FILERR_ACCESS_DENIED; +} + #endif From 898fc7b3730975aa60cb960287502c6f673bb592 Mon Sep 17 00:00:00 2001 From: fulivi Date: Fri, 9 Oct 2015 16:47:47 +0200 Subject: [PATCH 2/6] pty: seems ok (linux only) --- scripts/src/emu.lua | 2 + src/emu/bus/rs232/pty.c | 136 +++++++++++++++++++--------------------- src/emu/bus/rs232/pty.h | 1 + src/emu/dipty.c | 5 ++ src/emu/dipty.h | 2 + src/emu/ui/info_pty.c | 44 +++++++++++++ src/emu/ui/info_pty.h | 24 +++++++ src/emu/ui/mainmenu.c | 9 +++ src/emu/ui/mainmenu.h | 3 +- 9 files changed, 152 insertions(+), 74 deletions(-) create mode 100644 src/emu/ui/info_pty.c create mode 100644 src/emu/ui/info_pty.h diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index eccb515ad02..5187f87b71a 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -194,6 +194,8 @@ files { MAME_DIR .. "src/emu/ui/imgcntrl.h", MAME_DIR .. "src/emu/ui/info.c", MAME_DIR .. "src/emu/ui/info.h", + MAME_DIR .. "src/emu/ui/info_pty.c", + MAME_DIR .. "src/emu/ui/info_pty.h", MAME_DIR .. "src/emu/ui/inputmap.c", MAME_DIR .. "src/emu/ui/inputmap.h", MAME_DIR .. "src/emu/ui/selgame.c", diff --git a/src/emu/bus/rs232/pty.c b/src/emu/bus/rs232/pty.c index d1ed6d7d24a..bc673318e2a 100644 --- a/src/emu/bus/rs232/pty.c +++ b/src/emu/bus/rs232/pty.c @@ -4,20 +4,18 @@ #include #include "pty.h" -#define FU_TEST - static const int TIMER_POLL = 1; pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__), - device_serial_interface(mconfig, *this), - device_rs232_port_interface(mconfig, *this), + device_serial_interface(mconfig, *this), + device_rs232_port_interface(mconfig, *this), device_pty_interface(mconfig, *this), - m_rs232_txbaud(*this, "RS232_TXBAUD"), - m_rs232_rxbaud(*this, "RS232_RXBAUD"), - m_rs232_startbits(*this, "RS232_STARTBITS"), - m_rs232_databits(*this, "RS232_DATABITS"), - m_rs232_parity(*this, "RS232_PARITY"), + m_rs232_txbaud(*this, "RS232_TXBAUD"), + m_rs232_rxbaud(*this, "RS232_RXBAUD"), + m_rs232_startbits(*this, "RS232_STARTBITS"), + m_rs232_databits(*this, "RS232_DATABITS"), + m_rs232_parity(*this, "RS232_PARITY"), m_rs232_stopbits(*this, "RS232_STOPBITS"), m_input_count(0), m_input_index(0) @@ -26,97 +24,94 @@ pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, co WRITE_LINE_MEMBER(pseudo_terminal_device::update_serial) { - int startbits = convert_startbits(m_rs232_startbits->read()); - int databits = convert_databits(m_rs232_databits->read()); - parity_t parity = convert_parity(m_rs232_parity->read()); - stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read()); + int startbits = convert_startbits(m_rs232_startbits->read()); + int databits = convert_databits(m_rs232_databits->read()); + parity_t parity = convert_parity(m_rs232_parity->read()); + stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read()); - set_data_frame(startbits, databits, parity, stopbits); + set_data_frame(startbits, databits, parity, stopbits); - int txbaud = convert_baud(m_rs232_txbaud->read()); - set_tra_rate(txbaud); + int txbaud = convert_baud(m_rs232_txbaud->read()); + set_tra_rate(txbaud); - int rxbaud = convert_baud(m_rs232_rxbaud->read()); - set_rcv_rate(rxbaud); + int rxbaud = convert_baud(m_rs232_rxbaud->read()); + set_rcv_rate(rxbaud); - output_rxd(1); + output_rxd(1); - // TODO: make this configurable - output_dcd(0); - output_dsr(0); - output_cts(0); + // TODO: make this configurable + output_dcd(0); + output_dsr(0); + output_cts(0); } static INPUT_PORTS_START(pseudo_terminal) - MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial) - MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial) - MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial) - MCFG_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial) - MCFG_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial) - MCFG_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial) + MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial) + MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial) + MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial) + MCFG_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial) + MCFG_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial) + MCFG_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial) INPUT_PORTS_END ioport_constructor pseudo_terminal_device::device_input_ports() const { - return INPUT_PORTS_NAME(pseudo_terminal); + return INPUT_PORTS_NAME(pseudo_terminal); } void pseudo_terminal_device::device_start() { - m_timer_poll = timer_alloc(TIMER_POLL); + m_timer_poll = timer_alloc(TIMER_POLL); - if (open()) { -#ifdef FU_TEST - printf("slave PTY = %s\n" , slave_name()); -#endif - } else { -#ifdef FU_TEST - puts("Opening PTY failed"); -#endif - } + open(); +} + +void pseudo_terminal_device::device_stop() +{ + close(); } void pseudo_terminal_device::device_reset() { - update_serial(0); + update_serial(0); queue(); } void pseudo_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - switch (id) - { - case TIMER_POLL: - queue(); - break; + switch (id) + { + case TIMER_POLL: + queue(); + break; - default: - device_serial_interface::device_timer(timer, id, param, ptr); - } + default: + device_serial_interface::device_timer(timer, id, param, ptr); + } } void pseudo_terminal_device::tra_callback() { - output_rxd(transmit_register_get_data_bit()); + output_rxd(transmit_register_get_data_bit()); } void pseudo_terminal_device::tra_complete() { - queue(); + queue(); } void pseudo_terminal_device::rcv_complete() { - receive_register_extract(); + receive_register_extract(); write(get_received_char()); } void pseudo_terminal_device::queue(void) { - if (is_transmit_register_empty()) - { - if (m_input_index == m_input_count) - { + if (is_transmit_register_empty()) + { + if (m_input_index == m_input_count) + { m_input_index = 0; int tmp = read(m_input_buffer , sizeof(m_input_buffer)); if (tmp > 0) { @@ -124,25 +119,20 @@ void pseudo_terminal_device::queue(void) } else { m_input_count = 0; } -#ifdef FU_TEST - if (m_input_count) { - printf("read %u\n" , m_input_count); - } -#endif - } + } - if (m_input_count != 0) - { - transmit_register_setup(m_input_buffer[ m_input_index++ ]); + if (m_input_count != 0) + { + transmit_register_setup(m_input_buffer[ m_input_index++ ]); - m_timer_poll->adjust(attotime::never); - } - else - { - int txbaud = convert_baud(m_rs232_txbaud->read()); - m_timer_poll->adjust(attotime::from_hz(txbaud)); - } - } + m_timer_poll->adjust(attotime::never); + } + else + { + int txbaud = convert_baud(m_rs232_txbaud->read()); + m_timer_poll->adjust(attotime::from_hz(txbaud)); + } + } } const device_type PSEUDO_TERMINAL = &device_creator; diff --git a/src/emu/bus/rs232/pty.h b/src/emu/bus/rs232/pty.h index 75a1c0c2f1a..1f4ddbce754 100644 --- a/src/emu/bus/rs232/pty.h +++ b/src/emu/bus/rs232/pty.h @@ -23,6 +23,7 @@ public: protected: virtual ioport_constructor device_input_ports() const; virtual void device_start(); + virtual void device_stop(); virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/emu/dipty.c b/src/emu/dipty.c index 197d736b0ad..1d188f95d0a 100644 --- a/src/emu/dipty.c +++ b/src/emu/dipty.c @@ -48,6 +48,11 @@ void device_pty_interface::close(void) } } +bool device_pty_interface::is_open(void) const +{ + return m_opened; +} + ssize_t device_pty_interface::read(UINT8 *rx_chars , size_t count) { UINT32 actual_bytes; diff --git a/src/emu/dipty.h b/src/emu/dipty.h index cbb4a9cb725..c381420a0ca 100644 --- a/src/emu/dipty.h +++ b/src/emu/dipty.h @@ -27,6 +27,8 @@ public: bool open(void); void close(void); + bool is_open(void) const; + ssize_t read(UINT8 *rx_chars , size_t count); void write(UINT8 tx_char); diff --git a/src/emu/ui/info_pty.c b/src/emu/ui/info_pty.c new file mode 100644 index 00000000000..1fe865f5668 --- /dev/null +++ b/src/emu/ui/info_pty.c @@ -0,0 +1,44 @@ +// license:BSD-3-Clause +// copyright-holders:F.Ulivi +/*************************************************************************** + + ui/info_pty.c + + Information screen on pseudo terminals + +***************************************************************************/ + +#include "emu.h" +#include "ui/menu.h" +#include "ui/info_pty.h" + +ui_menu_pty_info::ui_menu_pty_info(running_machine &machine, render_container *container) : + ui_menu(machine, container) +{ +} + +ui_menu_pty_info::~ui_menu_pty_info() +{ +} + +void ui_menu_pty_info::populate() +{ + item_append("Pseudo terminals", NULL, MENU_FLAG_DISABLE, NULL); + item_append("", NULL, MENU_FLAG_DISABLE, NULL); + + pty_interface_iterator iter(machine().root_device()); + for (device_pty_interface *pty = iter.first(); pty != NULL; pty = iter.next()) { + const char *port_name = pty->device().owner()->tag() + 1; + if (pty->is_open()) { + item_append(port_name , pty->slave_name() , MENU_FLAG_DISABLE , NULL); + } else { + item_append(port_name , "[failed]" , MENU_FLAG_DISABLE , NULL); + } + item_append("", NULL, MENU_FLAG_DISABLE, NULL); + } +} + +void ui_menu_pty_info::handle() +{ + process(0); +} diff --git a/src/emu/ui/info_pty.h b/src/emu/ui/info_pty.h new file mode 100644 index 00000000000..4352c1d48c8 --- /dev/null +++ b/src/emu/ui/info_pty.h @@ -0,0 +1,24 @@ +// license:BSD-3-Clause +// copyright-holders:F.Ulivi +/*************************************************************************** + + ui/info_pty.h + + Information screen on pseudo terminals + +***************************************************************************/ + +#pragma once + +#ifndef __UI_INFO_PTY_H__ +#define __UI_INFO_PTY_H__ + +class ui_menu_pty_info : public ui_menu { +public: + ui_menu_pty_info(running_machine &machine, render_container *container); + virtual ~ui_menu_pty_info(); + virtual void populate(); + virtual void handle(); +}; + +#endif // __UI_INFO_PTY_H__ diff --git a/src/emu/ui/mainmenu.c b/src/emu/ui/mainmenu.c index 51b0ad4970a..196fdb976c2 100644 --- a/src/emu/ui/mainmenu.c +++ b/src/emu/ui/mainmenu.c @@ -22,6 +22,7 @@ #include "ui/barcode.h" #include "ui/cheatopt.h" #include "ui/info.h" +#include "ui/info_pty.h" #include "ui/inputmap.h" #include "ui/mainmenu.h" #include "ui/miscmenu.h" @@ -90,6 +91,10 @@ void ui_menu_main::populate() item_append("Tape Control", NULL, 0, (void *)TAPE_CONTROL); } + pty_interface_iterator ptyiter(machine().root_device()); + if (ptyiter.first() != NULL) { + item_append("Pseudo terminals", NULL, 0, (void *)PTY_INFO); + } if (machine().ioport().has_bioses()) item_append("Bios Selection", NULL, 0, (void *)BIOS_SELECTION); @@ -191,6 +196,10 @@ void ui_menu_main::handle() ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_tape_control(machine(), container, NULL))); break; + case PTY_INFO: + ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_pty_info(machine(), container))); + break; + case SLOT_DEVICES: ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_slot_devices(machine(), container))); break; diff --git a/src/emu/ui/mainmenu.h b/src/emu/ui/mainmenu.h index b21d5da1c73..b35a5927073 100644 --- a/src/emu/ui/mainmenu.h +++ b/src/emu/ui/mainmenu.h @@ -44,7 +44,8 @@ private: CHEAT, SELECT_GAME, BIOS_SELECTION, - BARCODE_READ + BARCODE_READ, + PTY_INFO }; }; From d2d30ee26ce80c8a73e2d111fc3131bbede79b28 Mon Sep 17 00:00:00 2001 From: fulivi Date: Tue, 13 Oct 2015 13:37:57 +0200 Subject: [PATCH 3/6] pty: fixed for mame0166 release --- src/{emu => devices}/bus/rs232/pty.c | 0 src/{emu => devices}/bus/rs232/pty.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/{emu => devices}/bus/rs232/pty.c (100%) rename src/{emu => devices}/bus/rs232/pty.h (100%) diff --git a/src/emu/bus/rs232/pty.c b/src/devices/bus/rs232/pty.c similarity index 100% rename from src/emu/bus/rs232/pty.c rename to src/devices/bus/rs232/pty.c diff --git a/src/emu/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h similarity index 100% rename from src/emu/bus/rs232/pty.h rename to src/devices/bus/rs232/pty.h From ba6f6fc1272a9dce9beca9726d87a09d80744283 Mon Sep 17 00:00:00 2001 From: fulivi Date: Wed, 14 Oct 2015 11:44:56 +0200 Subject: [PATCH 4/6] pty: put a stopper in windows & osdmini versions of OSD as they don't support PTYs --- src/osd/osdmini/minifile.c | 8 ++++++++ src/osd/sdl/sdlptty_os2.c | 5 +++++ src/osd/windows/winfile.c | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/src/osd/osdmini/minifile.c b/src/osd/osdmini/minifile.c index 52ddc3a2503..2883b81c731 100644 --- a/src/osd/osdmini/minifile.c +++ b/src/osd/osdmini/minifile.c @@ -101,6 +101,14 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l return FILERR_NONE; } +//============================================================ +// osd_openpty +//============================================================ + +file_error osd_openpty(osd_file **file, char *name, size_t name_len) +{ + return FILERR_FAILURE; +} //============================================================ // osd_truncate diff --git a/src/osd/sdl/sdlptty_os2.c b/src/osd/sdl/sdlptty_os2.c index 800b3d9a16b..e7d76965238 100644 --- a/src/osd/sdl/sdlptty_os2.c +++ b/src/osd/sdl/sdlptty_os2.c @@ -32,3 +32,8 @@ file_error sdl_close_ptty(osd_file *file) { return FILERR_ACCESS_DENIED; } + +file_error sdl_slave_name_ptty(osd_file *file) +{ + return FILERR_ACCESS_DENIED; +} diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c index 3663a4a7c3e..2ac5cddaee3 100644 --- a/src/osd/windows/winfile.c +++ b/src/osd/windows/winfile.c @@ -235,6 +235,14 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l return FILERR_NONE; } +//============================================================ +// osd_openpty +//============================================================ + +file_error osd_openpty(osd_file **file, char *name, size_t name_len) +{ + return FILERR_FAILURE; +} //============================================================ // osd_truncate From e496024c9ca4e30b19cfcc48cffdfb766a238ee8 Mon Sep 17 00:00:00 2001 From: fulivi Date: Sat, 17 Oct 2015 18:26:41 +0200 Subject: [PATCH 5/6] pty: changed pstname_r to ptsname for OSX compatibility --- src/osd/sdl/sdlptty_unix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c index 13cd3eb1034..aeca6fd4baf 100644 --- a/src/osd/sdl/sdlptty_unix.c +++ b/src/osd/sdl/sdlptty_unix.c @@ -118,10 +118,14 @@ file_error sdl_close_ptty(osd_file *file) file_error sdl_slave_name_ptty(osd_file *file , char *name , size_t name_len) { - if (ptsname_r(file->handle , name , name_len) < 0) { + const char *slave_name = ptsname(file->handle); + + if (slave_name == NULL || strlen(slave_name) >= name_len) { return FILERR_INVALID_ACCESS; } + strcpy(name , slave_name); + return FILERR_NONE; } From 3f70abab450861bca09dc6e4100850fdabe9d560 Mon Sep 17 00:00:00 2001 From: fulivi Date: Sun, 18 Oct 2015 10:13:31 +0200 Subject: [PATCH 6/6] pty: added inclusion of stdlib.h on systems != Linux --- src/osd/sdl/sdlptty_unix.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c index aeca6fd4baf..6b618314d72 100644 --- a/src/osd/sdl/sdlptty_unix.c +++ b/src/osd/sdl/sdlptty_unix.c @@ -2,7 +2,7 @@ // copyright-holders:Olivier Galibert, R. Belmont //============================================================ // -// sdlptty_unix.c - SDL psuedo tty access functions +// sdlptty_unix.c - SDL pseudo tty access functions // // SDLMAME by Olivier Galibert and R. Belmont // @@ -28,9 +28,7 @@ #elif defined(SDLMAME_HAIKU) # include #endif -#if defined(SDLMAME_LINUX) #include -#endif #include "sdlfile.h"