← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/audio/starwars.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/audio/starwars.c
90
90
}
91
91
 
92
92
 
93
 
READ8_HANDLER( starwars_sin_r )
 
93
READ8_MEMBER(starwars_state::starwars_sin_r)
94
94
{
95
 
        starwars_state *state = space->machine().driver_data<starwars_state>();
96
 
        riot6532_porta_in_set(state->m_riot, 0x00, 0x80);
97
 
        return state->m_sound_data;
 
95
        riot6532_porta_in_set(m_riot, 0x00, 0x80);
 
96
        return m_sound_data;
98
97
}
99
98
 
100
99
 
101
 
WRITE8_HANDLER( starwars_sout_w )
 
100
WRITE8_MEMBER(starwars_state::starwars_sout_w)
102
101
{
103
 
        space->machine().scheduler().synchronize(FUNC(sound_callback), data);
 
102
        machine().scheduler().synchronize(FUNC(sound_callback), data);
104
103
}
105
104
 
106
105
 
111
110
 *
112
111
 *************************************/
113
112
 
114
 
READ8_HANDLER( starwars_main_read_r )
 
113
READ8_MEMBER(starwars_state::starwars_main_read_r)
115
114
{
116
 
        starwars_state *state = space->machine().driver_data<starwars_state>();
117
 
        riot6532_porta_in_set(state->m_riot, 0x00, 0x40);
118
 
        return state->m_main_data;
 
115
        riot6532_porta_in_set(m_riot, 0x00, 0x40);
 
116
        return m_main_data;
119
117
}
120
118
 
121
119
 
122
 
READ8_HANDLER( starwars_main_ready_flag_r )
 
120
READ8_MEMBER(starwars_state::starwars_main_ready_flag_r)
123
121
{
124
 
        starwars_state *state = space->machine().driver_data<starwars_state>();
125
 
        return riot6532_porta_in_get(state->m_riot) & 0xc0;     /* only upper two flag bits mapped */
 
122
        return riot6532_porta_in_get(m_riot) & 0xc0;    /* only upper two flag bits mapped */
126
123
}
127
124
 
128
125
static TIMER_CALLBACK( main_callback )
136
133
        machine.scheduler().boost_interleave(attotime::zero, attotime::from_usec(100));
137
134
}
138
135
 
139
 
WRITE8_HANDLER( starwars_main_wr_w )
 
136
WRITE8_MEMBER(starwars_state::starwars_main_wr_w)
140
137
{
141
 
        space->machine().scheduler().synchronize(FUNC(main_callback), data);
 
138
        machine().scheduler().synchronize(FUNC(main_callback), data);
142
139
}
143
140
 
144
141
 
145
 
WRITE8_HANDLER( starwars_soundrst_w )
 
142
WRITE8_MEMBER(starwars_state::starwars_soundrst_w)
146
143
{
147
 
        starwars_state *state = space->machine().driver_data<starwars_state>();
148
 
        riot6532_porta_in_set(state->m_riot, 0x00, 0xc0);
 
144
        riot6532_porta_in_set(m_riot, 0x00, 0xc0);
149
145
 
150
146
        /* reset sound CPU here  */
151
 
        cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, PULSE_LINE);
 
147
        cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, PULSE_LINE);
152
148
}