← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/drivers/funkyjet.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Jordi Mallach, Emmanuel Kasper
  • Date: 2011-12-19 22:56:27 UTC
  • mfrom: (0.1.2)
  • Revision ID: package-import@ubuntu.com-20111219225627-ub5oga1oys4ogqzm
Tags: 0.144-1
http://bugs.debian.org/651538
[ Jordi Mallach ]
* Fix syntax errors in DEP5 copyright file (lintian).
* Use a versioned copyright Format specification field.
* Update Vcs-* URLs.
* Move transitional packages to the new metapackages section, and make
  them priority extra.
* Remove references to GNU/Linux and MESS sources from copyright.
* Add build variables for s390x.
* Use .xz tarballs as it cuts 4MB for the upstream sources.
* Add nplayers.ini as a patch. Update copyright file to add CC-BY-SA-3.0.

[ Emmanuel Kasper ]
* New upstream release. Closes: #651538.
* Add Free Desktop compliant png icons of various sizes taken from
  the hydroxygen iconset
* Mess is now built from a new source package, to avoid possible source
  incompatibilities between mame and the mess overlay.
* Mame-tools are not built from the mame source package anymore, but
  from the mess source package

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/drivers/funkyjet.c
159
159
 
160
160
        /* Dips seem inverted with respect to other Deco games */
161
161
        PORT_START("DSW")
162
 
        PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Coin_A ) )
 
162
        PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Coin_A ) )               PORT_DIPLOCATION("SW1:1,2,3")
163
163
        PORT_DIPSETTING(      0x0000, DEF_STR( 3C_1C ) )
164
164
        PORT_DIPSETTING(      0x0080, DEF_STR( 2C_1C ) )
165
165
        PORT_DIPSETTING(      0x00e0, DEF_STR( 1C_1C ) )
168
168
        PORT_DIPSETTING(      0x0020, DEF_STR( 1C_4C ) )
169
169
        PORT_DIPSETTING(      0x00c0, DEF_STR( 1C_5C ) )
170
170
        PORT_DIPSETTING(      0x0040, DEF_STR( 1C_6C ) )
171
 
        PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coin_B ) )
 
171
        PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coin_B ) )               PORT_DIPLOCATION("SW1:4,5,6")
172
172
        PORT_DIPSETTING(      0x0000, DEF_STR( 3C_1C ) )
173
173
        PORT_DIPSETTING(      0x0010, DEF_STR( 2C_1C ) )
174
174
        PORT_DIPSETTING(      0x001c, DEF_STR( 1C_1C ) )
177
177
        PORT_DIPSETTING(      0x0004, DEF_STR( 1C_4C ) )
178
178
        PORT_DIPSETTING(      0x0018, DEF_STR( 1C_5C ) )
179
179
        PORT_DIPSETTING(      0x0008, DEF_STR( 1C_6C ) )
180
 
        PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) )
 
180
        PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) )          PORT_DIPLOCATION("SW1:7")
181
181
        PORT_DIPSETTING(      0x0002, DEF_STR( Off ) )
182
182
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
183
 
        PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
 
183
        PORT_SERVICE_DIPLOC(  0x0001, IP_ACTIVE_LOW, "SW1:8" )
184
184
 
185
 
        PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Demo_Sounds ) )
 
185
        PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Demo_Sounds ) )          PORT_DIPLOCATION("SW2:8")
186
186
        PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
187
187
        PORT_DIPSETTING(      0x0100, DEF_STR( On ) )
188
 
        PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Allow_Continue ) )
 
188
        PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Allow_Continue ) )       PORT_DIPLOCATION("SW2:7")
189
189
        PORT_DIPSETTING(      0x0000, DEF_STR( No ) )
190
190
        PORT_DIPSETTING(      0x0200, DEF_STR( Yes ) )
191
 
        PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Free_Play ) )
 
191
        PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Free_Play ) )            PORT_DIPLOCATION("SW2:6")
192
192
        PORT_DIPSETTING(      0x0400, DEF_STR( Off ) )
193
193
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
194
 
        PORT_DIPNAME( 0x0800, 0x0800, "Freeze" )
 
194
        PORT_DIPNAME( 0x0800, 0x0800, "Freeze" )                        PORT_DIPLOCATION("SW2:5")
195
195
        PORT_DIPSETTING(      0x0800, DEF_STR( Off ) )
196
196
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
197
 
        PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Difficulty ) )
 
197
        PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Difficulty ) )           PORT_DIPLOCATION("SW2:4,3")
198
198
        PORT_DIPSETTING(      0x1000, DEF_STR( Easy ) )
199
199
        PORT_DIPSETTING(      0x3000, DEF_STR( Normal ) )
200
200
        PORT_DIPSETTING(      0x2000, DEF_STR( Hard ) )
201
201
        PORT_DIPSETTING(      0x0000, DEF_STR( Hardest ) )
202
 
        PORT_DIPNAME( 0xc000, 0xc000, DEF_STR( Lives ) )
 
202
        PORT_DIPNAME( 0xc000, 0xc000, DEF_STR( Lives ) )                PORT_DIPLOCATION("SW2:2,1")
203
203
        PORT_DIPSETTING(      0x8000, "1" )
204
204
        PORT_DIPSETTING(      0xc000, "2" )
205
205
        PORT_DIPSETTING(      0x4000, "3" )
210
210
        PORT_INCLUDE(funkyjet)
211
211
 
212
212
        PORT_MODIFY("DSW")
213
 
        PORT_DIPNAME( 0x0100, 0x0000, DEF_STR( Demo_Sounds ) )
 
213
        PORT_DIPNAME( 0x0100, 0x0000, DEF_STR( Demo_Sounds ) )          PORT_DIPLOCATION("SW2:8")
214
214
        PORT_DIPSETTING(      0x0100, DEF_STR( Off ) )
215
215
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
216
216
INPUT_PORTS_END
219
219
        PORT_INCLUDE(funkyjet)
220
220
 
221
221
        PORT_MODIFY("DSW")
222
 
        PORT_DIPUNUSED( 0x0100, IP_ACTIVE_LOW )                   // See notes
223
 
        PORT_DIPNAME( 0x0200, 0x0000, DEF_STR( Demo_Sounds ) )
 
222
        PORT_DIPUNUSED_DIPLOC( 0x0100, IP_ACTIVE_LOW, "SW2:8" )         // See notes
 
223
        PORT_DIPNAME( 0x0200, 0x0000, DEF_STR( Demo_Sounds ) )          PORT_DIPLOCATION("SW2:7")
224
224
        PORT_DIPSETTING(      0x0200, DEF_STR( Off ) )
225
225
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
226
 
        PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Lives ) )
 
226
        PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Lives ) )                PORT_DIPLOCATION("SW2:6,5")
227
227
        PORT_DIPSETTING(      0x0400, "1" )
228
228
        PORT_DIPSETTING(      0x0800, "2" )
229
229
        PORT_DIPSETTING(      0x0c00, "3" )
230
230
        PORT_DIPSETTING(      0x0000, "4" )
231
 
        PORT_DIPNAME( 0x3000, 0x2000, DEF_STR( Difficulty ) )
 
231
        PORT_DIPNAME( 0x3000, 0x2000, DEF_STR( Difficulty ) )           PORT_DIPLOCATION("SW2:4,3")
232
232
        PORT_DIPSETTING(      0x3000, DEF_STR( Easy ) )
233
233
        PORT_DIPSETTING(      0x2000, DEF_STR( Normal ) )
234
234
        PORT_DIPSETTING(      0x1000, DEF_STR( Hard ) )
235
235
        PORT_DIPSETTING(      0x0000, DEF_STR( Hardest ) )
236
 
        PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Free_Play ) )
 
236
        PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Free_Play ) )            PORT_DIPLOCATION("SW2:2")
237
237
        PORT_DIPSETTING(      0x4000, DEF_STR( Off ) )
238
238
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
239
 
        PORT_DIPNAME( 0x8000, 0x8000, "Freeze" )
 
239
        PORT_DIPNAME( 0x8000, 0x8000, "Freeze" )                        PORT_DIPLOCATION("SW2:1")
240
240
        PORT_DIPSETTING(      0x8000, DEF_STR( Off ) )
241
241
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
242
242
INPUT_PORTS_END
309
309
static MACHINE_CONFIG_START( funkyjet, funkyjet_state )
310
310
 
311
311
        /* basic machine hardware */
312
 
        MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 28 MHz crystal */
 
312
        MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* 28 MHz crystal */
313
313
        MCFG_CPU_PROGRAM_MAP(funkyjet_map)
314
314
        MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
315
315
 
316
 
        MCFG_CPU_ADD("audiocpu", H6280,32220000/4)      /* Custom chip 45, Audio section crystal is 32.220 MHz */
 
316
        MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
317
317
        MCFG_CPU_PROGRAM_MAP(sound_map)
318
318
 
319
319
        MCFG_MACHINE_START(funkyjet)
337
337
        /* sound hardware */
338
338
        MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
339
339
 
340
 
        MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
 
340
        MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_32_22MHz/9)
341
341
        MCFG_SOUND_CONFIG(ym2151_config)
342
342
        MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
343
343
        MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
344
344
 
345
 
        MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
 
345
        MCFG_OKIM6295_ADD("oki", XTAL_28MHz/28, OKIM6295_PIN7_HIGH)
346
346
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
347
347
        MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
348
348
MACHINE_CONFIG_END