← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/model1.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/model1.c
1168
1168
                state->m_listctl[0] ^= 0x40;
1169
1169
}
1170
1170
 
1171
 
READ16_HANDLER( model1_listctl_r )
 
1171
READ16_MEMBER(model1_state::model1_listctl_r)
1172
1172
{
1173
 
        model1_state *state = space->machine().driver_data<model1_state>();
1174
1173
        if(!offset)
1175
 
                return state->m_listctl[0] | 0x30;
 
1174
                return m_listctl[0] | 0x30;
1176
1175
        else
1177
 
                return state->m_listctl[1];
 
1176
                return m_listctl[1];
1178
1177
}
1179
1178
 
1180
 
WRITE16_HANDLER( model1_listctl_w )
 
1179
WRITE16_MEMBER(model1_state::model1_listctl_w)
1181
1180
{
1182
 
        model1_state *state = space->machine().driver_data<model1_state>();
1183
 
        COMBINE_DATA(state->m_listctl+offset);
1184
 
        LOG_TGP(("VIDEO: control=%08x\n", (state->m_listctl[1]<<16)|state->m_listctl[0]));
 
1181
        COMBINE_DATA(m_listctl+offset);
 
1182
        LOG_TGP(("VIDEO: control=%08x\n", (m_listctl[1]<<16)|m_listctl[0]));
1185
1183
}
1186
1184
 
1187
1185
static void tgp_render(running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cliprect)
1448
1446
VIDEO_START(model1)
1449
1447
{
1450
1448
        model1_state *state = machine.driver_data<model1_state>();
1451
 
        state->m_paletteram16 = machine.generic.paletteram.u16;
 
1449
        state->m_paletteram16 = state->m_generic_paletteram_16;
1452
1450
 
1453
1451
        state->m_view = auto_alloc_clear(machine, struct view);
1454
1452
 
1455
 
        state->m_poly_rom = (UINT32 *)machine.region("user1")->base();
 
1453
        state->m_poly_rom = (UINT32 *)state->memregion("user1")->base();
1456
1454
        state->m_poly_ram = auto_alloc_array_clear(machine, UINT32, 0x400000);
1457
1455
        state->m_tgp_ram = auto_alloc_array_clear(machine, UINT16, 0x100000-0x40000);
1458
1456
        state->m_pointdb = auto_alloc_array_clear(machine, struct point, 1000000*2);