← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/niyanpai.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/video/niyanpai.c
18
18
 
19
19
 
20
20
******************************************************************************/
21
 
READ16_HANDLER( niyanpai_palette_r )
 
21
READ16_MEMBER(niyanpai_state::niyanpai_palette_r)
22
22
{
23
 
        niyanpai_state *state = space->machine().driver_data<niyanpai_state>();
24
 
        return state->m_palette[offset];
 
23
        return m_palette[offset];
25
24
}
26
25
 
27
 
WRITE16_HANDLER( niyanpai_palette_w )
 
26
WRITE16_MEMBER(niyanpai_state::niyanpai_palette_w)
28
27
{
29
 
        niyanpai_state *state = space->machine().driver_data<niyanpai_state>();
30
28
        int r, g, b;
31
29
        int offs_h, offs_l;
32
 
        UINT16 oldword = state->m_palette[offset];
 
30
        UINT16 oldword = m_palette[offset];
33
31
        UINT16 newword;
34
32
 
35
 
        COMBINE_DATA(&state->m_palette[offset]);
36
 
        newword = state->m_palette[offset];
 
33
        COMBINE_DATA(&m_palette[offset]);
 
34
        newword = m_palette[offset];
37
35
 
38
36
        if (oldword != newword)
39
37
        {
42
40
 
43
41
                if (ACCESSING_BITS_8_15)
44
42
                {
45
 
                        r  = ((state->m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
46
 
                        g  = ((state->m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
47
 
                        b  = ((state->m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
 
43
                        r  = ((m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
 
44
                        g  = ((m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
 
45
                        b  = ((m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
48
46
 
49
 
                        palette_set_color(space->machine(), ((offs_h << 8) + (offs_l << 1) + 0), MAKE_RGB(r, g, b));
 
47
                        palette_set_color(machine(), ((offs_h << 8) + (offs_l << 1) + 0), MAKE_RGB(r, g, b));
50
48
                }
51
49
 
52
50
                if (ACCESSING_BITS_0_7)
53
51
                {
54
 
                        r  = ((state->m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
55
 
                        g  = ((state->m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
56
 
                        b  = ((state->m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
 
52
                        r  = ((m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
 
53
                        g  = ((m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
 
54
                        b  = ((m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
57
55
 
58
 
                        palette_set_color(space->machine(), ((offs_h << 8) + (offs_l << 1) + 1), MAKE_RGB(r, g, b));
 
56
                        palette_set_color(machine(), ((offs_h << 8) + (offs_l << 1) + 1), MAKE_RGB(r, g, b));
59
57
                }
60
58
        }
61
59
}
68
66
{
69
67
        niyanpai_state *state = machine.driver_data<niyanpai_state>();
70
68
        int ret;
71
 
        UINT8 *GFXROM = machine.region("gfx1")->base();
 
69
        UINT8 *GFXROM = state->memregion("gfx1")->base();
72
70
 
73
71
        switch (offset)
74
72
        {
182
180
static void niyanpai_gfxdraw(running_machine &machine, int vram)
183
181
{
184
182
        niyanpai_state *state = machine.driver_data<niyanpai_state>();
185
 
        UINT8 *GFX = machine.region("gfx1")->base();
 
183
        UINT8 *GFX = state->memregion("gfx1")->base();
186
184
        int width = machine.primary_screen->width();
187
185
 
188
186
        int x, y;
229
227
                skipy = -1;
230
228
        }
231
229
 
232
 
        gfxlen = machine.region("gfx1")->bytes();
 
230
        gfxlen = machine.root_device().memregion("gfx1")->bytes();
233
231
        gfxaddr = ((state->m_blitter_src_addr[vram] + 2) & 0x00ffffff);
234
232
 
235
233
        for (y = starty, ctry = sizey; ctry >= 0; y += skipy, ctry--)
332
330
        }
333
331
 
334
332
        state->m_nb19010_busyflag = 0;
335
 
        machine.scheduler().timer_set(attotime::from_nsec(1650 * state->m_nb19010_busyctr), FUNC(blitter_timer_callback));
 
333
        machine.scheduler().timer_set(attotime::from_nsec(1000 * state->m_nb19010_busyctr), FUNC(blitter_timer_callback));
336
334
}
337
335
 
338
336
/******************************************************************************
339
337
 
340
338
 
341
339
******************************************************************************/
342
 
WRITE16_HANDLER( niyanpai_blitter_0_w ) { niyanpai_blitter_w(space->machine(), 0, offset, data); }
343
 
WRITE16_HANDLER( niyanpai_blitter_1_w ) { niyanpai_blitter_w(space->machine(), 1, offset, data); }
344
 
WRITE16_HANDLER( niyanpai_blitter_2_w ) { niyanpai_blitter_w(space->machine(), 2, offset, data); }
345
 
 
346
 
READ16_HANDLER( niyanpai_blitter_0_r )  { return niyanpai_blitter_r(space->machine(), 0, offset); }
347
 
READ16_HANDLER( niyanpai_blitter_1_r )  { return niyanpai_blitter_r(space->machine(), 1, offset); }
348
 
READ16_HANDLER( niyanpai_blitter_2_r )  { return niyanpai_blitter_r(space->machine(), 2, offset); }
349
 
 
350
 
WRITE16_HANDLER( niyanpai_clut_0_w )    { niyanpai_clut_w(space->machine(), 0, offset, data); }
351
 
WRITE16_HANDLER( niyanpai_clut_1_w )    { niyanpai_clut_w(space->machine(), 1, offset, data); }
352
 
WRITE16_HANDLER( niyanpai_clut_2_w )    { niyanpai_clut_w(space->machine(), 2, offset, data); }
353
 
 
354
 
WRITE16_HANDLER( niyanpai_clutsel_0_w ) { niyanpai_clutsel_w(space->machine(), 0, data); }
355
 
WRITE16_HANDLER( niyanpai_clutsel_1_w ) { niyanpai_clutsel_w(space->machine(), 1, data); }
356
 
WRITE16_HANDLER( niyanpai_clutsel_2_w ) { niyanpai_clutsel_w(space->machine(), 2, data); }
 
340
WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_0_w){ niyanpai_blitter_w(machine(), 0, offset, data); }
 
341
WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_1_w){ niyanpai_blitter_w(machine(), 1, offset, data); }
 
342
WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_2_w){ niyanpai_blitter_w(machine(), 2, offset, data); }
 
343
 
 
344
READ16_MEMBER(niyanpai_state::niyanpai_blitter_0_r){ return niyanpai_blitter_r(machine(), 0, offset); }
 
345
READ16_MEMBER(niyanpai_state::niyanpai_blitter_1_r){ return niyanpai_blitter_r(machine(), 1, offset); }
 
346
READ16_MEMBER(niyanpai_state::niyanpai_blitter_2_r){ return niyanpai_blitter_r(machine(), 2, offset); }
 
347
 
 
348
WRITE16_MEMBER(niyanpai_state::niyanpai_clut_0_w){ niyanpai_clut_w(machine(), 0, offset, data); }
 
349
WRITE16_MEMBER(niyanpai_state::niyanpai_clut_1_w){ niyanpai_clut_w(machine(), 1, offset, data); }
 
350
WRITE16_MEMBER(niyanpai_state::niyanpai_clut_2_w){ niyanpai_clut_w(machine(), 2, offset, data); }
 
351
 
 
352
WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_0_w){ niyanpai_clutsel_w(machine(), 0, data); }
 
353
WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_1_w){ niyanpai_clutsel_w(machine(), 1, data); }
 
354
WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_2_w){ niyanpai_clutsel_w(machine(), 2, data); }
357
355
 
358
356
/******************************************************************************
359
357