Previous 199869 Revisions Next

r32261 Sunday 21st September, 2014 at 20:54:24 UTC by Fabio Priuli
fixed nes regressions from rev. 32216: m_maincpu is not set yet at this stage,
so better perform a single tagmap lookup than crash the emulator ;-). nw.
[src/emu/bus/nes]bandai.c bootleg.c cony.c datach.c disksys.c event.c irem.c jaleco.c jy.c kaiser.c konami.c legacy.c namcot.c pirate.c sunsoft.c sunsoft_dcs.c tengen.c

trunk/src/emu/bus/nes/disksys.c
r32260r32261
123123   m_disk->floppy_install_unload_proc(nes_disksys_device::unload_proc);
124124
125125   irq_timer = timer_alloc(TIMER_IRQ);
126   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
126   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
127127   
128128   save_item(NAME(m_fds_motor_on));
129129   save_item(NAME(m_fds_door_closed));
trunk/src/emu/bus/nes/irem.c
r32260r32261
131131{
132132   common_start();
133133   irq_timer = timer_alloc(TIMER_IRQ);
134   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
134   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
135135
136136   save_item(NAME(m_irq_enable));
137137   save_item(NAME(m_irq_count));
trunk/src/emu/bus/nes/konami.c
r32260r32261
129129{
130130   common_start();
131131   irq_timer = timer_alloc(TIMER_IRQ);
132   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
132   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
133133
134134   save_item(NAME(m_irq_mode));
135135   save_item(NAME(m_irq_enable));
r32260r32261
157157{
158158   common_start();
159159   irq_timer = timer_alloc(TIMER_IRQ);
160   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
160   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
161161
162162   save_item(NAME(m_irq_mode));
163163   save_item(NAME(m_irq_prescale));
r32260r32261
198198{
199199   common_start();
200200   irq_timer = timer_alloc(TIMER_IRQ);
201   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
201   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
202202
203203   save_item(NAME(m_irq_mode));
204204   save_item(NAME(m_irq_prescale));
trunk/src/emu/bus/nes/bandai.c
r32260r32261
129129{
130130   common_start();
131131   irq_timer = timer_alloc(TIMER_IRQ);
132   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
132   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
133133
134134   save_item(NAME(m_irq_enable));
135135   save_item(NAME(m_irq_count));
r32260r32261
150150{
151151   common_start();
152152   irq_timer = timer_alloc(TIMER_IRQ);
153   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
153   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
154154
155155   save_item(NAME(m_irq_enable));
156156   save_item(NAME(m_irq_count));
r32260r32261
173173{
174174   common_start();
175175   irq_timer = timer_alloc(TIMER_IRQ);
176   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
176   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
177177
178178   save_item(NAME(m_reg));
179179}
trunk/src/emu/bus/nes/namcot.c
r32260r32261
146146{
147147   common_start();
148148   irq_timer = timer_alloc(TIMER_IRQ);
149   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
149   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
150150
151151   save_item(NAME(m_irq_enable));
152152   save_item(NAME(m_irq_count));
r32260r32261
172172{
173173   common_start();
174174   irq_timer = timer_alloc(TIMER_IRQ);
175   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
175   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
176176
177177   save_item(NAME(m_irq_enable));
178178   save_item(NAME(m_irq_count));
r32260r32261
200200{
201201   common_start();
202202   irq_timer = timer_alloc(TIMER_IRQ);
203   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
203   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
204204
205205   save_item(NAME(m_irq_enable));
206206   save_item(NAME(m_irq_count));
trunk/src/emu/bus/nes/datach.c
r32260r32261
242242   common_start();
243243   irq_timer = timer_alloc(TIMER_IRQ);
244244   serial_timer = timer_alloc(TIMER_SERIAL);
245   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
246   serial_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1000));
245   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
246   serial_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1000));
247247
248248   save_item(NAME(m_irq_enable));
249249   save_item(NAME(m_irq_count));
trunk/src/emu/bus/nes/pirate.c
r32260r32261
427427{
428428   common_start();
429429   irq_timer = timer_alloc(TIMER_IRQ);
430   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
430   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
431431
432432   save_item(NAME(m_prg_reg));
433433   save_item(NAME(m_prg_mode));
trunk/src/emu/bus/nes/sunsoft_dcs.c
r32260r32261
175175   common_start();
176176   ntb_enable_timer = timer_alloc(TIMER_PROTECT);
177177   ntb_enable_timer->reset();
178   timer_freq = m_maincpu->cycles_to_attotime(107520);
178   timer_freq = machine().device<cpu_device>("maincpu")->cycles_to_attotime(107520);
179179
180180   save_item(NAME(m_latch1));
181181   save_item(NAME(m_latch2));
trunk/src/emu/bus/nes/bootleg.c
r32260r32261
208208   common_start();
209209   irq_timer = timer_alloc(TIMER_IRQ);
210210   irq_timer->reset();
211   timer_freq = m_maincpu->cycles_to_attotime(24576);
211   timer_freq = machine().device<cpu_device>("maincpu")->cycles_to_attotime(24576);
212212
213213   save_item(NAME(m_irq_enable));
214214   save_item(NAME(m_latch));
r32260r32261
243243{
244244   common_start();
245245   irq_timer = timer_alloc(TIMER_IRQ);
246   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
246   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
247247
248248   save_item(NAME(m_irq_enable));
249249   save_item(NAME(m_irq_count));
r32260r32261
297297{
298298   common_start();
299299   irq_timer = timer_alloc(TIMER_IRQ);
300   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
300   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
301301
302302   save_item(NAME(m_irq_enable));
303303   save_item(NAME(m_irq_count));
r32260r32261
320320{
321321   common_start();
322322   irq_timer = timer_alloc(TIMER_IRQ);
323   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
323   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
324324
325325   save_item(NAME(m_irq_enable));
326326   save_item(NAME(m_irq_count));
r32260r32261
343343{
344344   common_start();
345345   irq_timer = timer_alloc(TIMER_IRQ);
346   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
346   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
347347
348348   save_item(NAME(m_irq_enable));
349349   save_item(NAME(m_irq_count));
r32260r32261
429429{
430430   common_start();
431431   irq_timer = timer_alloc(TIMER_IRQ);
432   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
432   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
433433
434434   save_item(NAME(m_irq_enable));
435435   save_item(NAME(m_irq_count));
r32260r32261
510510   common_start();
511511   irq_timer = timer_alloc(TIMER_IRQ);
512512   // always running and checking for IRQ every 114 cycles? or resetting every frame?
513   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(114));
513   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(114));
514514
515515   save_item(NAME(m_irq_enable));
516516   save_item(NAME(m_irq_count));
trunk/src/emu/bus/nes/jaleco.c
r32260r32261
209209{
210210   common_start();
211211   irq_timer = timer_alloc(TIMER_IRQ);
212   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
212   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
213213
214214   save_item(NAME(m_mmc_prg_bank));
215215   save_item(NAME(m_mmc_vrom_bank));
trunk/src/emu/bus/nes/cony.c
r32260r32261
6262{
6363   common_start();
6464   irq_timer = timer_alloc(TIMER_IRQ);
65   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
65   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
6666
6767   save_item(NAME(m_irq_enable));
6868   save_item(NAME(m_irq_count));
r32260r32261
9898{
9999   common_start();
100100   irq_timer = timer_alloc(TIMER_IRQ);
101   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
101   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
102102
103103   save_item(NAME(m_irq_enable));
104104   save_item(NAME(m_irq_count));
trunk/src/emu/bus/nes/kaiser.c
r32260r32261
138138{
139139   common_start();
140140   irq_timer = timer_alloc(TIMER_IRQ);
141   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
141   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
142142
143143   save_item(NAME(m_latch));
144144   save_item(NAME(m_irq_enable));
r32260r32261
164164{
165165   common_start();
166166   irq_timer = timer_alloc(TIMER_IRQ);
167   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
167   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
168168
169169   save_item(NAME(m_latch));
170170   save_item(NAME(m_irq_enable));
trunk/src/emu/bus/nes/tengen.c
r32260r32261
8484   common_start();
8585   irq_timer = timer_alloc(TIMER_IRQ);
8686   irq_timer->reset();
87   timer_freq = m_maincpu->cycles_to_attotime(4);
87   timer_freq = machine().device<cpu_device>("maincpu")->cycles_to_attotime(4);
8888
8989   save_item(NAME(m_mmc_prg_bank));
9090   save_item(NAME(m_mmc_vrom_bank));
trunk/src/emu/bus/nes/jy.c
r32260r32261
7676   common_start();
7777   irq_timer = timer_alloc(TIMER_IRQ);
7878   irq_timer->reset();
79   timer_freq = m_maincpu->cycles_to_attotime(1);
79   timer_freq = machine().device<cpu_device>("maincpu")->cycles_to_attotime(1);
8080
8181   save_item(NAME(m_mul));
8282   save_item(NAME(m_latch));
trunk/src/emu/bus/nes/sunsoft.c
r32260r32261
123123{
124124   common_start();
125125   irq_timer = timer_alloc(TIMER_IRQ);
126   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
126   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
127127
128128   save_item(NAME(m_irq_enable));
129129   save_item(NAME(m_irq_toggle));
r32260r32261
169169   irq_timer = timer_alloc(TIMER_IRQ);
170170   // this has to be hardcoded because some some scanline code only suits NTSC... it will be fixed with PPU rewrite
171171   irq_timer->adjust(attotime::zero, 0, attotime::from_hz((21477272.724 / 12)));
172//  irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
172//  irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
173173
174174   save_item(NAME(m_wram_bank));
175175   save_item(NAME(m_latch));
trunk/src/emu/bus/nes/legacy.c
r32260r32261
7979{
8080   common_start();
8181   irq_timer = timer_alloc(TIMER_IRQ);
82   irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1));
82   irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
8383
8484   save_item(NAME(m_exram));
8585   save_item(NAME(m_exram_enabled));
trunk/src/emu/bus/nes/event.c
r32260r32261
4848   common_start();
4949   event_timer = timer_alloc(TIMER_EVENT);
5050   event_timer->adjust(attotime::never);
51   timer_freq = m_maincpu->cycles_to_attotime(1);
51   timer_freq = machine().device<cpu_device>("maincpu")->cycles_to_attotime(1);
5252
5353   save_item(NAME(m_latch));
5454   save_item(NAME(m_count));

Previous 199869 Revisions Next

© 1997-2024 The MAME Team