diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/sh4/sh4.c | 12 | ||||
| -rw-r--r-- | src/emu/cpu/tms32031/tms32031.c | 12 | ||||
| -rw-r--r-- | src/emu/sound/5110intf.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/disc_dev.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/discrete.h | 24 | ||||
| -rw-r--r-- | src/emu/sound/tms5110.c | 162 | ||||
| -rw-r--r-- | src/emu/sound/tms5110r.c | 8 |
7 files changed, 113 insertions, 113 deletions
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index aeae6d7a924..4f0d501f403 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -48,9 +48,9 @@ #define FP_XFD(r) *( (double *)(sh4.xf+(r)) ) // double precision extended floating point register r #ifdef LSB_FIRST #define FP_RS2(r) sh4.fr[(r) ^ sh4.fpu_pr] -#define FP_RFS2(r) *( (float *)(sh4.fr+((r) ^ sh4.fpu_pr)) ) +#define FP_RFS2(r) *( (float *)(sh4.fr+((r) ^ sh4.fpu_pr)) ) #define FP_XS2(r) sh4.xf[(r) ^ sh4.fpu_pr] -#define FP_XFS2(r) *( (float *)(sh4.xf+((r) ^ sh4.fpu_pr)) ) +#define FP_XFS2(r) *( (float *)(sh4.xf+((r) ^ sh4.fpu_pr)) ) #endif typedef struct @@ -3094,13 +3094,13 @@ INLINE void FMOVFR(UINT32 m,UINT32 n) /* FLDI1 FRn 1111nnnn10011101 */ INLINE void FLDI1(UINT32 n) { - sh4.fr[n] = 0x3F800000; + sh4.fr[n] = 0x3F800000; } /* FLDI0 FRn 1111nnnn10001101 */ INLINE void FLDI0(UINT32 n) { - sh4.fr[n] = 0; + sh4.fr[n] = 0; } /* FLDS FRm,FPUL 1111mmmm00011101 */ @@ -3233,10 +3233,10 @@ INLINE void FCNVDS(UINT32 n) if (sh4.fpu_pr) { /* PR = 1 */ n = n & 14; #ifdef LSB_FIRST - if (sh4.fpscr & RM) + if (sh4.fpscr & RM) sh4.fr[n] &= 0xe0000000; /* round toward zero*/ #else - if (sh4.fpscr & RM) + if (sh4.fpscr & RM) sh4.fr[n | 1] &= 0xe0000000; /* round toward zero*/ #endif *((float *)&sh4.fpul) = (float)FP_RFD(n); diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index 8e31ba8840c..a3979dfa4c9 100644 --- a/src/emu/cpu/tms32031/tms32031.c +++ b/src/emu/cpu/tms32031/tms32031.c @@ -318,8 +318,8 @@ static void check_irqs(void) int i; /* external interrupts are level-sensitive on the '31 and can be - configured as such on the '32; in that case, if the external - signal is high, we need to update the value in IF accordingly */ + configured as such on the '32; in that case, if the external + signal is high, we need to update the value in IF accordingly */ if (!tms32031.is_32032 || (IREG(TMR_ST) & 0x4000) == 0) IREG(TMR_IF) |= tms32031.irq_state & 0x0f; @@ -341,13 +341,13 @@ static void check_irqs(void) if (!tms32031.delayed) { UINT16 intmask = 1 << (whichtrap - 1); - + /* bit in IF is cleared when interrupt is taken */ IREG(TMR_IF) &= ~intmask; trap(whichtrap); - + /* after auto-clearing the interrupt bit, we need to re-trigger - level-sensitive interrupts */ + level-sensitive interrupts */ if (!tms32031.is_32032 || (IREG(TMR_ST) & 0x4000) == 0) IREG(TMR_IF) |= tms32031.irq_state & 0x0f; } @@ -359,7 +359,7 @@ static void check_irqs(void) static void set_irq_line(int irqline, int state) { UINT16 intmask = 1 << irqline; - + /* ignore anything out of range */ if (irqline >= 12) return; diff --git a/src/emu/sound/5110intf.c b/src/emu/sound/5110intf.c index 472a5ef02c8..6cb4641c293 100644 --- a/src/emu/sound/5110intf.c +++ b/src/emu/sound/5110intf.c @@ -40,7 +40,7 @@ static int speech_rom_read_bit(void) const UINT8 *table = memory_region(info->intf->rom_region); int r; - + if (info->speech_rom_bitnum<0) r = 0; else @@ -55,7 +55,7 @@ static void speech_rom_set_addr(int addr) { struct tms5110_info *info = sndti_token(SOUND_TMS5110, 0); - info->speech_rom_bitnum = addr * 8 - 1; + info->speech_rom_bitnum = addr * 8 - 1; } /****************************************************************************** diff --git a/src/emu/sound/disc_dev.c b/src/emu/sound/disc_dev.c index f86b7da66c0..83531d86ea8 100644 --- a/src/emu/sound/disc_dev.c +++ b/src/emu/sound/disc_dev.c @@ -1395,7 +1395,7 @@ void dsd_566_reset(node_description *node) #define DSD_LS624__C (*(node->input[3])) #define DSD_LS624__OUTTYPE (*(node->input[4])) -/* +/* * These formulas are derived from diagrams in the datasheet! * They are not based on any law. The function is not * described anywhere. @@ -1459,7 +1459,7 @@ void dsd_ls624_reset(node_description *node) context->remain = 0; context->state = 0; context->outtype = DSD_LS624__OUTTYPE; - + /* Step the output */ dsd_ls624_step(node); } diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index 753d8e5fd29..01fcac9598b 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -2932,13 +2932,13 @@ * DISCRETE_74LS624 - VCO. * * Simplified 74LS624 - calculated frequencies should match datasheet - * for C > 1nF. Output is Logic (1/0) - * + * for C > 1nF. Output is Logic (1/0) + * * The datasheet gives no formulae. The implementation therefore is - * a rough model of the diagrams given. - * + * a rough model of the diagrams given. + * * For a LS628, use VRng = 3.2 - * + * * V+ * | * .---------. @@ -2953,7 +2953,7 @@ * | | | * '---|CX2 | * '---------' - * | + * | * GND * * Declaration syntax @@ -2963,14 +2963,14 @@ * vMod node or static value, * vRng node or static value, * C node or static value in Farads, - * Type of output static value) - * + * Type of output static value) + * * Type of Output - * DISC_LS624_OUT_ENERGY Energy - use for audio output + * DISC_LS624_OUT_ENERGY Energy - use for audio output * DISC_LS624_OUT_LOGIC Logic ( 0 or 1) - * DISC_LS624_OUT_COUNT_F Number of Falling edges - * DISC_LS624_OUT_COUNT_R Number of Rising edges - * + * DISC_LS624_OUT_COUNT_F Number of Falling edges + * DISC_LS624_OUT_COUNT_R Number of Rising edges + * *********************************************************************** * * DISCRETE_CUSTOMx - Link to custom code diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c index 8d012cc09a8..fac34537080 100644 --- a/src/emu/sound/tms5110.c +++ b/src/emu/sound/tms5110.c @@ -1,57 +1,57 @@ /********************************************************************************************** - TMS5110 simulator (modified from TMS5220 by Jarek Burczynski) - - Written for MAME by Frank Palazzolo - With help from Neill Corlett - Additional tweaking by Aaron Giles - Various fixes by Lord Nightmare - Additional enhancements by Couriersud - - Todo: - - implement CS - - implement missing commands - - TMS5100: - - +-----------------+ - TST | 1 28 | CS - PDC | 2 27 | CTL8 - ROM CK | 3 26 | ADD8 - CPU CK | 4 25 | CTL1 - VDD | 5 24 | ADD1 - CR OSC | 6 23 | CTL2 - RC OSC | 7 22 | ADD2 - T11 | 8 21 | ADD4 - NC | 9 20 | CTL4 - I/O | 10 19 | M1 - SPK1 | 11 18 | NC - SPK2 | 12 17 | NC - PROM OUT | 13 16 | NC - VSS | 14 15 | M0 - +-----------------+ - - M58817 - - The following connections could be derived from radar scope schematics. - The M58817 is not 100% pin compatible to the 5100, but really close. - - +-----------------+ - (NC) | 1 28 | CS - PDC | 2 27 | CTL8 - ROM CK | 3 26 | ADD8 (to 58819) - (NC) | 4 25 | CTL1 - (VDD,-5) | 5 24 | ADD1 (to 58819) - (GND) | 6 23 | CTL2 - Xin | 7 22 | ADD2 (to 58819) - Xout | 8 21 | ADD4 (to 58819) - (NC) | 9 20 | CTL4 - (VDD,-5) | 10 19 | Status back to CPU - (NC) | 11 18 | C1 (to 58819) - SPKR | 12 17 | (NC) - SPKR | 13 16 | C0 (to 58819) - (NC) | 14 15 | (5V) - +-----------------+ + TMS5110 simulator (modified from TMS5220 by Jarek Burczynski) + + Written for MAME by Frank Palazzolo + With help from Neill Corlett + Additional tweaking by Aaron Giles + Various fixes by Lord Nightmare + Additional enhancements by Couriersud + + Todo: + - implement CS + - implement missing commands + + TMS5100: + + +-----------------+ + TST | 1 28 | CS + PDC | 2 27 | CTL8 + ROM CK | 3 26 | ADD8 + CPU CK | 4 25 | CTL1 + VDD | 5 24 | ADD1 + CR OSC | 6 23 | CTL2 + RC OSC | 7 22 | ADD2 + T11 | 8 21 | ADD4 + NC | 9 20 | CTL4 + I/O | 10 19 | M1 + SPK1 | 11 18 | NC + SPK2 | 12 17 | NC + PROM OUT | 13 16 | NC + VSS | 14 15 | M0 + +-----------------+ + + M58817 + + The following connections could be derived from radar scope schematics. + The M58817 is not 100% pin compatible to the 5100, but really close. + + +-----------------+ + (NC) | 1 28 | CS + PDC | 2 27 | CTL8 + ROM CK | 3 26 | ADD8 (to 58819) + (NC) | 4 25 | CTL1 + (VDD,-5) | 5 24 | ADD1 (to 58819) + (GND) | 6 23 | CTL2 + Xin | 7 22 | ADD2 (to 58819) + Xout | 8 21 | ADD4 (to 58819) + (NC) | 9 20 | CTL4 + (VDD,-5) | 10 19 | Status back to CPU + (NC) | 11 18 | C1 (to 58819) + SPKR | 12 17 | (NC) + SPKR | 13 16 | C0 (to 58819) + (NC) | 14 15 | (5V) + +-----------------+ ***********************************************************************************************/ @@ -263,7 +263,7 @@ void tms5110_reset_chip(void *chip) /****************************************************************************************** - tms5110_set_M0_callback -- set M0 callback for the TMS5110 + tms5110_set_M0_callback -- set M0 callback for the TMS5110 ******************************************************************************************/ @@ -275,7 +275,7 @@ void tms5110_set_M0_callback(void *chip, int (*func)(void)) /****************************************************************************************** - tms5110_set_load_address -- set M0 callback for the TMS5110 + tms5110_set_load_address -- set M0 callback for the TMS5110 ******************************************************************************************/ @@ -287,7 +287,7 @@ void tms5110_set_load_address(void *chip, void (*func)(int)) /****************************************************************************************** - FIFO_data_write -- handle bit data write to the TMS5110 (as a result of toggling M0 pin) + FIFO_data_write -- handle bit data write to the TMS5110 (as a result of toggling M0 pin) ******************************************************************************************/ static void FIFO_data_write(struct tms5110 *tms, int data) @@ -310,7 +310,7 @@ static void FIFO_data_write(struct tms5110 *tms, int data) /****************************************************************************************** - extract_bits -- extract a specific number of bits from the FIFO + extract_bits -- extract a specific number of bits from the FIFO ******************************************************************************************/ @@ -359,14 +359,14 @@ static void perform_dummy_read(struct tms5110 *tms) /********************************************************************************************** - tms5110_status_read -- read status from the TMS5110 + tms5110_status_read -- read status from the TMS5110 - bit 0 = TS - Talk Status is active (high) when the VSP is processing speech data. - Talk Status goes active at the initiation of a SPEAK command. - It goes inactive (low) when the stop code (Energy=1111) is processed, or - immediately(?????? not TMS5110) by a RESET command. - TMS5110 datasheets mention this is only available as a result of executing - TEST TALK command. + bit 0 = TS - Talk Status is active (high) when the VSP is processing speech data. + Talk Status goes active at the initiation of a SPEAK command. + It goes inactive (low) when the stop code (Energy=1111) is processed, or + immediately(?????? not TMS5110) by a RESET command. + TMS5110 datasheets mention this is only available as a result of executing + TEST TALK command. ***********************************************************************************************/ @@ -383,7 +383,7 @@ int tms5110_status_read(void *chip) /********************************************************************************************** - tms5110_ready_read -- returns the ready state of the TMS5110 + tms5110_ready_read -- returns the ready state of the TMS5110 ***********************************************************************************************/ @@ -397,7 +397,7 @@ int tms5110_ready_read(void *chip) /********************************************************************************************** - tms5110_process -- fill the buffer with a specific number of samples + tms5110_process -- fill the buffer with a specific number of samples ***********************************************************************************************/ @@ -418,12 +418,12 @@ void tms5110_process(void *chip, INT16 *buffer, unsigned int size) /* a "dummy read" is mentioned in the tms5200 datasheet */ /* The Bagman speech roms data are organized in such a way that - ** the bit at address 0 is NOT a speech data. The bit at address 1 - ** is the speech data. It seems that the tms5110 performs a dummy read - ** just before it executes a SPEAK command. - ** This has been moved to command logic ... - ** perform_dummy_read(tms); - */ + ** the bit at address 0 is NOT a speech data. The bit at address 1 + ** is the speech data. It seems that the tms5110 performs a dummy read + ** just before it executes a SPEAK command. + ** This has been moved to command logic ... + ** perform_dummy_read(tms); + */ /* clear out the new frame parameters (it will become old frame just before the first call to parse_frame() ) */ tms->new_energy = 0; @@ -486,9 +486,9 @@ void tms5110_process(void *chip, INT16 *buffer, unsigned int size) else if ((tms->old_energy == 0) && (tms->new_energy != 0)) /* was the old frame a zero-energy frame? */ { /* if so, and if the new frame is non-zero energy frame then the new parameters - should become our current and target parameters immediately, - i.e. we should NOT interpolate them slowly in. - */ + should become our current and target parameters immediately, + i.e. we should NOT interpolate them slowly in. + */ /*logerror("processing non-zero energy frame after zero-energy frame\n");*/ tms->target_energy = tms->new_energy; @@ -499,8 +499,8 @@ void tms5110_process(void *chip, INT16 *buffer, unsigned int size) else if ((tms->old_pitch == 0) && (tms->new_pitch != 0)) /* is this a change from unvoiced to voiced frame ? */ { /* if so, then the new parameters should become our current and target parameters immediately, - i.e. we should NOT interpolate them slowly in. - */ + i.e. we should NOT interpolate them slowly in. + */ /*if (DEBUG_5110) logerror("processing frame: UNVOICED->VOICED frame change\n");*/ tms->target_energy = tms->new_energy; tms->target_pitch = tms->current_pitch = tms->new_pitch; @@ -510,8 +510,8 @@ void tms5110_process(void *chip, INT16 *buffer, unsigned int size) else if ((tms->old_pitch != 0) && (tms->new_pitch == 0)) /* is this a change from voiced to unvoiced frame ? */ { /* if so, then the new parameters should become our current and target parameters immediately, - i.e. we should NOT interpolate them slowly in. - */ + i.e. we should NOT interpolate them slowly in. + */ /*if (DEBUG_5110) logerror("processing frame: VOICED->UNVOICED frame change\n");*/ tms->target_energy = tms->new_energy; tms->target_pitch = tms->current_pitch = tms->new_pitch; @@ -662,7 +662,7 @@ empty: /****************************************************************************************** - CTL_set -- set CTL pins named CTL1, CTL2, CTL4 and CTL8 + CTL_set -- set CTL pins named CTL1, CTL2, CTL4 and CTL8 ******************************************************************************************/ @@ -674,7 +674,7 @@ void tms5110_CTL_set(void *chip, int data) /****************************************************************************************** - PDC_set -- set Processor Data Clock. Execute CTL_pins command on hi-lo transition. + PDC_set -- set Processor Data Clock. Execute CTL_pins command on hi-lo transition. ******************************************************************************************/ @@ -740,7 +740,7 @@ void tms5110_PDC_set(void *chip, int data) /****************************************************************************************** - parse_frame -- parse a new frame's worth of data; returns 0 if not enough bits in buffer + parse_frame -- parse a new frame's worth of data; returns 0 if not enough bits in buffer ******************************************************************************************/ diff --git a/src/emu/sound/tms5110r.c b/src/emu/sound/tms5110r.c index 58f8bace789..6dbcf709807 100644 --- a/src/emu/sound/tms5110r.c +++ b/src/emu/sound/tms5110r.c @@ -10,10 +10,10 @@ * 4234761 * 4189779 * 4449233 - * + * * All patents give interpolation coefficients - * { 8, 8, 8, 4, 4, 2, 2, 1 } - * This sequence will not calculate the published + * { 8, 8, 8, 4, 4, 2, 2, 1 } + * This sequence will not calculate the published * fractions: * 1 8 0.125 * 2 8 0.234 @@ -23,7 +23,7 @@ * 6 2 0.717 * 7 2 0.859 * 0 1 1.000 - * + * * Instead, { 8, 8, 8, 4, 4, 4, 2, 1 } * will calculate those coefficients and this has been used below. */ |
