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

More cleanups, there is issue with srcclean that needs to be taken care as well, just doing now what we can

Browse Source
This commit is contained in:
Miodrag Milanovic 2014-07-22 06:21:54 +00:00
parent 5d7e1fcc62
commit 79246ab917
382 changed files with 9321 additions and 9413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hash/abc80.xml
View File

@ -63,7 +63,7 @@
<description>Kundregister</description>
<year>19??</year>
<publisher>&lt;unknown&gt;</publisher>
<part name="flop1" interface="floppy_5_25">
<dataarea name="flop" size="79143">
<rom name="fd2_bifak.imd" size="79143" crc="a741ad5d" sha1="a0cb8cc31a30fcbea258dd5249845819930e60c2" offset="0" />

16
hash/cc40_cart.xml
View File

@ -5,14 +5,14 @@
<!--
Not included in list:
- SS-1000 16KB RAM
- SS-2000 8KB RAM, battery backed
Also, not sure if these exist, probably canceled:
- Business Graphics
- Games II
- Perspective Drawing
Not included in list:
- SS-1000 16KB RAM
- SS-2000 8KB RAM, battery backed
Also, not sure if these exist, probably canceled:
- Business Graphics
- Games II
- Perspective Drawing
-->

8
hash/hp9835a_rom.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<softwarelist name="hp9835a_rom" description="HP 9835A/B Option ROMs">
<software name="mass">
<description>Mass Storage</description>
<year>198?</year>
@ -16,7 +16,7 @@
</dataarea>
</part>
</software>
<software name="io">
<description>I/O</description>
<year>198?</year>
@ -32,7 +32,7 @@
</dataarea>
</part>
</software>
<software name="asmexec">
<description>Assembly Execution</description>
<year>198?</year>
@ -45,7 +45,7 @@
</dataarea>
</part>
</software>
<software name="asmdev">
<description>Assembly Language Development &amp; Execution</description>
<year>198?</year>

16
hash/hp9845a_rom.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<softwarelist name="hp9845a_rom" description="HP 9845A/S Option ROMs">
<software name="mass">
<description>Mass Storage</description>
<year>198?</year>
@ -15,7 +15,7 @@
</dataarea>
</part>
</software>
<software name="iolpu">
<description>I/O LPU</description>
<year>198?</year>
@ -28,7 +28,7 @@
</dataarea>
</part>
</software>
<software name="ioppu">
<description>I/O PPU</description>
<year>198?</year>
@ -41,7 +41,7 @@
</dataarea>
</part>
</software>
<software name="graphics">
<description>Graphics</description>
<year>198?</year>
@ -54,7 +54,7 @@
</dataarea>
</part>
</software>
<software name="pdr45">
<description>PDR-45</description>
<year>198?</year>
@ -68,7 +68,7 @@
</dataarea>
</part>
</software>
<software name="progtkit">
<description>Programmer's Toolkit</description>
<year>198?</year>
@ -82,7 +82,7 @@
</dataarea>
</part>
</software>
<software name="cfmms">
<description>HP 9845B Command File/Memory Mass Storage ROM (Rev A)</description>
<year>198?</year>
@ -95,7 +95,7 @@
</dataarea>
</part>
</software>
<software name="cfmmsb" cloneof="cfmms">
<description>HP 9845B Command File/Memory Mass Storage ROM (Rev B)</description>
<year>198?</year>

42
hash/hp9845b_rom.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<softwarelist name="hp9845b_rom" description="HP 9845B/T/C Option ROMs">
<software name="mass">
<description>Mass Storage (Rev B)</description>
<year>198?</year>
@ -16,7 +16,7 @@
</dataarea>
</part>
</software>
<software name="massc" cloneof="mass">
<description>Mass Storage (Rev C)</description>
<year>198?</year>
@ -30,7 +30,7 @@
</dataarea>
</part>
</software>
<software name="massd" cloneof="mass">
<description>Mass Storage (Rev D)</description>
<year>198?</year>
@ -45,7 +45,7 @@
</dataarea>
</part>
</software>
<software name="graphics">
<description>Graphics</description>
<year>198?</year>
@ -59,7 +59,7 @@
</dataarea>
</part>
</software>
<software name="iolpu">
<description>I/O LPU (Rev A)</description>
<year>198?</year>
@ -73,7 +73,7 @@
</dataarea>
</part>
</software>
<software name="iolpub" cloneof="iolpu">
<description>I/O LPU (Rev B)</description>
<year>198?</year>
@ -87,7 +87,7 @@
</dataarea>
</part>
</software>
<software name="ioppu">
<description>I/O PPU (Rev B)</description>
<year>198?</year>
@ -101,7 +101,7 @@
</dataarea>
</part>
</software>
<software name="ioppuc" cloneof="ioppu">
<description>I/O PPU (Rev C)</description>
<year>198?</year>
@ -115,7 +115,7 @@
</dataarea>
</part>
</software>
<software name="advprog">
<description>Advanced Programming</description>
<year>198?</year>
@ -128,7 +128,7 @@
</dataarea>
</part>
</software>
<software name="asmexec">
<description>Assembly Execution</description>
<year>198?</year>
@ -142,7 +142,7 @@
</dataarea>
</part>
</software>
<software name="asmdev">
<description>Assembly Development &amp; Execution</description>
<year>198?</year>
@ -158,7 +158,7 @@
</dataarea>
</part>
</software>
<software name="image45">
<description>IMAGE/45 Database Manager (Rev B)</description>
<year>198?</year>
@ -178,7 +178,7 @@
</dataarea>
</part>
</software>
<software name="image45c" cloneof="image45">
<description>IMAGE/45 Database Manager (Rev C)</description>
<year>198?</year>
@ -198,7 +198,7 @@
</dataarea>
</part>
</software>
<software name="strucprg">
<description>Structured Programming</description>
<year>198?</year>
@ -211,7 +211,7 @@
</dataarea>
</part>
</software>
<software name="resmgmt">
<description>Resource Management</description>
<year>198?</year>
@ -229,7 +229,7 @@
</dataarea>
</part>
</software>
<software name="test">
<description>Test ROM</description>
<year>198?</year>
@ -243,7 +243,7 @@
</dataarea>
</part>
</software>
<software name="datacomm">
<description>BASIC Datacomm</description>
<year>198?</year>
@ -259,7 +259,7 @@
</dataarea>
</part>
</software>
<software name="bisync">
<description>RJE Bisync</description>
<year>198?</year>
@ -273,7 +273,7 @@
</dataarea>
</part>
</software>
<software name="colorgfx">
<description>Color Graphics</description>
<year>198?</year>
@ -289,7 +289,7 @@
</dataarea>
</part>
</software>
<software name="enhgfx">
<description>Enhanced Graphics (Rev A)</description>
<year>198?</year>
@ -306,7 +306,7 @@
</dataarea>
</part>
</software>
<software name="enhgfxb" cloneof="enhgfx">
<description>Enhanced Graphics (Rev B)</description>
<year>198?</year>

38
hash/msx1_cart.xml
View File

@ -1038,7 +1038,7 @@ kept for now until finding out what those bytes affect...
<info name="alt_title" value="スーパーレイドック(THE LINKS NETWORK VERSION)" />
<part name="cart" interface="msx_cart">
<feature name="pcb" value="TA6228" />
<feature name="slot" value="ascii8" />
<feature name="slot" value="ascii8" />
<feature name="mapper" value="M60002-0125SP" />
<dataarea name="rom" size="262144">
<rom name="lh532045" size="262144" crc="" sha1="" offset="0" />
@ -1071,7 +1071,7 @@ kept for now until finding out what those bytes affect...
<info name="alt_title" value="シンセサウルス" />
<part name="cart" interface="msx_cart">
<feature name="pcb" value="TAS-1M-008S" />
<feature name="slot" value="ascii8" />
<feature name="slot" value="ascii8" />
<feature name="mapper" value="LZ93A13" />
<dataarea name="rom" size="131072">
<rom name="m5m27512p" size="131072" crc="" sha1="" offset="0" />
@ -1088,7 +1088,7 @@ kept for now until finding out what those bytes affect...
<info name="alt_title" value="シンセサウルス" />
<part name="cart" interface="msx_cart">
<feature name="pcb" value="TAS-2M008-E2M" />
<feature name="slot" value="ascii8" />
<feature name="slot" value="ascii8" />
<feature name="mapper" value="LZ93A13" />
<dataarea name="rom" size="262144">
<rom name="m5m27512p" size="131072" crc="" sha1="" offset="0" />
@ -14568,31 +14568,31 @@ kept for now until finding out what those bytes affect...
<!--
This memory is currently declared as a memory region inside the nms1205 implementation otherwise the
legacy FM implementations cannot find it.
<dataarea name="ram" size="32768">
</dataarea>
<dataarea name="ram" size="32768">
</dataarea>
-->
</part>
</software>
<!--
<software name="nms1205v10" cloneof="nms1205" supported="no">
<description>Philips NMS-1205 Music Module v1.0</description>
<year>198?</year>
<publisher>Philips</publisher>
<part name="cart" interface="msx_cart">
<feature name="slot" value="msxaud_nms1205" />
<dataarea name="rom" size="32768">
<!- - SUM16: 53BF - ->
<rom name="nms1205_53bf.bin" size="32768" crc="6e68bd44" sha1="146d9738b6d534277dab9b41a07556ffec9065b9" status="baddump" offset="0" />
</dataarea>
<software name="nms1205v10" cloneof="nms1205" supported="no">
<description>Philips NMS-1205 Music Module v1.0</description>
<year>198?</year>
<publisher>Philips</publisher>
<part name="cart" interface="msx_cart">
<feature name="slot" value="msxaud_nms1205" />
<dataarea name="rom" size="32768">
<!- - SUM16: 53BF - ->
<rom name="nms1205_53bf.bin" size="32768" crc="6e68bd44" sha1="146d9738b6d534277dab9b41a07556ffec9065b9" status="baddump" offset="0" />
</dataarea>
<!- -
This memory is currently declared as a memory region inside the nms1205 implementation otherwise the
legacy FM implementations cannot find it.
<dataarea name="ram" size="32768">
</dataarea>
<dataarea name="ram" size="32768">
</dataarea>
- ->
</part>
</software>
</part>
</software>
-->
<!-- Dictionary ROMs? -->

6
hash/msx2_cart.xml
View File

@ -836,7 +836,7 @@ LZ93A13 (32 pin) - 8KB banks
<info name="alt_title" value="ミケランジェロⅡ" />
<part name="cart" interface="msx_cart">
<feature name="pcb" value="1M-8KB" />
<feature name="slot" value="ascii8" />
<feature name="slot" value="ascii8" />
<feature name="mapper" value="NEOS MR6401" />
<dataarea name="rom" size="131072">
<rom name="rp231024d" size="131072" crc="" sha1="" offset="0" />
@ -3167,7 +3167,7 @@ LZ93A13 (32 pin) - 8KB banks
</part>
</software>
<!-- This is the sound cartridge that came with the game SD Snatcher. This should eventually be
<!-- This is the sound cartridge that came with the game SD Snatcher. This should eventually be
combined in one software description including the Sound cartridge and the floppies.
This sound cartridge can _not_ be used with the MSX Game Collections from Konami.
-->
@ -3177,7 +3177,7 @@ LZ93A13 (32 pin) - 8KB banks
<publisher>Konami</publisher>
<part name="cart" interface="msx_cart">
<feature name="slot" value="sound_sdsnatch" />
<dataarea name="ram" size="65536">
<dataarea name="ram" size="65536">
</dataarea>
</part>
</software>

20
hash/msx2_flop.xml
View File

@ -297,16 +297,16 @@ The following floppies came with the machines.
</software>
<!--
<software name="">
<description></description>
<year></year>
<publisher></publisher>
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="737280">
<rom name="" size="737280" crc="" sha1="" offset="0" />
</dataarea>
</part>
</software>
<software name="">
<description></description>
<year></year>
<publisher></publisher>
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="737280">
<rom name="" size="737280" crc="" sha1="" offset="0" />
</dataarea>
</part>
</software>
-->
<software name="arc">

1818
hash/neogeo.xml
View File

File diff suppressed because it is too large Load Diff

6
hash/nes.xml
View File

@ -8428,10 +8428,10 @@
<feature name="mmc1_type" value="MMC1B2" />
<feature name="pcb_model" value="HVC-SXROM-01" />
<feature name="u1" value="U1 PRG-ROM" />
<feature name="u2" value="U2 CHR-RAM" /> <!-- LH5168FB-10L -->
<feature name="u2" value="U2 CHR-RAM" /> <!-- LH5168FB-10L -->
<feature name="u3" value="U3 MMC1" />
<feature name="u4" value="U4 W-RAM" /> <!-- LH52A256-10LL -->
<feature name="u5" value="U5 HCU04" /> <!-- 74HCU04AP -->
<feature name="u4" value="U4 W-RAM" /> <!-- LH52A256-10LL -->
<feature name="u5" value="U5 HCU04" /> <!-- 74HCU04AP -->
<dataarea name="prg" size="131072">
<rom name="ath-87-0 prg.u1" size="131072" crc="d1e50064" sha1="bd442a386741ee63c0dcbbd46b3f53fb60a6d45d" offset="00000" />
</dataarea>

2
hash/sc3000_cass.xml
View File

@ -13,5 +13,5 @@
</dataarea>
</part>
</software>
</softwarelist>

2
hash/snes.xml
View File

@ -3262,7 +3262,7 @@ Beyond that last category are the roms waiting to be classified.
</software>
<software name="contra3p" cloneof="sprobot">
<!-- Notes: this rom image was released in 2014 without any documentation, despite its name, it is a prototype of Contra III
<!-- Notes: this rom image was released in 2014 without any documentation, despite its name, it is a prototype of Contra III
the rom was overdumped to 4MiB likely due to header based dumping tools, the right size "should be" 1MiB -->
<description>Contra IV - The Alien Wars (USA, Prototype)</description>
<year>1992</year>

4
hash/tandy2k.xml
View File

@ -4,9 +4,9 @@
<!--
Undumped and most wanted:
Undumped and most wanted:
#700-2611 Driver disk for Windows 1.03
#700-2611 Driver disk for Windows 1.03
-->

2
src/emu/addrmap.h
View File

@ -130,7 +130,7 @@ public:
write16_delegate m_wproto16; // 16-bit write proto-delegate
write32_delegate m_wproto32; // 32-bit write proto-delegate
write64_delegate m_wproto64; // 64-bit write proto-delegate
setoffset_delegate m_soproto; // set offset proto-delegate
address_map_delegate m_submap_delegate;
int m_submap_bits;

4
src/emu/bus/a1bus/a1bus.h
View File

@ -75,7 +75,7 @@ public:
// construction/destruction
a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); }
@ -97,7 +97,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
// internal state
cpu_device *m_maincpu;

6
src/emu/bus/a2bus/a2bus.h
View File

@ -32,7 +32,7 @@
#define MCFG_A2BUS_OUT_INH_CB(_devcb) \
devcb = &a2bus_device::set_out_inh_callback(*device, DEVCB_##_devcb);
#define MCFG_A2BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, A2BUS_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@ -83,7 +83,7 @@ public:
// construction/destruction
a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(object); }
@ -104,7 +104,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
// internal state
cpu_device *m_maincpu;

8
src/emu/bus/a2bus/a2eauxslot.h
View File

@ -20,13 +20,13 @@
#define MCFG_A2EAUXSLOT_CPU(_cputag) \
a2eauxslot_device::static_set_cputag(*device, _cputag);
#define MCFG_A2EAUXSLOT_OUT_IRQ_CB(_devcb) \
devcb = &a2eauxslot_device::set_out_irq_callback(*device, DEVCB_##_devcb);
#define MCFG_A2EAUXSLOT_OUT_NMI_CB(_devcb) \
devcb = &a2eauxslot_device::set_out_nmi_callback(*device, DEVCB_##_devcb);
#define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, A2EAUXSLOT_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@ -71,12 +71,12 @@ public:
// construction/destruction
a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(object); }
void add_a2eauxslot_card(device_a2eauxslot_card_interface *card);
device_a2eauxslot_card_interface *get_a2eauxslot_card();

2
src/emu/bus/a2bus/a2mcms.h
View File

@ -106,7 +106,7 @@ protected:
virtual bool take_c800() { return false; }
private:
a2bus_mcms1_device *m_card1; // card 1 for passthrough
a2bus_mcms1_device *m_card1; // card 1 for passthrough
mcms_device *m_engine;
};

4
src/emu/bus/amiga/zorro/a2052.h
View File

@ -1,11 +1,11 @@
/***************************************************************************
Commodore A2052
Commodore A2052
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
Zorro-II RAM Expansion (0.5, 1 or 2 MB)
Zorro-II RAM Expansion (0.5, 1 or 2 MB)
***************************************************************************/

6
src/emu/bus/amiga/zorro/a2232.h
View File

@ -1,13 +1,13 @@
/***************************************************************************
Commodore A2232
Commodore A2232
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
Zorro-II Serial Card
Zorro-II Serial Card
Provides the Amiga with 7 additional RS232 ports.
Provides the Amiga with 7 additional RS232 ports.
***************************************************************************/

4
src/emu/bus/amiga/zorro/a590.h
View File

@ -1,11 +1,11 @@
/***************************************************************************
Commodore A590 / A2091
Commodore A590 / A2091
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
DMAC based SCSI controller for the Amiga 500 and Zorro-II
DMAC based SCSI controller for the Amiga 500 and Zorro-II
***************************************************************************/

4
src/emu/bus/amiga/zorro/action_replay.h
View File

@ -1,11 +1,11 @@
/***************************************************************************
Datel Action Replay
Datel Action Replay
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
Freezer cartridge for Amiga 500 and Amiga 2000
Freezer cartridge for Amiga 500 and Amiga 2000
***************************************************************************/

4
src/emu/bus/amiga/zorro/buddha.h
View File

@ -1,11 +1,11 @@
/***************************************************************************
Buddha
Buddha
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
Zorro-II IDE controller
Zorro-II IDE controller
***************************************************************************/

26
src/emu/bus/amiga/zorro/cards.h
View File

@ -1,21 +1,21 @@
/***************************************************************************
Amiga Zorro Cards
Amiga Zorro Cards
There are different card types and layouts:
There are different card types and layouts:
* 86-pin expansion slot
- A1000
- A500 (rotated slot)
- A2000/B2000 (internal slot)
* Zorro-II
- A2000
- B2000
* Zorro-III
- A3000, A4000
* 86-pin expansion slot
- A1000
- A500 (rotated slot)
- A2000/B2000 (internal slot)
* Zorro-II
- A2000
- B2000
* Zorro-III
- A3000, A4000
For details see zorro.h. Zorro-II cards can be inserted into
Zorro-III slots.
For details see zorro.h. Zorro-II cards can be inserted into
Zorro-III slots.
***************************************************************************/

240
src/emu/bus/amiga/zorro/zorro.h
View File

@ -1,140 +1,140 @@
/***************************************************************************
Amiga Zorro Slots
Amiga Zorro Slots
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
86-pin Expansion Slot (Zorro-I), Zorro-II, Zorro-III
86-pin Expansion Slot (Zorro-I), Zorro-II, Zorro-III
86-pin Expansion Slot
86-pin Expansion Slot
2 Ground 1 Ground
4 Ground 3 Ground
6 +5VDC 5 +5VDC
8 -5VDC 7 N/C
10 +12VDC 9 N/C *1
12 CFGIN 11 N/C *2
14 /C3 Clock 13 Ground
16 /C1 Clock 15 CDAC
18 XRDY 17 /OVR
20 N/C *3 19 /INT2
22 /INT6 21 A5
24 A4 23 A6
26 A3 25 Ground
28 A7 27 A2
30 A8 29 A1
32 A9 31 FC0
34 A10 33 FC1
36 A11 35 FC2
38 A12 37 Ground
40 /IPL0 39 A13
42 /IPL1 41 A14
44 /IPL2 43 A15
46 /BEER 45 A16
48 /VPA 47 A17
50 E Clock 49 Ground
52 A18 51 /VMA
54 A19 53 /RST
56 A20 55 /HLT
58 A21 57 A22
60 /BR *4 59 A23
62 /BGACK 61 Ground
64 /BG *5 63 D15
66 /DTACK 65 D14
68 R/W 67 D13
70 /LDS 69 D12
72 /UDS 71 D11
74 /AS 73 Ground
76 D10 75 D0
78 D9 77 D1
80 D8 79 D2
82 D7 81 D3
84 D6 83 D4
86 D5 85 Ground
2 Ground 1 Ground
4 Ground 3 Ground
6 +5VDC 5 +5VDC
8 -5VDC 7 N/C
10 +12VDC 9 N/C *1
12 CFGIN 11 N/C *2
14 /C3 Clock 13 Ground
16 /C1 Clock 15 CDAC
18 XRDY 17 /OVR
20 N/C *3 19 /INT2
22 /INT6 21 A5
24 A4 23 A6
26 A3 25 Ground
28 A7 27 A2
30 A8 29 A1
32 A9 31 FC0
34 A10 33 FC1
36 A11 35 FC2
38 A12 37 Ground
40 /IPL0 39 A13
42 /IPL1 41 A14
44 /IPL2 43 A15
46 /BEER 45 A16
48 /VPA 47 A17
50 E Clock 49 Ground
52 A18 51 /VMA
54 A19 53 /RST
56 A20 55 /HLT
58 A21 57 A22
60 /BR *4 59 A23
62 /BGACK 61 Ground
64 /BG *5 63 D15
66 /DTACK 65 D14
68 R/W 67 D13
70 /LDS 69 D12
72 /UDS 71 D11
74 /AS 73 Ground
76 D10 75 D0
78 D9 77 D1
80 D8 79 D2
82 D7 81 D3
84 D6 83 D4
86 D5 85 Ground
*1 28 MHz Clock on A2000 and B2000
*2 /COPCFG on B2000
*3 /PALOPE on A1000, /BOSS on B2000
*4 /CBR on B2000
*5 /CBG on B2000
*1 28 MHz Clock on A2000 and B2000
*2 /COPCFG on B2000
*3 /PALOPE on A1000, /BOSS on B2000
*4 /CBR on B2000
*5 /CBG on B2000
Zorro-II (differences only)
Zorro-II (differences only)
7 /OWN
9 /SLAVEn
11 /CFGOUTn
12 /CFGINn
20 -12VDC
40 /EINT7
42 /EINT5
44 /EINT4
60 /BRn
64 /BGn
7 /OWN
9 /SLAVEn
11 /CFGOUTn
12 /CFGINn
20 -12VDC
40 /EINT7
42 /EINT5
44 /EINT4
60 /BRn
64 /BGn
88 Ground 87 Ground
90 Ground 89 Ground
92 7 MHz 91 Ground
94 /BURST 93 DOE
96 /EINT1 95 /BG *5
98 N/C 97 N/C
88 Ground 87 Ground
90 Ground 89 Ground
92 7 MHz 91 Ground
94 /BURST 93 DOE
96 /EINT1 95 /BG *5
98 N/C 97 N/C
100 Ground 99 Ground
*6 /GBG on B2000
*6 /GBG on B2000
Zorro-III
Zorro-III
The Zorro-III is a multiplexed Zorro-II bus with address- and
data phases. Signals changes as follows:
The Zorro-III is a multiplexed Zorro-II bus with address- and
data phases. Signals changes as follows:
17 /CINH
18 /MTCR
29 /LOCK
30 AD8 (D0)
32 AD9 (D1)
34 AD10 (D2)
36 AD11 (D3)
38 AD12 (D4)
39 AD13 (D5)
40 Reserved
41 AD14 (D6)
42 Reserved
43 AD15 (D7)
44 Reserved
45 AD16 (D8)
47 AD17 (D9)
48 /MTACK
51 /DS0
52 AD18 (D10)
54 AD19 (D11)
56 AD20 (D12)
57 AD22 (D14)
58 AD21 (D13)
59 AD23 (D15)
63 AD31
65 AD30
67 AD29
69 AD28
70 /DS2
71 AD27
72 /DS3
74 /CCS
75 SD0 (D16)
76 AD26
77 SD1 (D17)
78 AD25
79 SD2 (D18)
80 AD24
81 SD3 (D19)
82 SD7 (D23)
83 SD4 (D20)
84 SD6 (D22)
86 SD5 (D21)
91 Sense Z3
94 /IORST
95 /BCLR
97 /FCS
98 /DS1
17 /CINH
18 /MTCR
29 /LOCK
30 AD8 (D0)
32 AD9 (D1)
34 AD10 (D2)
36 AD11 (D3)
38 AD12 (D4)
39 AD13 (D5)
40 Reserved
41 AD14 (D6)
42 Reserved
43 AD15 (D7)
44 Reserved
45 AD16 (D8)
47 AD17 (D9)
48 /MTACK
51 /DS0
52 AD18 (D10)
54 AD19 (D11)
56 AD20 (D12)
57 AD22 (D14)
58 AD21 (D13)
59 AD23 (D15)
63 AD31
65 AD30
67 AD29
69 AD28
70 /DS2
71 AD27
72 /DS3
74 /CCS
75 SD0 (D16)
76 AD26
77 SD1 (D17)
78 AD25
79 SD2 (D18)
80 AD24
81 SD3 (D19)
82 SD7 (D23)
83 SD4 (D20)
84 SD6 (D22)
86 SD5 (D21)
91 Sense Z3
94 /IORST
95 /BCLR
97 /FCS
98 /DS1
***************************************************************************/

4
src/emu/bus/bml3/bml3bus.h
View File

@ -21,7 +21,7 @@
#define MCFG_BML3BUS_CPU(_cputag) \
bml3bus_device::static_set_cputag(*device, _cputag);
#define MCFG_BML3BUS_OUT_NMI_CB(_devcb) \
devcb = &bml3bus_device::set_out_nmi_callback(*device, DEVCB_##_devcb);
@ -79,7 +79,7 @@ public:
// construction/destruction
bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_nmi_cb.set_callback(object); }

2
src/emu/bus/centronics/epson_ex800.h
View File

@ -28,7 +28,7 @@
// ======================> epson_ex800_t
class epson_ex800_t : public device_t,
public device_centronics_peripheral_interface
public device_centronics_peripheral_interface
{
public:
// construction/destruction

2
src/emu/bus/centronics/epson_lx800.h
View File

@ -29,7 +29,7 @@
// ======================> epson_lx800_t
class epson_lx800_t : public device_t,
public device_centronics_peripheral_interface
public device_centronics_peripheral_interface
{
public:
// construction/destruction

18
src/emu/bus/coco/cococart.h
View File

@ -46,7 +46,7 @@ struct coco_cartridge_line
cococart_line_value value;
int line;
int q_count;
devcb_write_line *callback;
devcb_write_line *callback;
};
// ======================> cococart_base_update_delegate
@ -56,13 +56,13 @@ typedef delegate<void (UINT8 *)> cococart_base_update_delegate;
#define MCFG_COCO_CARTRIDGE_CART_CB(_devcb) \
devcb = &cococart_slot_device::static_set_cart_callback(*device, DEVCB_##_devcb);
#define MCFG_COCO_CARTRIDGE_NMI_CB(_devcb) \
devcb = &cococart_slot_device::static_set_nmi_callback(*device, DEVCB_##_devcb);
#define MCFG_COCO_CARTRIDGE_HALT_CB(_devcb) \
devcb = &cococart_slot_device::static_set_halt_callback(*device, DEVCB_##_devcb);
// ======================> cococart_slot_device
class device_cococart_interface;
@ -78,7 +78,7 @@ public:
template<class _Object> static devcb_base &static_set_cart_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_cart_callback.set_callback(object); }
template<class _Object> static devcb_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_nmi_callback.set_callback(object); }
template<class _Object> static devcb_base &static_set_halt_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_halt_callback.set_callback(object); }
// device-level overrides
virtual void device_start();
virtual void device_config_complete();
@ -128,10 +128,10 @@ private:
coco_cartridge_line m_cart_line;
coco_cartridge_line m_nmi_line;
coco_cartridge_line m_halt_line;
public:
devcb_write_line m_cart_callback;
devcb_write_line m_nmi_callback;
devcb_write_line m_halt_callback;
public:
devcb_write_line m_cart_callback;
devcb_write_line m_nmi_callback;
devcb_write_line m_halt_callback;
private:
// cartridge
device_cococart_interface *m_cart;

2
src/emu/bus/cpc/cpc_rs232.h
View File

@ -14,7 +14,7 @@
#include "cpcexp.h"
class cpc_rs232_device : public device_t,
public device_cpc_expansion_card_interface
public device_cpc_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/cpc/cpcexp.h
View File

@ -93,7 +93,7 @@ public:
// construction/destruction
cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~cpc_expansion_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_reset_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_reset_cb.set_callback(object); }

2
src/emu/bus/gameboy/mbc.h
View File

@ -221,7 +221,7 @@ class gb_rom_licheng_device : public gb_rom_mbc5_device
public:
// construction/destruction
gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_WRITE8_MEMBER(write_bank);
};

2
src/emu/bus/iq151/iq151.h
View File

@ -79,7 +79,7 @@ public:
// construction/destruction
iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~iq151cart_slot_device();
template<class _Object> static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq1_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq2_cb.set_callback(object); }

2
src/emu/bus/isa/aga.h
View File

@ -57,7 +57,7 @@ public:
DECLARE_READ8_MEMBER( pc_aga_videoram_r );
MC6845_UPDATE_ROW( aga_update_row );
MC6845_UPDATE_ROW( mda_text_inten_update_row );
MC6845_UPDATE_ROW( mda_text_inten_update_row );
MC6845_UPDATE_ROW( mda_text_blink_update_row );
MC6845_UPDATE_ROW( cga_text_inten_update_row );
MC6845_UPDATE_ROW( cga_text_inten_alt_update_row );

10
src/emu/bus/isa/gus.h
View File

@ -61,22 +61,22 @@
#define MCFG_GF1_TIMER2_IRQ_HANDLER(_devcb) \
devcb = &gf1_device::set_timer2_irq_handler(*device, DEVCB_##_devcb);
#define MCFG_GF1_SB_IRQ_HANDLER(_devcb) \
devcb = &gf1_device::set_sb_irq_handler(*device, DEVCB_##_devcb);
#define MCFG_GF1_DMA_IRQ_HANDLER(_devcb) \
devcb = &gf1_device::set_dma_irq_handler(*device, DEVCB_##_devcb);
#define MCFG_GF1_DRQ1_HANDLER(_devcb) \
devcb = &gf1_device::set_drq1_handler(*device, DEVCB_##_devcb);
#define MCFG_GF1_DRQ2_HANDLER(_devcb) \
devcb = &gf1_device::set_drq2_handler(*device, DEVCB_##_devcb);
#define MCFG_GF1_NMI_HANDLER(_devcb) \
devcb = &gf1_device::set_nmi_handler(*device, DEVCB_##_devcb);
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************

6
src/emu/bus/isa/isa.h
View File

@ -92,7 +92,7 @@
#define MCFG_ISA_BUS_IOCHCK(_iochck) \
downcast<isa8_device *>(device)->set_iochck_callback(DEVCB_##_iochck);
#define MCFG_ISA_OUT_IRQ2_CB(_devcb) \
devcb = &isa8_device::set_out_irq2_callback(*device, DEVCB_##_devcb);
@ -119,7 +119,7 @@
#define MCFG_ISA_OUT_DRQ3_CB(_devcb) \
devcb = &isa8_device::set_out_drq3_callback(*device, DEVCB_##_devcb);
#define MCFG_ISA_OUT_IRQ10_CB(_devcb) \
devcb = &isa16_device::set_out_irq10_callback(*device, DEVCB_##_devcb);
@ -354,7 +354,7 @@ public:
template<class _Object> static devcb_base &set_out_drq5_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq5_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq6_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq6_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq7_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq7_cb.set_callback(object); }
void install16_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_delegate rhandler, write16_delegate whandler);
// for ISA16, put the 16-bit configs in the primary slots and the 8-bit configs in the secondary

14
src/emu/bus/kc/kc.h
View File

@ -49,7 +49,7 @@ public:
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_halt_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_halt_cb.set_callback(object); }
// device-level overrides
virtual void device_start();
@ -127,7 +127,7 @@ extern const device_type KCCART_SLOT;
#define MCFG_KCEXP_SLOT_NEXT_SLOT(_next_slot_tag) \
kcexp_slot_device::static_set_next_slot(*device, _next_slot_tag);
#define MCFG_KCCART_SLOT_OUT_IRQ_CB(_devcb) \
devcb = &kccart_slot_device::set_out_irq_callback(*device, DEVCB_##_devcb);
@ -141,12 +141,12 @@ extern const device_type KCCART_SLOT;
#define MCFG_KCCART_SLOT_NEXT_SLOT(_next_slot_tag) \
kccart_slot_device::static_set_next_slot(*device, _next_slot_tag);
// #define MCFG_KC85_EXPANSION_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot)
// MCFG_DEVICE_ADD(_tag, KCEXP_SLOT, 0)
// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
// #define MCFG_KC85_EXPANSION_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot)
// MCFG_DEVICE_ADD(_tag, KCEXP_SLOT, 0)
// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
// #define MCFG_KC85_CARTRIDGE_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot)
// MCFG_DEVICE_ADD(_tag, KCCART_SLOT, 0)
// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
// MCFG_DEVICE_ADD(_tag, KCCART_SLOT, 0)
// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
#endif /* __KCEXP_H__ */

1
src/emu/bus/msx_cart/ascii.h
View File

@ -113,4 +113,3 @@ private:
#endif

16
src/emu/bus/msx_cart/konami.h
View File

@ -94,22 +94,22 @@ private:
class msx_cart_synthesizer : public device_t
, public msx_cart_interface
, public msx_cart_interface
{
public:
msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start();
// device-level overrides
virtual void device_start();
virtual machine_config_constructor device_mconfig_additions() const;
virtual void initialize_cartridge();
virtual void initialize_cartridge();
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
private:
UINT8 *m_bank_base;
UINT8 *m_bank_base;
required_device<dac_device> m_dac;
};

1
src/emu/bus/msx_cart/yamaha.h
View File

@ -60,4 +60,3 @@ public:
};
#endif

4
src/emu/bus/msx_slot/bunsetsu.h
View File

@ -11,8 +11,7 @@ extern const device_type MSX_SLOT_BUNSETSU;
#define MCFG_MSX_SLOT_BUNSETSU_ADD(_tag, _startpage, _numpages, _region, _offset, _bunsetsu_region_tag) \
MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_BUNSETSU, _startpage, _numpages) \
msx_slot_rom_device::set_rom_start(*device, _region, _offset); \
msx_slot_bunsetsu_device::set_bunsetsu_region_tag(*device, _bunsetsu_region_tag); \
msx_slot_bunsetsu_device::set_bunsetsu_region_tag(*device, _bunsetsu_region_tag);
class msx_slot_bunsetsu_device : public msx_slot_rom_device
{
public:
@ -35,4 +34,3 @@ private:
#endif

1
src/emu/bus/msx_slot/cartridge.h
View File

@ -80,4 +80,3 @@ public:
#endif

7
src/emu/bus/msx_slot/disk.h
View File

@ -103,9 +103,9 @@ protected:
class msx_slot_tc8566_disk_device : public msx_slot_disk_device
{
public:
msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void device_start();
virtual void device_start();
protected:
tc8566af_device *m_fdc;
@ -185,7 +185,7 @@ public:
DECLARE_READ8_MEMBER(io_read);
DECLARE_WRITE8_MEMBER(io_write);
void post_load();
void post_load();
private:
UINT8 m_control;
@ -195,4 +195,3 @@ private:
#endif

4
src/emu/bus/msx_slot/music.h
View File

@ -13,8 +13,7 @@ extern const device_type MSX_SLOT_MUSIC;
#define MCFG_MSX_SLOT_MUSIC_ADD(_tag, _startpage, _numpages, _region, _offset, _ym2413_tag) \
MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_MUSIC, _startpage, _numpages) \
msx_slot_rom_device::set_rom_start(*device, _region, _offset); \
msx_slot_music_device::set_ym2413_tag(*device, _ym2413_tag); \
msx_slot_music_device::set_ym2413_tag(*device, _ym2413_tag);
class msx_slot_music_device : public msx_slot_rom_device
{
public:
@ -36,4 +35,3 @@ private:
#endif

3
src/emu/bus/msx_slot/ram.h
View File

@ -4,8 +4,7 @@
#include "slot.h"
#define MCFG_MSX_SLOT_RAM_ADD(_tag, _startpage, _numpages) \
MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_RAM, _startpage, _numpages) \
MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_RAM, _startpage, _numpages)
class msx_slot_ram_device : public device_t,
public msx_internal_slot_interface
{

1
src/emu/bus/msx_slot/ram_mm.h
View File

@ -41,4 +41,3 @@ private:
extern const device_type MSX_SLOT_RAM_MM;
#endif

3
src/emu/bus/neogeo/banked_cart.h
View File

@ -42,6 +42,3 @@ private:
};
#endif

5
src/emu/bus/neogeo/bootleg_prot.h
View File

@ -22,7 +22,7 @@ public:
void neogeo_bootleg_sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value);
void kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
void kof97oro_px_decode(UINT8* cpurom, UINT32 cpurom_size);
void kof10thBankswitch(address_space &space, UINT16 nBank);
void kof10thBankswitch(address_space &space, UINT16 nBank);
DECLARE_READ16_MEMBER(kof10th_RAM2_r);
DECLARE_READ16_MEMBER(kof10th_RAMB_r);
DECLARE_WRITE16_MEMBER(kof10th_custom_w);
@ -95,6 +95,3 @@ private:
};
#endif

3
src/emu/bus/neogeo/cmc_prot.h
View File

@ -83,6 +83,3 @@ private:
};
#endif

5
src/emu/bus/neogeo/fatfury2_prot.h
View File

@ -38,8 +38,3 @@ private:
};
#endif

3
src/emu/bus/neogeo/kof2002_prot.h
View File

@ -34,6 +34,3 @@ private:
};
#endif

6
src/emu/bus/neogeo/kof98_prot.h
View File

@ -16,7 +16,7 @@ class kof98_prot_device : public device_t
public:
// construction/destruction
kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void kof98_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
void install_kof98_protection(cpu_device* maincpu);
DECLARE_WRITE16_MEMBER(kof98_prot_w);
@ -36,7 +36,3 @@ private:
};
#endif

3
src/emu/bus/neogeo/mslugx_prot.h
View File

@ -37,6 +37,3 @@ private:
};
#endif

3
src/emu/bus/neogeo/neogeo_intf.h
View File

@ -49,7 +49,7 @@ public:
void ym_alloc(UINT32 size) { if (m_ym == NULL) m_ym.resize(size/sizeof(UINT8)); }
UINT8* get_ym_base() { return m_ym; }
UINT32 get_ym_size() { return m_ym.bytes(); }
void ymdelta_alloc(UINT32 size) { if (m_ymdelta == NULL) m_ymdelta.resize(size/sizeof(UINT8)); }
UINT8* get_ymdelta_base() { return m_ymdelta; }
UINT32 get_ymdelta_size() { return m_ymdelta.bytes(); }
@ -74,4 +74,3 @@ protected:
};
#endif

5
src/emu/bus/neogeo/pcm2_prot.h
View File

@ -16,7 +16,7 @@ class pcm2_prot_device : public device_t
public:
// construction/destruction
pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void neo_pcm2_snk_1999(UINT8* ymrom, UINT32 ymsize, int value);
void neo_pcm2_swap(UINT8* ymrom, UINT32 ymsize, int value);
@ -32,6 +32,3 @@ private:
};
#endif

3
src/emu/bus/neogeo/pvc_prot.h
View File

@ -46,6 +46,3 @@ private:
};
#endif

6
src/emu/bus/neogeo/sbp_prot.h
View File

@ -16,7 +16,7 @@ class sbp_prot_device : public device_t
public:
// construction/destruction
sbp_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
UINT8* m_mainrom;
@ -36,7 +36,3 @@ private:
};
#endif

3
src/emu/bus/neogeo/sma_prot.h
View File

@ -54,6 +54,3 @@ private:
};
#endif

2
src/emu/bus/nes/mmc5.h
View File

@ -78,7 +78,7 @@ protected:
// MMC-5 contains 1K of internal ram
UINT8 m_exram[0x400];
UINT8 m_ram_hi_banks[4];
// int m_nes_vram_sprite[8];

4
src/emu/bus/nubus/nubus.h
View File

@ -38,7 +38,7 @@
#define MCFG_NUBUS_OUT_IRQE_CB(_devcb) \
devcb = &nubus_device::set_out_irqe_callback(*device, DEVCB_##_devcb);
#define MCFG_NUBUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, NUBUS_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@ -88,7 +88,7 @@ public:
nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~nubus_device() { m_device_list.detach_all(); }
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq9_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irq9_cb.set_callback(object); }

2
src/emu/bus/oricext/jasmin.h
View File

@ -28,7 +28,7 @@ protected:
bool side_sel, fdc_reset, ram_access, rom_access, select[4];
UINT8 *jasmin_rom;
floppy_image_device *cur_floppy, *floppies[4];
virtual void device_start();
virtual void device_reset();
const rom_entry *device_rom_region() const;

2
src/emu/bus/oricext/microdisc.h
View File

@ -40,7 +40,7 @@ protected:
floppy_image_device *floppies[4];
UINT8 port_314;
bool intrq_state, drq_state, hld_state;
virtual void device_start();
virtual void device_reset();
const rom_entry *device_rom_region() const;

6
src/emu/bus/oricext/oricext.h
View File

@ -10,7 +10,7 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
#define MCFG_ORICEXT_ADD(_tag, _slot_intf, _def_slot, _cputag, _irq) \
#define MCFG_ORICEXT_ADD(_tag, _slot_intf, _def_slot, _cputag, _irq) \
MCFG_DEVICE_ADD(_tag, ORICEXT_CONNECTOR, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
downcast<oricext_connector *>(device)->set_cputag(_cputag); \
@ -20,7 +20,7 @@
class oricext_device;
class oricext_connector: public device_t,
public device_slot_interface
public device_slot_interface
{
public:
oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@ -38,7 +38,7 @@ protected:
};
class oricext_device : public device_t,
public device_slot_card_interface
public device_slot_card_interface
{
public:
oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);

4
src/emu/bus/pc_kbd/pc_kbdc.h
View File

@ -24,7 +24,7 @@ set the data line and then set the clock line.
#define MCFG_PC_KBDC_OUT_DATA_CB(_devcb) \
devcb = &pc_kbdc_device::set_out_data_callback(*device, DEVCB_##_devcb);
#define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, PC_KBDC_SLOT, 0 ) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@ -67,7 +67,7 @@ public:
template<class _Object> static devcb_base &set_out_clock_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_clock_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_data_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_data_cb.set_callback(object); }
void set_keyboard(device_pc_kbd_interface *keyboard);
int clock_signal() { return m_clock_state; }

2
src/emu/bus/pet/diag.h
View File

@ -46,7 +46,7 @@ public:
virtual DECLARE_WRITE_LINE_MEMBER( input_d ) { output_4(state); }
virtual DECLARE_WRITE_LINE_MEMBER( input_k ) { output_9(state); }
virtual DECLARE_WRITE_LINE_MEMBER( input_l ) { output_10(state); }
protected:
// device-level overrides
virtual void device_start();

2
src/emu/bus/ql/cst_q_plus4.h
View File

@ -26,7 +26,7 @@
// ======================> cst_q_plus4_t
class cst_q_plus4_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/cst_qdisc.h
View File

@ -25,7 +25,7 @@
// ======================> cst_ql_disc_interface_t
class cst_ql_disc_interface_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

4
src/emu/bus/ql/cumana_fdi.h
View File

@ -2,7 +2,7 @@
// copyright-holders:Curt Coder
/**********************************************************************
Cumana Floppy Disk Interface emulation
Cumana Floppy Disk Interface emulation
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@ -25,7 +25,7 @@
// ======================> cumana_floppy_disk_interface_t
class cumana_floppy_disk_interface_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

44
src/emu/bus/ql/exp.h
View File

@ -64,13 +64,13 @@
#define MCFG_QL_EXPANSION_SLOT_IPL0L_CALLBACK(_write) \
devcb = &ql_expansion_slot_t::set_ipl0l_wr_callback(*device, DEVCB_##_write);
devcb = &ql_expansion_slot_t::set_ipl0l_wr_callback(*device, DEVCB_##_write);
#define MCFG_QL_EXPANSION_SLOT_IPL1L_CALLBACK(_write) \
devcb = &ql_expansion_slot_t::set_ipl1l_wr_callback(*device, DEVCB_##_write);
devcb = &ql_expansion_slot_t::set_ipl1l_wr_callback(*device, DEVCB_##_write);
#define MCFG_QL_EXPANSION_SLOT_BERRL_CALLBACK(_write) \
devcb = &ql_expansion_slot_t::set_berrl_wr_callback(*device, DEVCB_##_write);
devcb = &ql_expansion_slot_t::set_berrl_wr_callback(*device, DEVCB_##_write);
#define MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(_write) \
devcb = &ql_expansion_slot_t::set_extintl_wr_callback(*device, DEVCB_##_write);
@ -93,14 +93,14 @@ public:
// construction/destruction
device_ql_expansion_card_interface(const machine_config &mconfig, device_t &device);
virtual void romoeh_w(int state) { m_romoeh = state; }
virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
virtual void write(address_space &space, offs_t offset, UINT8 data) { }
virtual void romoeh_w(int state) { m_romoeh = state; }
virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
virtual void write(address_space &space, offs_t offset, UINT8 data) { }
protected:
ql_expansion_slot_t *m_slot;
int m_romoeh;
int m_romoeh;
};
@ -113,31 +113,31 @@ public:
// construction/destruction
ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl0l.set_callback(object); }
template<class _Object> static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl1l.set_callback(object); }
template<class _Object> static devcb_base &set_berrl_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_berrl.set_callback(object); }
template<class _Object> static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl0l.set_callback(object); }
template<class _Object> static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl1l.set_callback(object); }
template<class _Object> static devcb_base &set_berrl_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_berrl.set_callback(object); }
template<class _Object> static devcb_base &set_extintl_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_extintl.set_callback(object); }
// computer interface
UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; }
void write(address_space &space, offs_t offset, UINT8 data) { if (m_card) m_card->write(space, offset, data); }
DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); }
// computer interface
UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; }
void write(address_space &space, offs_t offset, UINT8 data) { if (m_card) m_card->write(space, offset, data); }
DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); }
// card interface
DECLARE_WRITE_LINE_MEMBER( ipl0l_w ) { m_write_ipl0l(state); }
DECLARE_WRITE_LINE_MEMBER( ipl1l_w ) { m_write_ipl1l(state); }
DECLARE_WRITE_LINE_MEMBER( berrl_w ) { m_write_berrl(state); }
// card interface
DECLARE_WRITE_LINE_MEMBER( ipl0l_w ) { m_write_ipl0l(state); }
DECLARE_WRITE_LINE_MEMBER( ipl1l_w ) { m_write_ipl1l(state); }
DECLARE_WRITE_LINE_MEMBER( berrl_w ) { m_write_berrl(state); }
DECLARE_WRITE_LINE_MEMBER( extintl_w ) { m_write_extintl(state); }
protected:
// device-level overrides
virtual void device_start();
virtual void device_reset() { if (get_card_device()) get_card_device()->reset(); }
virtual void device_reset() { if (get_card_device()) get_card_device()->reset(); }
devcb_write_line m_write_ipl0l;
devcb_write_line m_write_ipl1l;
devcb_write_line m_write_berrl;
devcb_write_line m_write_extintl;
devcb_write_line m_write_ipl1l;
devcb_write_line m_write_berrl;
devcb_write_line m_write_extintl;
device_ql_expansion_card_interface *m_card;
};

2
src/emu/bus/ql/kempston_di.h
View File

@ -25,7 +25,7 @@
// ======================> kempston_disk_interface_t
class kempston_disk_interface_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/miracle_gold_card.h
View File

@ -25,7 +25,7 @@
// ======================> miracle_gold_card_t
class miracle_gold_card_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/miracle_hd.h
View File

@ -25,7 +25,7 @@
// ======================> miracle_hard_disk_t
class miracle_hard_disk_t : public device_t,
public device_ql_rom_cartridge_card_interface
public device_ql_rom_cartridge_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/mp_fdi.h
View File

@ -25,7 +25,7 @@
// ======================> micro_peripherals_floppy_disk_interface_t
class micro_peripherals_floppy_disk_interface_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/opd_basic_master.h
View File

@ -25,7 +25,7 @@
// ======================> opd_basic_master_t
class opd_basic_master_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/pcml_qdisk.h
View File

@ -25,7 +25,7 @@
// ======================> pcml_q_disk_interface_t
class pcml_q_disk_interface_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/qubide.h
View File

@ -26,7 +26,7 @@
// ======================> qubide_t
class qubide_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

8
src/emu/bus/ql/rom.h
View File

@ -64,16 +64,16 @@ public:
device_ql_rom_cartridge_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_ql_rom_cartridge_card_interface();
virtual void romoeh_w(int state) { m_romoeh = state; }
virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
virtual void write(address_space &space, offs_t offset, UINT8 data) { }
virtual void romoeh_w(int state) { m_romoeh = state; }
virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
virtual void write(address_space &space, offs_t offset, UINT8 data) { }
protected:
ql_rom_cartridge_slot_t *m_slot;
optional_shared_ptr<UINT8> m_rom;
int m_romoeh;
int m_romoeh;
};

2
src/emu/bus/ql/sandy_superdisk.h
View File

@ -28,7 +28,7 @@
// ======================> sandy_super_disk_device
class sandy_super_disk_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/sandy_superqboard.h
View File

@ -28,7 +28,7 @@
// ======================> sandy_superqboard_t
class sandy_superqboard_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

2
src/emu/bus/ql/trumpcard.h
View File

@ -27,7 +27,7 @@
// ======================> ql_trump_card_t
class ql_trump_card_t : public device_t,
public device_ql_expansion_card_interface
public device_ql_expansion_card_interface
{
public:
// construction/destruction

3
src/emu/bus/scsi/scsihle.h
View File

@ -88,6 +88,5 @@ extern const input_device_default DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_7)[];
MCFG_DEVICE_MODIFY(_tag ) \
MCFG_SLOT_OPTION_ADD( _option, _type ) \
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS( _option, _id ) \
MCFG_SLOT_DEFAULT_OPTION( _option ) \
MCFG_SLOT_DEFAULT_OPTION( _option )
#endif

4
src/emu/bus/tvc/tvc.h
View File

@ -89,7 +89,7 @@ public:
// construction/destruction
tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~tvcexp_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); }
@ -124,5 +124,5 @@ extern const device_type TVCEXP_SLOT;
#define MCFG_TVCEXP_SLOT_OUT_NMI_CB(_devcb) \
devcb = &tvcexp_slot_device::set_out_nmi_callback(*device, DEVCB_##_devcb);
#endif /* __TVCEXP_H__ */

2
src/emu/bus/vtech/ioexp/carts.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
VTech Laser/VZ I/O Expansion Slot Devices
VTech Laser/VZ I/O Expansion Slot Devices
***************************************************************************/

34
src/emu/bus/vtech/ioexp/ioexp.h
View File

@ -1,27 +1,27 @@
/***************************************************************************
VTech Laser/VZ I/O Expansion Slot
VTech Laser/VZ I/O Expansion Slot
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
30-pin slot
30-pin slot
15 GND 16 NC
14 /WR 17 NC
13 A3 18 NC
12 A6 19 +5VDC
11 A2 20 NC
10 A5 21 D4
9 D0 22 D5
8 D2 23 D7
7 D6 24 D1
6 D3 25 /RD
5 /IORQ 26 A1
4 +5VDC 27 A4
3 NC 28 A0
2 NC 29 A7
1 NC 30 NC
15 GND 16 NC
14 /WR 17 NC
13 A3 18 NC
12 A6 19 +5VDC
11 A2 20 NC
10 A5 21 D4
9 D0 22 D5
8 D2 23 D7
7 D6 24 D1
6 D3 25 /RD
5 /IORQ 26 A1
4 +5VDC 27 A4
3 NC 28 A0
2 NC 29 A7
1 NC 30 NC
***************************************************************************/

2
src/emu/bus/vtech/ioexp/joystick.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
VTech Laser Joystick Interface
VTech Laser Joystick Interface
license: MAME, GPL-2.0+
copyright-holders: Dirk Best

2
src/emu/bus/vtech/ioexp/printer.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
VTech Laser/VZ Printer Interface
VTech Laser/VZ Printer Interface
license: MAME, GPL-2.0+
copyright-holders: Dirk Best

2
src/emu/bus/vtech/memexp/carts.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
VTech Laser/VZ Memory Expansion Slot Devices
VTech Laser/VZ Memory Expansion Slot Devices
***************************************************************************/

4
src/emu/bus/vtech/memexp/floppy.h
View File

@ -1,11 +1,11 @@
/***************************************************************************
VTech Laser/VZ Floppy Controller Cartridge
VTech Laser/VZ Floppy Controller Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
Laser DD 20
Laser DD 20
Dick Smith Electronics X-7304
***************************************************************************/

48
src/emu/bus/vtech/memexp/memexp.h
View File

@ -1,34 +1,34 @@
/***************************************************************************
VTech Laser/VZ Memory Expansion Slot
VTech Laser/VZ Memory Expansion Slot
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
44-pin slot
44-pin slot
22 GND 23 NC
21 +5VDC 24 A11
20 /IORQ 25 A12
19 /RD 26 A13
18 /NMI 27 A14
17 /WAIT 28 A15
16 /MI 29 CLK
15 /RFSH 30 D4
14 D7 31 D3
13 D2 32 D5
12 A1 33 D6
11 A2 34 NC
10 A3 35 A0
9 A4 36 D0
8 A5 37 D1
7 A6 38 /INT
6 A7 39 /HALT
5 A8 40 /MERQ
4 A9 41 /WR
3 A10 42 /NC
2 /RESET 43 +9VDC
1 GND 44 NC
22 GND 23 NC
21 +5VDC 24 A11
20 /IORQ 25 A12
19 /RD 26 A13
18 /NMI 27 A14
17 /WAIT 28 A15
16 /MI 29 CLK
15 /RFSH 30 D4
14 D7 31 D3
13 D2 32 D5
12 A1 33 D6
11 A2 34 NC
10 A3 35 A0
9 A4 36 D0
8 A5 37 D1
7 A6 38 /INT
6 A7 39 /HALT
5 A8 40 /MERQ
4 A9 41 /WR
3 A10 42 /NC
2 /RESET 43 +9VDC
1 GND 44 NC
***************************************************************************/

2
src/emu/bus/vtech/memexp/memory.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
VTech Laser/VZ Memory Expansions
VTech Laser/VZ Memory Expansions
license: MAME, GPL-2.0+
copyright-holders: Dirk Best

2
src/emu/bus/vtech/memexp/rs232.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
Dick Smith VZ-200/300 RS-232 Cartridge
Dick Smith VZ-200/300 RS-232 Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best

2
src/emu/bus/vtech/memexp/wordpro.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
Dick Smith VZ-300 WordPro Cartridge
Dick Smith VZ-300 WordPro Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best

4
src/emu/bus/x68k/x68kexp.h
View File

@ -85,7 +85,7 @@
#define MCFG_X68K_EXPANSION_SLOT_OUT_RESET_CB(_devcb) \
devcb = &x68k_expansion_slot_device::set_out_reset_callback(*device, DEVCB_##_devcb);
//**************************************************************************
// TYPE DEFINITIONS
@ -115,7 +115,7 @@ public:
// construction/destruction
x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~x68k_expansion_slot_device();
template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq2_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq4_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); }

4
src/emu/bus/z88/z88.h
View File

@ -85,7 +85,7 @@ public:
// construction/destruction
z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~z88cart_slot_device();
template<class _Object> static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); }
// device-level overrides
@ -134,5 +134,5 @@ extern const device_type Z88CART_SLOT;
#define MCFG_Z88CART_SLOT_OUT_FLP_CB(_devcb) \
devcb = &z88cart_slot_device::set_out_flp_callback(*device, DEVCB_##_devcb);
#endif /* __Z88CART_H__ */

6
src/emu/cpu/adsp2100/adsp2100.h
View File

@ -456,9 +456,9 @@ protected:
UINT16 m_mask_table[0x4000];
UINT16 m_reverse_table[0x4000];
devcb_read32 m_sport_rx_cb; // callback for serial receive
devcb_write32 m_sport_tx_cb; // callback for serial transmit
devcb_write_line m_timer_fired_cb; // callback for timer fired
devcb_read32 m_sport_rx_cb; // callback for serial receive
devcb_write32 m_sport_tx_cb; // callback for serial transmit
devcb_write_line m_timer_fired_cb; // callback for timer fired
// debugging
#if ADSP_TRACK_HOTSPOTS

2
src/emu/cpu/cpu.mak
View File

@ -1780,7 +1780,7 @@ DASMOBJS += $(CPUOBJ)/upd7810/upd7810_dasm.o
endif
$(CPUOBJ)/upd7810/upd7810_opcodes.o: $(CPUSRC)/upd7810/upd7810_opcodes.c \
$(CPUSRC)/upd7810/upd7810_macros.h
$(CPUSRC)/upd7810/upd7810_macros.h
$(CPUOBJ)/upd7810/upd7810.o: $(CPUSRC)/upd7810/upd7810.c \
$(CPUSRC)/upd7810/upd7810.h \

10
src/emu/cpu/g65816/g65816op.h
View File

@ -1915,15 +1915,15 @@ TABLE_FUNCTION(void, set_reg, (int regnum, uint val))
#if EXECUTION_MODE == EXECUTION_MODE_E
#define g65816i_correct_mode() (FLAG_E == EFLAG_SET)
#define g65816i_correct_mode() (FLAG_E == EFLAG_SET)
#elif EXECUTION_MODE == EXECUTION_MODE_M0X0
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_CLEAR))
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_CLEAR))
#elif EXECUTION_MODE == EXECUTION_MODE_M0X1
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_SET))
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_SET))
#elif EXECUTION_MODE == EXECUTION_MODE_M1X0
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_CLEAR))
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_CLEAR))
#elif EXECUTION_MODE == EXECUTION_MODE_M1X1
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_SET))
#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_SET))
#else
#error Invalid EXECUTION_MODE
#endif

16
src/emu/cpu/m68000/m68000.h
View File

@ -252,14 +252,14 @@ public:
const UINT8* cyc_exception;
/* Callbacks to host */
device_irq_acknowledge_delegate int_ack_callback; /* Interrupt Acknowledge */
write32_delegate bkpt_ack_callback; /* Breakpoint Acknowledge */
write_line_delegate reset_instr_callback; /* Called when a RESET instruction is encountered */
write32_delegate cmpild_instr_callback; /* Called when a CMPI.L #v, Dn instruction is encountered */
write_line_delegate rte_instr_callback; /* Called when a RTE instruction is encountered */
write8_delegate tas_write_callback; /* Called instead of normal write8 by the TAS instruction,
allowing writeback to be disabled globally or selectively
or other side effects to be implemented */
device_irq_acknowledge_delegate int_ack_callback; /* Interrupt Acknowledge */
write32_delegate bkpt_ack_callback; /* Breakpoint Acknowledge */
write_line_delegate reset_instr_callback; /* Called when a RESET instruction is encountered */
write32_delegate cmpild_instr_callback; /* Called when a CMPI.L #v, Dn instruction is encountered */
write_line_delegate rte_instr_callback; /* Called when a RTE instruction is encountered */
write8_delegate tas_write_callback; /* Called instead of normal write8 by the TAS instruction,
allowing writeback to be disabled globally or selectively
or other side effects to be implemented */
address_space *program;

6
src/emu/cpu/m68000/m68kmmu.h
View File

@ -774,12 +774,12 @@ INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 f
if (!(ptest))
{
page_entry |= 0x8; // always set the U bit
page_entry |= 0x8; // always set the U bit
// if we're writing, the M bit comes into play
if (!m68k->mmu_tmp_rw)
{
page_entry |= 0x10; // set Modified
page_entry |= 0x10; // set Modified
}
// if these updates resulted in a change, write the entry back where we found it
@ -795,7 +795,7 @@ INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 f
// SR: B G U1 U0 S CM CM M 0 W T R
m68k->mmu_tmp_sr |= ((addr_out & ~0xfff) || (page_entry & 0x7f4));
}
break;
break;
case 2: // shouldn't happen
fatalerror("68040: got indirect final page pointer, shouldn't be possible\n");

2
src/emu/cpu/mb86233/mb86233.h
View File

@ -103,7 +103,7 @@ private:
UINT32 m_shift;
UINT32 m_repcnt;
UINT16 m_sr;
UINT8 m_fpucontrol;
UINT8 m_fpucontrol;
UINT32 m_gpr[16];
UINT32 m_extport[0x30];

Some files were not shown because too many files have changed in this diff Show More