← Back to branch summary

~ubuntu-branches/debian/wheezy/mame/wheezy

« back to all changes in this revision

Viewing changes to src/mame/drivers/armedf.c

  • Committer: Bazaar Package Importer
  • Author(s): Jordi Mallach, Emmanuel Kasper, Félix Arreola Rodríguez, Jordi Mallach
  • Date: 2011-05-11 21:06:50 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110511210650-jizvh8a6x117y9hr
Tags: 0.142-1
[ Emmanuel Kasper ]
* New upstream release
* Set NOWERROR=1 to allow compiling with gcc-4.6
* Remove fix_powerpc_build.patch, as upstream has taken it in this release
* Add gnome-video-arcade front end as a suggested package

[ Félix Arreola Rodríguez ]
* Add kfreebsd-build.patch to quilt series, to fix build on kfreebsd

[ Jordi Mallach ]
* Remove unneeded and bogus addition of --with-quilt to the dh invocation.
* Add Cesare Falco (long time Ubuntu maintainer) to Uploaders, and wrap
  them into multiple lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/drivers/armedf.c
176
176
 
177
177
static WRITE16_HANDLER( io_w )
178
178
{
179
 
        armedf_state *state = space->machine->driver_data<armedf_state>();
 
179
        armedf_state *state = space->machine().driver_data<armedf_state>();
180
180
 
181
 
        COMBINE_DATA(&state->vreg);
 
181
        COMBINE_DATA(&state->m_vreg);
182
182
        /* bits 0 and 1 of armedf_vreg are coin counters */
183
183
        /* bit 12 seems to handle screen flipping */
184
 
        flip_screen_set(space->machine, state->vreg & 0x1000);
 
184
        flip_screen_set(space->machine(), state->m_vreg & 0x1000);
185
185
}
186
186
 
187
187
static WRITE16_HANDLER( terraf_io_w )
188
188
{
189
 
        armedf_state *state = space->machine->driver_data<armedf_state>();
 
189
        armedf_state *state = space->machine().driver_data<armedf_state>();
190
190
 
191
 
        COMBINE_DATA(&state->vreg);
 
191
        COMBINE_DATA(&state->m_vreg);
192
192
        /* bits 0 and 1 of armedf_vreg are coin counters */
193
193
        /* bit 12 seems to handle screen flipping */
194
 
        flip_screen_set(space->machine, state->vreg & 0x1000);
 
194
        flip_screen_set(space->machine(), state->m_vreg & 0x1000);
195
195
 
196
 
        if ((state->vreg & 0x4000) && !(state->vreg & 0x0100))
 
196
        if ((state->m_vreg & 0x4000) && !(state->m_vreg & 0x0100))
197
197
        {
198
198
                int i;
199
199
                for (i = 0x10; i < 0x1000; i++)
200
200
                {
201
 
                        state->text_videoram[i] = 0x20;
 
201
                        state->m_text_videoram[i] = 0x20;
202
202
                }
203
 
                tilemap_mark_all_tiles_dirty(state->tx_tilemap);
 
203
                tilemap_mark_all_tiles_dirty(state->m_tx_tilemap);
204
204
                //logerror("vreg WIPE TX\n");
205
205
        }
206
 
        //logerror("VReg = %04x\n", state->vreg);
 
206
        //logerror("VReg = %04x\n", state->m_vreg);
207
207
 
208
208
}
209
209
 
210
210
static WRITE16_HANDLER( kodure_io_w )
211
211
{
212
 
        armedf_state *state = space->machine->driver_data<armedf_state>();
 
212
        armedf_state *state = space->machine().driver_data<armedf_state>();
213
213
 
214
 
        COMBINE_DATA(&state->vreg);
 
214
        COMBINE_DATA(&state->m_vreg);
215
215
        /* bits 0 and 1 of armedf_vreg are coin counters */
216
216
        /* bit 12 seems to handle screen flipping */
217
 
        flip_screen_set(space->machine, state->vreg & 0x1000);
 
217
        flip_screen_set(space->machine(), state->m_vreg & 0x1000);
218
218
 
219
219
        /* This is a temporary condition specification. */
220
 
        if (!(state->vreg & 0x0080))
 
220
        if (!(state->m_vreg & 0x0080))
221
221
        {
222
222
                int i;
223
223
                for (i = 0; i < 0x1000; i++)
233
233
                soundlatch_w(space, 0, ((data & 0x7f) << 1) | 1);
234
234
}
235
235
 
 
236
static READ8_HANDLER( soundlatch_clear_r )
 
237
{
 
238
        soundlatch_clear_w(space, 0, 0);
 
239
        return 0;
 
240
}
 
241
 
236
242
#ifdef UNUSED_FUNCTION
237
243
static WRITE16_HANDLER( legion_command_c )
238
244
{
239
 
        armedf_state *state = space->machine->driver_data<armedf_state>();
 
245
        armedf_state *state = space->machine().driver_data<armedf_state>();
240
246
 
241
 
        COMBINE_DATA(&state->legion_cmd[offset]);
 
247
        COMBINE_DATA(&state->m_legion_cmd[offset]);
242
248
        //logerror("Legion CMD %04x=%04x", offset, data);
243
249
}
244
250
#endif
251
257
 *
252
258
 *************************************/
253
259
 
254
 
static ADDRESS_MAP_START( terraf_map, ADDRESS_SPACE_PROGRAM, 16 )
 
260
static ADDRESS_MAP_START( terraf_map, AS_PROGRAM, 16 )
255
261
        AM_RANGE(0x000000, 0x04ffff) AM_ROM
256
262
        AM_RANGE(0x060000, 0x0603ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
257
263
        AM_RANGE(0x060400, 0x063fff) AM_RAM
258
264
        AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
259
 
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, text_videoram)
 
265
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, m_text_videoram)
260
266
        AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
261
267
        AM_RANGE(0x06c000, 0x06c9ff) AM_RAM
262
 
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, fg_videoram)
263
 
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, bg_videoram)
 
268
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, m_fg_videoram)
 
269
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, m_bg_videoram)
264
270
        AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
265
271
        AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
266
272
        AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
277
283
ADDRESS_MAP_END
278
284
 
279
285
/* the same for now */
280
 
static ADDRESS_MAP_START( terrafb_map, ADDRESS_SPACE_PROGRAM, 16 )
 
286
static ADDRESS_MAP_START( terrafb_map, AS_PROGRAM, 16 )
281
287
        AM_RANGE(0x000000, 0x04ffff) AM_ROM
282
288
        AM_RANGE(0x060000, 0x0603ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
283
289
        AM_RANGE(0x060400, 0x063fff) AM_RAM
284
290
        AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
285
 
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, text_videoram)
 
291
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, m_text_videoram)
286
292
        AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
287
293
        AM_RANGE(0x06c000, 0x06c9ff) AM_RAM
288
 
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, fg_videoram)
289
 
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, bg_videoram)
 
294
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, m_fg_videoram)
 
295
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, m_bg_videoram)
290
296
        AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
291
297
        AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
292
298
        AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
302
308
        AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(terraf_fg_scroll_msb_arm_w)       /* written between two consecutive writes to 7c008 */
303
309
ADDRESS_MAP_END
304
310
 
305
 
static ADDRESS_MAP_START( kodure_map, ADDRESS_SPACE_PROGRAM, 16 )
 
311
static ADDRESS_MAP_START( kodure_map, AS_PROGRAM, 16 )
306
312
        AM_RANGE(0x000000, 0x05ffff) AM_ROM
307
313
        AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
308
314
        AM_RANGE(0x061000, 0x063fff) AM_RAM
309
315
        AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
310
 
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, text_videoram)
 
316
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, m_text_videoram)
311
317
        AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
312
318
        AM_RANGE(0x06c000, 0x06c9ff) AM_RAM
313
 
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, fg_videoram)
314
 
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, bg_videoram)
 
319
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, m_fg_videoram)
 
320
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, m_bg_videoram)
315
321
        AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
316
322
        AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
317
323
        AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
324
330
        AM_RANGE(0xffd000, 0xffd001) AM_WRITENOP /* ? */
325
331
ADDRESS_MAP_END
326
332
 
327
 
static ADDRESS_MAP_START( cclimbr2_map, ADDRESS_SPACE_PROGRAM, 16 )
 
333
static ADDRESS_MAP_START( cclimbr2_map, AS_PROGRAM, 16 )
328
334
        AM_RANGE(0x000000, 0x05ffff) AM_ROM
329
335
        AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
330
336
        AM_RANGE(0x061000, 0x063fff) AM_RAM
331
337
        AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
332
 
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, text_videoram)
 
338
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, m_text_videoram)
333
339
        AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
334
340
        AM_RANGE(0x06c000, 0x06c9ff) AM_RAM
335
341
        AM_RANGE(0x06ca00, 0x06cbff) AM_WRITEONLY
336
 
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, fg_videoram)
337
 
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, bg_videoram)
 
342
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, m_fg_videoram)
 
343
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, m_bg_videoram)
338
344
        AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
339
345
        AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
340
346
        AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
347
353
        AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
348
354
ADDRESS_MAP_END
349
355
 
350
 
static ADDRESS_MAP_START( legion_map, ADDRESS_SPACE_PROGRAM, 16 )
 
356
static ADDRESS_MAP_START( legion_map, AS_PROGRAM, 16 )
351
357
        AM_RANGE(0x000000, 0x05ffff) AM_ROM
352
358
        AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
353
359
        AM_RANGE(0x061000, 0x063fff) AM_RAM
354
360
        AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
355
 
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, text_videoram)
 
361
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, m_text_videoram)
356
362
        AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
357
363
        AM_RANGE(0x06c000, 0x06c9ff) AM_RAM
358
364
        AM_RANGE(0x06ca00, 0x06cbff) AM_WRITEONLY
359
 
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, fg_videoram)
360
 
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, bg_videoram)
 
365
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, m_fg_videoram)
 
366
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, m_bg_videoram)
361
367
        AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
362
368
        AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
363
369
        AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
370
376
        AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP                /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
371
377
ADDRESS_MAP_END
372
378
 
373
 
static ADDRESS_MAP_START( legiono_map, ADDRESS_SPACE_PROGRAM, 16 )
 
379
static ADDRESS_MAP_START( legiono_map, AS_PROGRAM, 16 )
374
380
        AM_RANGE(0x000000, 0x03ffff) AM_ROM
375
 
        AM_RANGE(0x040000, 0x04003f) AM_WRITEONLY AM_BASE_MEMBER(armedf_state, legion_cmd)
 
381
        AM_RANGE(0x040000, 0x04003f) AM_WRITEONLY AM_BASE_MEMBER(armedf_state, m_legion_cmd)
376
382
        AM_RANGE(0x040040, 0x05ffff) AM_ROM
377
383
        AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
378
384
        AM_RANGE(0x061000, 0x063fff) AM_RAM
379
385
        AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
380
 
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, text_videoram)
 
386
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, m_text_videoram)
381
387
        AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
382
388
        AM_RANGE(0x06c000, 0x06c9ff) AM_RAM
383
389
        AM_RANGE(0x06ca00, 0x06cbff) AM_WRITEONLY
384
 
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, fg_videoram)
385
 
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, bg_videoram)
 
390
        AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, m_fg_videoram)
 
391
        AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, m_bg_videoram)
386
392
        AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
387
393
        AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
388
394
        AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
395
401
        //AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP      /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
396
402
ADDRESS_MAP_END
397
403
 
398
 
static ADDRESS_MAP_START( armedf_map, ADDRESS_SPACE_PROGRAM, 16 )
 
404
static ADDRESS_MAP_START( armedf_map, AS_PROGRAM, 16 )
399
405
        AM_RANGE(0x000000, 0x05ffff) AM_ROM
400
406
        AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
401
407
        AM_RANGE(0x061000, 0x065fff) AM_RAM
402
 
        AM_RANGE(0x066000, 0x066fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, bg_videoram)
403
 
        AM_RANGE(0x067000, 0x067fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, fg_videoram)
404
 
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, text_videoram)
 
408
        AM_RANGE(0x066000, 0x066fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE_MEMBER(armedf_state, m_bg_videoram)
 
409
        AM_RANGE(0x067000, 0x067fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE_MEMBER(armedf_state, m_fg_videoram)
 
410
        AM_RANGE(0x068000, 0x069fff) AM_RAM_WRITE(armedf_text_videoram_w) AM_BASE_MEMBER(armedf_state, m_text_videoram)
405
411
        AM_RANGE(0x06a000, 0x06afff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
406
412
        AM_RANGE(0x06b000, 0x06bfff) AM_RAM
407
413
        AM_RANGE(0x06c000, 0x06c001) AM_READ_PORT("P1")
418
424
ADDRESS_MAP_END
419
425
 
420
426
 
421
 
static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 
427
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
422
428
        AM_RANGE(0x0000, 0xf7ff) AM_ROM
423
429
        AM_RANGE(0xf800, 0xffff) AM_RAM
424
430
ADDRESS_MAP_END
425
431
 
426
 
static ADDRESS_MAP_START( cclimbr2_soundmap, ADDRESS_SPACE_PROGRAM, 8 )
 
432
static ADDRESS_MAP_START( cclimbr2_soundmap, AS_PROGRAM, 8 )
427
433
        AM_RANGE(0x0000, 0xbfff) AM_ROM
428
434
        AM_RANGE(0xc000, 0xffff) AM_RAM
429
435
ADDRESS_MAP_END
430
436
 
431
437
 
432
 
static ADDRESS_MAP_START( terrafb_extraz80_map, ADDRESS_SPACE_PROGRAM, 8 )
 
438
static ADDRESS_MAP_START( terrafb_extraz80_map, AS_PROGRAM, 8 )
433
439
        AM_RANGE(0x0000, 0x3fff) AM_ROM
434
440
ADDRESS_MAP_END
435
441
 
436
 
static ADDRESS_MAP_START( terrafb_extraz80_portmap, ADDRESS_SPACE_IO, 8 )
 
442
static ADDRESS_MAP_START( terrafb_extraz80_portmap, AS_IO, 8 )
437
443
        ADDRESS_MAP_GLOBAL_MASK(0xff)
438
444
ADDRESS_MAP_END
439
445
 
440
 
 
441
 
static READ8_HANDLER( soundlatch_clear_r )
442
 
{
443
 
        soundlatch_clear_w(space, 0, 0);
444
 
        return 0;
445
 
}
446
 
 
447
 
static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 
446
static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
448
447
        ADDRESS_MAP_GLOBAL_MASK(0xff)
449
448
        AM_RANGE(0x0, 0x1) AM_DEVWRITE("ymsnd", ym3812_w)
450
449
        AM_RANGE(0x2, 0x2) AM_DEVWRITE("dac1", dac_signed_w)
762
761
 
763
762
static MACHINE_START( armedf )
764
763
{
765
 
        armedf_state *state = machine->driver_data<armedf_state>();
 
764
        armedf_state *state = machine.driver_data<armedf_state>();
766
765
 
767
 
        state_save_register_global(machine, state->mcu_mode);
768
 
        state_save_register_global(machine, state->old_mcu_mode);
769
 
        state_save_register_global(machine, state->scroll_msb);
770
 
        state_save_register_global(machine, state->waiting_msb);
771
 
        state_save_register_global(machine, state->vreg);
772
 
        state_save_register_global(machine, state->fg_scrollx);
773
 
        state_save_register_global(machine, state->fg_scrolly);
774
 
        state_save_register_global(machine, state->bg_scrollx);
775
 
        state_save_register_global(machine, state->bg_scrolly);
 
766
        state->save_item(NAME(state->m_mcu_mode));
 
767
        state->save_item(NAME(state->m_old_mcu_mode));
 
768
        state->save_item(NAME(state->m_scroll_msb));
 
769
        state->save_item(NAME(state->m_waiting_msb));
 
770
        state->save_item(NAME(state->m_vreg));
 
771
        state->save_item(NAME(state->m_fg_scrollx));
 
772
        state->save_item(NAME(state->m_fg_scrolly));
 
773
        state->save_item(NAME(state->m_bg_scrollx));
 
774
        state->save_item(NAME(state->m_bg_scrolly));
776
775
}
777
776
 
778
777
static MACHINE_RESET( armedf )
779
778
{
780
 
        armedf_state *state = machine->driver_data<armedf_state>();
 
779
        armedf_state *state = machine.driver_data<armedf_state>();
781
780
 
782
 
        state->mcu_mode = 0;
783
 
        state->old_mcu_mode = 0;
784
 
        state->scroll_msb = 0;
785
 
        state->waiting_msb = 0;
786
 
        state->vreg = 0;
787
 
        state->fg_scrollx = 0;
788
 
        state->fg_scrolly = 0;
789
 
        state->bg_scrollx = 0;
790
 
        state->bg_scrolly = 0;
 
781
        state->m_mcu_mode = 0;
 
782
        state->m_old_mcu_mode = 0;
 
783
        state->m_scroll_msb = 0;
 
784
        state->m_waiting_msb = 0;
 
785
        state->m_vreg = 0;
 
786
        state->m_fg_scrollx = 0;
 
787
        state->m_fg_scrolly = 0;
 
788
        state->m_bg_scrollx = 0;
 
789
        state->m_bg_scrolly = 0;
791
790
}
792
791
 
793
792
 
794
793
static MACHINE_CONFIG_START( terraf, armedf_state )
795
794
 
796
795
        /* basic machine hardware */
797
 
        MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
 
796
        MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)   // 8mhz?
798
797
        MCFG_CPU_PROGRAM_MAP(terraf_map)
799
798
        MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
800
799
 
801
 
        MCFG_CPU_ADD("audiocpu", Z80, 3072000)  /* 3.072 MHz???? */
 
800
        MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2)              // 4mhz?
802
801
        MCFG_CPU_PROGRAM_MAP(sound_map)
803
802
        MCFG_CPU_IO_MAP(sound_portmap)
804
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
803
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
805
804
 
806
805
        MCFG_MACHINE_START(armedf)
807
806
        MCFG_MACHINE_RESET(armedf)
815
814
        MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
816
815
        MCFG_SCREEN_SIZE(64*8, 32*8)
817
816
        MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
 
817
        MCFG_SCREEN_UPDATE(armedf)
 
818
        MCFG_SCREEN_EOF(armedf)
 
819
 
818
820
        MCFG_GFXDECODE(armedf)
 
821
 
819
822
        MCFG_PALETTE_LENGTH(2048)
820
823
 
821
 
        MCFG_VIDEO_EOF(armedf)
822
824
        MCFG_VIDEO_START(armedf)
823
 
        MCFG_VIDEO_UPDATE(armedf)
824
825
 
825
826
        /* sound hardware */
826
827
        MCFG_SPEAKER_STANDARD_MONO("mono")
827
828
 
828
 
        MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
 
829
        MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
829
830
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
830
831
 
831
832
        MCFG_SOUND_ADD("dac1", DAC, 0)
832
 
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
833
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
833
834
 
834
835
        MCFG_SOUND_ADD("dac2", DAC, 0)
835
 
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
836
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
836
837
MACHINE_CONFIG_END
837
838
 
838
839
static MACHINE_CONFIG_START( terrafb, armedf_state )
839
840
 
840
841
        /* basic machine hardware */
841
 
        MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
 
842
        MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)   // 8mhz?
842
843
        MCFG_CPU_PROGRAM_MAP(terrafb_map)
843
844
        MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
844
845
 
845
 
        MCFG_CPU_ADD("audiocpu", Z80, 3072000)  /* 3.072 MHz???? */
 
846
        MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2)              // 4mhz?
846
847
        MCFG_CPU_PROGRAM_MAP(sound_map)
847
848
        MCFG_CPU_IO_MAP(sound_portmap)
848
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
849
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
849
850
 
850
 
        MCFG_CPU_ADD("extra", Z80, 3072000)     /* 3.072 MHz???? */
 
851
        MCFG_CPU_ADD("extra", Z80, XTAL_8MHz/2)                 // 4mhz?
851
852
        MCFG_CPU_PROGRAM_MAP(terrafb_extraz80_map)
852
853
        MCFG_CPU_IO_MAP(terrafb_extraz80_portmap)
853
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
854
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
854
855
 
855
856
        MCFG_MACHINE_START(armedf)
856
857
        MCFG_MACHINE_RESET(armedf)
864
865
        MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
865
866
        MCFG_SCREEN_SIZE(64*8, 32*8)
866
867
        MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
 
868
        MCFG_SCREEN_UPDATE(armedf)
 
869
        MCFG_SCREEN_EOF(armedf)
 
870
 
867
871
        MCFG_GFXDECODE(armedf)
868
872
        MCFG_PALETTE_LENGTH(2048)
869
873
 
870
 
        MCFG_VIDEO_EOF(armedf)
871
874
        MCFG_VIDEO_START(armedf)
872
 
        MCFG_VIDEO_UPDATE(armedf)
873
875
 
874
876
        /* sound hardware */
875
877
        MCFG_SPEAKER_STANDARD_MONO("mono")
876
878
 
877
 
        MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
 
879
        MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
878
880
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
879
881
 
880
882
        MCFG_SOUND_ADD("dac1", DAC, 0)
881
 
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
883
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
882
884
 
883
885
        MCFG_SOUND_ADD("dac2", DAC, 0)
884
 
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
886
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
885
887
MACHINE_CONFIG_END
886
888
 
887
889
static MACHINE_CONFIG_START( kodure, armedf_state )
888
890
 
889
891
        /* basic machine hardware */
890
 
        MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
 
892
        MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)   // 8mhz?
891
893
        MCFG_CPU_PROGRAM_MAP(kodure_map)
892
894
        MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
893
895
 
894
 
        MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
 
896
        MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2)              // 4mhz?
895
897
        MCFG_CPU_PROGRAM_MAP(sound_map)
896
898
        MCFG_CPU_IO_MAP(sound_portmap)
897
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
899
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
898
900
 
899
901
        MCFG_MACHINE_START(armedf)
900
902
        MCFG_MACHINE_RESET(armedf)
908
910
        MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
909
911
        MCFG_SCREEN_SIZE(64*8, 32*8)
910
912
        MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
 
913
        MCFG_SCREEN_UPDATE(armedf)
 
914
        MCFG_SCREEN_EOF(armedf)
 
915
 
911
916
        MCFG_GFXDECODE(armedf)
912
917
        MCFG_PALETTE_LENGTH(2048)
913
918
 
914
 
        MCFG_VIDEO_EOF(armedf)
915
919
        MCFG_VIDEO_START(armedf)
916
 
        MCFG_VIDEO_UPDATE(armedf)
917
920
 
918
921
        /* sound hardware */
919
922
        MCFG_SPEAKER_STANDARD_MONO("mono")
920
923
 
921
 
        MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
 
924
        MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
922
925
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
923
926
 
924
927
        MCFG_SOUND_ADD("dac1", DAC, 0)
931
934
static MACHINE_CONFIG_START( armedf, armedf_state )
932
935
 
933
936
        /* basic machine hardware */
934
 
        MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
 
937
        MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)   // 8mhz?
935
938
        MCFG_CPU_PROGRAM_MAP(armedf_map)
936
939
        MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
937
940
 
938
 
        MCFG_CPU_ADD("audiocpu", Z80, 3072000)  /* 3.072 MHz???? */
 
941
        MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2)              // 4mhz?
939
942
        MCFG_CPU_PROGRAM_MAP(sound_map)
940
943
        MCFG_CPU_IO_MAP(sound_portmap)
941
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
944
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
942
945
 
943
946
        MCFG_MACHINE_START(armedf)
944
947
        MCFG_MACHINE_RESET(armedf)
952
955
        MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
953
956
        MCFG_SCREEN_SIZE(64*8, 32*8)
954
957
        MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
 
958
        MCFG_SCREEN_UPDATE(armedf)
 
959
        MCFG_SCREEN_EOF(armedf)
 
960
 
955
961
        MCFG_GFXDECODE(armedf)
956
962
        MCFG_PALETTE_LENGTH(2048)
957
963
 
958
 
        MCFG_VIDEO_EOF(armedf)
959
964
        MCFG_VIDEO_START(armedf)
960
 
        MCFG_VIDEO_UPDATE(armedf)
961
965
 
962
966
        /* sound hardware */
963
967
        MCFG_SPEAKER_STANDARD_MONO("mono")
964
968
 
965
 
        MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
 
969
        MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
966
970
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
967
971
 
968
972
        MCFG_SOUND_ADD("dac1", DAC, 0)
969
 
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
973
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
970
974
 
971
975
        MCFG_SOUND_ADD("dac2", DAC, 0)
972
 
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
976
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
973
977
MACHINE_CONFIG_END
974
978
 
975
979
static MACHINE_CONFIG_START( cclimbr2, armedf_state )
976
980
 
977
981
        /* basic machine hardware */
978
 
        MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
 
982
        MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)   // 8mhz?
979
983
        MCFG_CPU_PROGRAM_MAP(cclimbr2_map)
980
984
        MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
981
985
 
982
 
        MCFG_CPU_ADD("audiocpu", Z80, 3072000)          /* 3.072 MHz???? */
 
986
        MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2)              // 4mhz?
983
987
        MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
984
988
        MCFG_CPU_IO_MAP(sound_portmap)
985
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
989
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
986
990
 
987
991
        MCFG_MACHINE_START(armedf)
988
992
        MCFG_MACHINE_RESET(armedf)
996
1000
        MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
997
1001
        MCFG_SCREEN_SIZE(64*8, 32*8)
998
1002
        MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
 
1003
        MCFG_SCREEN_UPDATE(armedf)
 
1004
        MCFG_SCREEN_EOF(armedf)
 
1005
 
999
1006
        MCFG_GFXDECODE(armedf)
1000
1007
        MCFG_PALETTE_LENGTH(2048)
1001
1008
 
1002
 
        MCFG_VIDEO_EOF(armedf)
1003
1009
        MCFG_VIDEO_START(armedf)
1004
 
        MCFG_VIDEO_UPDATE(armedf)
1005
1010
 
1006
1011
        /* sound hardware */
1007
1012
        MCFG_SPEAKER_STANDARD_MONO("mono")
1008
1013
 
1009
 
        MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
 
1014
        MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
1010
1015
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
1011
1016
 
1012
1017
        MCFG_SOUND_ADD("dac1", DAC, 0)
1019
1024
static MACHINE_CONFIG_START( legion, armedf_state )
1020
1025
 
1021
1026
        /* basic machine hardware */
1022
 
        MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
 
1027
        MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)   // 8mhz?
1023
1028
        MCFG_CPU_PROGRAM_MAP(legion_map)
1024
1029
        MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
1025
1030
 
1026
 
        MCFG_CPU_ADD("audiocpu", Z80, 3072000)  /* 3.072 MHz???? */
 
1031
        MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2)              // 4mhz?
1027
1032
        MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
1028
1033
        MCFG_CPU_IO_MAP(sound_portmap)
1029
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
1034
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
1030
1035
 
1031
1036
        MCFG_MACHINE_START(armedf)
1032
1037
        MCFG_MACHINE_RESET(armedf)
1040
1045
        MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
1041
1046
        MCFG_SCREEN_SIZE(64*8, 32*8)
1042
1047
        MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
 
1048
        MCFG_SCREEN_UPDATE(armedf)
 
1049
        MCFG_SCREEN_EOF(armedf)
 
1050
 
1043
1051
        MCFG_GFXDECODE(armedf)
1044
1052
        MCFG_PALETTE_LENGTH(2048)
1045
1053
 
1046
 
        MCFG_VIDEO_EOF(armedf)
1047
1054
        MCFG_VIDEO_START(armedf)
1048
 
        MCFG_VIDEO_UPDATE(armedf)
1049
1055
 
1050
1056
        /* sound hardware */
1051
1057
        MCFG_SPEAKER_STANDARD_MONO("mono")
1052
1058
 
1053
 
        MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
 
1059
        MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
1054
1060
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
1055
1061
 
1056
1062
        MCFG_SOUND_ADD("dac1", DAC, 0)
1063
1069
static MACHINE_CONFIG_START( legiono, armedf_state )
1064
1070
 
1065
1071
        /* basic machine hardware */
1066
 
        MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
 
1072
        MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)   // 8mhz?
1067
1073
        MCFG_CPU_PROGRAM_MAP(legiono_map)
1068
1074
        MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
1069
1075
 
1070
 
        MCFG_CPU_ADD("audiocpu", Z80, 3072000)  /* 3.072 MHz???? */
 
1076
        MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2)              // 4mhz?
1071
1077
        MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
1072
1078
        MCFG_CPU_IO_MAP(sound_portmap)
1073
 
        MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
 
1079
        MCFG_CPU_PERIODIC_INT(irq0_line_hold, XTAL_8MHz/2/512)  // ?
1074
1080
 
1075
1081
        MCFG_MACHINE_START(armedf)
1076
1082
        MCFG_MACHINE_RESET(armedf)
1084
1090
        MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
1085
1091
        MCFG_SCREEN_SIZE(64*8, 32*8)
1086
1092
        MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
 
1093
        MCFG_SCREEN_UPDATE(armedf)
 
1094
        MCFG_SCREEN_EOF(armedf)
 
1095
 
1087
1096
        MCFG_GFXDECODE(armedf)
1088
1097
        MCFG_PALETTE_LENGTH(2048)
1089
1098
 
1090
 
        MCFG_VIDEO_EOF(armedf)
1091
1099
        MCFG_VIDEO_START(armedf)
1092
 
        MCFG_VIDEO_UPDATE(armedf)
1093
1100
 
1094
1101
        /* sound hardware */
1095
1102
        MCFG_SPEAKER_STANDARD_MONO("mono")
1096
1103
 
1097
 
        MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
 
1104
        MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
1098
1105
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
1099
1106
 
1100
1107
        MCFG_SOUND_ADD("dac1", DAC, 0)
1501
1508
 
1502
1509
static DRIVER_INIT( terraf )
1503
1510
{
1504
 
        armedf_state *state = machine->driver_data<armedf_state>();
1505
 
        state->scroll_type = 0;
 
1511
        armedf_state *state = machine.driver_data<armedf_state>();
 
1512
        state->m_scroll_type = 0;
1506
1513
}
1507
1514
 
1508
1515
static DRIVER_INIT( terrafu )
1509
1516
{
1510
 
        armedf_state *state = machine->driver_data<armedf_state>();
1511
 
        state->scroll_type = 5;
 
1517
        armedf_state *state = machine.driver_data<armedf_state>();
 
1518
        state->m_scroll_type = 5;
1512
1519
}
1513
1520
 
1514
1521
static DRIVER_INIT( armedf )
1515
1522
{
1516
 
        armedf_state *state = machine->driver_data<armedf_state>();
1517
 
        state->scroll_type = 1;
 
1523
        armedf_state *state = machine.driver_data<armedf_state>();
 
1524
        state->m_scroll_type = 1;
1518
1525
}
1519
1526
 
1520
1527
 
1521
1528
static DRIVER_INIT( kodure )
1522
1529
{
1523
 
        armedf_state *state = machine->driver_data<armedf_state>();
1524
 
        state->scroll_type = 2;
 
1530
        armedf_state *state = machine.driver_data<armedf_state>();
 
1531
        state->m_scroll_type = 2;
1525
1532
}
1526
1533
 
1527
1534
static DRIVER_INIT( legion )
1528
1535
{
1529
 
        armedf_state *state = machine->driver_data<armedf_state>();
 
1536
        armedf_state *state = machine.driver_data<armedf_state>();
1530
1537
#if LEGION_HACK
1531
1538
        /* This is a hack to allow you to use the extra features
1532
1539
         of 3 of the "Unused" Dip Switches (see notes above). */
1533
 
        UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base();
 
1540
        UINT16 *RAM = (UINT16 *)machine.region("maincpu")->base();
1534
1541
        RAM[0x0001d6 / 2] = 0x0001;
1535
1542
        /* To avoid checksum error */
1536
1543
        RAM[0x000488 / 2] = 0x4e71;
1537
1544
#endif
1538
1545
 
1539
 
        state->scroll_type = 3;
 
1546
        state->m_scroll_type = 3;
1540
1547
}
1541
1548
 
1542
1549
static DRIVER_INIT( legiono )
1543
1550
{
1544
 
        armedf_state *state = machine->driver_data<armedf_state>();
 
1551
        armedf_state *state = machine.driver_data<armedf_state>();
1545
1552
#if LEGION_HACK
1546
1553
        /* This is a hack to allow you to use the extra features
1547
1554
         of 3 of the "Unused" Dip Switches (see notes above). */
1548
 
        UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base();
 
1555
        UINT16 *RAM = (UINT16 *)machine.region("maincpu")->base();
1549
1556
        RAM[0x0001d6/2] = 0x0001;
1550
1557
        /* No need to patch the checksum routine (see notes) ! */
1551
1558
#endif
1552
1559
 
1553
 
        state->scroll_type = 6;
 
1560
        state->m_scroll_type = 6;
1554
1561
}
1555
1562
 
1556
1563
static DRIVER_INIT( cclimbr2 )
1557
1564
{
1558
 
        armedf_state *state = machine->driver_data<armedf_state>();
1559
 
        state->scroll_type = 4;
 
1565
        armedf_state *state = machine.driver_data<armedf_state>();
 
1566
        state->m_scroll_type = 4;
1560
1567
}
1561
1568
 
1562
1569