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

more cleanup (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2013-04-19 12:00:24 +00:00
parent 60bd953c5f
commit 1056c6e5fc
33 changed files with 37 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -1332,8 +1332,8 @@ src/emu/machine/pcf8593.c svneol=native#text/plain
src/emu/machine/pcf8593.h svneol=native#text/plain
src/emu/machine/pci.c svneol=native#text/plain
src/emu/machine/pci.h svneol=native#text/plain
src/emu/machine/pckeybrd.c svneol=native#text/plain
src/emu/machine/pckeybrd.h svneol=native#text/plain
src/emu/machine/pcshare.h svneol=native#text/plain
src/emu/machine/pd4990a.c svneol=native#text/plain
src/emu/machine/pd4990a.h svneol=native#text/plain
src/emu/machine/pic8259.c svneol=native#text/plain
@ -5001,8 +5001,8 @@ src/mame/machine/opwolf.c svneol=native#text/plain
src/mame/machine/pacplus.c svneol=native#text/plain
src/mame/machine/pcecommn.c svneol=native#text/plain
src/mame/machine/pcecommn.h svneol=native#text/plain
src/mame/machine/pckeybrd.c svneol=native#text/plain
src/mame/machine/pcshare.c svneol=native#text/plain
src/mame/machine/pcshare.h svneol=native#text/plain
src/mame/machine/pgmcrypt.c svneol=native#text/plain
src/mame/machine/pgmcrypt.h svneol=native#text/plain
src/mame/machine/pgmprot.c svneol=native#text/plain

1
src/emu/emu.mak
View File

@ -250,6 +250,7 @@ EMUMACHINEOBJS = \
$(EMUMACHINE)/pc16552d.o \
$(EMUMACHINE)/pcf8593.o \
$(EMUMACHINE)/pci.o \
$(EMUMACHINE)/pckeybrd.o \
$(EMUMACHINE)/pd4990a.o \
$(EMUMACHINE)/pic8259.o \
$(EMUMACHINE)/pit8253.o \

1
src/emu/machine/8042kbdc.c
View File

@ -177,7 +177,6 @@
#include "machine/pckeybrd.h"
#include "machine/8042kbdc.h"
#include "machine/pcshare.h"
/***************************************************************************

2
src/mame/machine/pckeybrd.c → src/emu/machine/pckeybrd.c
View File

@ -17,7 +17,7 @@
*/
#include "emu.h"
#include "machine/pckeybrd.h"
#include "pckeybrd.h"
/* AT keyboard documentation comes from www.beyondlogic.org and HelpPC documentation */

3
src/emu/machine/pcshare.h
View File

@ -1,3 +0,0 @@
extern IRQ_CALLBACK(pcat_irq_callback);
ADDRESS_MAP_EXTERN(pcat32_io_common, 32);
MACHINE_CONFIG_EXTERN(pcat_common);

1
src/mame/drivers/calchase.c
View File

@ -117,7 +117,6 @@ something wrong in the disk geometry reported by calchase.chd (20,255,63) since
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/funkball.c
View File

@ -73,7 +73,6 @@ Notes:
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/gamecstl.c
View File

@ -68,7 +68,6 @@
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/gammagic.c
View File

@ -36,7 +36,6 @@ Additional CD-ROM games: "99 Bottles of Beer"
//#include "machine/i82439tx.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

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

@ -84,14 +84,13 @@ video card
#include "video/pc_vga.h"
class magtouch_state : public driver_device
class magtouch_state : public pcat_base_state
{
public:
magtouch_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
: pcat_base_state(mconfig, type, tag),
m_uart(*this, "ns16450_0"),
m_microtouch(*this, "microtouch"),
m_maincpu(*this, "maincpu") { }
m_microtouch(*this, "microtouch"){ }
required_device<ns16450_device> m_uart;
required_device<microtouch_serial_device> m_microtouch;
@ -104,7 +103,6 @@ public:
DECLARE_READ8_MEMBER(get_out2);
DECLARE_DRIVER_INIT(magtouch);
virtual void machine_start();
required_device<cpu_device> m_maincpu;
};
@ -219,7 +217,7 @@ static const struct kbdc8042_interface at8042 =
void magtouch_state::machine_start()
{
m_maincpu->set_irq_acknowledge_callback(pcat_irq_callback);
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(magtouch_state::irq_callback),this));
membank("rombank")->configure_entries(0, 0x80, memregion("game_prg")->base(), 0x8000 );
membank("rombank")->set_entry(0);

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

@ -70,7 +70,6 @@
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/midqslvr.c
View File

@ -28,7 +28,6 @@
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

8
src/mame/drivers/pangofun.c
View File

@ -102,17 +102,15 @@ Arcade Version (Coin-Op) by InfoCube (Pisa, Italy)
#include "video/pc_vga.h"
class pangofun_state : public driver_device
class pangofun_state : public pcat_base_state
{
public:
pangofun_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) { }
DECLARE_READ8_MEMBER(get_out2);
DECLARE_DRIVER_INIT(pangofun);
virtual void machine_start();
required_device<cpu_device> m_maincpu;
};
@ -191,7 +189,7 @@ static const struct kbdc8042_interface at8042 =
void pangofun_state::machine_start()
{
m_maincpu->set_irq_acknowledge_callback(pcat_irq_callback);
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(pangofun_state::irq_callback),this));
}
static MACHINE_CONFIG_START( pangofun, pangofun_state )

8
src/mame/drivers/pcat_dyn.c
View File

@ -37,17 +37,15 @@ keyboard trick;
#include "video/pc_vga.h"
class pcat_dyn_state : public driver_device
class pcat_dyn_state : public pcat_base_state
{
public:
pcat_dyn_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) { }
DECLARE_READ8_MEMBER(get_out2);
DECLARE_DRIVER_INIT(pcat_dyn);
virtual void machine_start();
required_device<cpu_device> m_maincpu;
};
@ -129,7 +127,7 @@ static const struct kbdc8042_interface at8042 =
void pcat_dyn_state::machine_start()
{
m_maincpu->set_irq_acknowledge_callback(pcat_irq_callback);
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(pcat_dyn_state::irq_callback),this));
}
static MACHINE_CONFIG_START( pcat_dyn, pcat_dyn_state )

12
src/mame/drivers/pcat_nit.c
View File

@ -93,14 +93,13 @@ Smitdogg
#include "machine/8042kbdc.h"
#include "machine/pit8253.h"
class pcat_nit_state : public driver_device
class pcat_nit_state : public pcat_base_state
{
public:
pcat_nit_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
: pcat_base_state(mconfig, type, tag),
m_uart(*this, "ns16450_0"),
m_microtouch(*this, "microtouch"),
m_maincpu(*this, "maincpu") { }
m_microtouch(*this, "microtouch") { }
UINT8 *m_banked_nvram;
required_device<ns16450_device> m_uart;
@ -113,8 +112,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(at_com_interrupt_1);
DECLARE_DRIVER_INIT(pcat_nit);
DECLARE_READ8_MEMBER(get_out2);
virtual void machine_start();
required_device<cpu_device> m_maincpu;
virtual void machine_start();
};
WRITE_LINE_MEMBER(pcat_nit_state::microtouch_out)
@ -247,7 +245,7 @@ static const struct kbdc8042_interface at8042 =
void pcat_nit_state::machine_start()
{
m_maincpu->set_irq_acknowledge_callback(pcat_irq_callback);
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(pcat_nit_state::irq_callback),this));
membank("rombank")->configure_entries(0, 0x80, memregion("game_prg")->base(), 0x8000 );
membank("rombank")->set_entry(0);

1
src/mame/drivers/photoply.c
View File

@ -15,7 +15,6 @@ TODO:
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/queen.c
View File

@ -30,7 +30,6 @@ processor speed is 533MHz <- likely to be a Celeron or a Pentium III class CPU -
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/savquest.c
View File

@ -31,7 +31,6 @@
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

20
src/mame/drivers/su2000.c
View File

@ -64,12 +64,11 @@
*
*************************************/
class su2000_state : public driver_device
class su2000_state : public pcat_base_state
{
public:
su2000_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){ }
device_t *m_pit8254;
device_t *m_pic8259_1;
@ -83,8 +82,6 @@ public:
DECLARE_READ8_MEMBER(get_slave_ack);
virtual void machine_start();
virtual void machine_reset();
IRQ_CALLBACK_MEMBER(irq_callback);
required_device<cpu_device> m_maincpu;
};
@ -218,19 +215,6 @@ static const struct pit8253_config su2000_pit8254_config =
}
};
/*************************************
*
* Interrupt Generation
*
*************************************/
IRQ_CALLBACK_MEMBER(su2000_state::irq_callback)
{
return pic8259_acknowledge(m_pic8259_1);
}
/*************************************
*
* Initialization

1
src/mame/drivers/taitowlf.c
View File

@ -31,7 +31,6 @@ clocks 50MHz (near 3DFX) and 14.31818MHz (near RAMDAC)
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/voyager.c
View File

@ -18,7 +18,6 @@ TODO: VIA KT133a chipset support, GeForce 2MX video support, lots of things ;-)
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

1
src/mame/drivers/xtom3d.c
View File

@ -44,7 +44,6 @@ MX29F1610MC 16M FlashROM (x7)
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/mc146818.h"
#include "machine/pcshare.h"
#include "machine/pci.h"
#include "machine/8042kbdc.h"
#include "machine/pckeybrd.h"

4
src/mame/machine/pcshare.c
View File

@ -172,9 +172,9 @@ static const struct pic8259_interface pic8259_2_config =
DEVCB_NULL
};
IRQ_CALLBACK(pcat_irq_callback)
IRQ_CALLBACK_MEMBER(pcat_base_state::irq_callback)
{
return pic8259_acknowledge(device->machine().device("pic8259_1"));
return pic8259_acknowledge(machine().device("pic8259_1"));
}
static WRITE_LINE_DEVICE_HANDLER( at_pit8254_out0_changed )

14
src/mame/machine/pcshare.h Normal file
View File

@ -0,0 +1,14 @@
class pcat_base_state : public driver_device
{
public:
pcat_base_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
IRQ_CALLBACK_MEMBER(irq_callback);
required_device<cpu_device> m_maincpu;
};
ADDRESS_MAP_EXTERN(pcat32_io_common, 32);
MACHINE_CONFIG_EXTERN(pcat_common);

1
src/mame/mame.mak
View File

@ -374,7 +374,6 @@ DRVLIBS += \
$(MAMEOBJ)/shared.a: \
$(MACHINE)/nmk112.o \
$(MACHINE)/pckeybrd.o \
$(MACHINE)/pcshare.o \
$(MACHINE)/segacrpt.o \
$(MACHINE)/segacrp2.o \

1
src/mess/drivers/amstr_pc.c
View File

@ -47,7 +47,6 @@ More information can be found at http://www.seasip.info/AmstradXT/1640tech/index
#include "includes/amstr_pc.h"
#include "machine/pcshare.h"
#include "includes/pc.h"
#include "imagedev/flopdrv.h"

1
src/mess/drivers/ip22.c
View File

@ -47,7 +47,6 @@
#include "includes/at.h"
#include "machine/8042kbdc.h"
#include "machine/pit8253.h"
#include "machine/pcshare.h"
#include "video/newport.h"
#include "sound/dac.h"
#include "machine/nvram.h"

1
src/mess/drivers/pc.c
View File

@ -84,7 +84,6 @@ video HW too.
#include "includes/europc.h"
#include "includes/tandy1t.h"
#include "machine/pcshare.h"
#include "includes/pc.h"
#include "imagedev/flopdrv.h"

1
src/mess/machine/amstr_pc.c
View File

@ -2,7 +2,6 @@
#include "machine/pit8253.h"
#include "machine/pc_lpt.h"
#include "machine/pcshare.h"
#include "includes/amstr_pc.h"
#include "includes/pc.h"
#include "video/pc_vga.h"

1
src/mess/machine/europc.c
View File

@ -1,6 +1,5 @@
#include "emu.h"
#include "includes/europc.h"
#include "machine/pcshare.h"
#include "machine/pit8253.h"
#include "coreutil.h"

1
src/mess/machine/pc.c
View File

@ -30,7 +30,6 @@
#include "machine/pc_fdc.h"
#include "machine/upd765.h"
#include "includes/amstr_pc.h"
#include "machine/pcshare.h"
#include "imagedev/cassette.h"
#include "sound/speaker.h"

2
src/mess/machine/tandy1t.c
View File

@ -1,8 +1,6 @@
#include "emu.h"
#include "machine/pckeybrd.h"
#include "machine/pcshare.h"
#include "includes/pc.h"
#include "machine/pit8253.h"
#include "includes/tandy1t.h"

2
src/mess/mess.mak
View File

@ -430,7 +430,6 @@ DRVLIBS += \
#-------------------------------------------------
$(MESSOBJ)/mame.a: \
$(MAME_MACHINE)/pckeybrd.o \
$(MAME_MACHINE)/archimds.o \
$(MAME_VIDEO)/archimds.o \
$(MAME_VIDEO)/amiga.o \
@ -459,7 +458,6 @@ $(MESSOBJ)/mame.a: \
$(MAME_VIDEO)/rdpblend.o \
$(MAME_VIDEO)/rdptpipe.o \
$(MAME_VIDEO)/rdpspn16.o \
$(MAME_MACHINE)/pcshare.o \
$(MAME_MACHINE)/megadriv.o \
$(MAME_MACHINE)/megacd.o \
$(MAME_MACHINE)/megacdcd.o \