Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

isa_gus: Added MIDI In and Out.

Browse Source 
6850acia: Added accessor function for status (no whatsnew)

MIDI Out seems to work fine with Win 3.1 MIDI Mapper and Media Player.
To use with these, open MIDI Mapper, and edit the General MIDI setup, and
change each channel from "Ultrasound MIDI Synth" to "Ultrasound MIDI Output
Port"

MIDI In is untested, and the MIDI Receive IRQ test still fails.
This commit is contained in:
mahlemiut 2013-02-01 12:21:53 +00:00
parent 9032bb6816
commit 7f882f3262
3 changed files with 74 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/machine/6850acia.h
View File

@ -91,6 +91,8 @@ public:
void receive_data(UINT8 data);
UINT8 get_status() { return m_status; } // returns current status without mangling it
protected:
// device-level overrides
virtual void device_start();

70
src/mess/machine/isa_gus.c
View File

@ -10,6 +10,7 @@
#include "sound/speaker.h"
#include "machine/6850acia.h"
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
@ -1199,10 +1200,10 @@ void gf1_device::eop_w(int state)
static const acia6850_interface gus_midi_interface =
{
31250 * 16,
31250 * 16,
0,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, isa16_gus_device, rx_in), // rx in
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, isa16_gus_device, tx_out), // tx out
DEVCB_NULL,
DEVCB_NULL,
@ -1211,6 +1212,24 @@ static const acia6850_interface gus_midi_interface =
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER,isa16_gus_device,midi_irq)
};
static SLOT_INTERFACE_START(midiin_slot)
SLOT_INTERFACE("midiin", MIDIIN_PORT)
SLOT_INTERFACE_END
static const serial_port_interface midiin_intf =
{
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, isa16_gus_device, midi_rx_w)
};
static SLOT_INTERFACE_START(midiout_slot)
SLOT_INTERFACE("midiout", MIDIOUT_PORT)
SLOT_INTERFACE_END
static const serial_port_interface midiout_intf =
{
DEVCB_NULL // midi out ports don't transmit inward
};
static const gf1_interface gus_gf1_config =
{
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER,isa16_gus_device,wavetable_irq),
@ -1231,6 +1250,8 @@ static MACHINE_CONFIG_FRAGMENT( gus_config )
MCFG_SOUND_ROUTE(0,"lspeaker",0.50)
MCFG_SOUND_ROUTE(1,"rspeaker",0.50)
MCFG_ACIA6850_ADD("midi",gus_midi_interface)
MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL)
MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL)
MACHINE_CONFIG_END
static INPUT_PORTS_START( gus_joy )
@ -1274,6 +1295,7 @@ void isa16_gus_device::device_start()
{
m_gf1 = subdevice<gf1_device>("gf1");
m_midi = subdevice<acia6850_device>("midi");
m_mdout = subdevice<serial_port_device>("mdout");
set_isa_device();
m_isa->install_device(0x0200, 0x0201, 0, 0, read8_delegate(FUNC(isa16_gus_device::joy_r),this), write8_delegate(FUNC(isa16_gus_device::joy_w),this) );
m_isa->install_device(0x0220, 0x022f, 0, 0, read8_delegate(FUNC(isa16_gus_device::board_r),this), write8_delegate(FUNC(isa16_gus_device::board_w),this) );
@ -1672,10 +1694,46 @@ void isa16_gus_device::reset_midi_irq(UINT8 source)
WRITE_LINE_MEMBER( isa16_gus_device::midi_irq )
{
if(state)
set_midi_irq(IRQ_MIDI_TRANSMIT);
UINT8 irq_type;
UINT8 st = m_midi->get_status();
logerror("GUS: MIDI IRQ: state: %i Status: %02x\n",state,st);
if(state == ASSERT_LINE)
{
if(st & 0x01) // receive
irq_type = IRQ_MIDI_RECEIVE;
else
if(st & 0x02) // transmit
irq_type = IRQ_MIDI_TRANSMIT;
else
{
logerror("GUS: MIDI IRQ unknown: %02x\n",st);
return; // Should never reach here...
}
set_midi_irq(irq_type);
}
else
reset_midi_irq(IRQ_MIDI_TRANSMIT);
reset_midi_irq(IRQ_MIDI_TRANSMIT | IRQ_MIDI_RECEIVE);
}
WRITE_LINE_MEMBER( isa16_gus_device::midi_rx_w )
{
m_rx_state = state;
for (int i = 0; i < 16; i++) // divider is set to 16
{
m_midi->rx_clock_in();
}
}
READ_LINE_MEMBER( isa16_gus_device::rx_in )
{
return m_rx_state;
}
WRITE_LINE_MEMBER( isa16_gus_device::tx_out )
{
m_mdout->tx(state);
}
WRITE_LINE_MEMBER( isa16_gus_device::nmi_w)

8
src/mess/machine/isa_gus.h
View File

@ -43,6 +43,9 @@
#include "emu.h"
#include "machine/isa.h"
#include "machine/6850acia.h"
#include "machine/serial.h"
#include "machine/midiinport.h"
#include "machine/midioutport.h"
//**************************************************************************
// TYPE DEFINITIONS
@ -251,6 +254,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(drq1_w);
DECLARE_WRITE_LINE_MEMBER(drq2_w);
DECLARE_WRITE_LINE_MEMBER(nmi_w);
DECLARE_WRITE_LINE_MEMBER( midi_rx_w );
DECLARE_READ_LINE_MEMBER( rx_in );
DECLARE_WRITE_LINE_MEMBER( tx_out );
// DMA overrides
virtual UINT8 dack_r(int line);
@ -269,9 +275,11 @@ protected:
private:
gf1_device* m_gf1;
acia6850_device* m_midi;
serial_port_device* m_mdout;
UINT8 m_irq_status;
attotime m_joy_time;
int m_rx_state;
};
// device type definition