← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/machine/cchip.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/cchip.c
117
117
        {
118
118
                switch (offset)
119
119
                {
120
 
                case 0x00: return input_port_read(space->machine(), "IN0");    /* Player 1 controls + START1 */
121
 
                case 0x01: return input_port_read(space->machine(), "IN1");    /* Player 2 controls + START2 */
122
 
                case 0x02: return input_port_read(space->machine(), "IN2");    /* COINn + SERVICE1 + TILT */
 
120
                case 0x00: return space->machine().root_device().ioport("IN0")->read();    /* Player 1 controls + START1 */
 
121
                case 0x01: return space->machine().root_device().ioport("IN1")->read();    /* Player 2 controls + START2 */
 
122
                case 0x02: return space->machine().root_device().ioport("IN2")->read();    /* COINn + SERVICE1 + TILT */
123
123
                case 0x03: return cc_port;
124
124
                }
125
125
        }