← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/video/amiga.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/amiga.c
147
147
{
148
148
        amiga_state *state = screen.machine().driver_data<amiga_state>();
149
149
        UINT32 hvpos = (state->m_last_scanline << 8) | (screen.hpos() >> 2);
150
 
        UINT32 latchedpos = input_port_read_safe(screen.machine(), "HVPOS", 0);
 
150
        UINT32 latchedpos = state->ioport("HVPOS")->read_safe(0);
151
151
 
152
152
        /* if there's no latched position, or if we are in the active display area */
153
153
        /* but before the latching point, return the live HV position */