Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-08 05:44:09 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

(MESS) isa_sblaster: working SB-MIDI In (tested w/MIDI Monitor for Windows) [R. Belmont]

Browse Source
This commit is contained in:
R. Belmont 2013-02-02 03:40:55 +00:00
parent a2f42d3375
commit ac0df905b5
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/mess/machine/isa_sblaster.c
View File

@ -71,6 +71,15 @@ static const ymf262_interface pc_ymf262_interface =
NULL NULL
}; };
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, sb_device, midi_rx_w)
};
static SLOT_INTERFACE_START(midiout_slot) static SLOT_INTERFACE_START(midiout_slot)
SLOT_INTERFACE("midiout", MIDIOUT_PORT) SLOT_INTERFACE("midiout", MIDIOUT_PORT)
SLOT_INTERFACE_END SLOT_INTERFACE_END
@ -99,6 +108,7 @@ static MACHINE_CONFIG_FRAGMENT( sblaster1_0_config )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
MCFG_PC_JOY_ADD("joy") MCFG_PC_JOY_ADD("joy")
MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL)
MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -116,6 +126,7 @@ static MACHINE_CONFIG_FRAGMENT( sblaster1_5_config )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
MCFG_PC_JOY_ADD("joy") MCFG_PC_JOY_ADD("joy")
MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL)
MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -133,6 +144,7 @@ static MACHINE_CONFIG_FRAGMENT( sblaster_16_config )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
MCFG_PC_JOY_ADD("joy") MCFG_PC_JOY_ADD("joy")
MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL)
MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -272,7 +284,7 @@ WRITE8_MEMBER( sb_device::dsp_reset_w )
m_tx_busy = false; m_tx_busy = false;
m_xmit_read = m_xmit_write = 0; m_xmit_read = m_xmit_write = 0;
m_recv_read = m_recv_write = 0; m_recv_read = m_recv_write = 0;
m_uart_xmitfull = false; m_rx_waiting = m_tx_waiting = false;
//printf("%02x\n",data); //printf("%02x\n",data);
} }
@ -285,12 +297,10 @@ READ8_MEMBER( sb_device::dsp_data_r )
if (m_uart_midi) if (m_uart_midi)
{ {
UINT8 rv = m_recvring[m_recv_read]; UINT8 rv = m_recvring[m_recv_read++];
if (m_rx_waiting)
// only advance the read pointer if the ring wasn't empty
if (m_recv_read != m_xmit_read)
{ {
m_recv_read++; m_rx_waiting--;
} }
return rv; return rv;
@ -325,7 +335,7 @@ READ8_MEMBER(sb_device::dsp_rbuf_status_r)
// to read. // to read.
if (m_uart_midi || m_onebyte_midi) if (m_uart_midi || m_onebyte_midi)
{ {
if (m_recv_read != m_recv_write) if (m_rx_waiting)
{ {
return 0x80; return 0x80;
} }
@ -347,7 +357,7 @@ READ8_MEMBER(sb_device::dsp_wbuf_status_r)
// set = buffer full // set = buffer full
if (m_uart_midi || m_onebyte_midi) if (m_uart_midi || m_onebyte_midi)
{ {
if (m_uart_xmitfull) if (m_tx_waiting >= MIDI_RING_SIZE)
{ {
return 0x80; return 0x80;
} }
@ -429,12 +439,12 @@ void sb_device::process_fifo(UINT8 cmd)
case 0x34: case 0x34:
m_uart_midi = true; m_uart_midi = true;
m_uart_irq = true; m_uart_irq = false;
break; break;
case 0x35: case 0x35:
m_uart_midi = true; m_uart_midi = true;
m_uart_irq = false; m_uart_irq = true;
break; break;
case 0x36: case 0x36:
@ -1228,7 +1238,7 @@ void sb_device::device_reset()
m_tx_busy = false; m_tx_busy = false;
m_xmit_read = m_xmit_write = 0; m_xmit_read = m_xmit_write = 0;
m_recv_read = m_recv_write = 0; m_recv_read = m_recv_write = 0;
m_uart_xmitfull = false; m_rx_waiting = m_tx_waiting = false;
// MIDI is 31250 baud, 8-N-1 // MIDI is 31250 baud, 8-N-1
set_rcv_rate(31250); set_rcv_rate(31250);
@ -1534,8 +1544,10 @@ void sb_device::rcv_complete() // Rx completed receiving byte
if (m_uart_midi) if (m_uart_midi)
{ {
m_recvring[m_recv_write++] = data; m_recvring[m_recv_write++] = data;
if (m_recv_write != m_recv_read)
// if not polling mode, trigger the DMA8 IRQ {
m_rx_waiting++;
}
if (m_uart_irq) if (m_uart_irq)
{ {
irq_w(1, IRQ_DMA8); irq_w(1, IRQ_DMA8);
@ -1552,8 +1564,15 @@ void sb16_device::rcv_complete() // Rx completed receiving byte
if (m_uart_midi) if (m_uart_midi)
{ {
m_recvring[m_recv_write++] = data; m_recvring[m_recv_write++] = data;
if (m_recv_write != m_recv_read)
{
m_rx_waiting++;
}
if (m_uart_irq)
{
irq_w(1, IRQ_DMA8); irq_w(1, IRQ_DMA8);
} }
}
// in MPU MIDI mode, do this instead // in MPU MIDI mode, do this instead
if (m_mpu_midi) if (m_mpu_midi)
@ -1571,14 +1590,14 @@ void sb_device::tra_complete() // Tx completed sending byte
{ {
// printf("Tx complete\n"); // printf("Tx complete\n");
// is there more waiting to send? // is there more waiting to send?
if ((m_xmit_read != m_xmit_write) || (m_uart_xmitfull)) if (m_tx_waiting)
{ {
transmit_register_setup(m_xmitring[m_xmit_read++]); transmit_register_setup(m_xmitring[m_xmit_read++]);
if (m_xmit_read >= MIDI_RING_SIZE) if (m_xmit_read >= MIDI_RING_SIZE)
{ {
m_xmit_read = 0; m_xmit_read = 0;
} }
m_uart_xmitfull = false; m_tx_waiting--;
} }
else else
{ {
@ -1610,11 +1629,7 @@ void sb_device::xmit_char(UINT8 data)
{ {
m_xmit_write = 0; m_xmit_write = 0;
} }
m_tx_waiting++;
if (m_xmit_write == m_xmit_read)
{
m_uart_xmitfull = true;
}
} }
} }

5
src/mess/machine/isa_sblaster.h
View File

@ -117,6 +117,8 @@ public:
DECLARE_WRITE8_MEMBER(dsp_rbuf_status_w); DECLARE_WRITE8_MEMBER(dsp_rbuf_status_w);
DECLARE_WRITE8_MEMBER(dsp_cmd_w); DECLARE_WRITE8_MEMBER(dsp_cmd_w);
DECLARE_WRITE_LINE_MEMBER( midi_rx_w ) { check_for_start((UINT8)state); }
protected: protected:
// device-level overrides // device-level overrides
virtual void device_reset(); virtual void device_reset();
@ -140,7 +142,8 @@ protected:
struct sb8_dsp_state m_dsp; struct sb8_dsp_state m_dsp;
UINT8 m_dack_out; UINT8 m_dack_out;
void xmit_char(UINT8 data); void xmit_char(UINT8 data);
bool m_onebyte_midi, m_uart_midi, m_uart_irq, m_mpu_midi, m_uart_xmitfull; bool m_onebyte_midi, m_uart_midi, m_uart_irq, m_mpu_midi;
int m_rx_waiting, m_tx_waiting;
UINT8 m_recvring[MIDI_RING_SIZE]; UINT8 m_recvring[MIDI_RING_SIZE];
UINT8 m_xmitring[MIDI_RING_SIZE]; UINT8 m_xmitring[MIDI_RING_SIZE];
int m_xmit_read, m_xmit_write; int m_xmit_read, m_xmit_write;