Skip to content

Commit 692a5e4

Browse files
committed
Spacing and version bump.
1 parent ad5e3bb commit 692a5e4

File tree

9 files changed

+61
-64
lines changed

9 files changed

+61
-64
lines changed

src/emu/cpu/x86emit.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,7 +1705,7 @@ INLINE void emit_xchg_r8_r8(x86code **emitptr, UINT8 dreg, UINT8 sreg)
17051705
else if (sreg == REG_EAX)
17061706
emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_32BIT, dreg);
17071707
else
1708-
emit_op_modrm_reg(emitptr, OP_XCHG_Eb_Gb, OP_32BIT, dreg, sreg);
1708+
emit_op_modrm_reg(emitptr, OP_XCHG_Eb_Gb, OP_32BIT, dreg, sreg);
17091709
}
17101710

17111711

@@ -1742,7 +1742,7 @@ INLINE void emit_xchg_r16_r16(x86code **emitptr, UINT8 dreg, UINT8 sreg)
17421742
else if (sreg == REG_EAX)
17431743
emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_16BIT, dreg);
17441744
else
1745-
emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_16BIT, dreg, sreg);
1745+
emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_16BIT, dreg, sreg);
17461746
}
17471747

17481748

@@ -1783,7 +1783,7 @@ INLINE void emit_xchg_r32_r32(x86code **emitptr, UINT8 dreg, UINT8 sreg)
17831783
else if (sreg == REG_EAX)
17841784
emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_32BIT, dreg);
17851785
else
1786-
emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_32BIT, dreg, sreg);
1786+
emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_32BIT, dreg, sreg);
17871787
}
17881788

17891789

@@ -1838,7 +1838,7 @@ INLINE void emit_xchg_r64_r64(x86code **emitptr, UINT8 dreg, UINT8 sreg)
18381838
else if (sreg == REG_EAX)
18391839
emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_64BIT, dreg);
18401840
else
1841-
emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_64BIT, dreg, sreg);
1841+
emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_64BIT, dreg, sreg);
18421842
}
18431843

18441844
#endif

src/emu/sound/ay8910.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -66,34 +66,34 @@ where used to calibrate channel mixing for the YM2149. This was done using
6666
a least square approach using a fixed RL of 1K Ohm.
6767
6868
For the AY measurements cited in e.g. openmsx as "Hacker Kay" for a single
69-
channel were taken. These were normalized to 0 ... 65535 and consequently
69+
channel were taken. These were normalized to 0 ... 65535 and consequently
7070
adapted to an offset of 0.2V and a VPP of 1.3V. These measurements are in
7171
line e.g. with the formula used by pcmenc for the volume: vol(i) = exp(i/2-7.5).
7272
7373
The following is documentation from the code moved here and amended to reflect
7474
the changes done:
75-
75+
7676
Careful studies of the chip output prove that the chip counts up from 0
77-
until the counter becomes greater or equal to the period. This is an
78-
important difference when the program is rapidly changing the period to
79-
modulate the sound. This is worthwhile noting, since the datasheets
77+
until the counter becomes greater or equal to the period. This is an
78+
important difference when the program is rapidly changing the period to
79+
modulate the sound. This is worthwhile noting, since the datasheets
8080
say, that the chip counts down.
8181
Also, note that period = 0 is the same as period = 1. This is mentioned
8282
in the YM2203 data sheets. However, this does NOT apply to the Envelope
8383
period. In that case, period = 0 is half as period = 1.
8484
8585
Envelope shapes:
86-
C AtAlH
87-
0 0 x x \___
88-
0 1 x x /___
89-
1 0 0 0 \\\\
90-
1 0 0 1 \___
91-
1 0 1 0 \/\/
92-
1 0 1 1 \```
93-
1 1 0 0 ////
94-
1 1 0 1 /```
95-
1 1 1 0 /\/\
96-
1 1 1 1 /___
86+
C AtAlH
87+
0 0 x x \___
88+
0 1 x x /___
89+
1 0 0 0 \\\\
90+
1 0 0 1 \___
91+
1 0 1 0 \/\/
92+
1 0 1 1 \```
93+
1 1 0 0 ////
94+
1 1 0 1 /```
95+
1 1 1 0 /\/\
96+
1 1 1 1 /___
9797
9898
The envelope counter on the AY-3-8910 has 16 steps. On the YM2149 it
9999
has twice the steps, happening twice as fast.
@@ -191,7 +191,7 @@ struct _ay8910_context
191191

192192
/*************************************
193193
*
194-
* Static
194+
* Static
195195
*
196196
*************************************/
197197

@@ -263,7 +263,7 @@ static const ay_ym_param ay8910_param =
263263

264264
/*************************************
265265
*
266-
* Inline
266+
* Inline
267267
*
268268
*************************************/
269269

@@ -380,7 +380,7 @@ INLINE UINT16 mix_3D(ay8910_context *psg)
380380

381381
/*************************************
382382
*
383-
* Static functions
383+
* Static functions
384384
*
385385
*************************************/
386386

@@ -547,7 +547,7 @@ static void ay8910_update(void *param,stream_sample_t **inputs, stream_sample_t
547547
if (psg->holding == 0)
548548
{
549549
psg->count_env++;
550-
if (psg->count_env >= ENVELOPE_PERIOD(psg) * psg->step )
550+
if (psg->count_env >= ENVELOPE_PERIOD(psg) * psg->step )
551551
{
552552
psg->count_env = 0;
553553
psg->env_step--;
@@ -620,9 +620,9 @@ static void build_mixer_table(ay8910_context *psg)
620620
build_single_table(psg->intf->res_load[chan], psg->par_env, normalize, psg->env_table[chan], 0);
621621
}
622622
/*
623-
* The previous implementation added all three channels up instead of averaging them.
624-
* The factor of 3 will force the same levels if normalizing is used.
625-
*/
623+
* The previous implementation added all three channels up instead of averaging them.
624+
* The factor of 3 will force the same levels if normalizing is used.
625+
*/
626626
build_3D_table(psg->intf->res_load[0], psg->par, psg->par_env, normalize, 3, psg->zero_is_off, psg->vol3d_table);
627627
}
628628

@@ -651,8 +651,8 @@ static void ay8910_statesave(ay8910_context *psg, int sndindex)
651651

652652
/*************************************
653653
*
654-
* Public functions
655-
*
654+
* Public functions
655+
*
656656
* used by e.g. YM2203, YM2210 ...
657657
*
658658
*************************************/
@@ -813,7 +813,7 @@ int ay8910_read_ym(void *chip)
813813
/*************************************
814814
*
815815
* Sound Interface
816-
*
816+
*
817817
*************************************/
818818

819819
static void *ay8910_start(int sndindex, int clock, const void *config)
@@ -948,7 +948,7 @@ void ymz294_get_info(void *token, UINT32 state, sndinfo *info)
948948
/*************************************
949949
*
950950
* Read/Write Handlers
951-
*
951+
*
952952
*************************************/
953953

954954
READ8_HANDLER( AY8910_read_port_0_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 0)); }

src/mame/drivers/dynax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3846,7 +3846,7 @@ static MACHINE_DRIVER_START( yarunara )
38463846
MDRV_SCREEN_MODIFY("main")
38473847
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
38483848
MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 8, 256-1-8-1)
3849-
3849+
38503850
/* devices */
38513851
MDRV_DEVICE_ADD("rtc", MSM6242)
38523852
MACHINE_DRIVER_END

src/mame/drivers/flower.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
66
fix sound
77
improve interrupts
8-
sprite flipping is incorrect for one of the enemies so its probably wrong
9-
screenshots look like the game has sprite zooming
10-
http://emustatus.rainemu.com/games/flower.htm
118
129
1310
FLOWER CHIP PLACEMENT

src/mame/drivers/galaxian.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2068,7 +2068,7 @@ MACHINE_DRIVER_END
20682068

20692069
static MACHINE_DRIVER_START( anteater )
20702070
MDRV_IMPORT_FROM(scobra)
2071-
2071+
20722072
/* quiet down the sounds */
20732073
MDRV_SOUND_MODIFY("konami")
20742074
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)

src/mame/drivers/m90.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ static MACHINE_DRIVER_START( m90 )
663663
MDRV_CPU_VBLANK_INT("main", m90_interrupt)
664664

665665
MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */
666-
/* audio CPU */
666+
/* audio CPU */
667667
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
668668
MDRV_CPU_IO_MAP(sound_readport,sound_writeport)
669669
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
@@ -746,7 +746,7 @@ static MACHINE_DRIVER_START( bombrman )
746746
MDRV_CPU_VBLANK_INT("main", m90_interrupt)
747747

748748
MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */
749-
/* audio CPU */
749+
/* audio CPU */
750750
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
751751
MDRV_CPU_IO_MAP(sound_readport,sound_writeport)
752752
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
@@ -792,7 +792,7 @@ static MACHINE_DRIVER_START( bbmanw )
792792
MDRV_CPU_VBLANK_INT("main", m90_interrupt)
793793

794794
MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */
795-
/* audio CPU */
795+
/* audio CPU */
796796
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
797797
MDRV_CPU_IO_MAP(bbmanw_sound_readport,bbmanw_sound_writeport)
798798
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */

src/mame/machine/seicop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,7 @@ WRITE16_HANDLER( denjinmk_mcu_w )
16471647

16481648
//case (0x05a/2): { /* brightness?? */ break; }
16491649
case (0x070/2): { denjinmk_setgfxbank(cop_mcu_ram[offset]); break; }
1650-
1650+
16511651
case (0x21c/2): { legionna_layer_disable = cop_mcu_ram[offset]; break; }
16521652

16531653
case (0x220/2): { legionna_scrollram16[0] = cop_mcu_ram[offset]; break; }

src/mame/video/legionna.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ VIDEO_START( cupsoc )
225225
226226
+1 xx...... ........ Priority? (1=high?)
227227
+1 ..xxxxxx xxxxxxxx Tile number
228-
228+
229229
+2 ----xxxx xxxxxxxx X coordinate (signed)
230-
231-
+3 b------- -------- more tile banking used by Denjin Makai
230+
231+
+3 b------- -------- more tile banking used by Denjin Makai
232232
+3 ----xxxx xxxxxxxx Y coordinate (signed)
233233
234234
*************************************************************************/
@@ -251,25 +251,25 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
251251
sprite &= 0x3fff;
252252
if(data & 0x0040) sprite |= 0x4000;//tile banking,used in Denjin Makai
253253
if(spriteram16[offs+3] & 0x8000) sprite |= 0x8000;//tile banking?,used in Denjin Makai
254-
254+
255255
y = spriteram16[offs+3];
256256
x = spriteram16[offs+2];
257257

258258
/* heated barrel hardware seems to need 0x1ff with 0x100 sign bit for sprite warp,
259-
this doesn't work on denjin makai as the visible area is larger */
259+
this doesn't work on denjin makai as the visible area is larger */
260260
/*
261-
x&=0x1ff;
262-
y&=0xfff;
263-
264-
if (x&0x100) x-=0x200;
265-
if (y&0x800) y-=0x1000;
266-
*/
267-
261+
x&=0x1ff;
262+
y&=0xfff;
263+
264+
if (x&0x100) x-=0x200;
265+
if (y&0x800) y-=0x1000;
266+
*/
267+
268268
x&=0xfff;
269269
y&=0xfff;
270-
270+
271271
if (x&0x800) x-=0x1000;
272-
if (y&0x800) y-=0x1000;
272+
if (y&0x800) y-=0x1000;
273273

274274
color = (data &0x3f) + 0x40;
275275
fx = (data &0x4000) >> 14;
@@ -377,29 +377,29 @@ VIDEO_UPDATE( godzilla )
377377
tilemap_set_scrolly( foreground_layer, 0, legionna_scrollram16[5] );
378378

379379
fillbitmap(bitmap,0x0200,cliprect);
380-
380+
381381
if (!(legionna_layer_disable&0x0001))
382382
{
383383
tilemap_draw(bitmap,cliprect,background_layer,0,0);
384-
}
385-
384+
}
385+
386386
draw_sprites(screen->machine,bitmap,cliprect,2);
387-
387+
388388
if (!(legionna_layer_disable&0x0002))
389389
{
390390
tilemap_draw(bitmap,cliprect,midground_layer,0,0);
391391
}
392-
392+
393393
draw_sprites(screen->machine,bitmap,cliprect,1);
394-
394+
395395
if (!(legionna_layer_disable&0x0004))
396396
{
397-
tilemap_draw(bitmap,cliprect,foreground_layer,0,0);
397+
tilemap_draw(bitmap,cliprect,foreground_layer,0,0);
398398
}
399-
399+
400400
draw_sprites(screen->machine,bitmap,cliprect,0);
401401
draw_sprites(screen->machine,bitmap,cliprect,3);
402-
402+
403403
if (!(legionna_layer_disable&0x0008))
404404
{
405405
tilemap_draw(bitmap,cliprect,text_layer,0,0);

src/version.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
1010
***************************************************************************/
1111

12-
const char build_version[] = "0.124u5 ("__DATE__")";
12+
const char build_version[] = "0.125 ("__DATE__")";

0 commit comments

Comments
 (0)