diff options
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/cpu/i8085/i8085.c | 10 | ||||
-rw-r--r-- | src/emu/cpu/tms0980/tms0980.c | 2 | ||||
-rw-r--r-- | src/emu/sound/disc_flt.c | 2 | ||||
-rw-r--r-- | src/emu/sound/disc_mth.c | 4 | ||||
-rw-r--r-- | src/emu/sound/disc_wav.c | 14 | ||||
-rw-r--r-- | src/emu/sound/discrete.c | 26 | ||||
-rw-r--r-- | src/emu/sound/discrete.h | 22 | ||||
-rw-r--r-- | src/emu/sound/fm2612.c | 10 | ||||
-rw-r--r-- | src/emu/sound/tms5110.c | 2 | ||||
-rw-r--r-- | src/emu/sound/tms5220.c | 2 |
10 files changed, 47 insertions, 47 deletions
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index 96812753ef5..7758bb3a15e 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -278,8 +278,8 @@ const UINT8 lut_cycles_8085[256]={ /* special cases (partially taken care of elsewhere): base c taken? not taken? -M_RET 8080 5 +6(11) -0 (conditional) -M_RET 8085 6 +6(12) -0 (conditional) +M_RET 8080 5 +6(11) -0 (conditional) +M_RET 8085 6 +6(12) -0 (conditional) M_JMP 8080 10 +0 -0 M_JMP 8085 10 +0 -3(7) M_CALL 8080 11 +6(17) -0 @@ -530,7 +530,7 @@ static void check_for_interrupts(i8085_state *cpustate) static void execute_one(i8085_state *cpustate, int opcode) { cpustate->icount -= lut_cycles[opcode]; - + switch (opcode) { case 0x00: break; /* NOP */ @@ -600,7 +600,7 @@ static void execute_one(i8085_state *cpustate, int opcode) case 0x22: cpustate->WZ.w.l = ARG16(cpustate); /* SHLD nnnn */ WM(cpustate, cpustate->WZ.d, cpustate->HL.b.l); cpustate->WZ.w.l++; WM(cpustate, cpustate->WZ.d, cpustate->HL.b.h); - break; + break; case 0x23: cpustate->HL.w.l++; /* INX H */ if (IS_8085(cpustate)) { if (cpustate->HL.w.l == 0x0000) cpustate->AF.b.l |= X5F; else cpustate->AF.b.l &= ~X5F; } break; @@ -990,7 +990,7 @@ static void init_tables (int type) { /* cycles */ lut_cycles[i] = type?lut_cycles_8085[i]:lut_cycles_8080[i]; - + /* flags */ zs = 0; if (i==0) zs |= ZF; diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c index 163156517c9..132b6e29fec 100644 --- a/src/emu/cpu/tms0980/tms0980.c +++ b/src/emu/cpu/tms0980/tms0980.c @@ -22,7 +22,7 @@ tms1200 | 1024 * 8 | 64 * 4 | 13 | 8 | 4 | tms1215 tms1270 | 1024 * 8 | 64 * 4 | 13 | 10 | 4 | tms1278 tms1300 | 2048 * 8 | 128 * 4 | 16 | 8 | 4 | tms1309 tms1370* | 2048 * 8 | 128 * 4 | | | | za0543 -tms1400* | 4096 * 8 | 128 * 4 | | | | +tms1400* | 4096 * 8 | 128 * 4 | | | | tms1470* | 4096 * 8 | 128 * 4 | | | | tms1470 tms1500* | 2048 * 13 | 64 * 20 | | | | tmc1501 tms1600* | 4096 * 8 | 128 * 4 | | | | diff --git a/src/emu/sound/disc_flt.c b/src/emu/sound/disc_flt.c index 47f69a96e3e..73c49e46b5d 100644 --- a/src/emu/sound/disc_flt.c +++ b/src/emu/sound/disc_flt.c @@ -844,7 +844,7 @@ static DISCRETE_STEP( dst_rcdisc5) { if(diff > 0) context->v_cap = u; - + node->output[0] = 0; } } diff --git a/src/emu/sound/disc_mth.c b/src/emu/sound/disc_mth.c index f2c29fda07a..7d7221e173e 100644 --- a/src/emu/sound/disc_mth.c +++ b/src/emu/sound/disc_mth.c @@ -694,7 +694,7 @@ static DISCRETE_STEP(dst_bits_decode) struct dst_bits_decode_context *context = (struct dst_bits_decode_context *)node->context; int v = DST_BITS_DECODE__IN; int i; - + if (context->last_val != v) { context->last_val = v; @@ -710,7 +710,7 @@ static DISCRETE_RESET(dst_bits_decode) context->from = DST_BITS_DECODE__FROM; context->count = DST_BITS_DECODE__TO - context->from + 1; context->v_out = DST_BITS_DECODE__VOUT; - + DISCRETE_STEP_CALL(dst_bits_decode); } /************************************************************************ diff --git a/src/emu/sound/disc_wav.c b/src/emu/sound/disc_wav.c index 50826e6bb6f..7c666cebfda 100644 --- a/src/emu/sound/disc_wav.c +++ b/src/emu/sound/disc_wav.c @@ -436,24 +436,24 @@ static DISCRETE_STEP(dss_lfsr) break; } - if (inc > 0) + if (inc > 0) { noise_feed = (DSS_LFSR_NOISE__FEED ? 0x01 : 0x00); for (clock = 0; clock < inc; clock++) { /* Fetch the last feedback result */ fbresult = (context->lfsr_reg >> lfsr_desc->bitlength) & 0x01; - + /* Stage 2 feedback combine fbresultNew with infeed bit */ fbresult = dss_lfsr_function(disc_info, lfsr_desc->feedback_function1, fbresult, noise_feed, 0x01); - + /* Stage 3 first we setup where the bit is going to be shifted into */ fbresult = fbresult * lfsr_desc->feedback_function2_mask; /* Then we left shift the register, */ context->lfsr_reg = context->lfsr_reg << 1; /* Now move the fbresult into the shift register and mask it to the bitlength */ context->lfsr_reg = dss_lfsr_function(disc_info, lfsr_desc->feedback_function2, fbresult, context->lfsr_reg, (1 << lfsr_desc->bitlength) - 1 ); - + /* Now get and store the new feedback result */ /* Fetch the feedback bits */ fb0 = (context->lfsr_reg >> lfsr_desc->feedback_bitsel0) & 0x01; @@ -461,7 +461,7 @@ static DISCRETE_STEP(dss_lfsr) /* Now do the combo on them */ fbresult = dss_lfsr_function(disc_info, lfsr_desc->feedback_function0, fb0, fb1, 0x01); context->lfsr_reg = dss_lfsr_function(disc_info, DISC_LFSR_REPLACE, context->lfsr_reg, fbresult << lfsr_desc->bitlength, (2 << lfsr_desc->bitlength) - 1); - + } /* Now select the output bit */ if (context->out_is_f0) @@ -476,11 +476,11 @@ static DISCRETE_STEP(dss_lfsr) node->output[0] = node->output[0] ? DSS_LFSR_NOISE__AMP / 2 : -DSS_LFSR_NOISE__AMP / 2; /* Bias input as required */ node->output[0] = node->output[0] + DSS_LFSR_NOISE__BIAS; - + /* output the lfsr reg ?*/ if (context->out_lfsr_reg) node->output[1] = context->lfsr_reg; - + } if(!DSS_LFSR_NOISE__ENABLE) { diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index 3c18495ddf8..f92a299e9fe 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -128,7 +128,7 @@ static const discrete_module module_list[] = /* nop */ { DSS_NOP ,"DSS_NOP" , 0 ,0 ,NULL ,NULL }, - + /* from disc_inp.c */ { DSS_ADJUSTMENT ,"DSS_ADJUSTMENT" , 1 ,sizeof(struct dss_adjustment_context) ,dss_adjustment_reset ,dss_adjustment_step }, { DSS_CONSTANT ,"DSS_CONSTANT" , 1 ,0 ,dss_constant_reset ,NULL }, @@ -252,22 +252,22 @@ static node_description *discrete_find_node(const discrete_info *info, int node) static int discrete_build_list(discrete_info *info, discrete_sound_block *intf, discrete_sound_block *out, int offset) { int node_count = 0; - + for (; intf[node_count].type != DSS_NULL; ) { /* scan imported */ if (intf[node_count].type == DSO_IMPORT) { offset = discrete_build_list(info, (discrete_sound_block *) intf[node_count].custom, out, offset); - } + } else if (intf[node_count].type == DSO_REPLACE) { int i; - + node_count++; if (intf[node_count].type == DSS_NULL) fatalerror("discrete_build_list: DISCRETE_REPLACE at end of node_list"); - + for (i = 0; i < offset; i++) if (out[i].type != NODE_SPECIAL ) if (out[i].node == intf[node_count].node) @@ -275,15 +275,15 @@ static int discrete_build_list(discrete_info *info, discrete_sound_block *intf, out[i] = intf[node_count]; break; } - + if (i >= offset) fatalerror("discrete_build_list: DISCRETE_REPLACE did not found node %d", NODE_INDEX(intf[node_count].node)); - + } else if (intf[node_count].type == DSO_DELETE) { int i,p,deleted; - + p = 0; deleted = 0; for (i = 0; i < offset; i++) @@ -332,7 +332,7 @@ static DEVICE_START( discrete ) info->sample_rate = device->machine->sample_rate; info->sample_time = 1.0 / info->sample_rate; info->neg_sample_time = - info->sample_time; - + info->total_samples = 0; /* create the logfile */ @@ -343,7 +343,7 @@ static DEVICE_START( discrete ) /* Build the final block list */ intf = auto_alloc_array_clear(device->machine, discrete_sound_block, DISCRETE_MAX_NODES); discrete_build_list(info, intf_start, intf, 0); - + /* first pass through the nodes: sanity check, fill in the indexed_nodes, and make a total count */ discrete_log(info, "discrete_start() - Doing node list sanity check"); for (info->node_count = 0; intf[info->node_count].type != DSS_NULL; info->node_count++) @@ -476,8 +476,8 @@ static DEVICE_RESET( discrete ) } } -/* This was a try which unfortunately did not provide - * any improvement. Left here for reference +/* This was a try which unfortunately did not provide + * any improvement. Left here for reference */ #if 0 INLINE void bigselect(const device_config *device, node_description *node) @@ -591,7 +591,7 @@ static STREAM_UPDATE( discrete_stream_update ) if (node->module.step) (*node->module.step)(info, node); //bigselect(info->device, node); - + if (DISCRETE_PROFILING) node->run_time += osd_profiling_ticks(); diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index 4311993225c..e670943f2ea 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -1266,20 +1266,20 @@ * DISCRETE_BIT_DECODE(NODE_03,7,3,5) * * Node output is 0 - * + * * if the range variant is used, you may access the bits (up to 8) * by using NODE_SUB, i.e. - * + * * DISCRETE_BITS_DECODE(NODE_03,5,0,4,5) - * + * * NODE_SUB(NODE_03, 0) = 5 * NODE_SUB(NODE_03, 1) = 0 * NODE_SUB(NODE_03, 2) = 5 * NODE_SUB(NODE_03, 3) = 0 * NODE_SUB(NODE_03, 4) = 0 - * + * * EXAMPLES: galaxian, dkong, mario - * + * # *********************************************************************** * * DISCRETE_LOGIC_INVERT - Logic invertor @@ -2477,7 +2477,7 @@ * DISCRETE_RCDISC3 - RC discharge network * * FIXME: Diode direction (for bzone) - * + * * .-----------------. * | | * ENAB -0------>| | @@ -2605,7 +2605,7 @@ * | -----+----- | * | |gnd | * '---------------------' - * + * * Declaration syntax * * DISCRETE_RCDISC5(name of node, @@ -2621,7 +2621,7 @@ * When enabled by NODE_10, C discharges from 10v as indicated by RC * of 100R & 1uF. If not enabled, the capcitors keeps it load and may * still be charged through input1. The switch is assumed to be a CD4066, - * thus if not enabled the output will be drawn by R to GND since + * thus if not enabled the output will be drawn by R to GND since * the switch is in high impedance mode. * * EXAMPLES: see Spiders, Galaxian @@ -3663,7 +3663,7 @@ struct _discrete_info int num_wavelogs; wav_file *disc_wav_file[DISCRETE_MAX_WAVELOGS]; node_description *wavelog_node[DISCRETE_MAX_WAVELOGS]; - + /* profiling */ int total_samples; }; @@ -4153,8 +4153,8 @@ enum /* Output Node -- this must be the last entry in this enum! */ DSO_OUTPUT, /* The final output node */ - - /* Import another blocklist */ + + /* Import another blocklist */ DSO_IMPORT, /* import from another discrete block */ DSO_REPLACE, /* replace next node */ DSO_DELETE, /* delete nodes */ diff --git a/src/emu/sound/fm2612.c b/src/emu/sound/fm2612.c index c27b9349506..dc3cdeed000 100644 --- a/src/emu/sound/fm2612.c +++ b/src/emu/sound/fm2612.c @@ -14,7 +14,7 @@ ** History: ** ** 2006~2009 Eke-Eke (Genesis Plus GX): -** Credits to Nemesis (@spritesmind.net), most of those fixes came from his tests on a Model 1 Sega Mega Drive +** Credits to Nemesis (@spritesmind.net), most of those fixes came from his tests on a Model 1 Sega Mega Drive ** More informations at http://gendev.spritesmind.net/forum/viewtopic.php?t=386 ** ** - fixed LFO implementation (Spider-Man & Venom : Separation Anxiety intro,Warlock birds, Aladdin bug sound): @@ -24,7 +24,7 @@ ** - improved internal timers emulation ** - fixed Attack Rate update in some specific case (Batman & Robin intro) ** - fixed EG behavior when Attack Rate is maximal -** - fixed EG behavior when SL=0 (Mega Turrican tracks 03,09...) or/and Key ON occurs at minimal attenuation +** - fixed EG behavior when SL=0 (Mega Turrican tracks 03,09...) or/and Key ON occurs at minimal attenuation ** - added EG output immediate update on register writes ** - fixed YM2612 initial values (after the reset) ** - implemented Detune overflow (Ariel, Comix Zone, Shaq Fu, Spiderman & many others) @@ -699,7 +699,7 @@ typedef struct /* there are 2048 FNUMs that can be generated using FNUM/BLK registers - but LFO works with one more bit of a precision so we really need 4096 elements */ + but LFO works with one more bit of a precision so we really need 4096 elements */ UINT32 fn_table[4096]; /* fnumber->increment counter */ UINT32 fn_max; /* maximal phase increment (used for phase overflow) */ @@ -1952,7 +1952,7 @@ static void OPNSetPres(FM_OPN *OPN, int pres, int timer_prescaler, int SSGpres) init_timetables( &OPN->ST, dt_tab ); /* there are 2048 FNUMs that can be generated using FNUM/BLK registers - but LFO works with one more bit of a precision so we really need 4096 elements */ + but LFO works with one more bit of a precision so we really need 4096 elements */ for(i = 0; i < 4096; i++) { /* freq table for octave 7 */ @@ -2088,7 +2088,7 @@ static void OPNWriteReg(FM_OPN *OPN, int r, int v) case 0x90: /* SSG-EG */ SLOT->ssg = v&0x0f; - + /* recalculate EG output */ if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)) && (SLOT->state > EG_REL)) SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl; diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c index 89964717e34..3e86b6dcd19 100644 --- a/src/emu/sound/tms5110.c +++ b/src/emu/sound/tms5110.c @@ -930,7 +930,7 @@ static DEVICE_START( tms5110 ) tms->M0_callback = speech_rom_read_bit; tms->set_load_address = speech_rom_set_addr; } - + register_for_save_states(tms); } diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c index f3add337325..e1b5bac2295 100644 --- a/src/emu/sound/tms5220.c +++ b/src/emu/sound/tms5220.c @@ -1105,7 +1105,7 @@ static DEVICE_START( tms5220 ) /* initialize a stream */ tms->stream = stream_create(device, 0, 1, device->clock / 80, tms, tms5220_update); - + register_for_save_states(tms); } |