Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 02:07:14 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

-hlemouse.cpp: Added support for the SGI Indigo mouse. [Ryan Holtz]

Browse Source 
-indigo.cpp: Added framebuffer copy command to LG1. [Ryan Holtz]
This commit is contained in:
mooglyguy 2018-11-14 16:58:48 +01:00
parent fb92b09a9e
commit 04bbe717e0
3 changed files with 94 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/devices/bus/rs232/hlemouse.cpp
View File

@ -79,6 +79,7 @@ DEFINE_DEVICE_TYPE_NS(LOGITECH_HLE_SERIAL_MOUSE, bus::rs232, hle_logitech_mouse
DEFINE_DEVICE_TYPE_NS(WHEEL_HLE_SERIAL_MOUSE, bus::rs232, hle_wheel_mouse_device, "rs232_mouse_hle_wheel", "Microsoft Serial Mouse with Wheel (HLE)")
DEFINE_DEVICE_TYPE_NS(MSYSTEMS_HLE_SERIAL_MOUSE, bus::rs232, hle_msystems_mouse_device, "rs232_mouse_hle_msystems", "Mouse Systems Non-rotatable Mouse (HLE)")
DEFINE_DEVICE_TYPE_NS(ROTATABLE_HLE_SERIAL_MOUSE, bus::rs232, hle_rotatable_mouse_device, "rs232_mouse_hle_rotatable", "Mouse Systems Rotatable Mouse (HLE)")
DEFINE_DEVICE_TYPE_NS(SGI_HLE_SERIAL_MOUSE, bus::rs232, hle_sgi_mouse_device, "rs232_mouse_hle_sgi", "SGI IRIS Indigo Mouse (HLE)")
namespace bus { namespace rs232 {
@ -515,10 +516,11 @@ TIMER_CALLBACK_MEMBER(hle_msystems_device_base::start_mouse)
hle_msystems_mouse_device::hle_msystems_mouse_device(
machine_config const &mconfig,
device_type type,
char const *tag,
device_t *owner,
uint32_t clock)
: hle_msystems_device_base(mconfig, MSYSTEMS_HLE_SERIAL_MOUSE, tag, owner, clock)
: hle_msystems_device_base(mconfig, type, tag, owner, clock)
, m_buttons(*this, "BTN")
, m_x_axis(*this, "X")
, m_y_axis(*this, "Y")
@ -531,6 +533,15 @@ hle_msystems_mouse_device::hle_msystems_mouse_device(
{
}
hle_msystems_mouse_device::hle_msystems_mouse_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
uint32_t clock)
: hle_msystems_mouse_device(mconfig, MSYSTEMS_HLE_SERIAL_MOUSE, tag, owner, clock)
{
}
ioport_constructor hle_msystems_mouse_device::device_input_ports() const
{
return INPUT_PORTS_NAME(msystems);
@ -688,4 +699,25 @@ uint8_t hle_rotatable_mouse_device::report_y2_delta()
return report_axis<int16_t>(m_y_delta[1], -120, 127);
}
//**************************************************
// SGI IRIS Indigo mouse
//**************************************************
hle_sgi_mouse_device::hle_sgi_mouse_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
uint32_t clock)
: hle_msystems_mouse_device(mconfig, SGI_HLE_SERIAL_MOUSE, tag, owner, clock)
{
}
void hle_sgi_mouse_device::device_start()
{
hle_msystems_mouse_device::device_start();
set_rate(4'800);
receive_register_reset();
transmit_register_reset();
}
} } // namespace bus::rs232

18
src/devices/bus/rs232/hlemouse.h
View File

@ -160,6 +160,8 @@ public:
hle_msystems_mouse_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
protected:
hle_msystems_mouse_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
virtual void device_start() override;
@ -205,6 +207,21 @@ private:
uint8_t m_btn_val, m_btn_sent;
};
//**************************************************
// SGI IRIS Indigo mouse
//**************************************************
class hle_sgi_mouse_device : public hle_msystems_mouse_device
{
public:
hle_sgi_mouse_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void rcv_complete() override;
};
} } // namespace bus::rs232
@ -217,5 +234,6 @@ DECLARE_DEVICE_TYPE_NS(LOGITECH_HLE_SERIAL_MOUSE, bus::rs232, hle_logitech_mous
DECLARE_DEVICE_TYPE_NS(WHEEL_HLE_SERIAL_MOUSE, bus::rs232, hle_wheel_mouse_device)
DECLARE_DEVICE_TYPE_NS(MSYSTEMS_HLE_SERIAL_MOUSE, bus::rs232, hle_msystems_mouse_device)
DECLARE_DEVICE_TYPE_NS(ROTATABLE_HLE_SERIAL_MOUSE, bus::rs232, hle_rotatable_mouse_device)
DECLARE_DEVICE_TYPE_NS(SGI_HLE_SERIAL_MOUSE, bus::rs232, hle_sgi_mouse_device)
#endif // MAME_BUS_RS232_SER_MOUSE_H

48
src/mame/drivers/indigo.cpp
View File

@ -18,6 +18,7 @@
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "bus/rs232/hlemouse.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsicd512.h"
#include "bus/scsi/scsihd.h"
@ -54,7 +55,7 @@
#define LOG_DUART (LOG_DUART0 | LOG_DUART1 | LOG_DUART2)
#define LOG_ALL (LOG_UNKNOWN | LOG_INT | LOG_HPC | LOG_EEPROM | LOG_DMA | LOG_SCSI | LOG_SCSI_DMA | LOG_DUART | LOG_PIT | LOG_DSP | LOG_GFX | LOG_GFX_CMD)
#define VERBOSE (LOG_ALL & ~(LOG_DUART1 | LOG_DUART0 | LOG_SCSI | LOG_SCSI_DMA | LOG_EEPROM | LOG_PIT | LOG_DSP))
#define VERBOSE (LOG_ALL & ~(LOG_DUART0 | LOG_DUART1 | LOG_SCSI | LOG_SCSI_DMA | LOG_EEPROM | LOG_PIT | LOG_DSP))
#include "logmacro.h"
class indigo_state : public driver_device
@ -920,8 +921,32 @@ void indigo_state::do_rex_command()
{
return;
}
if (m_lg1.m_command == 0x30080329)
{
bool xycontinue = (m_lg1.m_command & REX15_OP_FLAG_XYCONTINUE);
bool copy = (m_lg1.m_command & REX15_OP_FLAG_LOGICSRC);
const uint32_t start_x = xycontinue ? m_lg1.m_x_curr_i : m_lg1.m_x_start_i;
const uint32_t start_y = xycontinue ? m_lg1.m_y_curr_i : m_lg1.m_y_start_i;
const uint32_t end_x = m_lg1.m_x_end_i;
const uint32_t end_y = m_lg1.m_y_end_i;
const uint32_t src_start_x = start_x + (m_lg1.m_xy_move >> 16);
const uint32_t src_start_y = start_y + (uint16_t)m_lg1.m_xy_move;;
if (m_lg1.m_command == 0x30000329)
LOGMASKED(LOG_GFX, "LG1: Command %08x: Block copy from %d,%d-%d,%d inclusive.\n", m_lg1.m_command, start_x, start_y, end_x, end_y);
if (copy)
{
for (uint32_t y = start_y, src_y = src_start_y; y <= end_y; y++, src_y++)
for (uint32_t x = start_x, src_x = src_start_x; x <= end_x; x++, src_x++)
m_framebuffer[y*1024 + x] = m_framebuffer[src_y*1024 + src_x];
}
else
{
for (uint32_t y = start_y; y <= end_y; y++)
for (uint32_t x = start_x; x <= end_x; x++)
m_framebuffer[y*1024 + x] = m_lg1.m_color_red_i;
}
}
else if (m_lg1.m_command == 0x30000329)
{
bool xycontinue = (m_lg1.m_command & REX15_OP_FLAG_XYCONTINUE);
uint32_t start_x = xycontinue ? m_lg1.m_x_curr_i : m_lg1.m_x_start_i;
@ -1000,6 +1025,8 @@ WRITE32_MEMBER(indigo_state::entry_w)
case (REX15_PAGE0_GO+REX15_P0REG_XYMOVE)/4:
m_lg1.m_xy_move = data;
LOGMASKED(LOG_GFX, "%s: LG1 REX1.5 XYMove Write (%s) = %08x\n", machine().describe_context(), (offset & 0x200) ? "Go" : "Set", data);
if (go)
do_rex_command();
break;
case (REX15_PAGE0_SET+REX15_P0REG_COLORREDI)/4:
case (REX15_PAGE0_GO+REX15_P0REG_COLORREDI)/4:
@ -1063,7 +1090,7 @@ WRITE32_MEMBER(indigo_state::entry_w)
break;
case (REX15_PAGE1_SET+REX15_P1REG_CFGDATA)/4:
case (REX15_PAGE1_GO+REX15_P1REG_CFGDATA)/4:
if (offset & 0x200) // Ignore 'Go' writes for now
if (go) // Ignore 'Go' writes for now, unsure what they do
break;
switch (m_lg1.m_config_sel)
{
@ -1157,6 +1184,11 @@ void indigo_state::cdrom_config(device_t *device)
cdda->add_route(ALL_OUTPUTS, ":mono", 1.0);
}
static void indigo_mice(device_slot_interface &device)
{
device.option_add("sgimouse", SGI_HLE_SERIAL_MOUSE);
}
void indigo_state::indigo_base(machine_config &config)
{
/* video hardware */
@ -1190,6 +1222,14 @@ void indigo_state::indigo_base(machine_config &config)
m_scc[2]->configure_channels(SCC_RXA_CLK.value(), SCC_TXA_CLK.value(), SCC_RXB_CLK.value(), SCC_TXB_CLK.value());
m_scc[2]->out_int_callback().set(FUNC(indigo_state::duart2_int_w));
SGIKBD_PORT(config, "keyboard", default_sgi_keyboard_devices, "hlekbd").rxd_handler().set(m_scc[0], FUNC(z80scc_device::rxa_w));
rs232_port_device &mouseport(RS232_PORT(config, "mouseport", indigo_mice, "sgimouse"));
mouseport.set_fixed(true);
mouseport.rxd_handler().set(m_scc[0], FUNC(scc8530_device::rxa_w));
mouseport.cts_handler().set(m_scc[0], FUNC(scc8530_device::ctsa_w));
mouseport.dcd_handler().set(m_scc[0], FUNC(scc8530_device::dcda_w));
rs232_port_device &rs232a(RS232_PORT(config, RS232A_TAG, default_rs232_devices, nullptr));
rs232a.cts_handler().set(m_scc[1], FUNC(scc8530_device::ctsa_w));
rs232a.dcd_handler().set(m_scc[1], FUNC(scc8530_device::dcda_w));
@ -1200,8 +1240,6 @@ void indigo_state::indigo_base(machine_config &config)
rs232b.dcd_handler().set(m_scc[1], FUNC(scc8530_device::dcdb_w));
rs232b.rxd_handler().set(m_scc[1], FUNC(scc8530_device::rxb_w));
SGIKBD_PORT(config, "keyboard", default_sgi_keyboard_devices, "hlekbd").rxd_handler().set(m_scc[0], FUNC(z80scc_device::rxa_w));
scsi_port_device &scsi(SCSI_PORT(config, "scsi"));
scsi.set_slot_device(1, "harddisk", SCSIHD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_1));
scsi.set_slot_device(2, "cdrom", RRD45, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_4));