summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-04-12 07:32:37 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-04-12 07:32:37 +0000
commit056c7d387ca68c28dced90bdc1a36701a51a8a1e (patch)
tree258340e27e7c9820332252b0f1297fa089b7ff75 /src/mame/includes
parent4570c897cf65fd758ea58d80e08fb286032a5a97 (diff)
discrete lookups removal (nw)
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/atarifb.h4
-rw-r--r--src/mame/includes/grchamp.h4
-rw-r--r--src/mame/includes/hitme.h4
-rw-r--r--src/mame/includes/madalien.h4
-rw-r--r--src/mame/includes/norautp.h4
-rw-r--r--src/mame/includes/skydiver.h4
-rw-r--r--src/mame/includes/sprint2.h4
-rw-r--r--src/mame/includes/sprint4.h4
-rw-r--r--src/mame/includes/starshp1.h4
-rw-r--r--src/mame/includes/tank8.h4
-rw-r--r--src/mame/includes/triplhnt.h4
-rw-r--r--src/mame/includes/ultratnk.h5
-rw-r--r--src/mame/includes/videopin.h4
-rw-r--r--src/mame/includes/wiz.h6
14 files changed, 45 insertions, 14 deletions
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index f09a0d1c026..e8e867e5647 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -25,7 +25,8 @@ public:
m_field_videoram(*this, "field_videoram"),
m_spriteram(*this, "spriteram"),
m_scroll_register(*this, "scroll_register"),
- m_maincpu(*this, "maincpu"){ }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete"){ }
/* video-related */
required_shared_ptr<UINT8> m_alphap1_videoram;
@@ -59,6 +60,7 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
DECLARE_WRITE8_MEMBER(atarifb_out1_w);
DECLARE_WRITE8_MEMBER(atarifb4_out1_w);
DECLARE_WRITE8_MEMBER(abaseb_out1_w);
diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h
index b31687dc0e9..bea1d5be3bd 100644
--- a/src/mame/includes/grchamp.h
+++ b/src/mame/includes/grchamp.h
@@ -19,7 +19,8 @@ public:
m_centerram(*this, "centerram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
- m_subcpu(*this, "sub") { }
+ m_subcpu(*this, "sub"),
+ m_discrete(*this, "discrete") { }
UINT8 m_cpu0_out[16];
UINT8 m_cpu1_out[16];
@@ -82,6 +83,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<cpu_device> m_subcpu;
+ required_device<discrete_device> m_discrete;
};
/* Discrete Sound Input Nodes */
diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h
index 25471a8e185..649023b7ab6 100644
--- a/src/mame/includes/hitme.h
+++ b/src/mame/includes/hitme.h
@@ -18,7 +18,8 @@ public:
hitme_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
/* memory pointers */
required_shared_ptr<UINT8> m_videoram;
@@ -45,6 +46,7 @@ public:
UINT8 read_port_and_t0( int port );
UINT8 read_port_and_t0_and_hblank( int port );
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index ea389878fa8..998239a0bb2 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -28,7 +28,8 @@ public:
m_edge2_pos(*this, "edge2_pos"),
m_scroll(*this, "scroll"),
m_maincpu(*this, "maincpu"),
- m_audiocpu(*this, "audiocpu") { }
+ m_audiocpu(*this, "audiocpu"),
+ m_discrete(*this, "discrete") { }
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_charram;
@@ -72,6 +73,7 @@ public:
inline UINT8 shift_common(UINT8 hi, UINT8 lo);
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
+ required_device<discrete_device> m_discrete;
};
/*----------- defined in video/madalien.c -----------*/
diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h
index d631ba22c75..585dc04cad8 100644
--- a/src/mame/includes/norautp.h
+++ b/src/mame/includes/norautp.h
@@ -11,7 +11,8 @@ class norautp_state : public driver_device
public:
norautp_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
UINT16 *m_np_vram;
UINT16 m_np_addr;
@@ -30,6 +31,7 @@ public:
virtual void palette_init();
UINT32 screen_update_norautp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
/*----------- defined in audio/norautp.c -----------*/
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index 710020e8603..3c40dd7105c 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -25,7 +25,8 @@ public:
skydiver_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_videoram(*this, "videoram") ,
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
required_shared_ptr<UINT8> m_videoram;
int m_nmion;
@@ -55,6 +56,7 @@ public:
INTERRUPT_GEN_MEMBER(skydiver_interrupt);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
/*----------- defined in audio/skydiver.c -----------*/
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index 2f5366d5561..91b8ed0a1bf 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -27,7 +27,8 @@ public:
sprint2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_video_ram(*this, "video_ram"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
int m_attract;
int m_steering[2];
@@ -74,6 +75,7 @@ public:
inline int get_sprite_y(UINT8 *video_ram, int n);
int service_mode();
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
/*----------- defined in audio/sprint2.c -----------*/
diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h
index 75263ced83a..dc4e4e342b2 100644
--- a/src/mame/includes/sprint4.h
+++ b/src/mame/includes/sprint4.h
@@ -4,7 +4,8 @@ public:
sprint4_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
required_shared_ptr<UINT8> m_videoram;
int m_da_latch;
@@ -43,4 +44,5 @@ public:
void screen_eof_sprint4(screen_device &screen, bool state);
TIMER_CALLBACK_MEMBER(nmi_callback);
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index e120b2bcbb4..f0eb6166e18 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -39,7 +39,8 @@ public:
m_hpos_ram(*this, "hpos_ram"),
m_vpos_ram(*this, "vpos_ram"),
m_obj_ram(*this, "obj_ram"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
int m_analog_in_select;
int m_attract;
@@ -98,6 +99,7 @@ public:
int point_in_circle(int x, int y, int center_x, int center_y, int r);
int circle_collision(const rectangle &rect);
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
/*----------- defined in audio/starshp1.c -----------*/
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index 42886f3a96c..7a799538aac 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -33,7 +33,8 @@ public:
m_pos_v_ram(*this, "pos_v_ram"),
m_pos_d_ram(*this, "pos_d_ram"),
m_team(*this, "team"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
int m_collision_index;
required_shared_ptr<UINT8> m_video_ram;
@@ -70,6 +71,7 @@ public:
void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect);
void tank8_set_collision(int index);
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
/*----------- defined in audio/tank8.c -----------*/
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index 73557801375..abea70daf6a 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -26,7 +26,8 @@ public:
m_hpos_ram(*this, "hpos_ram"),
m_orga_ram(*this, "orga_ram"),
m_code_ram(*this, "code_ram"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
UINT8 m_cmos[16];
UINT8 m_da_latch;
@@ -57,6 +58,7 @@ public:
void triplhnt_set_collision(int code);
void triplhnt_update_misc(address_space &space, int offset);
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h
index d3339244797..7c4d9a6b749 100644
--- a/src/mame/includes/ultratnk.h
+++ b/src/mame/includes/ultratnk.h
@@ -4,6 +4,7 @@
*************************************************************************/
+#include "sound/discrete.h"
class ultratnk_state : public driver_device
{
@@ -11,7 +12,8 @@ public:
ultratnk_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
required_shared_ptr<UINT8> m_videoram;
int m_da_latch;
@@ -44,4 +46,5 @@ public:
void screen_eof_ultratnk(screen_device &screen, bool state);
TIMER_CALLBACK_MEMBER(nmi_callback);
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h
index 9c8f6717c56..7a921e12cb9 100644
--- a/src/mame/includes/videopin.h
+++ b/src/mame/includes/videopin.h
@@ -21,7 +21,8 @@ public:
videopin_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_video_ram(*this, "video_ram"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu"),
+ m_discrete(*this, "discrete") { }
attotime m_time_pushed;
attotime m_time_released;
@@ -47,6 +48,7 @@ public:
void update_plunger();
double calc_plunger_pos();
required_device<cpu_device> m_maincpu;
+ required_device<discrete_device> m_discrete;
};
/*----------- defined in audio/videopin.c -----------*/
diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h
index 9ff4e782252..cd1c441de0d 100644
--- a/src/mame/includes/wiz.h
+++ b/src/mame/includes/wiz.h
@@ -1,3 +1,5 @@
+#include "sound/discrete.h"
+
class wiz_state : public driver_device
{
public:
@@ -12,7 +14,8 @@ public:
m_spriteram(*this, "spriteram"),
m_sprite_bank(*this, "sprite_bank"),
m_maincpu(*this, "maincpu"),
- m_audiocpu(*this, "audiocpu") { }
+ m_audiocpu(*this, "audiocpu"),
+ m_discrete(*this, "discrete") { }
int m_dsc0;
int m_dsc1;
@@ -60,4 +63,5 @@ public:
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, UINT8* sprite_ram,int bank);
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
+ optional_device<discrete_device> m_discrete;
};