summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-02-28 09:27:05 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-02-28 09:27:05 +0000
commit9ef0bcf8f2cb40d88ee35567d1850f41812b5bb4 (patch)
treeb8d40ccf79f4f7845c1fd99233e8270be0b031a8 /src/emu
parent173642d46ca44e7c930f9fe88e0e828ec27ffa21 (diff)
Cleanups and version bump.mame0141u3
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/audit.h2
-rw-r--r--src/emu/cpu/i386/i386priv.h2
-rw-r--r--src/emu/cpu/m68000/m68k_in.c2
-rw-r--r--src/emu/cpu/m68000/m68kfpu.c10
-rw-r--r--src/emu/fileio.c20
-rw-r--r--src/emu/fileio.h16
-rw-r--r--src/emu/hash.c60
-rw-r--r--src/emu/hash.h28
-rw-r--r--src/emu/imagedev/multcart.c2
-rw-r--r--src/emu/info.c4
-rw-r--r--src/emu/inptport.c4
-rw-r--r--src/emu/machine/secflash.h2
-rw-r--r--src/emu/machine/x76f041.c2
-rw-r--r--src/emu/machine/x76f100.c4
-rw-r--r--src/emu/rendlay.h2
-rw-r--r--src/emu/romload.c2
-rw-r--r--src/emu/screen.h4
-rw-r--r--src/emu/softlist.c24
-rw-r--r--src/emu/sound/aica.c8
-rw-r--r--src/emu/sound/bsmt2000.c2
-rw-r--r--src/emu/sound/okiadpcm.c2
-rw-r--r--src/emu/sound/okim9810.c48
-rw-r--r--src/emu/sound/okim9810.h10
-rw-r--r--src/emu/sound/rf5c68.c2
-rw-r--r--src/emu/sound/sn76496.c2
-rw-r--r--src/emu/sound/spu.c130
-rw-r--r--src/emu/sound/spu.h2
-rw-r--r--src/emu/sound/spu_tables.c4
-rw-r--r--src/emu/sound/spureverb.c8
-rw-r--r--src/emu/sound/spureverb.h32
-rw-r--r--src/emu/video.c4
31 files changed, 222 insertions, 222 deletions
diff --git a/src/emu/audit.h b/src/emu/audit.h
index 098737513f0..419e2e48e2a 100644
--- a/src/emu/audit.h
+++ b/src/emu/audit.h
@@ -83,7 +83,7 @@ struct _audit_record
const char * name; /* name of item */
UINT32 explength; /* expected length of item */
UINT32 length; /* actual length of item */
- hash_collection exphashes; /* expected hash data */
+ hash_collection exphashes; /* expected hash data */
hash_collection hashes; /* actual hash information */
};
diff --git a/src/emu/cpu/i386/i386priv.h b/src/emu/cpu/i386/i386priv.h
index b9d66e7b209..115772ed079 100644
--- a/src/emu/cpu/i386/i386priv.h
+++ b/src/emu/cpu/i386/i386priv.h
@@ -892,7 +892,7 @@ INLINE void BUMP_DI(i386_state *cpustate,int adjustment)
/***********************************************************************************
- I/O ACCESS
+ I/O ACCESS
***********************************************************************************/
INLINE UINT8 READPORT8(i386_state *cpustate, offs_t port)
diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c
index 8e76a54c97b..7cce71fc383 100644
--- a/src/emu/cpu/m68000/m68k_in.c
+++ b/src/emu/cpu/m68000/m68k_in.c
@@ -6701,7 +6701,7 @@ M68KMAKE_OP(movec, 32, rc, .)
m68k->cacr = REG_DA[(word2 >> 12) & 15] & 0x0f;
}
-// logerror("movec to cacr=%04x\n", m68k->cacr);
+// logerror("movec to cacr=%04x\n", m68k->cacr);
if (m68k->cacr & (M68K_CACR_CI | M68K_CACR_CEI))
{
m68ki_ic_clear(m68k);
diff --git a/src/emu/cpu/m68000/m68kfpu.c b/src/emu/cpu/m68000/m68kfpu.c
index 9de8f4c7b2d..e3b49ccb044 100644
--- a/src/emu/cpu/m68000/m68kfpu.c
+++ b/src/emu/cpu/m68000/m68kfpu.c
@@ -1318,11 +1318,11 @@ static void fpgen_rm_reg(m68ki_cpu_core *m68k, UINT16 w2)
m68k->remaining_cycles -= 109;
break;
}
-// case 0x0e: // FSIN
-// {
-// // TODO
-// break;
-// }
+// case 0x0e: // FSIN
+// {
+// // TODO
+// break;
+// }
case 0x18: // FABS
{
REG_FP[dst] = source;
diff --git a/src/emu/fileio.c b/src/emu/fileio.c
index 3b7750787ae..2c8860c5070 100644
--- a/src/emu/fileio.c
+++ b/src/emu/fileio.c
@@ -118,7 +118,7 @@ file_enumerator::~file_enumerator()
//-------------------------------------------------
-// next - return information about the next file
+// next - return information about the next file
// in the search path
//-------------------------------------------------
@@ -213,11 +213,11 @@ hash_collection &emu_file::hashes(const char *types)
for (const char *scan = types; *scan != 0; scan++)
if (m_hashes.hash(*scan) == NULL)
needed.cat(*scan);
-
+
// if we need nothing, skip it
if (!needed)
return m_hashes;
-
+
// load the ZIP file if needed
if (m_zipfile != NULL && load_zipped_file() != FILERR_NONE)
return m_hashes;
@@ -323,7 +323,7 @@ file_error emu_file::open_next()
// if we're open from a previous attempt, close up now
if (m_file != NULL)
close();
-
+
// loop over paths
file_error filerr = FILERR_NOT_FOUND;
while (m_iterator.next(m_fullpath))
@@ -351,7 +351,7 @@ file_error emu_file::open_next()
//-------------------------------------------------
-// open_ram - open a "file" which is actually
+// open_ram - open a "file" which is actually
// just an array of data in RAM
//-------------------------------------------------
@@ -360,7 +360,7 @@ file_error emu_file::open_ram(const void *data, UINT32 length)
// set a fake filename and CRC
m_filename = "RAM";
m_crc = 0;
-
+
// use the core_file's built-in RAM support
return core_fopen_ram(data, length, m_openflags, &m_file);
}
@@ -377,19 +377,19 @@ void emu_file::close()
if (m_zipfile != NULL)
zip_file_close(m_zipfile);
m_zipfile = NULL;
-
+
if (m_file != NULL)
core_fclose(m_file);
m_file = NULL;
-
+
if (m_zipdata != NULL)
global_free(m_zipdata);
m_zipdata = NULL;
-
+
if (m_remove_on_close)
osd_rmfile(m_fullpath);
m_remove_on_close = false;
-
+
// reset our hashes and path as well
m_hashes.reset();
m_fullpath.reset();
diff --git a/src/emu/fileio.h b/src/emu/fileio.h
index af19a57b56c..dda8189877b 100644
--- a/src/emu/fileio.h
+++ b/src/emu/fileio.h
@@ -97,10 +97,10 @@ class path_iterator
public:
// construction/destruction
path_iterator(core_options &options, const char *searchpath = "");
-
+
// getters
bool next(astring &buffer);
-
+
// reset
void reset() { m_current = m_base; m_index = 0; }
@@ -145,7 +145,7 @@ public:
emu_file(core_options &options, const char *searchpath, UINT32 openflags);
virtual ~emu_file();
- // getters
+ // getters
operator core_file *();
bool open() const { return (m_file != NULL); }
const char *filename() const { return m_filename; }
@@ -169,33 +169,33 @@ public:
file_error open_next();
file_error open_ram(const void *data, UINT32 length);
void close();
-
+
// control
file_error compress(int compress);
int seek(INT64 offset, int whence);
UINT64 tell();
bool eof();
UINT64 size();
-
+
// reading
UINT32 read(void *buffer, UINT32 length);
int getc();
int ungetc(int c);
char *gets(char *s, int n);
-
+
// writing
UINT32 write(const void *buffer, UINT32 length);
int puts(const char *s);
int vprintf(const char *fmt, va_list va);
int printf(const char *fmt, ...);
-
+
private:
// internal helpers
file_error attempt_zipped();
file_error load_zipped_file();
bool zip_filename_match(const zip_file_header &header, const astring &filename);
bool zip_header_is_path(const zip_file_header &header);
-
+
// internal state
astring m_filename; // original filename provided
astring m_fullpath; // full filename
diff --git a/src/emu/hash.c b/src/emu/hash.c
index 8b47a206a5c..61092ce64af 100644
--- a/src/emu/hash.c
+++ b/src/emu/hash.c
@@ -59,7 +59,7 @@ public:
// construction/destruction
hash_crc();
- // operators
+ // operators
operator UINT32() const { return (m_buffer[0] << 24) | (m_buffer[1] << 16) | (m_buffer[2] << 8) | m_buffer[3]; }
// creation
@@ -153,11 +153,11 @@ hash_base::hash_base(char id, const char *name, UINT8 length, UINT8 *bufptr)
int hash_base::fromhex(char c)
{
- if (c >= '0' && c <= '9')
+ if (c >= '0' && c <= '9')
return c - '0';
- else if (c >= 'A' && c <= 'F')
+ else if (c >= 'A' && c <= 'F')
return c - 'A' + 10;
- else if (c >= 'a' && c <= 'f')
+ else if (c >= 'a' && c <= 'f')
return (c - 'a' + 10);
else
return -1;
@@ -194,7 +194,7 @@ const char *hash_base::string(astring &buffer)
//-------------------------------------------------
// from_string - parse a string into the current
-// hash
+// hash
//-------------------------------------------------
bool hash_base::from_string(const char *&string, int length)
@@ -209,7 +209,7 @@ bool hash_base::from_string(const char *&string, int length)
string++;
return true;
}
-
+
// fail if we're too short
if (length < 2 * m_length)
return false;
@@ -224,7 +224,7 @@ bool hash_base::from_string(const char *&string, int length)
m_parse_error = true;
return false;
}
-
+
// parse the lower digit
int lower = fromhex(string[1]);
if (lower == -1)
@@ -233,14 +233,14 @@ bool hash_base::from_string(const char *&string, int length)
return false;
}
- // set the byte and advance
+ // set the byte and advance
m_bufptr[index] = (upper << 4) | lower;
string += 2;
}
return true;
}
-
+
//**************************************************************************
// HASH CRC
@@ -508,7 +508,7 @@ void hash_collection::reset()
//-------------------------------------------------
-// add_from_buffer - add a new hash, importing
+// add_from_buffer - add a new hash, importing
// from a buffer
//-------------------------------------------------
@@ -523,21 +523,21 @@ hash_base *hash_collection::add_from_buffer(char type, const UINT8 *buffer, int
hash_base *newhash = alloc_by_id(type);
if (newhash == NULL)
return NULL;
-
+
// then import
if (!newhash->from_buffer(buffer, bufflen))
{
global_free(newhash);
return NULL;
}
-
+
// and append to our list
return &m_hashlist.append(*newhash);
}
//-------------------------------------------------
-// add_from_string - add a new hash, importing
+// add_from_string - add a new hash, importing
// from a string
//-------------------------------------------------
@@ -552,14 +552,14 @@ hash_base *hash_collection::add_from_string(char type, const char *buffer, int l
hash_base *newhash = alloc_by_id(type);
if (newhash == NULL)
return NULL;
-
+
// then import
if (!newhash->from_string(buffer, length))
{
global_free(newhash);
return NULL;
}
-
+
// and append to our list
return &m_hashlist.append(*newhash);
}
@@ -578,7 +578,7 @@ bool hash_collection::remove(char type)
m_hashlist.remove(*hash);
return true;
}
-
+
// didn't find it
return false;
}
@@ -613,22 +613,22 @@ hash_base *hash_collection::add_crc(UINT32 crc)
buffer[1] = crc >> 16;
buffer[2] = crc >> 8;
buffer[3] = crc >> 0;
-
+
// add it the standard way
return add_from_buffer(HASH_CRC, buffer, sizeof(buffer));
}
//-------------------------------------------------
-// internal_string - convert set of hashes and
-// flags to a string in our internal compact
+// internal_string - convert set of hashes and
+// flags to a string in our internal compact
// format
//-------------------------------------------------
const char *hash_collection::internal_string(astring &buffer) const
{
astring temp;
-
+
// output hashes first
buffer.reset();
for (hash_base *hash = m_hashlist.first(); hash != NULL; hash = hash->next())
@@ -641,7 +641,7 @@ const char *hash_collection::internal_string(astring &buffer) const
//-------------------------------------------------
-// macro_string - convert set of hashes and
+// macro_string - convert set of hashes and
// flags to a string in the macroized format
//-------------------------------------------------
@@ -679,14 +679,14 @@ bool hash_collection::from_internal_string(const char *string)
// determine the end of the string
const char *stringend = string + strlen(string);
const char *ptr = string;
-
+
// loop until we hit it
bool errors = false;
while (ptr < stringend)
{
char c = *ptr++;
char lc = tolower(c);
-
+
// non-hex alpha values specify a hash type
if (lc >= 'g' && lc <= 'z')
{
@@ -700,11 +700,11 @@ bool hash_collection::from_internal_string(const char *string)
else
errors = true;
}
-
+
// hex values are ignored, though unexpected
else if ((lc >= '0' && lc <= '9') || (lc >= 'a' && lc <= 'f'))
errors = true;
-
+
// anything else is a flag
else
m_flags.cat(c);
@@ -726,7 +726,7 @@ void hash_collection::begin(const char *types)
m_hashlist.append(*alloc_by_id(HASH_MD5)).begin();
m_hashlist.append(*alloc_by_id(HASH_SHA1)).begin();
}
-
+
// otherwise, just allocate the ones that are specified
else
{
@@ -736,7 +736,7 @@ void hash_collection::begin(const char *types)
hash_base *existing = hash(*scan);
if (existing != NULL)
m_hashlist.remove(*existing);
-
+
// append a new one
m_hashlist.append(*alloc_by_id(*scan)).begin();
}
@@ -771,7 +771,7 @@ void hash_collection::end()
//-------------------------------------------------
-// alloc_by_id - based on the ID character,
+// alloc_by_id - based on the ID character,
// allocate a new hash
//-------------------------------------------------
@@ -788,7 +788,7 @@ hash_base *hash_collection::alloc_by_id(char id)
//-------------------------------------------------
-// copyfrom - copy everything from another
+// copyfrom - copy everything from another
// collection
//-------------------------------------------------
@@ -796,7 +796,7 @@ void hash_collection::copyfrom(const hash_collection &src)
{
// copy flags directly
m_flags = src.m_flags;
-
+
// rebuild the hashlist by copying from the source
m_hashlist.reset();
for (hash_base *hash = src.first(); hash != NULL; hash = hash->next())
diff --git a/src/emu/hash.h b/src/emu/hash.h
index 38b0633b217..985f4c4766e 100644
--- a/src/emu/hash.h
+++ b/src/emu/hash.h
@@ -73,11 +73,11 @@ class hash_base
public:
// construction/destruction
hash_base(char id, const char *name, UINT8 length, UINT8 *bufptr);
-
+
// operators
bool operator==(const hash_base &rhs) const { return (m_length == rhs.m_length && memcmp(m_bufptr, rhs.m_bufptr, m_length) == 0); }
bool operator!=(const hash_base &rhs) const { return (m_length != rhs.m_length || memcmp(m_bufptr, rhs.m_bufptr, m_length) != 0); }
-
+
// getters
hash_base *next() const { return m_next; }
char id() const { return m_id; }
@@ -86,24 +86,24 @@ public:
bool in_progress() const { return m_in_progress; }
bool parse_error() const { return m_parse_error; }
UINT8 byte(int index) const { return (index >= 0 && index < m_length) ? m_bufptr[index] : 0; }
-
+
// buffer conversion
const UINT8 *buffer() { return m_bufptr; }
bool from_buffer(const UINT8 *buffer, int buflen);
-
+
// string conversion
const char *string(astring &buffer);
bool from_string(const char *&string, int length);
-
+
// creation
virtual void begin() = 0;
virtual void buffer(const UINT8 *data, UINT32 length) = 0;
virtual void end() = 0;
-
+
protected:
// internal helpers
int fromhex(char c);
-
+
// internal state
hash_base * m_next;
const char * m_name;
@@ -125,12 +125,12 @@ public:
static const char HASH_CRC = 'R';
static const char HASH_MD5 = 'M';
static const char HASH_SHA1 = 'S';
-
+
// common combinations for requests
static const char *HASH_TYPES_CRC;
static const char *HASH_TYPES_CRC_SHA1;
static const char *HASH_TYPES_ALL;
-
+
// flags are identified by punctuation marks
static const char FLAG_NO_DUMP = '!';
static const char FLAG_BAD_DUMP = '^';
@@ -140,7 +140,7 @@ public:
hash_collection(const char *string);
hash_collection(const hash_collection &src);
~hash_collection();
-
+
// operators
hash_collection &operator=(const hash_collection &src);
bool operator==(const hash_collection &rhs) const;
@@ -158,16 +158,16 @@ public:
hash_base *add_from_buffer(char type, const UINT8 *buffer, int bufflen);
hash_base *add_from_string(char type, const char *buffer, int length);
bool remove(char type);
-
+
// CRC-specific helpers
bool crc(UINT32 &result);
hash_base *add_crc(UINT32 crc);
- // string conversion
+ // string conversion
const char *internal_string(astring &buffer) const;
const char *macro_string(astring &buffer) const;
bool from_internal_string(const char *string);
-
+
// creation
void begin(const char *types = NULL);
void buffer(const UINT8 *data, UINT32 length);
@@ -181,7 +181,7 @@ private:
// internal state
astring m_flags;
- simple_list<hash_base> m_hashlist;
+ simple_list<hash_base> m_hashlist;
};
diff --git a/src/emu/imagedev/multcart.c b/src/emu/imagedev/multcart.c
index 093a1e2efff..334060532d7 100644
--- a/src/emu/imagedev/multcart.c
+++ b/src/emu/imagedev/multcart.c
@@ -195,7 +195,7 @@ static multicart_open_error load_rom_resource(multicart_load_state *state, xml_d
{
hash_collection actual_hashes;
actual_hashes.compute((const UINT8 *)resource->ptr, resource->length, hash_collection::HASH_TYPES_CRC_SHA1);
-
+
hash_collection expected_hashes;
expected_hashes.add_from_string(hash_collection::HASH_SHA1, sha1, strlen(sha1));
diff --git a/src/emu/info.c b/src/emu/info.c
index c11f2d17a13..188c5e2304b 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -456,7 +456,7 @@ static const char *get_merge_name(const hash_collection &romhashes, int parents,
{
int parent;
const char *merge_name = NULL;
-
+
for (parent = 0; parent < parents; ++parent)
{
const machine_config *pconfig = &pinfoarray[parent]->mconfig;
@@ -1054,7 +1054,7 @@ static void print_game_info(FILE *out, const game_driver *game)
input_port_list_init(portlist, cfg->input_ports(), NULL, 0, FALSE, cfg);
}
}
-
+
/* print the header and the game name */
fprintf(out, "\t<" XML_TOP);
fprintf(out, " name=\"%s\"", xml_normalize_string(game->name) );
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 53b66434e6f..fe15cbe8f1e 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -1003,7 +1003,7 @@ time_t input_port_init(running_machine *machine, const input_port_token *tokens,
if (config->input_ports()!=NULL) {
input_port_list_init(machine->m_portlist, config->input_ports(), errorbuf, sizeof(errorbuf), TRUE, config);
if (errorbuf[0] != 0)
- mame_printf_error("Input port errors:\n%s", errorbuf);
+ mame_printf_error("Input port errors:\n%s", errorbuf);
}
}
@@ -2937,7 +2937,7 @@ static void port_config_detokenize(ioport_list &portlist, const input_port_token
field_config_insert(curfield, &maskbits, errorbuf, errorbuflen);
maskbits = 0;
- string = TOKEN_GET_STRING(ipt);
+ string = TOKEN_GET_STRING(ipt);
if (owner!=NULL) {
fulltag = core_strdup(owner->subtag(tempstring, string));
} else {
diff --git a/src/emu/machine/secflash.h b/src/emu/machine/secflash.h
index cefbc089305..c2291435349 100644
--- a/src/emu/machine/secflash.h
+++ b/src/emu/machine/secflash.h
@@ -11,7 +11,7 @@ class device_secure_serial_flash_config : public device_config,
public:
device_secure_serial_flash_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 param = 0);
};
-
+
class device_secure_serial_flash : public device_t,
public device_nvram_interface
{
diff --git a/src/emu/machine/x76f041.c b/src/emu/machine/x76f041.c
index 9da2a847728..6844c2ac507 100644
--- a/src/emu/machine/x76f041.c
+++ b/src/emu/machine/x76f041.c
@@ -335,7 +335,7 @@ void x76f041_device::scl_1()
byte = 0;
break;
}
-
+
bit = 0;
shift = 0;
}
diff --git a/src/emu/machine/x76f100.c b/src/emu/machine/x76f100.c
index cfa436758a7..222a8d540f6 100644
--- a/src/emu/machine/x76f100.c
+++ b/src/emu/machine/x76f100.c
@@ -183,7 +183,7 @@ void x76f100_device::scl_0()
sdar = shift & 1;
shift >>= 1;
bit++;
-
+
if(bit == 8) {
bit = 0;
byte++;
@@ -265,7 +265,7 @@ void x76f100_device::scl_1()
}
}
break;
-
+
case STATE_READ_DATA:
if(bit < 8) {
if(bit == 0) {
diff --git a/src/emu/rendlay.h b/src/emu/rendlay.h
index 94afb5292c9..96e55afb207 100644
--- a/src/emu/rendlay.h
+++ b/src/emu/rendlay.h
@@ -152,7 +152,7 @@ private:
astring m_string; // string for text components
bitmap_t * m_bitmap; // source bitmap for images
astring m_dirname; // directory name of image file (for lazy loading)
- emu_file * m_file; // file object for reading image/alpha files
+ emu_file * m_file; // file object for reading image/alpha files
astring m_imagefile; // name of the image file (for lazy loading)
astring m_alphafile; // name of the alpha file (for lazy loading)
bool m_hasalpha; // is there any alpha component present?
diff --git a/src/emu/romload.c b/src/emu/romload.c
index f0fe51681e6..b5423281734 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -461,7 +461,7 @@ static void dump_wrong_and_correct_checksums(rom_load_data *romdata, const hash_
romdata->errorstring.catprintf(" EXPECTED: %s\n", hashes.macro_string(tempstr));
romdata->errorstring.catprintf(" FOUND: %s\n", acthashes.macro_string(tempstr));
- // warn about any ill-formed hashes
+ // warn about any ill-formed hashes
for (hash_base *hash = hashes.first(); hash != NULL; hash = hash->next())
if (hash->parse_error())
{
diff --git a/src/emu/screen.h b/src/emu/screen.h
index 387adbef552..1de260f8b08 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -164,7 +164,7 @@ public:
const rectangle &visible_area() const { return m_visarea; }
bitmap_format format() const { return m_config.m_format; }
render_container &container() const { assert(m_container != NULL); return *m_container; }
- bool screen_update(bitmap_t &bitmap, const rectangle &cliprect);
+ bool screen_update(bitmap_t &bitmap, const rectangle &cliprect);
void screen_eof();
// dynamic configuration
@@ -286,7 +286,7 @@ private:
#define SCREEN_EOF(name) void SCREEN_EOF_NAME(name)(screen_device *screen, running_machine *machine)
#define SCREEN_EOF_CALL(name) SCREEN_EOF_NAME(name)(screen, machine)
-#define screen_eof_0 NULL
+#define screen_eof_0 NULL
#define MCFG_SCREEN_ADD(_tag, _type) \
MCFG_DEVICE_ADD(_tag, SCREEN, 0) \
diff --git a/src/emu/softlist.c b/src/emu/softlist.c
index 41e47380c3f..212e488480e 100644
--- a/src/emu/softlist.c
+++ b/src/emu/softlist.c
@@ -293,7 +293,7 @@ static void add_info(software_list *swlist, char *feature_name, char *feature_va
/* First allocate the new entry */
new_entry = (feature_list *)pool_malloc_lib(swlist->pool, sizeof(feature_list) );
-
+
if ( new_entry )
{
new_entry->next = NULL;
@@ -455,7 +455,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut
elem->other_info->name = NULL;
elem->other_info->value = NULL;
}
-
+
/* Handle the supported flag */
elem->supported = SOFTWARE_SUPPORTED_YES;
if ( supported && ! strcmp( supported, "partial" ) )
@@ -502,37 +502,37 @@ static void start_handler(void *data, const char *tagname, const char **attribut
{
const char *str_feature_name = NULL;
const char *str_feature_value = NULL;
-
+
for ( ; attributes[0]; attributes += 2 )
{
if ( !strcmp( attributes[0], "name" ) )
str_feature_name = attributes[1];
-
+
if ( !strcmp( attributes[0], "value" ) )
str_feature_value = attributes[1];
}
-
+
/* Prepare for adding feature to feature list */
if ( str_feature_name && swlist->softinfo )
{
char *name = (char *)pool_malloc_lib(swlist->pool, ( strlen( str_feature_name ) + 1 ) * sizeof(char) );
char *value = NULL;
-
+
if ( !name )
return;
-
+
strcpy( name, str_feature_name );
-
+
if ( str_feature_value )
{
value = (char *)pool_malloc_lib(swlist->pool, ( strlen( str_feature_value ) + 1 ) * sizeof(char) );
-
+
if ( !value )
return;
-
+
strcpy( value, str_feature_value );
}
-
+
add_info( swlist, name, value );
}
}
@@ -862,7 +862,7 @@ static void end_handler(void *data, const char *name)
if ( swlist->softinfo && swlist->softinfo->other_info )
{
feature_list *list = swlist->softinfo->other_info;
-
+
while( list->next )
{
add_feature( swlist, list->next->name, list->next->value );
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index dd645ac4021..ca10f73af89 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -142,9 +142,9 @@ struct _SLOT
#define SCILV1(aica) ((aica->udata.data[0xac/2]>>0x0)&0xff)
#define SCILV2(aica) ((aica->udata.data[0xb0/2]>>0x0)&0xff)
-#define MCIEB(aica) ((aica->udata.data[0xb4/2]>>0x0)&0xff)
-#define MCIPD(aica) ((aica->udata.data[0xb8/2]>>0x0)&0xff)
-#define MCIRE(aica) ((aica->udata.data[0xbc/2]>>0x0)&0xff)
+#define MCIEB(aica) ((aica->udata.data[0xb4/2]>>0x0)&0xff)
+#define MCIPD(aica) ((aica->udata.data[0xb8/2]>>0x0)&0xff)
+#define MCIRE(aica) ((aica->udata.data[0xbc/2]>>0x0)&0xff)
#define SCIEX0 0
#define SCIEX1 1
@@ -880,7 +880,7 @@ static void AICA_UpdateRegR(aica_state *AICA, int reg)
struct _SLOT *slot=AICA->Slots+slotnum;
unsigned int CA = 0;
- if (PCMS(slot) == 0) // 16-bit samples
+ if (PCMS(slot) == 0) // 16-bit samples
{
CA = (slot->cur_addr>>(SHIFT-1))&AICA->RAM_MASK16;
}
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index d25a14037bb..93fcf158f5d 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -111,7 +111,7 @@ bsmt2000_device_config::bsmt2000_device_config(const machine_config &mconfig, co
device_config_sound_interface(mconfig, *this),
device_config_memory_interface(mconfig, *this),
m_space_config("samples", ENDIANNESS_LITTLE, 8, 32, 0, NULL, *ADDRESS_MAP_NAME(bsmt2000)),
- m_ready_callback(NULL)
+ m_ready_callback(NULL)
{
m_shortname = "bsmt2000";
}
diff --git a/src/emu/sound/okiadpcm.c b/src/emu/sound/okiadpcm.c
index 98ebc4386e9..75f81ccb33e 100644
--- a/src/emu/sound/okiadpcm.c
+++ b/src/emu/sound/okiadpcm.c
@@ -176,7 +176,7 @@ void oki_adpcm2_state::compute_tables()
// compute the step value
int stepval = floor(floatstep * 1.08f);
floatstep = floatstep * 1.08f;
-
+
// loop over all nibbles and compute the difference
for (int nib = 0; nib < 16; nib++)
{
diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index b02f8f1703c..775f1843448 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -18,7 +18,7 @@
const device_type OKIM9810 = okim9810_device_config::static_alloc_device_config;
-// volume lookup table. The manual lists a full 16 steps, 2dB per step.
+// volume lookup table. The manual lists a full 16 steps, 2dB per step.
// Given the dB values, that seems to map to a 7-bit volume control.
const UINT8 okim9810_device::okim_voice::s_volume_table[16] =
{
@@ -41,7 +41,7 @@ const UINT8 okim9810_device::okim_voice::s_volume_table[16] =
};
// sampling frequency lookup table.
-const UINT32 okim9810_device::s_sampling_freq_table[16] =
+const UINT32 okim9810_device::s_sampling_freq_table[16] =
{
4000,
8000,
@@ -199,7 +199,7 @@ void okim9810_device::sound_stream_update(sound_stream &stream, stream_sample_t
// reset the output streams
memset(outputs[0], 0, samples * sizeof(*outputs[0]));
memset(outputs[1], 0, samples * sizeof(*outputs[1]));
-
+
// iterate over voices and accumulate sample data
for (int voicenum = 0; voicenum < OKIM9810_VOICES; voicenum++)
m_voice[voicenum].generate_audio(*m_direct, outputs, samples, m_global_volume, clock(), m_filter_type);
@@ -242,19 +242,19 @@ void okim9810_device::write_command(UINT8 data)
{
const UINT8 cmd = (data & 0xf8) >> 3;
const UINT8 channel = (data & 0x07);
-
+
switch(cmd)
{
case 0x00: // START
{
- mame_printf_debug("START channel mask %02x\n", m_TMP_register);
+ mame_printf_debug("START channel mask %02x\n", m_TMP_register);
UINT8 channelMask = 0x01;
for (int i = 0; i < OKIM9810_VOICES; i++, channelMask <<= 1)
{
if (channelMask & m_TMP_register)
{
m_voice[i].m_playing = true;
- mame_printf_debug("\t\tPlaying channel %d: encoder type %d @ %dhz (volume = %d %d). From %08x for %d samples (looping=%d).\n",
+ mame_printf_debug("\t\tPlaying channel %d: encoder type %d @ %dhz (volume = %d %d). From %08x for %d samples (looping=%d).\n",
i,
m_voice[i].m_playbackAlgo,
m_voice[i].m_samplingFreq,
@@ -282,7 +282,7 @@ void okim9810_device::write_command(UINT8 data)
break;
}
case 0x02: // LOOP
- {
+ {
mame_printf_debug("LOOP channel mask %02x\n", m_TMP_register);
UINT8 channelMask = 0x01;
for (int i = 0; i < OKIM9810_VOICES; i++, channelMask <<= 1)
@@ -313,11 +313,11 @@ void okim9810_device::write_command(UINT8 data)
}
case 0x04: // MUON (silence)
{
- mame_printf_warning("MUON channel %d length %02x\n", channel, m_TMP_register);
+ mame_printf_warning("MUON channel %d length %02x\n", channel, m_TMP_register);
mame_printf_warning("MSM9810: UNIMPLEMENTED COMMAND!\n");
break;
}
-
+
case 0x05: // FADR (phrase address)
{
const offs_t base = m_TMP_register * 8;
@@ -343,7 +343,7 @@ void okim9810_device::write_command(UINT8 data)
startAddr = m_direct->read_raw_byte(subTable + 1) << 16;
startAddr |= m_direct->read_raw_byte(subTable + 2) << 8;
startAddr |= m_direct->read_raw_byte(subTable + 3) << 0;
-
+
// TODO: What does byte (subTable + 4) refer to?
endAddr = m_direct->read_raw_byte(subTable + 5) << 16;
endAddr |= m_direct->read_raw_byte(subTable + 6) << 8;
@@ -359,7 +359,7 @@ void okim9810_device::write_command(UINT8 data)
m_voice[channel].m_playbackAlgo = (startFlags & 0x30) >> 4;
m_voice[channel].m_samplingFreq = s_sampling_freq_table[startFlags & 0x0f];
- if (m_voice[channel].m_playbackAlgo == OKIM9810_ADPCM_PLAYBACK ||
+ if (m_voice[channel].m_playbackAlgo == OKIM9810_ADPCM_PLAYBACK ||
m_voice[channel].m_playbackAlgo == OKIM9810_ADPCM2_PLAYBACK)
m_voice[channel].m_count *= 2;
else
@@ -388,13 +388,13 @@ void okim9810_device::write_command(UINT8 data)
{
const UINT8 leftVolIndex = (m_TMP_register & 0xf0) >> 4;
const UINT8 rightVolIndex = m_TMP_register & 0x0f;
- mame_printf_debug("PAN channel %d left index: %02x right index: %02x (%02x)\n", channel, leftVolIndex, rightVolIndex, m_TMP_register);
- mame_printf_debug("\tChannel %d left -> %d right -> %d\n", channel, leftVolIndex, rightVolIndex);
+ mame_printf_debug("PAN channel %d left index: %02x right index: %02x (%02x)\n", channel, leftVolIndex, rightVolIndex, m_TMP_register);
+ mame_printf_debug("\tChannel %d left -> %d right -> %d\n", channel, leftVolIndex, rightVolIndex);
m_voice[channel].m_pan_volume_left = leftVolIndex;
m_voice[channel].m_pan_volume_right = rightVolIndex;
break;
}
- default:
+ default:
{
mame_printf_warning("MSM9810: UNKNOWN COMMAND!\n");
break;
@@ -456,8 +456,8 @@ okim9810_device::okim_voice::okim_voice()
// add them to an output stream
//-------------------------------------------------
-void okim9810_device::okim_voice::generate_audio(direct_read_data &direct,
- stream_sample_t **buffers,
+void okim9810_device::okim_voice::generate_audio(direct_read_data &direct,
+ stream_sample_t **buffers,
int samples,
const UINT8 global_volume,
const UINT32 clock,
@@ -494,13 +494,13 @@ void okim9810_device::okim_voice::generate_audio(direct_read_data &direct,
case OKIM9810_ADPCM_PLAYBACK:
{
m_adpcm.reset();
- m_startSample = (INT32)m_adpcm.clock(nibble0);
+ m_startSample = (INT32)m_adpcm.clock(nibble0);
break;
}
case OKIM9810_ADPCM2_PLAYBACK:
{
m_adpcm2.reset();
- m_startSample = (INT32)m_adpcm2.clock(nibble0);
+ m_startSample = (INT32)m_adpcm2.clock(nibble0);
break;
}
default:
@@ -519,12 +519,12 @@ void okim9810_device::okim_voice::generate_audio(direct_read_data &direct,
{
case OKIM9810_ADPCM_PLAYBACK:
{
- m_endSample = (INT32)m_adpcm.clock(nibble1);
+ m_endSample = (INT32)m_adpcm.clock(nibble1);
break;
}
case OKIM9810_ADPCM2_PLAYBACK:
{
- m_endSample = (INT32)m_adpcm2.clock(nibble1);
+ m_endSample = (INT32)m_adpcm2.clock(nibble1);
break;
}
default:
@@ -574,8 +574,8 @@ void okim9810_device::okim_voice::generate_audio(direct_read_data &direct,
//-------------------------------------------------
-// volume_scale - computes the volume equation as
-// seen on page 29 of the docs.
+// volume_scale - computes the volume equation as
+// seen on page 29 of the docs.
// Returns a value from the volume lookup table.
//-------------------------------------------------
@@ -587,9 +587,9 @@ UINT8 okim9810_device::okim_voice::volume_scale(const UINT8 global_volume_index,
const UINT8& L = pan_volume_index;
const UINT8& O = global_volume_index;
UINT32 index = (V+L) + (O*3);
-
+
if (index > 15)
index = 15;
-
+
return s_volume_table[index];
}
diff --git a/src/emu/sound/okim9810.h b/src/emu/sound/okim9810.h
index 1bc2db9791c..b1c5c01f5e3 100644
--- a/src/emu/sound/okim9810.h
+++ b/src/emu/sound/okim9810.h
@@ -4,8 +4,8 @@
OKI MSM9810 ADCPM(2) sound chip.
- Notes:
- The master clock frequency for this chip can range from 3.5MHz to 4.5Mhz.
+ Notes:
+ The master clock frequency for this chip can range from 3.5MHz to 4.5Mhz.
The typical oscillator is a 4.096Mhz crystal.
***************************************************************************/
@@ -124,8 +124,8 @@ protected:
{
public:
okim_voice();
- void generate_audio(direct_read_data &direct,
- stream_sample_t **buffers,
+ void generate_audio(direct_read_data &direct,
+ stream_sample_t **buffers,
int samples,
const UINT8 global_volume,
const UINT32 clock,
@@ -168,7 +168,7 @@ protected:
direct_read_data* m_direct;
UINT8 m_TMP_register;
-
+
UINT8 m_global_volume; // volume index set with the OPT command
UINT8 m_filter_type; // interpolation filter type set with the OPT command
UINT8 m_output_level; // flag stating if a voltage follower is connected
diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c
index 01fca50bfff..ba756d0ec56 100644
--- a/src/emu/sound/rf5c68.c
+++ b/src/emu/sound/rf5c68.c
@@ -169,7 +169,7 @@ READ8_DEVICE_HANDLER( rf5c68_r )
chip->stream->update();
shift = (offset & 1) ? 11 + 8 : 11;
-// printf("%08x\n",(chip->chan[(offset & 0x0e) >> 1].addr));
+// printf("%08x\n",(chip->chan[(offset & 0x0e) >> 1].addr));
return (chip->chan[(offset & 0x0e) >> 1].addr) >> (shift);
}
diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c
index 642421cfb54..e3d66fbed62 100644
--- a/src/emu/sound/sn76496.c
+++ b/src/emu/sound/sn76496.c
@@ -104,7 +104,7 @@
frequency register, while the others have 0x400 as before. Should fix a bug
or two on sega games, particularly Vigilante on Sega Master System. Verified
on SMS hardware.
-
+
TODO: * Implement the TMS9919 - any difference to sn94624?
* Implement the T6W28; has registers in a weird order, needs writes
to be 'sanitized' first. Also is stereo, similar to game gear.
diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c
index 7f203ab7f9a..4ffbe31f845 100644
--- a/src/emu/sound/spu.c
+++ b/src/emu/sound/spu.c
@@ -1,9 +1,9 @@
/*
-
+
Sony PlayStation SPU (CXD2922BQ/CXD2925Q) emulator
by pSXAuthor
MAME adaptation by R. Belmont
-
+
*/
#include "emu.h"
@@ -23,7 +23,7 @@
//#define show_xa_debug
//#ifndef _FINAL
-// #define show_cache_update
+// #define show_cache_update
//#endif
#ifdef show_xa_debug
@@ -32,7 +32,7 @@
#define debug_xa if (0)
#endif
-//
+//
//
//
INLINE unsigned int min(unsigned int a, unsigned int b)
@@ -125,10 +125,10 @@ enum srrr_flags
};
static const unsigned int sound_buffer_size=65536*4,
- xa_sector_size=(18*28*8)<<1,
- xa_buffer_sectors=16,
- cdda_sector_size=2352,
- cdda_buffer_sectors=16,
+ xa_sector_size=(18*28*8)<<1,
+ xa_buffer_sectors=16,
+ cdda_sector_size=2352,
+ cdda_buffer_sectors=16,
num_loop_cache_packets=4,
num_loop_cache_samples=num_loop_cache_packets*28,
spu_ram_size=512*1024,
@@ -341,7 +341,7 @@ public:
static unsigned int cache_size;
sample_cache()
- : invalid_start(0xffffffff),
+ : invalid_start(0xffffffff),
invalid_end(0),
last_update_end(0xffffffff),
data(NULL),
@@ -527,12 +527,12 @@ class stream_buffer
public:
stream_buffer(const unsigned int _sector_size,
const unsigned int _num_sectors)
- : head(0),
+ : head(0),
tail(0),
in(0),
sector_size(_sector_size),
num_sectors(_num_sectors),
- marker_head(NULL),
+ marker_head(NULL),
marker_tail(NULL)
{
buffer_size=sector_size*num_sectors;
@@ -575,7 +575,7 @@ public:
while ((marker_tail) && (marker_tail->sector>=sector))
{
-// debug_xa("flushing: %d\n", marker_tail->sector);
+// debug_xa("flushing: %d\n", marker_tail->sector);
stream_marker *xam=marker_tail;
head=xam->offset;
@@ -622,7 +622,7 @@ public:
bool passed=(((olddist==0) && (dist!=0)) || (dist>olddist));
if (! passed) break;
-// debug_xa("passed: %d\n",marker_head->sector);
+// debug_xa("passed: %d\n",marker_head->sector);
stream_marker *xam=marker_head;
marker_head=xam->next;
@@ -896,11 +896,11 @@ bool spu_device::cache_pointer::update(spu_device *spu)
{
if ((cache) && (! cache->valid))
{
-/* log(log_spu,"cache_pointer::update: block %08x-%08x invalidated %08x-%08x\n",
- cache->start,
- cache->end,
- cache->invalid_start,
- cache->invalid_end);*/
+/* log(log_spu,"cache_pointer::update: block %08x-%08x invalidated %08x-%08x\n",
+ cache->start,
+ cache->end,
+ cache->invalid_start,
+ cache->invalid_end);*/
if (! cache->try_update(spu))
{
@@ -1335,7 +1335,7 @@ void spu_device::update_vol(const unsigned int addr)
case 3: printf("exp dec: phase=%d val=%02x\n",(newval>>12)&1,newval&0x7f); break;
}
#endif
- }
+ }
else
{
voice[v].vol[ch]=((int)newval<<17)>>17;
@@ -1397,9 +1397,9 @@ void spu_device::flush_cache(sample_cache *sc,
for (unsigned int a=sc->start; a<sc->end; a+=16)
cache[a>>4]=NULL;
-/* log_static(log_spu,"cache_invalidate: %08x->%08x\n",
- sc->start,
- sc->end);*/
+/* log_static(log_spu,"cache_invalidate: %08x->%08x\n",
+ sc->start,
+ sc->end);*/
sc->invalid_start=min(sc->invalid_start,istart);
sc->invalid_end=max(sc->invalid_end,iend);
@@ -1413,8 +1413,8 @@ void spu_device::flush_cache(sample_cache *sc,
void spu_device::invalidate_cache(const unsigned int st, const unsigned int en)
{
- for (unsigned int a=st; a<en; a+=16)
- if (cache[a>>4]) flush_cache(cache[a>>4],st,en);
+ for (unsigned int a=st; a<en; a+=16)
+ if (cache[a>>4]) flush_cache(cache[a>>4],st,en);
}
//
@@ -1423,7 +1423,7 @@ void spu_device::invalidate_cache(const unsigned int st, const unsigned int en)
spu_device::sample_cache *spu_device::get_sample_cache(const unsigned int addr)
{
-// log_static(log_spu,"get_sample_cache: %08x\n",addr);
+// log_static(log_spu,"get_sample_cache: %08x\n",addr);
assert(addr<spu_ram_size);
sample_cache *sc=cache[addr>>4];
@@ -1466,9 +1466,9 @@ spu_device::sample_cache *spu_device::get_sample_cache(const unsigned int addr)
sc->dend=dp;
sc->add_ref();
-/* log_static(log_spu,"cache_add: %08x->%08x\n",
- sc->start,
- sc->end);*/
+/* log_static(log_spu,"cache_add: %08x->%08x\n",
+ sc->start,
+ sc->end);*/
return sc;
}
@@ -1642,7 +1642,7 @@ spu_device::sample_loop_cache *spu_device::get_loop_cache(sample_cache *cache, c
void spu_device::update_voice_loop(const unsigned int v)
{
-// voicereg *vr=&spureg.voice[v];
+// voicereg *vr=&spureg.voice[v];
voiceinfo *vi=&voice[v];
unsigned int ra = 0;
@@ -1723,11 +1723,11 @@ void spu_device::update_voice_state()
//
// Process voice state and build output segments
//
-// Input: const unsigned int v Voice number
-// const unsigned int sz Amount of time to process (in output samples)
-// unsigned int *tleft Returned number of output samples remaining
+// Input: const unsigned int v Voice number
+// const unsigned int sz Amount of time to process (in output samples)
+// unsigned int *tleft Returned number of output samples remaining
//
-// Output: bool true if voice is still playing
+// Output: bool true if voice is still playing
//
bool spu_device::process_voice(const unsigned int v,
@@ -1761,7 +1761,7 @@ bool spu_device::process_voice(const unsigned int v,
unsigned int ntoplay=fm?1:num,
nextevent=min(vi->samplestoend,
- min(vi->samplestoirq,vi->envsamples));
+ min(vi->samplestoirq,vi->envsamples));
ntoplay=min(ntoplay,nextevent);
if (ntoplay)
@@ -1931,9 +1931,9 @@ bool spu_device::process_voice(const unsigned int v,
//
// Generate voice output samples
//
-// Inputs: const unsigned int v Voice number
-// void *ptr Output buffer (if no reverb)
-// const unsigned int sz Number of samples to output
+// Inputs: const unsigned int v Voice number
+// void *ptr Output buffer (if no reverb)
+// const unsigned int sz Number of samples to output
//
void spu_device::generate_voice(const unsigned int v,
@@ -1977,7 +1977,7 @@ void spu_device::generate_voice(const unsigned int v,
vi->env_level+=(n*vi->env_delta);
- if (noiseptr)
+ if (noiseptr)
{
INT64 dptr=((INT64)n*vi->pitch)+vi->dptr;
unsigned int d=(unsigned int)(dptr>>12);
@@ -2087,7 +2087,7 @@ void spu_device::generate_voice(const unsigned int v,
sp+=(dptr>>12);
dptr&=0xfff;
}
- }
+ }
else
{
while (n--)
@@ -2126,7 +2126,7 @@ void spu_device::generate_voice(const unsigned int v,
if (! nsp)
{
- update_voice_loop(v);
+ update_voice_loop(v);
if (vi->loop) nsp=vi->loop_cache->data;
}
@@ -2143,7 +2143,7 @@ void spu_device::generate_voice(const unsigned int v,
v+=((nv-v)*(int)dptr)>>12;
- int l=(v*env_l)>>15,
+ int l=(v*env_l)>>15,
r=(v*env_r)>>15;
env_l+=envdelta_l;
env_r+=envdelta_r;
@@ -2172,7 +2172,7 @@ void spu_device::generate_voice(const unsigned int v,
v+=((nv-v)*(int)dptr)>>12;
- int l=(v*env_l)>>15,
+ int l=(v*env_l)>>15,
r=(v*env_r)>>15;
env_l+=envdelta_l;
env_r+=envdelta_r;
@@ -2287,7 +2287,7 @@ bool spu_device::update_envelope(const int v)
case 3: // sustain end
voice[v].envsamples=infinity;
- voice[v].env_delta=0.0f;
+ voice[v].env_delta=0.0f;
if (voice[v].env_sr<=0.0f)
{
voice[v].env_level=0.0f;
@@ -2329,7 +2329,7 @@ void spu_device::key_on(const int v)
{
voice[v].loop.reset();
-// printf("key_on: %d @ %x (pitch %x)\n", v, spureg.voice[v].addr<<3, spureg.voice[v].pitch);
+// printf("key_on: %d @ %x (pitch %x)\n", v, spureg.voice[v].addr<<3, spureg.voice[v].pitch);
translate_sample_addr(spureg.voice[v].addr<<3,&voice[v].play);
assert(voice[v].play.ptr<voice[v].play.cache->dend);
@@ -2344,7 +2344,7 @@ void spu_device::key_on(const int v)
voice[v].forceloop=false;
// Note: ChronoCross has note hang problems if this is 0 immediately
- // after key on
+ // after key on
spureg.voice[v].curvol=1;
for (unsigned int ch=0; ch<2; ch++)
@@ -2392,7 +2392,7 @@ void spu_device::key_on(const int v)
}
} else
{
- voice[v].env_sr=get_linear_rate((spureg.voice[v].srrr&srrr_sr_mask)>>srrr_sr_shift);
+ voice[v].env_sr=get_linear_rate((spureg.voice[v].srrr&srrr_sr_mask)>>srrr_sr_shift);
if (spureg.voice[v].srrr&srrr_sd)
voice[v].env_sr=-voice[v].env_sr;
}
@@ -2433,10 +2433,10 @@ void spu_device::generate_xa(void *ptr, const unsigned int sz)
{
// Don't start playing until 8 frames worth of data are in
- if ((! xa_playing) && (xa_buffer->get_bytes_in()<(xa_spf<<3)))
+ if ((! xa_playing) && (xa_buffer->get_bytes_in()<(xa_spf<<3)))
{
-// debug_xa("waiting...\n");
- return;
+// debug_xa("waiting...\n");
+ return;
}
xa_playing=true;
@@ -2587,7 +2587,7 @@ void spu_device::generate_cdda(void *ptr, const unsigned int sz)
void spu_device::key_off(const int v)
{
-// printf("key_off: %d\n", v);
+// printf("key_off: %d\n", v);
if (voice[v].env_state<=3)
{
@@ -2608,15 +2608,15 @@ void spu_device::update_reverb()
if (cur_reverb_preset==NULL)
{
-// printf("spu: reverb=unknown (reg 1c0 = %x)\n", reg[0x1c0]);
+// printf("spu: reverb=unknown (reg 1c0 = %x)\n", reg[0x1c0]);
} else
{
-// printf("spu: reverb=%s\n",cur_reverb_preset->name);
+// printf("spu: reverb=%s\n",cur_reverb_preset->name);
spu_reverb_cfg=&cur_reverb_preset->cfg;
if ((mame_stricmp("reverb off",cur_reverb_preset->name)) && (spu_reverb_cfg->band_gain<=0.0f))
{
-// printf("spu: no reverb config for %s\n",cur_reverb_preset->name);
+// printf("spu: no reverb config for %s\n",cur_reverb_preset->name);
}
}
@@ -2970,8 +2970,8 @@ void spu_device::decode_xa_stereo(const unsigned char *xa,
for (int i=0; i<28; i++)
{
short d=xa[16+(i<<2)+s],
- d0=(d&0xf)<<12,
- d1=(d>>4)<<12;
+ d0=(d&0xf)<<12,
+ d1=(d>>4)<<12;
d0=clamp((int)(d0>>shift0)+(((l0*f0)+(l1*f1)+32)>>6));
*dp++=d0;
l1=l0;
@@ -3000,12 +3000,12 @@ void spu_device::decode_xa_stereo(const unsigned char *xa,
/*
enum
{
- xaencoding_stereo_mask=3,
- xaencoding_freq_shift=2,
- xaencoding_freq_mask=3<<xaencoding_freq_shift,
- xaencoding_bps_shift=4,
- xaencoding_bps_mask=3<<xaencoding_bps_shift,
- xaencoding_emphasis=(1<<6)
+ xaencoding_stereo_mask=3,
+ xaencoding_freq_shift=2,
+ xaencoding_freq_mask=3<<xaencoding_freq_shift,
+ xaencoding_bps_shift=4,
+ xaencoding_bps_mask=3<<xaencoding_bps_shift,
+ xaencoding_emphasis=(1<<6)
};
*/
@@ -3015,7 +3015,7 @@ bool spu_device::play_xa(const unsigned int sector, const unsigned char *xa)
if (xa_buffer->get_bytes_free()<xa_sector_size) return false;
-// debug_xa("play_xa: %d\n",sector);
+// debug_xa("play_xa: %d\n",sector);
// Get XA format from sector header
@@ -3077,7 +3077,7 @@ bool spu_device::play_xa(const unsigned int sector, const unsigned char *xa)
void spu_device::flush_xa(const unsigned int sector)
{
-// debug_xa("flush_xa: %d\n",sector);
+// debug_xa("flush_xa: %d\n",sector);
if (xa_playing)
{
@@ -3107,7 +3107,7 @@ bool spu_device::play_cdda(const unsigned int sector, const unsigned char *cdda)
void spu_device::flush_cdda(const unsigned int sector)
{
-// debug_xa("flush_cdda: %d\n",sector);
+// debug_xa("flush_cdda: %d\n",sector);
if (cdda_playing)
{
@@ -3134,7 +3134,7 @@ static void spu_dma_write( running_machine *machine, UINT32 n_address, INT32 n_s
spu_device *spu = machine->device<spu_device>("spu");
UINT8 *psxram = (UINT8 *)memory_get_shared(*machine, "share1");
-// printf("SPU DMA write from %x, size %x\n", n_address, n_size);
+// printf("SPU DMA write from %x, size %x\n", n_address, n_size);
spu->start_dma(psxram + n_address, true, n_size*4);
}
diff --git a/src/emu/sound/spu.h b/src/emu/sound/spu.h
index 860543f67e2..07a11f1e91e 100644
--- a/src/emu/sound/spu.h
+++ b/src/emu/sound/spu.h
@@ -48,7 +48,7 @@ const unsigned int spu_base_frequency_hz=44100;
class stream_buffer;
-class spu_device : public device_t, public device_sound_interface
+class spu_device : public device_t, public device_sound_interface
{
friend class spu_device_config;
diff --git a/src/emu/sound/spu_tables.c b/src/emu/sound/spu_tables.c
index dd23c88e59f..5e1ed9a8ee1 100644
--- a/src/emu/sound/spu_tables.c
+++ b/src/emu/sound/spu_tables.c
@@ -455,7 +455,7 @@ spu_device::reverb_preset spu_device::reverb_presets[]=
0x0334, 0x01B5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x01B4, 0x0136, 0x00B8, 0x005C, 0x8000, 0x8000
},
- { // made up from studio small [used by BOF3]
+ { // made up from studio small [used by BOF3]
-0.3112f,
0.7832f,
@@ -476,7 +476,7 @@ spu_device::reverb_preset spu_device::reverb_presets[]=
0x031C, 0x025D, 0x025C, 0x018E, 0x022F, 0x0135, 0x01D2, 0x00B7,
0x018F, 0x00B5, 0x00B4, 0x0080, 0x004C, 0x0026, 0x8000, 0x8000
},
- { // made up from studio large [used by Fighters Impact]
+ { // made up from studio large [used by Fighters Impact]
-0.3112f,
0.7832f,
diff --git a/src/emu/sound/spureverb.c b/src/emu/sound/spureverb.c
index 1c83853054b..4f05211be4e 100644
--- a/src/emu/sound/spureverb.c
+++ b/src/emu/sound/spureverb.c
@@ -306,10 +306,10 @@ void reverb::comb_allpass(signed short *sp,
//
void reverb::process(signed short *output,
- signed short *reverb_input,
- const reverb_params *rp,
- const int wetvol_l,
- const int wetvol_r,
+ signed short *reverb_input,
+ const reverb_params *rp,
+ const int wetvol_l,
+ const int wetvol_r,
const unsigned int sz)
{
signed short *sp=(signed short *)reverb_input,
diff --git a/src/emu/sound/spureverb.h b/src/emu/sound/spureverb.h
index f5170b4c7f3..8e94a318a24 100644
--- a/src/emu/sound/spureverb.h
+++ b/src/emu/sound/spureverb.h
@@ -34,24 +34,24 @@
const int wetvol_r,
const unsigned int _sz);
void comb_allpass4(signed short *sp,
- signed short *dp,
- const comb_param &comb_delay,
- const int comb_gain,
- const int allpass_delay,
- const int allpass_gain,
- const int *rvol,
- const unsigned int sz);
+ signed short *dp,
+ const comb_param &comb_delay,
+ const int comb_gain,
+ const int allpass_delay,
+ const int allpass_gain,
+ const int *rvol,
+ const unsigned int sz);
void comb_allpass1(signed short *sp,
- signed short *dp,
- const comb_param &comb_delay,
- const int comb_gain,
- const int allpass_delay,
- const int allpass_gain,
- const int *rvol,
- const unsigned int sz);
+ signed short *dp,
+ const comb_param &comb_delay,
+ const int comb_gain,
+ const int allpass_delay,
+ const int allpass_gain,
+ const int *rvol,
+ const unsigned int sz);
void bandpass(signed short *sp,
- const reverb_params *rp,
- const unsigned int sz);
+ const reverb_params *rp,
+ const unsigned int sz);
public:
reverb(const int hz, const int maxdelay=65536);
diff --git a/src/emu/video.c b/src/emu/video.c
index 425c86020eb..d7bf0f41284 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -458,7 +458,7 @@ void video_manager::begin_recording(const char *name, movie_format format)
filerr = m_mngfile->open(name);
else
filerr = open_next(*m_mngfile, "mng");
-
+
if (filerr == FILERR_NONE)
{
// start the capture
@@ -1096,7 +1096,7 @@ void video_manager::create_snapshot_bitmap(device_t *screen)
//-------------------------------------------------
// open_next - open the next non-existing file of
-// type filetype according to our numbering
+// type filetype according to our numbering
// scheme
//-------------------------------------------------