← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/machine/cdislave.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/cdislave.c
79
79
 
80
80
void cdislave_device::perform_mouse_update()
81
81
{
82
 
    UINT16 x = input_port_read(machine(), "MOUSEX");
83
 
    UINT16 y = input_port_read(machine(), "MOUSEY");
84
 
    UINT8 buttons = input_port_read(machine(), "MOUSEBTN");
 
82
    UINT16 x = machine().root_device().ioport("MOUSEX")->read();
 
83
    UINT16 y = machine().root_device().ioport("MOUSEY")->read();
 
84
    UINT8 buttons = machine().root_device().ioport("MOUSEBTN")->read();
85
85
 
86
86
    UINT16 old_mouse_x = m_real_mouse_x;
87
87
    UINT16 old_mouse_y = m_real_mouse_y;
117
117
    }
118
118
}
119
119
 
120
 
INPUT_CHANGED( cdislave_device::mouse_update )
 
120
INPUT_CHANGED_MEMBER( cdislave_device::mouse_update )
121
121
{
122
 
    cdislave_device *slave = static_cast<cdislave_device *>(field.machine().device("slave"));
123
 
    slave->perform_mouse_update();
 
122
    perform_mouse_update();
124
123
}
125
124
 
126
125
READ16_DEVICE_HANDLER( slave_r )