summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2007-12-18 08:24:58 +0000
committer Aaron Giles <aaron@aarongiles.com>2007-12-18 08:24:58 +0000
commitb347392d924cfc2da9ec893c1e1b9bb183915ed6 (patch)
tree8e38e5fe74f00e17c3abfa0059df0a4c4efa4a1a /src/emu
parent75265e5e230644374d5525ccacb729c13cc70ab5 (diff)
Cleanups for MAME 0.122.mame0122
Added missing driver entry for orbs.
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/sound/m58817.c22
-rw-r--r--src/emu/sound/scsp.c50
-rw-r--r--src/emu/sound/sound.mak2
3 files changed, 37 insertions, 37 deletions
diff --git a/src/emu/sound/m58817.c b/src/emu/sound/m58817.c
index 15b15f852e4..abccd8f60f5 100644
--- a/src/emu/sound/m58817.c
+++ b/src/emu/sound/m58817.c
@@ -3,13 +3,13 @@
M58817 interface
Written for MAME by couriersud
-
+
- structure from TMS5110 interface
- - this is a wrapper around the TMS5110 interface
- - M58817 & TMS5110 seem to be similar, however it is very probable
- that they use different "coding" tables for energy, pitch
- - Speech is understandable, but off
- - This driver supports to use a "sample" interface instead as well
+ - this is a wrapper around the TMS5110 interface
+ - M58817 & TMS5110 seem to be similar, however it is very probable
+ that they use different "coding" tables for energy, pitch
+ - Speech is understandable, but off
+ - This driver supports to use a "sample" interface instead as well
******************************************************************************/
@@ -56,7 +56,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
@@ -85,8 +85,8 @@ static void m58817_state_loop(void *chip, int data)
case 0x00: // reset ????
info->count=0;
/*To be extremely accurate there should be a delays between each of
- the function calls below. In real they happen with the frequency of 160 kHz.
- */
+ the function calls below. In real they happen with the frequency of 160 kHz.
+ */
if (info->intf->rom_region != -1)
{
@@ -138,7 +138,7 @@ static void m58817_state_loop(void *chip, int data)
tms5110_PDC_set(info->chip, 0);
tms5110_PDC_set(info->chip, 1);
tms5110_PDC_set(info->chip, 0);
- }
+ }
else
{
for (i=0;i<M58817_MAX_SAMPLES;i++)
@@ -239,7 +239,7 @@ WRITE8_HANDLER( m58817_CTL_w )
struct m58817_info *info = sndti_token(SOUND_M58817, 0);
/* bring up to date first */
- //stream_update(info->stream);
+ //stream_update(info->stream);
info->command_latch = data & 0x0f;
}
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index ed26a1b7217..ffa63d0c2cd 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -471,7 +471,7 @@ static void SCSP_StartSlot(struct _SCSP *SCSP, struct _SLOT *slot)
slot->active=1;
start_offset = PCM8B(slot) ? SA(slot) : SA(slot) & 0x7FFFE;
slot->base=SCSP->SCSPRAM + start_offset;
- slot->cur_addr=0;
+ slot->cur_addr=0;
slot->nxt_addr=1<<SHIFT;
slot->step=SCSP_Step(slot);
Compute_EG(SCSP,slot);
@@ -1183,28 +1183,28 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
addr1=(slot->cur_addr>>(SHIFT-1))&0x7fffe;
addr2=(slot->nxt_addr>>(SHIFT-1))&0x7fffe;
}
-
+
/*if(MDL(slot)!=0 || MDXSL(slot)!=0 || MDYSL(slot)!=0)
- {
- INT32 smp=(SCSP->RINGBUF[(SCSP->BUFPTR+MDXSL(slot))&63]+SCSP->RINGBUF[(SCSP->BUFPTR+MDYSL(slot))&63])/2;
- INT32 cycle=LEA(slot)-LSA(slot); // cycle corresponds to 2 pi
-
- smp*=cycle; // associate cycle with full 16-bit sample range
- smp>>=0x1A-MDL(slot); // ex. for MDL=0xF, sample range corresponds to +/- 64 pi (32=2^5 cycles) so shift by 11 (16-5 == 0x1A-0xF)
- while(smp<0) smp+=cycle; smp%=cycle; // keep modulation sampler within a single cycle
- if(!PCM8B(slot)) smp<<=1;
-
- addr1+=smp; addr2+=smp;
- if(!PCM8B(slot))
- {
- addr1&=0x7fffe; addr2&=0x7fffe;
- }
- else
- {
- addr1&=0x7ffff; addr2&=0x7ffff;
- }
- }*/
-
+ {
+ INT32 smp=(SCSP->RINGBUF[(SCSP->BUFPTR+MDXSL(slot))&63]+SCSP->RINGBUF[(SCSP->BUFPTR+MDYSL(slot))&63])/2;
+ INT32 cycle=LEA(slot)-LSA(slot); // cycle corresponds to 2 pi
+
+ smp*=cycle; // associate cycle with full 16-bit sample range
+ smp>>=0x1A-MDL(slot); // ex. for MDL=0xF, sample range corresponds to +/- 64 pi (32=2^5 cycles) so shift by 11 (16-5 == 0x1A-0xF)
+ while(smp<0) smp+=cycle; smp%=cycle; // keep modulation sampler within a single cycle
+ if(!PCM8B(slot)) smp<<=1;
+
+ addr1+=smp; addr2+=smp;
+ if(!PCM8B(slot))
+ {
+ addr1&=0x7fffe; addr2&=0x7fffe;
+ }
+ else
+ {
+ addr1&=0x7ffff; addr2&=0x7ffff;
+ }
+ }*/
+
if(PCM8B(slot)) //8 bit signed
{
INT8 *p1=(signed char *) (SCSP->SCSPRAM+((SA(slot)+addr1)^1));
@@ -1236,10 +1236,10 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
else
slot->cur_addr+=step;
slot->nxt_addr=slot->cur_addr+(1<<SHIFT);
-
+
addr1=slot->cur_addr>>SHIFT;
addr2=slot->nxt_addr>>SHIFT;
-
+
if(addr1>=LSA(slot) && !(slot->Backwards))
{
if(LPSLNK(slot) && slot->EG.state==ATTACK)
@@ -1298,7 +1298,7 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
if(!STWINH(slot))
*RBUFDST=sample;
-
+
return sample;
}
diff --git a/src/emu/sound/sound.mak b/src/emu/sound/sound.mak
index 28928e7e702..17f9db32cc9 100644
--- a/src/emu/sound/sound.mak
+++ b/src/emu/sound/sound.mak
@@ -600,7 +600,7 @@ endif
SOUNDDEFS += -DHAS_M58817=$(if $(filter M58817,$(SOUNDS)),1,0)
ifneq ($(filter M58817,$(SOUNDS)),)
-SOUNDOBJS += $(SOUNDOBJ)/m58817.o
+SOUNDOBJS += $(SOUNDOBJ)/m58817.o
endif