Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 21:29:15 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

k053260: fix LP64 portability.

Browse Source
This commit is contained in:
R. Belmont 2009-01-10 04:47:39 +00:00
parent 5057616884
commit 3188238b14
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/emu/sound/k053260.c
View File

@ -17,14 +17,14 @@
#define BASE_SHIFT 16 #define BASE_SHIFT 16
struct k053260_channel_def { struct k053260_channel_def {
unsigned long rate; UINT32 rate;
unsigned long size; UINT32 size;
unsigned long start; UINT32 start;
unsigned long bank; UINT32 bank;
unsigned long volume; UINT32 volume;
int play; int play;
unsigned long pan; UINT32 pan;
unsigned long pos; UINT32 pos;
int loop; int loop;
int ppcm; /* packed PCM ( 4 bit signed ) */ int ppcm; /* packed PCM ( 4 bit signed ) */
int ppcm_data; int ppcm_data;
@ -33,9 +33,9 @@ struct k053260_chip_def {
sound_stream * channel; sound_stream * channel;
int mode; int mode;
int regs[0x30]; int regs[0x30];
unsigned char *rom; UINT8 *rom;
int rom_size; int rom_size;
unsigned long *delta_table; UINT32 *delta_table;
struct k053260_channel_def channels[4]; struct k053260_channel_def channels[4];
const k053260_interface *intf; const k053260_interface *intf;
const device_config *device; const device_config *device;
@ -46,7 +46,7 @@ static void InitDeltaTable( struct k053260_chip_def *ic, int rate, int clock ) {
int i; int i;
double base = ( double )rate; double base = ( double )rate;
double max = (double)(clock); /* Hz */ double max = (double)(clock); /* Hz */
unsigned long val; UINT32 val;
for( i = 0; i < 0x1000; i++ ) { for( i = 0; i < 0x1000; i++ ) {
double v = ( double )( 0x1000 - i ); double v = ( double )( 0x1000 - i );
@ -55,7 +55,7 @@ static void InitDeltaTable( struct k053260_chip_def *ic, int rate, int clock ) {
if ( target && base ) { if ( target && base ) {
target = fixed / ( base / target ); target = fixed / ( base / target );
val = ( unsigned long )target; val = ( UINT32 )target;
if ( val == 0 ) if ( val == 0 )
val = 1; val = 1;
} else } else
@ -105,7 +105,7 @@ static STREAM_UPDATE( k053260_update ) {
int i, j, lvol[4], rvol[4], play[4], loop[4], ppcm_data[4], ppcm[4]; int i, j, lvol[4], rvol[4], play[4], loop[4], ppcm_data[4], ppcm[4];
unsigned char *rom[4]; unsigned char *rom[4];
unsigned long delta[4], end[4], pos[4]; UINT32 delta[4], end[4], pos[4];
int dataL, dataR; int dataL, dataR;
signed char d; signed char d;
struct k053260_chip_def *ic = param; struct k053260_chip_def *ic = param;
@ -227,7 +227,7 @@ static SND_START( k053260 )
for ( i = 0; i < 0x30; i++ ) for ( i = 0; i < 0x30; i++ )
ic->regs[i] = 0; ic->regs[i] = 0;
ic->delta_table = ( unsigned long * )auto_malloc( 0x1000 * sizeof( unsigned long ) ); ic->delta_table = ( UINT32 * )auto_malloc( 0x1000 * sizeof( UINT32 ) );
ic->channel = stream_create( device, 0, 2, rate, ic, k053260_update ); ic->channel = stream_create( device, 0, 2, rate, ic, k053260_update );
@ -258,7 +258,7 @@ INLINE void check_bounds( struct k053260_chip_def *ic, int channel ) {
ic->channels[channel].size = ic->rom_size - channel_start; ic->channels[channel].size = ic->rom_size - channel_start;
} }
if (LOG) logerror("K053260: Sample Start = %06x, Sample End = %06x, Sample rate = %04lx, PPCM = %s\n", channel_start, channel_end, ic->channels[channel].rate, ic->channels[channel].ppcm ? "yes" : "no" ); if (LOG) logerror("K053260: Sample Start = %06x, Sample End = %06x, Sample rate = %04x, PPCM = %s\n", channel_start, channel_end, ic->channels[channel].rate, ic->channels[channel].ppcm ? "yes" : "no" );
} }
static void k053260_write( const address_space *space, offs_t offset, UINT8 data, int chip ) static void k053260_write( const address_space *space, offs_t offset, UINT8 data, int chip )
@ -395,8 +395,9 @@ static UINT8 k053260_read( const address_space *space, offs_t offset, int chip
break; break;
case 0x2e: /* read rom */ case 0x2e: /* read rom */
if ( ic->mode & 1 ) { if ( ic->mode & 1 )
unsigned int offs = ic->channels[0].start + ( ic->channels[0].pos >> BASE_SHIFT ) + ( ic->channels[0].bank << 16 ); {
UINT32 offs = ic->channels[0].start + ( ic->channels[0].pos >> BASE_SHIFT ) + ( ic->channels[0].bank << 16 );
ic->channels[0].pos += ( 1 << 16 ); ic->channels[0].pos += ( 1 << 16 );