summaryrefslogtreecommitdiffstats
path: root/src/mame/includes
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/alesis.h2
-rw-r--r--src/mame/includes/apexc.h1
-rw-r--r--src/mame/includes/apollo.h10
-rw-r--r--src/mame/includes/asteroid.h7
-rw-r--r--src/mame/includes/balsente.h1
-rw-r--r--src/mame/includes/ccastles.h1
-rw-r--r--src/mame/includes/cloud9.h2
-rw-r--r--src/mame/includes/cvs.h6
-rw-r--r--src/mame/includes/dec8.h1
-rw-r--r--src/mame/includes/dragon.h4
-rw-r--r--src/mame/includes/galaxold.h2
-rw-r--r--src/mame/includes/gng.h2
-rw-r--r--src/mame/includes/jpmsys5.h1
-rw-r--r--src/mame/includes/kopunch.h6
-rw-r--r--src/mame/includes/liberatr.h2
-rw-r--r--src/mame/includes/pgm2.h1
-rw-r--r--src/mame/includes/super6.h26
-rw-r--r--src/mame/includes/taito_b.h34
-rw-r--r--src/mame/includes/triplhnt.h4
-rw-r--r--src/mame/includes/v1050.h4
-rw-r--r--src/mame/includes/xbox_pci.h8
-rw-r--r--src/mame/includes/z88.h6
22 files changed, 61 insertions, 70 deletions
diff --git a/src/mame/includes/alesis.h b/src/mame/includes/alesis.h
index aefb7ce31af..a9fa9a1f33b 100644
--- a/src/mame/includes/alesis.h
+++ b/src/mame/includes/alesis.h
@@ -170,7 +170,7 @@ private:
required_device<hd44780_device> m_lcdc;
optional_device<cassette_image_device> m_cassette;
- required_device<cpu_device> m_maincpu;
+ required_device<mcs51_cpu_device> m_maincpu;
required_ioport m_col1;
required_ioport m_col2;
diff --git a/src/mame/includes/apexc.h b/src/mame/includes/apexc.h
index f6e938c7f8b..f012a10da0f 100644
--- a/src/mame/includes/apexc.h
+++ b/src/mame/includes/apexc.h
@@ -1,6 +1,5 @@
// license:GPL-2.0+
// copyright-holders:Raphael Nabet, Robbbert
-
#ifndef MAME_INCLUDES_APEXC
#define MAME_INCLUDES_APEXC
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index 7874dfbf0da..86381bf981e 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -338,16 +338,16 @@ void apollo_csr_set_status_register(uint16_t mask, uint16_t data);
MCFG_DEVICE_ADD(_tag, APOLLO_SIO, _clock)
#define MCFG_APOLLO_SIO_IRQ_CALLBACK(_cb) \
- devcb = &downcast<apollo_sio &>(*device).set_irq_cb(DEVCB_##_cb);
+ downcast<apollo_sio &>(*device).set_irq_cb(DEVCB_##_cb);
#define MCFG_APOLLO_SIO_A_TX_CALLBACK(_cb) \
- devcb = &downcast<apollo_sio &>(*device).set_a_tx_cb(DEVCB_##_cb);
+ downcast<apollo_sio &>(*device).set_a_tx_cb(DEVCB_##_cb);
#define MCFG_APOLLO_SIO_B_TX_CALLBACK(_cb) \
- devcb = &downcast<apollo_sio &>(*device).set_b_tx_cb(DEVCB_##_cb);
+ downcast<apollo_sio &>(*device).set_b_tx_cb(DEVCB_##_cb);
#define MCFG_APOLLO_SIO_OUTPORT_CALLBACK(_cb) \
- devcb = &downcast<apollo_sio &>(*device).set_outport_cb(DEVCB_##_cb);
+ downcast<apollo_sio &>(*device).set_outport_cb(DEVCB_##_cb);
class apollo_sio: public duart_base_device
{
@@ -685,7 +685,7 @@ DECLARE_DEVICE_TYPE(APOLLO_MONO19I, apollo_graphics_19i)
//**************************************************************************
#define MCFG_APOLLO_STDIO_TX_CALLBACK(_cb) \
- devcb = &downcast<apollo_stdio_device &>(*device).set_tx_cb(DEVCB_##_cb);
+ downcast<apollo_stdio_device &>(*device).set_tx_cb(DEVCB_##_cb);
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h
index c8d0f58ef86..42054d2c125 100644
--- a/src/mame/includes/asteroid.h
+++ b/src/mame/includes/asteroid.h
@@ -14,8 +14,8 @@
class asteroid_state : public driver_device
{
public:
- asteroid_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ asteroid_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_dvg(*this, "dvg"),
m_earom(*this, "earom"),
@@ -24,7 +24,8 @@ public:
m_dsw_sel(*this, "dsw_sel"),
m_cocktail(*this, "COCKTAIL"),
m_ram1(*this, "ram1"),
- m_ram2(*this, "ram2") { }
+ m_ram2(*this, "ram2")
+ { }
/* devices */
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h
index 3c5faab772f..955ea5e7e15 100644
--- a/src/mame/includes/balsente.h
+++ b/src/mame/includes/balsente.h
@@ -109,7 +109,6 @@ private:
DECLARE_READ8_MEMBER(novram_8bit_r);
DECLARE_WRITE8_MEMBER(novram_8bit_w);
DECLARE_WRITE8_MEMBER(acia_w);
- DECLARE_WRITE_LINE_MEMBER(uint_w);
DECLARE_WRITE_LINE_MEMBER(uint_propagate_w);
DECLARE_READ8_MEMBER(adc_data_r);
DECLARE_WRITE8_MEMBER(adc_select_w);
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h
index 0bbf47be6c2..a9f04bf671a 100644
--- a/src/mame/includes/ccastles.h
+++ b/src/mame/includes/ccastles.h
@@ -37,7 +37,6 @@ public:
protected:
DECLARE_WRITE8_MEMBER(irq_ack_w);
- template<int C> DECLARE_WRITE_LINE_MEMBER(ccounter_w);
DECLARE_READ8_MEMBER(leta_r);
DECLARE_WRITE8_MEMBER(nvram_recall_w);
DECLARE_WRITE_LINE_MEMBER(nvram_store_w);
diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h
index aaf24481d1f..8c9dc970317 100644
--- a/src/mame/includes/cloud9.h
+++ b/src/mame/includes/cloud9.h
@@ -36,8 +36,6 @@ public:
protected:
DECLARE_WRITE8_MEMBER(irq_ack_w);
- DECLARE_WRITE_LINE_MEMBER(coin1_counter_w);
- DECLARE_WRITE_LINE_MEMBER(coin2_counter_w);
DECLARE_READ8_MEMBER(leta_r);
DECLARE_WRITE8_MEMBER(nvram_recall_w);
DECLARE_WRITE8_MEMBER(nvram_store_w);
diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h
index b19bacfd303..49499306105 100644
--- a/src/mame/includes/cvs.h
+++ b/src/mame/includes/cvs.h
@@ -85,9 +85,9 @@ public:
uint32_t screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(cvs_main_cpu_interrupt);
TIMER_CALLBACK_MEMBER(cvs_393hz_timer_cb);
- void set_pens( );
- void cvs_scroll_stars( );
- void cvs_init_stars( );
+ void set_pens();
+ void cvs_scroll_stars();
+ void cvs_init_stars();
void cvs_update_stars(bitmap_ind16 &bitmap, const rectangle &cliprect, const pen_t star_pen, bool update_always);
void start_393hz_timer();
void cvs(machine_config &config);
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index 46bfea1cd24..b659e023ef0 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -133,7 +133,6 @@ private:
DECLARE_WRITE8_MEMBER(csilver_i8751_w);
DECLARE_WRITE8_MEMBER(dec8_bank_w);
DECLARE_WRITE8_MEMBER(ghostb_bank_w);
- DECLARE_WRITE_LINE_MEMBER(ghostb_nmi_w);
DECLARE_WRITE8_MEMBER(csilver_control_w);
DECLARE_WRITE8_MEMBER(dec8_sound_w);
DECLARE_WRITE8_MEMBER(csilver_adpcm_data_w);
diff --git a/src/mame/includes/dragon.h b/src/mame/includes/dragon.h
index 3e3d62d1853..1c8f38d8830 100644
--- a/src/mame/includes/dragon.h
+++ b/src/mame/includes/dragon.h
@@ -8,11 +8,11 @@
***************************************************************************/
-#pragma once
-
#ifndef MAME_INCLUDES_DRAGON_H
#define MAME_INCLUDES_DRAGON_H
+#pragma once
+
#include "includes/coco12.h"
#include "imagedev/printer.h"
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index e24108613b3..92fd3c0fdbb 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -317,7 +317,7 @@ public:
void mooncrst_map(address_map &map);
void ozon1_io_map(address_map &map);
void ozon1_map(address_map &map);
- void racknrol(address_map &map);
+ void racknrol_map(address_map &map);
void racknrol_io(address_map &map);
void rockclim_map(address_map &map);
void scramb2_map(address_map &map);
diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h
index 06940c6347a..3905f28b70b 100644
--- a/src/mame/includes/gng.h
+++ b/src/mame/includes/gng.h
@@ -33,8 +33,6 @@ public:
private:
DECLARE_WRITE8_MEMBER(gng_bankswitch_w);
- DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
- DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
DECLARE_WRITE_LINE_MEMBER(ym_reset_w);
DECLARE_READ8_MEMBER(diamond_hack_r);
DECLARE_WRITE8_MEMBER(gng_fgvideoram_w);
diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h
index 0e3cebb0731..c8efe8e8b22 100644
--- a/src/mame/includes/jpmsys5.h
+++ b/src/mame/includes/jpmsys5.h
@@ -42,7 +42,6 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia_irq);
DECLARE_WRITE_LINE_MEMBER(u29_ca2_w);
DECLARE_WRITE_LINE_MEMBER(u29_cb2_w);
- DECLARE_WRITE_LINE_MEMBER(acia_irq);
DECLARE_WRITE_LINE_MEMBER(a0_tx_w);
DECLARE_WRITE_LINE_MEMBER(a1_tx_w);
DECLARE_WRITE_LINE_MEMBER(a2_tx_w);
diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h
index 1bc3cceafdc..b4581f1764d 100644
--- a/src/mame/includes/kopunch.h
+++ b/src/mame/includes/kopunch.h
@@ -5,6 +5,10 @@
Sega KO Punch
*************************************************************************/
+#ifndef MAME_INCLUDES_KOPUNCH_H
+#define MAME_INCLUDES_KOPUNCH_H
+
+#pragma once
#include "emupal.h"
@@ -65,3 +69,5 @@ private:
uint8_t m_gfxbank;
uint8_t m_scrollx;
};
+
+#endif // MAME_INCLUDES_KOPUNCH_H
diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h
index 1d717f7cbd1..43139771e2d 100644
--- a/src/mame/includes/liberatr.h
+++ b/src/mame/includes/liberatr.h
@@ -54,8 +54,6 @@ private:
DECLARE_READ8_MEMBER( bitmap_xy_r );
DECLARE_WRITE8_MEMBER( bitmap_xy_w );
- DECLARE_WRITE_LINE_MEMBER(planet_select_w);
-
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// early raster EAROM interface
diff --git a/src/mame/includes/pgm2.h b/src/mame/includes/pgm2.h
index a3fbbcc6d33..f935cda5b72 100644
--- a/src/mame/includes/pgm2.h
+++ b/src/mame/includes/pgm2.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-
#ifndef MAME_INCLUDES_PGM2_H
#define MAME_INCLUDES_PGM2_H
diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h
index 1fecf3ae3aa..d9641bda2a3 100644
--- a/src/mame/includes/super6.h
+++ b/src/mame/includes/super6.h
@@ -31,19 +31,19 @@ class super6_state : public driver_device
{
public:
super6_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, Z80_TAG),
- m_ctc(*this, Z80CTC_TAG),
- m_dart(*this, Z80DART_TAG),
- m_dma(*this, Z80DMA_TAG),
- m_pio(*this, Z80PIO_TAG),
- m_fdc(*this, WD2793_TAG),
- m_brg(*this, BR1945_TAG),
- m_ram(*this, RAM_TAG),
- m_floppy0(*this, WD2793_TAG":0"),
- m_floppy1(*this, WD2793_TAG":1"),
- m_rom(*this, Z80_TAG),
- m_j7(*this, "J7")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, Z80_TAG)
+ , m_ctc(*this, Z80CTC_TAG)
+ , m_dart(*this, Z80DART_TAG)
+ , m_dma(*this, Z80DMA_TAG)
+ , m_pio(*this, Z80PIO_TAG)
+ , m_fdc(*this, WD2793_TAG)
+ , m_brg(*this, BR1945_TAG)
+ , m_ram(*this, RAM_TAG)
+ , m_floppy0(*this, WD2793_TAG":0")
+ , m_floppy1(*this, WD2793_TAG":1")
+ , m_rom(*this, Z80_TAG)
+ , m_j7(*this, "J7")
{ }
void super6(machine_config &config);
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 33b98ae3875..78e5fd2e3cc 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -56,18 +56,11 @@ public:
void init_taito_b();
- DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor);
-
- DECLARE_VIDEO_START(realpunc);
- uint32_t screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
+protected:
DECLARE_WRITE8_MEMBER(player_12_coin_ctrl_w);
- void realpunc_map(address_map &map);
- void realpunc_hd63484_map(address_map &map);
void sound_map(address_map &map);
-private:
DECLARE_WRITE8_MEMBER(bankswitch_w);
template<int Player> DECLARE_READ16_MEMBER(tracky_hi_r);
template<int Player> DECLARE_READ16_MEMBER(tracky_lo_r);
@@ -79,10 +72,8 @@ private:
DECLARE_READ16_MEMBER(player_34_coin_ctrl_r);
DECLARE_WRITE16_MEMBER(player_34_coin_ctrl_w);
DECLARE_WRITE16_MEMBER(spacedxo_tc0220ioc_w);
- DECLARE_WRITE16_MEMBER(realpunc_output_w);
DECLARE_WRITE16_MEMBER(hitice_pixelram_w);
DECLARE_WRITE16_MEMBER(hitice_pixel_scroll_w);
- DECLARE_WRITE16_MEMBER(realpunc_video_ctrl_w);
DECLARE_WRITE8_MEMBER(mb87078_gain_changed);
DECLARE_VIDEO_START(hitice);
DECLARE_VIDEO_RESET(hitice);
@@ -116,7 +107,6 @@ private:
/* video-related */
std::unique_ptr<bitmap_ind16> m_pixel_bitmap;
- std::unique_ptr<bitmap_ind16> m_realpunc_bitmap;
uint16_t m_pixel_scroll[3];
@@ -126,8 +116,6 @@ private:
uint16_t m_eep_latch;
uint16_t m_coin_word;
- uint16_t m_realpunc_video_ctrl;
-
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@@ -146,7 +134,7 @@ private:
optional_ioport_array<2> m_trackx_io;
optional_ioport_array<2> m_tracky_io;
- void hitice_clear_pixel_bitmap( );
+ void hitice_clear_pixel_bitmap();
};
class taitob_c_state : public taitob_state
@@ -155,6 +143,22 @@ public:
using taitob_state::taitob_state;
static constexpr feature_type unemulated_features() { return feature::CAMERA; }
void realpunc(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor);
+
+protected:
+ DECLARE_WRITE16_MEMBER(realpunc_output_w);
+ DECLARE_WRITE16_MEMBER(realpunc_video_ctrl_w);
+
+ void realpunc_map(address_map &map);
+ void realpunc_hd63484_map(address_map &map);
+
+ DECLARE_VIDEO_START(realpunc);
+ uint32_t screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+private:
+ std::unique_ptr<bitmap_ind16> m_realpunc_bitmap;
+ uint16_t m_realpunc_video_ctrl;
};
-#endif // MAME_INCLUDES_TAITO_B_H \ No newline at end of file
+#endif // MAME_INCLUDES_TAITO_B_H
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index 674d538bdf3..b666bd3ee25 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -57,10 +57,6 @@ private:
TIMER_HIT
};
- DECLARE_WRITE_LINE_MEMBER(ram_2_w);
- DECLARE_WRITE_LINE_MEMBER(sprite_zoom_w);
- DECLARE_WRITE_LINE_MEMBER(sprite_bank_w);
- DECLARE_WRITE_LINE_MEMBER(lamp1_w);
DECLARE_WRITE_LINE_MEMBER(coin_lockout_w);
DECLARE_WRITE_LINE_MEMBER(tape_control_w);
diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h
index f8f61f59ff0..87ef69b3119 100644
--- a/src/mame/includes/v1050.h
+++ b/src/mame/includes/v1050.h
@@ -64,8 +64,8 @@
class v1050_state : public driver_device
{
public:
- v1050_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ v1050_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, Z80_TAG),
m_subcpu(*this, M6502_TAG),
m_pic(*this, UPB8214_TAG),
diff --git a/src/mame/includes/xbox_pci.h b/src/mame/includes/xbox_pci.h
index 14800e22fc2..7d4f69dfd62 100644
--- a/src/mame/includes/xbox_pci.h
+++ b/src/mame/includes/xbox_pci.h
@@ -112,7 +112,7 @@ private:
DECLARE_DEVICE_TYPE(MCPX_SMBUS, mcpx_smbus_device)
#define MCFG_MCPX_SMBUS_INTERRUPT_HANDLER(_devcb) \
- devcb = &downcast<mcpx_smbus_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
+ downcast<mcpx_smbus_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
/*
* OHCI USB Controller
@@ -151,7 +151,7 @@ private:
DECLARE_DEVICE_TYPE(MCPX_OHCI, mcpx_ohci_device)
#define MCFG_MCPX_OHCI_INTERRUPT_HANDLER(_devcb) \
- devcb = &downcast<mcpx_ohci_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
+ downcast<mcpx_ohci_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
/*
* Ethernet
@@ -295,7 +295,7 @@ private:
DECLARE_DEVICE_TYPE(MCPX_IDE, mcpx_ide_device)
#define MCFG_MCPX_IDE_INTERRUPT_HANDLER(_devcb) \
- devcb = &downcast<mcpx_ide_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
+ downcast<mcpx_ide_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
/*
* AGP Bridge
@@ -352,6 +352,6 @@ DECLARE_DEVICE_TYPE(NV2A_GPU, nv2a_gpu_device)
#define MCFG_MCPX_NV2A_GPU_CPU(_cpu_tag) \
downcast<nv2a_gpu_device *>(device)->set_cpu_tag(_cpu_tag);
#define MCFG_MCPX_NV2A_GPU_INTERRUPT_HANDLER(_devcb) \
- devcb = &downcast<nv2a_gpu_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
+ downcast<nv2a_gpu_device &>(*device).set_interrupt_handler(DEVCB_##_devcb);
#endif // MAME_INCLUDES_XBOX_PCI_H
diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h
index ae644f4d746..cfe59c28a84 100644
--- a/src/mame/includes/z88.h
+++ b/src/mame/includes/z88.h
@@ -48,8 +48,6 @@ public:
, m_screen(*this, "screen")
, m_palette(*this, "palette")
, m_blink(*this, "blink")
- , m_mono(*this, "mono")
- , m_speaker(*this, "speaker")
, m_lines(*this, "LINE%u", 0U)
, m_banks(*this, "bank%u", 1U)
, m_carts(*this, "slot%u", 0U)
@@ -100,8 +98,6 @@ private:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_device<upd65031_device> m_blink;
- required_device<speaker_device> m_mono;
- required_device<speaker_sound_device> m_speaker;
required_ioport_array<8> m_lines;
required_memory_bank_array<5> m_banks;
optional_device_array<z88cart_slot_device, 4> m_carts;
@@ -117,4 +113,4 @@ private:
uint8_t * m_ram_base;
};
-#endif /* MAME_INCLUDES_Z88_H */
+#endif // MAME_INCLUDES_Z88_H