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

fix bug pointed out by tafoid (nw)

Browse Source
This commit is contained in:
cracyc 2013-05-31 23:06:26 +00:00
parent 527addf6e4
commit 014690a744
3 changed files with 10 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mame/drivers/magtouch.c
View File

@ -92,11 +92,8 @@ public:
required_device<ns16450_device> m_uart;
required_device<microtouch_serial_device> m_microtouch;
DECLARE_WRITE_LINE_MEMBER(microtouch_out);
DECLARE_WRITE_LINE_MEMBER(microtouch_in);
DECLARE_READ8_MEMBER(magtouch_io_r);
DECLARE_WRITE8_MEMBER(magtouch_io_w);
DECLARE_WRITE_LINE_MEMBER(at_com_interrupt_1);
DECLARE_DRIVER_INIT(magtouch);
virtual void machine_start();
};
@ -108,34 +105,19 @@ public:
*
*************************************/
WRITE_LINE_MEMBER(magtouch_state::microtouch_out)
{
m_microtouch->rx(state);
}
WRITE_LINE_MEMBER(magtouch_state::microtouch_in)
{
m_uart->rx_w(state);
}
WRITE_LINE_MEMBER(magtouch_state::at_com_interrupt_1)
{
machine().device<pic8259_device>("pic8259_1")->ir4_w(state);
}
static const ins8250_interface magtouch_com0_interface =
{
DEVCB_DRIVER_LINE_MEMBER(magtouch_state, microtouch_out),
DEVCB_DEVICE_LINE_MEMBER("microtouch", microtouch_serial_device, rx),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_LINE_MEMBER(magtouch_state,at_com_interrupt_1),
DEVCB_DEVICE_LINE_MEMBER("pic8259_1", pic8259_device, ir4_w),
DEVCB_NULL,
DEVCB_NULL
};
static const microtouch_serial_interface magtouch_microtouch_interface =
{
DEVCB_DRIVER_LINE_MEMBER(magtouch_state, microtouch_in)
DEVCB_DEVICE_LINE_MEMBER("ns16450_0", ins8250_uart_device, rx_w)
};
/*************************************

2
src/mame/drivers/mediagx.c
View File

@ -917,7 +917,7 @@ static MACHINE_CONFIG_START( mediagx, mediagx_state )
MCFG_PCI_BUS_LEGACY_DEVICE(18, NULL, cx5510_pci_r, cx5510_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir6_w))
MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_TIMER_DRIVER_ADD("sound_timer", mediagx_state, sound_timer_callback)

54
src/mame/drivers/quakeat.c
View File

@ -60,26 +60,19 @@ TODO:
#include "emu.h"
#include "cpu/i386/i386.h"
#include "machine/pic8259.h"
/* Insert IBM PC includes here */
#include "machine/pcshare.h"
class quakeat_state : public driver_device
class quakeat_state : public pcat_base_state
{
public:
quakeat_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
: pcat_base_state(mconfig, type, tag)
{ }
pic8259_device *m_pic8259_1;
pic8259_device *m_pic8259_2;
DECLARE_WRITE_LINE_MEMBER(quakeat_pic8259_1_set_int_line);
DECLARE_READ8_MEMBER(get_slave_ack);
virtual void machine_start();
virtual void video_start();
UINT32 screen_update_quake(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
IRQ_CALLBACK_MEMBER(irq_callback);
required_device<cpu_device> m_maincpu;
};
@ -97,14 +90,7 @@ static ADDRESS_MAP_START( quake_map, AS_PROGRAM, 32, quakeat_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( quake_io, AS_IO, 32, quakeat_state )
// AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8_LEGACY("dma8237_1", dma8237_r, dma8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_device, read, write, 0xffffffff)
// AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8_LEGACY("pit8254", pit8253_r, pit8253_w, 0xffffffff)
// AM_RANGE(0x0060, 0x006f) AM_READWRITE(kbdc8042_32le_r, kbdc8042_32le_w)
// AM_RANGE(0x0070, 0x007f) AM_DEVREADWRITE8("rtc", mc146818_device, read, write, 0xffffffff)
// AM_RANGE(0x0080, 0x009f) AM_READWRITE(at_page32_r, at_page32_w)
AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8("pic8259_2", pic8259_device, read, write, 0xffffffff)
// AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE_LEGACY("dma8237_2", at32_dma8237_2_r, at32_dma8237_2_w)
AM_IMPORT_FROM(pcat32_io_common)
AM_RANGE(0x00e8, 0x00eb) AM_NOP
// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE_LEGACY("ide", ide_r, ide_w)
AM_RANGE(0x0300, 0x03af) AM_NOP
@ -115,25 +101,6 @@ static ADDRESS_MAP_START( quake_io, AS_IO, 32, quakeat_state )
// AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_device, read, write)
ADDRESS_MAP_END
/*************************************************************
*
* pic8259 configuration
*
*************************************************************/
WRITE_LINE_MEMBER(quakeat_state::quakeat_pic8259_1_set_int_line)
{
m_maincpu->set_input_line(0, state ? HOLD_LINE : CLEAR_LINE);
}
READ8_MEMBER(quakeat_state::get_slave_ack)
{
if (offset==2) { // IRQ = 2
return m_pic8259_2->acknowledge();
}
return 0x00;
}
/*************************************************************/
static INPUT_PORTS_START( quake )
@ -141,17 +108,10 @@ INPUT_PORTS_END
/*************************************************************/
IRQ_CALLBACK_MEMBER(quakeat_state::irq_callback)
{
return m_pic8259_1->acknowledge();
}
void quakeat_state::machine_start()
{
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(quakeat_state::irq_callback),this));
m_pic8259_1 = machine().device<pic8259_device>( "pic8259_1" );
m_pic8259_2 = machine().device<pic8259_device>( "pic8259_2" );
}
/*************************************************************/
@ -161,9 +121,7 @@ static MACHINE_CONFIG_START( quake, quakeat_state )
MCFG_CPU_PROGRAM_MAP(quake_map)
MCFG_CPU_IO_MAP(quake_io)
MCFG_PIC8259_ADD( "pic8259_1", WRITELINE(quakeat_state,quakeat_pic8259_1_set_int_line), VCC, READ8(quakeat_state,get_slave_ack) )
MCFG_PIC8259_ADD( "pic8259_2", DEVWRITELINE("pic8259_1", pic8259_device, ir2_w), GND, NULL )
MCFG_FRAGMENT_ADD( pcat_common )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)