Previous 199869 Revisions Next

r26072 Saturday 9th November, 2013 at 16:36:27 UTC by Osso
Removed anonymous timers from some drivers. (nw)
[src/mame/drivers]2mindril.c 40love.c acefruit.c
[src/mame/includes]40love.h

trunk/src/mame/drivers/2mindril.c
r26071r26072
5050
5151   /* memory pointers */
5252   required_shared_ptr<UINT16> m_iodata;
53
53   
5454   /* input-related */
5555   UINT16        m_defender_sensor;
5656   UINT16        m_shutter_sensor;
r26071r26072
6868   DECLARE_MACHINE_RESET(drill);
6969   INTERRUPT_GEN_MEMBER(drill_vblank_irq);
7070   //INTERRUPT_GEN_MEMBER(drill_device_irq);
71   TIMER_CALLBACK_MEMBER(shutter_req);
72   TIMER_CALLBACK_MEMBER(defender_req);
7371   void tile_decode();
7472   DECLARE_WRITE_LINE_MEMBER(irqhandler);
73   #ifdef UNUSED_FUNCTION
74   enum
75   {
76      TIMER_SHUTTER_REQ,
77      TIMER_DEFENDER_REQ
78   };
79   
80protected:
81   virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
82   #endif
7583};
7684
7785
r26071r26072
136144    PORT_DIPSETTING(      0x0800, DEF_STR( On ) )
137145*/
138146#ifdef UNUSED_FUNCTION
139TIMER_CALLBACK_MEMBER(_2mindril_state::shutter_req)
147void _2mindril_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
140148{
141   m_shutter_sensor = param;
149   switch (id)
150   {
151   case TIMER_SHUTTER_REQ:
152         m_shutter_sensor = param;
153         break;
154   case TIMER_DEFENDER_REQ:
155          m_defender_sensor = param;
156         break;
157   default:
158         assert_always(FALSE, "Unknown id in _2mindril_state::device_timer");
159   }
142160}
143
144TIMER_CALLBACK_MEMBER(_2mindril_state::defender_req)
145{
146   m_defender_sensor = param;
147}
148161#endif
149162
150163WRITE16_MEMBER(_2mindril_state::sensors_w)
r26071r26072
153166   /*---- ---- ---- -x-- lamp*/
154167   if (data & 1)
155168   {
156      //machine().scheduler().timer_set(attotime::from_seconds(2), FUNC(shutter_req ), 0x100);
169      //timer_set( attotime::from_seconds(2), TIMER_SHUTTER_REQ, 0x100);
157170      m_shutter_sensor = 0x100;
158171   }
159172   else if (data & 2)
160173   {
161      //machine().scheduler().timer_set( attotime::from_seconds(2), FUNC(shutter_req ), 0x200);
174      //timer_set( attotime::from_seconds(2), TIMER_SHUTTER_REQ, 0x200);
162175      m_shutter_sensor = 0x200;
163176   }
164177
165178   if (data & 0x1000 || data & 0x4000)
166179   {
167      //machine().scheduler().timer_set( attotime::from_seconds(2), FUNC(defender_req ), 0x800);
180      //timer_set( attotime::from_seconds(2), TIMER_DEFENDER_REQ, 0x800);
168181      m_defender_sensor = 0x800;
169182   }
170183   else if (data & 0x2000 || data & 0x8000)
171184   {
172      //machine().scheduler().timer_set( attotime::from_seconds(2), FUNC(defender_req ), 0x400);
185      //timer_set( attotime::from_seconds(2), TIMER_DEFENDER_REQ, 0x400);
173186      m_defender_sensor = 0x400;
174187   }
175188}
trunk/src/mame/drivers/40love.c
r26071r26072
229229#include "sound/dac.h"
230230#include "includes/40love.h"
231231
232TIMER_CALLBACK_MEMBER(fortyl_state::nmi_callback)
232void fortyl_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
233233{
234   if (m_sound_nmi_enable)
235      m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
236   else
237      m_pending_nmi = 1;
234   switch(id)
235   {
236   case TIMER_NMI_CALLBACK:
237      if (m_sound_nmi_enable)
238         m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
239      else
240         m_pending_nmi = 1;
241      break;
242   default:
243         assert_always(FALSE, "Unknown id in fortyl_state::device_timer");
244   }
238245}
239246
240247WRITE8_MEMBER(fortyl_state::sound_command_w)
241248{
242249   soundlatch_byte_w(space, 0, data);
243   machine().scheduler().synchronize(timer_expired_delegate(FUNC(fortyl_state::nmi_callback),this), data);
250   synchronize(TIMER_NMI_CALLBACK, data);
244251}
245252
246253WRITE8_MEMBER(fortyl_state::nmi_disable_w)
trunk/src/mame/drivers/acefruit.c
r26071r26072
2020public:
2121   acefruit_state(const machine_config &mconfig, device_type type, const char *tag)
2222      : driver_device(mconfig, type, tag),
23      m_maincpu(*this, "maincpu"),
2324      m_videoram(*this, "videoram"),
2425      m_colorram(*this, "colorram"),
25      m_spriteram(*this, "spriteram"),
26      m_maincpu(*this, "maincpu") { }
26      m_spriteram(*this, "spriteram") { }
2727
28   required_device<cpu_device> m_maincpu;
2829   required_shared_ptr<UINT8> m_videoram;
2930   required_shared_ptr<UINT8> m_colorram;
3031   required_shared_ptr<UINT8> m_spriteram;
r26071r26072
4243   virtual void palette_init();
4344   UINT32 screen_update_acefruit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
4445   INTERRUPT_GEN_MEMBER(acefruit_vblank);
45   TIMER_CALLBACK_MEMBER(acefruit_refresh);
4646   void acefruit_update_irq(int vpos);
47   required_device<cpu_device> m_maincpu;
47   
48   enum
49   {
50      TIMER_ACEFRUIT_REFRESH
51   };
52
53protected:
54   virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);   
4855};
4956
5057
r26071r26072
6976}
7077
7178
72TIMER_CALLBACK_MEMBER(acefruit_state::acefruit_refresh)
79void acefruit_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
7380{
7481   int vpos = m_screen->vpos();
7582
76   m_screen->update_partial(vpos );
77   acefruit_update_irq(vpos);
83   switch(id)
84   {
85   case TIMER_ACEFRUIT_REFRESH:
86         
87         m_screen->update_partial(vpos );
88         acefruit_update_irq(vpos);
7889
79   vpos = ( ( vpos / 8 ) + 1 ) * 8;
90         vpos = ( ( vpos / 8 ) + 1 ) * 8;
8091
81   m_refresh_timer->adjust( m_screen->time_until_pos(vpos) );
92         m_refresh_timer->adjust( m_screen->time_until_pos(vpos) );
93         break;
94   default:
95         assert_always(FALSE, "Unknown id in acefruit_state::device_timer");
96   }
8297}
8398
8499void acefruit_state::video_start()
85100{
86   m_refresh_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(acefruit_state::acefruit_refresh),this));
101   m_refresh_timer = timer_alloc(TIMER_ACEFRUIT_REFRESH);
87102}
88103
89104INTERRUPT_GEN_MEMBER(acefruit_state::acefruit_vblank)
trunk/src/mame/includes/40love.h
r26071r26072
2525   required_shared_ptr<UINT8> m_colorram;
2626   required_shared_ptr<UINT8> m_spriteram2;
2727   optional_shared_ptr<UINT8> m_mcu_ram;
28
28   
2929   /* video-related */
3030   bitmap_ind16    *m_tmp_bitmap1;
3131   bitmap_ind16    *m_tmp_bitmap2;
r26071r26072
109109   DECLARE_MACHINE_RESET(common);
110110   DECLARE_MACHINE_RESET(ta7630);
111111   UINT32 screen_update_fortyl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
112   TIMER_CALLBACK_MEMBER(nmi_callback);
113112   void redraw_pixels();
114113   void fortyl_set_scroll_x( int offset );
115114   void fortyl_plot_pix( int offset );
116115   void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
117116   void draw_pixram( bitmap_ind16 &bitmap, const rectangle &cliprect );
117   
118   enum
119   {
120      TIMER_NMI_CALLBACK
121   };
122
123protected:
124   virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);   
118125};

Previous 199869 Revisions Next


© 1997-2024 The MAME Team