← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/mame/machine/archimds.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/machine/archimds.c
74
74
 
75
75
        if (ioc_regs[IRQ_MASK_B] & mask)
76
76
        {
77
 
                generic_pulse_irq_line(machine.device("maincpu"), ARM_IRQ_LINE);
 
77
                generic_pulse_irq_line(machine.device("maincpu"), ARM_IRQ_LINE, 1);
78
78
        }
79
79
}
80
80
 
84
84
 
85
85
        if (ioc_regs[FIQ_MASK] & mask)
86
86
        {
87
 
                generic_pulse_irq_line(machine.device("maincpu"), ARM_FIRQ_LINE);
 
87
                generic_pulse_irq_line(machine.device("maincpu"), ARM_FIRQ_LINE, 1);
88
88
        }
89
89
}
90
90
 
116
116
static TIMER_CALLBACK( vidc_video_tick )
117
117
{
118
118
        address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
119
 
        static UINT8 *vram = machine.region("vram")->base();
 
119
        static UINT8 *vram = machine.root_device().memregion("vram")->base();
120
120
        UINT32 size;
121
121
 
122
122
        size = vidc_vidend-vidc_vidstart+0x10;
289
289
        {
290
290
                UINT32 *rom;
291
291
 
292
 
                rom = (UINT32 *)space->machine().region("maincpu")->base();
 
292
                rom = (UINT32 *)space->machine().root_device().memregion("maincpu")->base();
293
293
 
294
294
                return rom[offset & 0x1fffff];
295
295
        }
355
355
        {
356
356
                UINT32 *rom;
357
357
 
358
 
                rom = (UINT32 *)space->machine().region("maincpu")->base();
 
358
                rom = (UINT32 *)space->machine().root_device().memregion("maincpu")->base();
359
359
 
360
360
                return rom[offset & 0x1fffff];
361
361
        }
406
406
        // if the boot ROM is mapped in, do some trickery to make it show up
407
407
        if (memc_latchrom)
408
408
        {
409
 
                direct.explicit_configure(0x000000, 0x1fffff, 0x1fffff, *direct.space().machine().region("maincpu"));
 
409
                direct.explicit_configure(0x000000, 0x1fffff, 0x1fffff, *direct.space().machine().root_device().memregion("maincpu"));
410
410
        }
411
411
        else    // executing from logical memory
412
412
        {
855
855
        // 0x00 - 0x3c Video Palette Logical Colors (16 colors)
856
856
        // 0x40 Border Color
857
857
        // 0x44 - 0x4c Cursor Palette Logical Colors
858
 
        if (reg >= 0x00 && reg <= 0x4c)
 
858
        if (reg <= 0x4c)
859
859
        {
860
860
                int r,g,b;
861
861