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

14
hash/cc40_cart.xml
View File

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

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? -->

2
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" />

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>

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/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
***************************************************************************/

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

8
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
@ -129,9 +129,9 @@ private:
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;
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

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

@ -142,11 +142,11 @@ extern const device_type KCCART_SLOT;
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)
// 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

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

@ -36,7 +36,3 @@ private:
};
#endif

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

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

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

@ -74,4 +74,3 @@ protected:
};
#endif

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

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

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

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

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

@ -36,7 +36,3 @@ private:
};
#endif

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

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

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);

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

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

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;

4
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

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];

1
src/emu/cpu/minx/minxfunc.h
View File

@ -360,4 +360,3 @@ void minx_cpu_device::CALL( UINT16 arg )
#define AD2_Y8 UINT32 addr2 = ( m_YI << 16 ) | ( m_Y + rdop() )
#define AD2_XL UINT32 addr2 = ( m_XI << 16 ) | ( m_X + ( m_HL & 0x00FF ) )
#define AD2_YL UINT32 addr2 = ( m_YI << 16 ) | ( m_Y + ( m_HL & 0x00FF ) )

1
src/emu/cpu/minx/minxops.h
View File

@ -559,4 +559,3 @@ const int minx_cpu_device::insnminx_cycles[256] = {
8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12, 12, 12, 12, 12, 12,
20, 8, 24, 12, 8, 1, 8, 12, 8, 8, 8, 20, 20, 1, 1, 8
};

2
src/emu/cpu/mips/mips3.h
View File

@ -359,7 +359,7 @@ private:
/* core state */
internal_mips3_state *m_core;
/* internal stuff */
/* internal stuff */
UINT32 m_ppc;
UINT32 m_nextpc;
UINT32 m_pcbase;

8
src/emu/cpu/powerpc/ppc.h
View File

@ -695,20 +695,20 @@ protected:
//class ppc403_device : public ppc_device
//{
//public:
// ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
//
//protected:
// virtual UINT32 execute_input_lines() const { return 8; }
// virtual UINT32 execute_input_lines() const { return 8; }
//};
//
//
//class ppc405_device : public ppc_device
//{
//public:
// ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
//
//protected:
// virtual UINT32 execute_input_lines() const { return 8; }
// virtual UINT32 execute_input_lines() const { return 8; }
//};

18
src/emu/cpu/sh2/sh2.h
View File

@ -519,19 +519,19 @@ public:
class sh2_frontend : public drc_frontend
{
public:
sh2_frontend(sh2_device *device, UINT32 window_start, UINT32 window_end, UINT32 max_sequence);
sh2_frontend(sh2_device *device, UINT32 window_start, UINT32 window_end, UINT32 max_sequence);
protected:
virtual bool describe(opcode_desc &desc, const opcode_desc *prev);
virtual bool describe(opcode_desc &desc, const opcode_desc *prev);
private:
bool describe_group_0(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_2(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_3(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_4(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_6(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_8(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_12(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_0(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_2(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_3(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_4(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_6(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_8(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
bool describe_group_12(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
sh2_device *m_sh2;
};

2
src/emu/cpu/sharc/sharcops.inc
View File

@ -823,7 +823,7 @@ void adsp21062_device::COMPUTE(UINT32 opcode)
case 0x62: compute_max(rn, rx, ry); break;
case 0x81: compute_fadd(rn, rx, ry); break;
case 0x82: compute_fsub(rn, rx, ry); break;
case 0x89: compute_favg(rn, rx, ry); break;
case 0x89: compute_favg(rn, rx, ry); break;
case 0x8a: compute_fcomp(rx, ry); break;
case 0x91: compute_fabs_plus(rn, rx, ry); break;
case 0xa1: compute_fpass(rn, rx); break;

2
src/emu/digfx.h
View File

@ -107,8 +107,6 @@ const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, {
// use these to declare a gfx_decode_entry array as a member of a device class
#define DECLARE_GFXDECODE_MEMBER( name ) static const gfx_decode_entry name[]
#define GFXDECODE_MEMBER( name ) const gfx_decode_entry name[] = {
// common gfx_decode_entry macros
#define GFXDECODE_ENTRYX(region,offset,layout,start,colors,flags) { region, offset, &layout, start, colors, flags },
#define GFXDECODE_ENTRY(region,offset,layout,start,colors) { region, offset, &layout, start, colors, 0 },

4
src/emu/imagedev/cartslot.h
View File

@ -102,10 +102,10 @@ extern const device_type CARTSLOT;
cartslot_image_device::static_set_must_be_loaded(*device, TRUE);
#define MCFG_CARTSLOT_LOAD(_class,_method) \
cartslot_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
cartslot_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
#define MCFG_CARTSLOT_UNLOAD(_class,_method) \
cartslot_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
cartslot_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
#define MCFG_CARTSLOT_PARTIALHASH(_partialhash) \
cartslot_image_device::static_set_partialhash(*device, _partialhash);

8
src/emu/imagedev/cassette.h
View File

@ -125,16 +125,16 @@ typedef device_type_iterator<&device_creator<cassette_image_device>, cassette_im
#define MCFG_CASSETTE_MODIFY(_tag) \
MCFG_DEVICE_MODIFY(_tag)
#define MCFG_CASSETTE_FORMATS(_formats) \
#define MCFG_CASSETTE_FORMATS(_formats) \
cassette_image_device::static_set_formats(*device, _formats);
#define MCFG_CASSETTE_CREATE_OPTS(_create_opts) \
#define MCFG_CASSETTE_CREATE_OPTS(_create_opts) \
cassette_image_device::static_set_create_opts(*device, _create_opts);
#define MCFG_CASSETTE_DEFAULT_STATE(_state) \
#define MCFG_CASSETTE_DEFAULT_STATE(_state) \
cassette_image_device::static_set_default_state(*device, (cassette_state) (_state));
#define MCFG_CASSETTE_INTERFACE(_interface) \
#define MCFG_CASSETTE_INTERFACE(_interface) \
cassette_image_device::static_set_interface(*device, _interface);
#endif /* CASSETTE_H */

4
src/emu/imagedev/diablo.h
View File

@ -84,10 +84,10 @@ extern const device_type DIABLO;
MCFG_DEVICE_CONFIG(_config)
#define MCFG_DIABLO_LOAD(_class,_method) \
diablo_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
diablo_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
#define MCFG_DIABLO_UNLOAD(_class,_method) \
diablo_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
diablo_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
#define MCFG_DIABLO_INTERFACE(_interface) \
diablo_image_device::static_set_interface(*device, _interface);

4
src/emu/imagedev/harddriv.h
View File

@ -79,10 +79,10 @@ extern const device_type HARDDISK;
MCFG_DEVICE_ADD(_tag, HARDDISK, 0)
#define MCFG_HARDDISK_LOAD(_class,_method) \
harddisk_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
harddisk_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
#define MCFG_HARDDISK_UNLOAD(_class,_method) \
harddisk_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
harddisk_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
#define MCFG_HARDDISK_INTERFACE(_interface) \
harddisk_image_device::static_set_interface(*device, _interface);

2
src/emu/luaengine.h
View File

@ -44,7 +44,7 @@ private:
int cb;
hook();
void set(lua_State *L, int idx);
void set(lua_State *L, int idx);
lua_State *precall();
void call(lua_engine *engine, lua_State *T, int nparam);
bool active() const { return L != NULL; }

4
src/emu/machine/6532riot.h
View File

@ -75,8 +75,8 @@ protected:
UINT8 m_in;
UINT8 m_out;
UINT8 m_ddr;
devcb_read8 *m_in_cb;
devcb_write8 *m_out_cb;
devcb_read8 *m_in_cb;
devcb_write8 *m_out_cb;
};
// device-level overrides

2
src/emu/machine/68307.h
View File

@ -69,7 +69,7 @@ public:
/* 68307 peripheral modules */
m68307_sim* m68307SIM;
m68307_mbus* m68307MBUS;
// m68307_serial* m68307SERIAL;
// m68307_serial* m68307SERIAL;
m68307_timer* m68307TIMER;
UINT16 m68307_base;

2
src/emu/machine/74123.h
View File

@ -75,7 +75,7 @@
ttl74123_device::set_clear_pin_value(*device, _value);
#define MCFG_TTL74123_OUTPUT_CHANGED_CB(_devcb) \
devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB_##_devcb);
devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB_##_devcb);
/* constants for the different ways the cap/res can be connected.
This determines the formula for calculating the pulse width */

2
src/emu/machine/8042kbdc.h
View File

@ -40,7 +40,7 @@ enum kbdc8042_type_t
devcb = &kbdc8042_device::set_output_buffer_empty_callback(*device, DEVCB_##_devcb);
#define MCFG_KBDC8042_SPEAKER_CB(_devcb) \
devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB_##_devcb);
devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB_##_devcb);
//**************************************************************************
// TYPE DEFINITIONS

10
src/emu/machine/aakart.h
View File

@ -49,8 +49,8 @@ public:
// I/O operations
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
void send_keycode_down(UINT8 row, UINT8 col);
void send_keycode_up(UINT8 row, UINT8 col);
void send_keycode_down(UINT8 row, UINT8 col);
void send_keycode_up(UINT8 row, UINT8 col);
protected:
// device-level overrides
virtual void device_validity_check(validity_checker &valid) const;
@ -77,9 +77,9 @@ private:
UINT8 m_status;
UINT8 m_mouse_enable;
UINT8 m_keyb_enable;
UINT8 m_keyb_row;
UINT8 m_keyb_col;
UINT8 m_keyb_state;
UINT8 m_keyb_row;
UINT8 m_keyb_col;
UINT8 m_keyb_state;
};

12
src/emu/machine/akiko.h
View File

@ -1,12 +1,12 @@
/***************************************************************************
Akiko
Akiko
Used in the Amiga CD32
Used in the Amiga CD32
- CD-ROM controller
- Builtin 1KB NVRAM
- Chunky to planar converter
- CD-ROM controller
- Builtin 1KB NVRAM
- Chunky to planar converter
***************************************************************************/
@ -74,7 +74,7 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const;
private:
// 1X CDROM sector time in msec (300KBps)
// 1X CDROM sector time in msec (300KBps)
static const int CD_SECTOR_TIME = (1000/((150*1024)/2048));
// internal state

2
src/emu/machine/autoconfig.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
Amiga Autoconfig
Amiga Autoconfig
***************************************************************************/

4
src/emu/machine/ay31015.h
View File

@ -175,7 +175,7 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va
devcb = &ay31015_device::set_write_so_callback(*device, DEVCB_##_devcb);
#define MCFG_AY31015_STATUS_CHANGED_CB(_devcb) \
devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB_##_devcb);
devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB_##_devcb);
#define MCFG_AY51013_TX_CLOCK(_txclk) \
@ -191,6 +191,6 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va
devcb = &ay51013_device::set_write_so_callback(*device, DEVCB_##_devcb);
#define MCFG_AY51013_STATUS_CHANGED_CB(_devcb) \
devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB_##_devcb);
devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB_##_devcb);
#endif

6
src/emu/machine/corvushd.h
View File

@ -405,9 +405,9 @@ private:
// Put drive into prep mode command (0x11)
//
struct {
UINT8 code; // Command code
UINT8 drive; // Drive number (starts at 1)
UINT8 prep_block[512]; // Machine code payload
UINT8 code; // Command code
UINT8 drive; // Drive number (starts at 1)
UINT8 prep_block[512]; // Machine code payload
} prep_mode_command;
//
// Read Firmware command (Prep Mode 0x32)

49
src/emu/machine/cr511b.h
View File

@ -1,33 +1,33 @@
/***************************************************************************
CR-511-B CD-ROM drive
CR-511-B CD-ROM drive
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
CD-ROM drive with a custom MKE/Panasonic interface as used in the
Commodore CDTV and early SoundBlaster cards.
CD-ROM drive with a custom MKE/Panasonic interface as used in the
Commodore CDTV and early SoundBlaster cards.
1 _RESET 2 GND
3 EFFK 4 SCCK
5 SBCP 6 SCOR
7 GND 8 GND
9 C16M 10 GND
11 _XAEN 12 GND
13 EMPASIS 14 D0
15 LRCK 16 DSCK
17 _MUTE 18 GND
19 _BUSY 20 _STCH
21 _ENABLE 22 DRQ
23 _HWR 24 GND
25 _DTEN 26 _HRD
27 _STEN 28 _CMD
29 _EOP 30 GND
31 DB7 32 GND
33 DB6 34 DB5
35 DB4 36 GND
37 DB3 38 DB2
39 DB1 40 DB0
1 _RESET 2 GND
3 EFFK 4 SCCK
5 SBCP 6 SCOR
7 GND 8 GND
9 C16M 10 GND
11 _XAEN 12 GND
13 EMPASIS 14 D0
15 LRCK 16 DSCK
17 _MUTE 18 GND
19 _BUSY 20 _STCH
21 _ENABLE 22 DRQ
23 _HWR 24 GND
25 _DTEN 26 _HRD
27 _STEN 28 _CMD
29 _EOP 30 GND
31 DB7 32 GND
33 DB6 34 DB5
35 DB4 36 GND
37 DB3 38 DB2
39 DB1 40 DB0
***************************************************************************/
@ -46,8 +46,7 @@
//**************************************************************************
#define MCFG_CR511B_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, CR511B, 0) \
MCFG_DEVICE_ADD(_tag, CR511B, 0)
#define MCFG_CR511B_STCH_HANDLER(_devcb) \
devcb = &cr511b_device::set_stch_handler(*device, DEVCB_##_devcb);

39
src/emu/machine/dmac.h
View File

@ -23,8 +23,7 @@
//**************************************************************************
#define MCFG_DMAC_ADD(_tag, _clock) \
MCFG_DEVICE_ADD(_tag, DMAC, _clock) \
MCFG_DEVICE_ADD(_tag, DMAC, _clock)
#define MCFG_DMAC_CFGOUT_HANDLER(_devcb) \
devcb = &dmac_device::set_cfgout_handler(*device, DEVCB_##_devcb);
@ -109,25 +108,25 @@ private:
// control register flags
enum
{
CNTR_TCEN = 0x80, // terminal count enable
CNTR_PREST = 0x40, // peripheral reset
CNTR_PDMD = 0x20, // peripheral device mode select (1=scsi, 0=xt)
CNTR_INTEN = 0x10, // interrupt enable
CNTR_DDIR = 0x08 // device direction (1=rd host, wr to peripheral)
CNTR_TCEN = 0x80, // terminal count enable
CNTR_PREST = 0x40, // peripheral reset
CNTR_PDMD = 0x20, // peripheral device mode select (1=scsi, 0=xt)
CNTR_INTEN = 0x10, // interrupt enable
CNTR_DDIR = 0x08 // device direction (1=rd host, wr to peripheral)
};
// interrupt status register
enum
{
ISTR_INTX = 0x100, // xt interrupt pending
ISTR_INT_F = 0x080, // interrupt follow
ISTR_INTS = 0x040, // scsi peripheral interrupt
ISTR_E_INT = 0x020, // end-of-process interrupt
ISTR_INT_P = 0x010, // interrupt pending
ISTR_UE_INT = 0x008, // under-run fifo error interrupt
ISTR_OE_INT = 0x004, // over-run fifo error interrupt
ISTR_FF_FLG = 0x002, // fifo-full flag
ISTR_FE_FLG = 0x001 // fifo-empty flag
ISTR_INTX = 0x100, // xt interrupt pending
ISTR_INT_F = 0x080, // interrupt follow
ISTR_INTS = 0x040, // scsi peripheral interrupt
ISTR_E_INT = 0x020, // end-of-process interrupt
ISTR_INT_P = 0x010, // interrupt pending
ISTR_UE_INT = 0x008, // under-run fifo error interrupt
ISTR_OE_INT = 0x004, // over-run fifo error interrupt
ISTR_FF_FLG = 0x002, // fifo-full flag
ISTR_FE_FLG = 0x001 // fifo-empty flag
};
static const int ISTR_INT_MASK = 0x1fc;
@ -153,10 +152,10 @@ private:
int m_rst;
// register
UINT16 m_cntr; // control register
UINT16 m_istr; // interrupt status register
UINT32 m_wtc; // word transfer count
UINT32 m_acr; // address control register
UINT16 m_cntr; // control register
UINT16 m_istr; // interrupt status register
UINT32 m_wtc; // word transfer count
UINT32 m_acr; // address control register
bool m_dma_active;

12
src/emu/machine/gayle.h
View File

@ -1,11 +1,11 @@
/***************************************************************************
GAYLE
GAYLE
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
Gate array used in the Amiga 600 and Amiga 1200 computers.
Gate array used in the Amiga 600 and Amiga 1200 computers.
***************************************************************************/
@ -87,10 +87,10 @@ protected:
private:
enum
{
GAYLE_CS = 0, // interrupt status
GAYLE_IRQ, // interrupt change
GAYLE_INTEN, // interrupt enable register
GAYLE_CFG // config register
GAYLE_CS = 0, // interrupt status
GAYLE_IRQ, // interrupt change
GAYLE_INTEN, // interrupt enable register
GAYLE_CFG // config register
};
devcb_write_line m_int2_w;

2
src/emu/machine/i8279.h
View File

@ -115,7 +115,7 @@ private:
devcb_write8 m_out_sl_cb; // Scanlines SL0-3
devcb_write8 m_out_disp_cb; // B0-3,A0-3
devcb_write_line m_out_bd_cb; // BD
devcb_read8 m_in_rl_cb; // kbd readlines RL0-7
devcb_read8 m_in_rl_cb; // kbd readlines RL0-7
devcb_read_line m_in_shift_cb; // Shift key
devcb_read_line m_in_ctrl_cb; // Ctrl-Strobe line

2
src/emu/machine/kb3600.h
View File

@ -137,7 +137,7 @@ private:
int m_b; // output buffer
int m_ako; // any key down
int m_x_mask[9]; // mask of what keys are down
int m_x_mask[9]; // mask of what keys are down
// timers
emu_timer *m_scan_timer; // keyboard scan timer

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