summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2008-07-31 09:00:13 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2008-07-31 09:00:13 +0000
commit57bd1856b5642538a458a4be3e3d0fd681eead71 (patch)
treec6a44058d50f0b0ffef08d7fb553e98dce324acc
parente8f2759a0c9e0bdd82a214bdad6e965be32760c6 (diff)
Cleanups/version bump.mame0126u3
-rw-r--r--src/emu/cheat.c222
-rw-r--r--src/emu/cpu/dsp56k/dsp56dsm.c22
-rw-r--r--src/emu/cpu/dsp56k/dsp56k.c156
-rw-r--r--src/emu/cpu/dsp56k/dsp56k.h10
-rw-r--r--src/emu/cpu/dsp56k/dsp56mem.c272
-rw-r--r--src/emu/cpu/dsp56k/dsp56pcu.c46
-rw-r--r--src/emu/cpu/sh2/sh2drc.c4
-rw-r--r--src/emu/debug/express.c10
-rw-r--r--src/emu/devintrf.c2
-rw-r--r--src/emu/devintrf.h2
-rw-r--r--src/emu/mame.c28
-rw-r--r--src/emu/memory.c2
-rw-r--r--src/emu/romload.c2
-rw-r--r--src/emu/sound/aica.c2
-rw-r--r--src/emu/validity.c12
-rw-r--r--src/lib/util/xmlfile.c2
-rw-r--r--src/mame/audio/atarijsa.c2
-rw-r--r--src/mame/audio/gottlieb.c4
-rw-r--r--src/mame/drivers/btime.c68
-rw-r--r--src/mame/drivers/cps1.c2
-rw-r--r--src/mame/drivers/galaxi.c28
-rw-r--r--src/mame/drivers/lucky74.c38
-rw-r--r--src/mame/drivers/m63.c2
-rw-r--r--src/mame/drivers/model3.c8
-rw-r--r--src/mame/drivers/naomi.c8
-rw-r--r--src/mame/drivers/plygonet.c22
-rw-r--r--src/mame/drivers/progolf.c4
-rw-r--r--src/mame/drivers/taito_l.c12
-rw-r--r--src/mame/drivers/warpwarp.c24
-rw-r--r--src/mame/drivers/zn.c34
-rw-r--r--src/mame/video/dc.c2
-rw-r--r--src/mame/video/lucky74.c2
-rw-r--r--src/osd/windows/debugwin.c6
-rw-r--r--src/version.c2
34 files changed, 531 insertions, 531 deletions
diff --git a/src/emu/cheat.c b/src/emu/cheat.c
index 98c7072c62d..26525b085fd 100644
--- a/src/emu/cheat.c
+++ b/src/emu/cheat.c
@@ -9,26 +9,26 @@
**********************************************************************
- Cheat XML format:
-
- <mamecheat version="1">
- <cheat desc="blah">
- <parameter variable="varname(param)" min="minval(0)" max="maxval(numitems)" step="stepval(1)">
- <item value="itemval(previtemval|minval+stepval)">text</item>
- ...
- </parameter>
- <script state="on|off|run|change(run)">
- <action condition="condexpr(1)">expression</action>
- ...
- <output condition="condexpr(1)" format="format(required)" line="line(0)" align="left|center|right(left)">
- <argument count="count(1)">expression</argument>
- </output>
- ...
- </script>
- ...
- </cheat>
- ...
- </mamecheat>
+ Cheat XML format:
+
+ <mamecheat version="1">
+ <cheat desc="blah">
+ <parameter variable="varname(param)" min="minval(0)" max="maxval(numitems)" step="stepval(1)">
+ <item value="itemval(previtemval|minval+stepval)">text</item>
+ ...
+ </parameter>
+ <script state="on|off|run|change(run)">
+ <action condition="condexpr(1)">expression</action>
+ ...
+ <output condition="condexpr(1)" format="format(required)" line="line(0)" align="left|center|right(left)">
+ <argument count="count(1)">expression</argument>
+ </output>
+ ...
+ </script>
+ ...
+ </cheat>
+ ...
+ </mamecheat>
*********************************************************************/
@@ -190,16 +190,16 @@ static void cheat_variable_set(void *ref, UINT64 value);
/*-------------------------------------------------
cheat_init - initialize the cheat engine,
- loading the cheat file
+ loading the cheat file
-------------------------------------------------*/
void cheat_init(running_machine *machine)
{
cheat_private *cheatinfo;
-
+
/* request a callback */
add_exit_callback(machine, cheat_exit);
-
+
/* allocate memory */
cheatinfo = auto_malloc(sizeof(*cheatinfo));
memset(cheatinfo, 0, sizeof(*cheatinfo));
@@ -221,7 +221,7 @@ void cheat_init(running_machine *machine)
static void cheat_exit(running_machine *machine)
{
cheat_private *cheatinfo = machine->cheat_data;
-
+
/* free the list of cheats */
if (cheatinfo->cheatlist != NULL)
cheat_list_free(cheatinfo->cheatlist);
@@ -235,7 +235,7 @@ static void cheat_exit(running_machine *machine)
/*-------------------------------------------------
cheat_list_load - load a cheat file into
- memory and create the cheat entry list
+ memory and create the cheat entry list
-------------------------------------------------*/
static cheat_entry *cheat_list_load(const char *filename)
@@ -258,7 +258,7 @@ static cheat_entry *cheat_list_load(const char *filename)
/* if that failed, return nothing */
if (filerr != FILERR_NONE)
return NULL;
-
+
/* read the XML file into internal data structures */
memset(&options, 0, sizeof(options));
options.error = &error;
@@ -316,7 +316,7 @@ error:
/*-------------------------------------------------
cheat_list_save - save a cheat file from
- memory to the given filename
+ memory to the given filename
-------------------------------------------------*/
static int cheat_list_save(const char *filename, const cheat_entry *cheatlist)
@@ -333,16 +333,16 @@ static int cheat_list_save(const char *filename, const cheat_entry *cheatlist)
/* if that failed, return nothing */
if (filerr != FILERR_NONE)
return FALSE;
-
+
/* output the outer layers */
mame_fprintf(cheatfile, "<?xml version=\"1.0\"?>\n");
mame_fprintf(cheatfile, "<!-- This file is autogenerated; comments and unknown tags will be stripped -->\n");
mame_fprintf(cheatfile, "<mamecheat version=\"%d\">\n", CHEAT_VERSION);
-
+
/* iterate over cheats in the list and save them */
for ( ; cheatlist != NULL; cheatlist = cheatlist->next)
cheat_entry_save(cheatfile, cheatlist);
-
+
/* close out the file */
mame_fprintf(cheatfile, "</mamecheat>\n");
mame_fclose(cheatfile);
@@ -367,8 +367,8 @@ static void cheat_list_free(cheat_entry *cheat)
/*-------------------------------------------------
cheat_entry_load - load a single cheat
- entry and create the underlying data
- structures
+ entry and create the underlying data
+ structures
-------------------------------------------------*/
static cheat_entry *cheat_entry_load(const char *filename, xml_data_node *cheatnode)
@@ -377,7 +377,7 @@ static cheat_entry *cheat_entry_load(const char *filename, xml_data_node *cheatn
const char *description;
int tempcount, curtemp;
cheat_entry *cheat;
-
+
/* pull the variable count out ahead of things */
tempcount = xml_get_attribute_int(cheatnode, "tempvariables", DEFAULT_TEMP_VARIABLES);
if (tempcount < 1)
@@ -385,12 +385,12 @@ static cheat_entry *cheat_entry_load(const char *filename, xml_data_node *cheatn
mame_printf_error("%s.xml(%d): invalid tempvariables attribute (%d)\n", filename, cheatnode->line, tempcount);
return NULL;
}
-
+
/* allocate memory for the cheat */
cheat = malloc_or_die(sizeof(*cheat) + (tempcount - 1) * sizeof(cheat->tempvar));
memset(cheat, 0, sizeof(*cheat) + (tempcount - 1) * sizeof(cheat->tempvar));
cheat->numtemp = tempcount;
-
+
/* get the description */
description = xml_get_attribute_string(cheatnode, "desc", NULL);
if (description == NULL || description[0] == 0)
@@ -399,7 +399,7 @@ static cheat_entry *cheat_entry_load(const char *filename, xml_data_node *cheatn
return NULL;
}
cheat->description = astring_dupc(description);
-
+
/* create the symbol table */
cheat->symbols = symtable_alloc(NULL);
for (curtemp = 0; curtemp < tempcount; curtemp++)
@@ -408,7 +408,7 @@ static cheat_entry *cheat_entry_load(const char *filename, xml_data_node *cheatn
sprintf(tempname, "temp%d", curtemp);
symtable_add_register(cheat->symbols, tempname, &cheat->tempvar[curtemp], cheat_variable_get, cheat_variable_set);
}
-
+
/* read the first parameter node */
paramnode = xml_get_sibling(cheatnode->child, "parameter");
if (paramnode != NULL)
@@ -421,7 +421,7 @@ static cheat_entry *cheat_entry_load(const char *filename, xml_data_node *cheatn
/* set this as the parameter and add the symbol */
cheat->parameter = curparam;
symtable_add_register(cheat->symbols, astring_c(curparam->name), &curparam->value, cheat_variable_get, cheat_variable_set);
-
+
/* only one parameter allowed */
paramnode = xml_get_sibling(paramnode->next, "parameter");
if (paramnode != NULL)
@@ -435,11 +435,11 @@ static cheat_entry *cheat_entry_load(const char *filename, xml_data_node *cheatn
cheat_script *curscript = cheat_script_load(filename, scriptnode, cheat);
if (curscript == NULL)
goto error;
-
+
/* if we have a script already for this slot, it is an error */
if (cheat->script[curscript->state] != NULL)
mame_printf_warning("%s.xml(%d): only one script per state allowed; ignoring additional scripts\n", filename, scriptnode->line);
-
+
/* otherwise, fill in the slot */
else
cheat->script[curscript->state] = curscript;
@@ -454,28 +454,28 @@ error:
/*-------------------------------------------------
cheat_entry_save - save a single cheat
- entry
+ entry
-------------------------------------------------*/
static void cheat_entry_save(mame_file *cheatfile, const cheat_entry *cheat)
{
script_state state;
-
+
/* output the cheat tag */
mame_fprintf(cheatfile, "\t<cheat desc=\"%s\"", astring_c(cheat->description));
if (cheat->numtemp != DEFAULT_TEMP_VARIABLES)
mame_fprintf(cheatfile, " tempvariables=\"%d\"", cheat->numtemp);
mame_fprintf(cheatfile, ">\n");
-
+
/* output the parameter, if present */
if (cheat->parameter != NULL)
cheat_parameter_save(cheatfile, cheat->parameter);
-
+
/* output the script nodes */
for (state = SCRIPT_STATE_OFF; state < SCRIPT_STATE_COUNT; state++)
if (cheat->script[state] != NULL)
cheat_script_save(cheatfile, cheat->script[state]);
-
+
/* close the cheat tag */
mame_fprintf(cheatfile, "\t</cheat>\n");
}
@@ -491,25 +491,25 @@ static void cheat_entry_free(cheat_entry *cheat)
if (cheat->description != NULL)
astring_free(cheat->description);
-
+
if (cheat->parameter != NULL)
cheat_parameter_free(cheat->parameter);
-
+
for (state = SCRIPT_STATE_OFF; state < SCRIPT_STATE_COUNT; state++)
if (cheat->script[state] != NULL)
cheat_script_free(cheat->script[state]);
-
+
if (cheat->symbols != NULL)
symtable_free(cheat->symbols);
-
+
free(cheat);
}
/*-------------------------------------------------
cheat_parameter_load - load a single cheat
- parameter and create the underlying data
- structures
+ parameter and create the underlying data
+ structures
-------------------------------------------------*/
static cheat_parameter *cheat_parameter_load(const char *filename, xml_data_node *paramnode)
@@ -517,27 +517,27 @@ static cheat_parameter *cheat_parameter_load(const char *filename, xml_data_node
parameter_item **itemtailptr;
xml_data_node *itemnode;
cheat_parameter *param;
-
+
/* allocate memory for it */
param = malloc_or_die(sizeof(*param));
memset(param, 0, sizeof(*param));
-
+
/* read the core attributes */
param->name = astring_dupc(xml_get_attribute_string(paramnode, "variable", "param"));
param->minval = xml_get_attribute_int(paramnode, "min", 0);
param->maxval = xml_get_attribute_int(paramnode, "max", 0);
param->stepval = xml_get_attribute_int(paramnode, "step", 1);
-
+
/* iterate over items */
itemtailptr = &param->itemlist;
for (itemnode = xml_get_sibling(paramnode->child, "item"); itemnode != NULL; itemnode = xml_get_sibling(itemnode->next, "item"))
{
parameter_item *curitem;
-
+
/* allocate memory for it */
curitem = malloc_or_die(sizeof(*curitem));
memset(curitem, 0, sizeof(*curitem));
-
+
/* check for NULL text */
if (itemnode->value == NULL || itemnode->value[0] == 0)
{
@@ -545,7 +545,7 @@ static cheat_parameter *cheat_parameter_load(const char *filename, xml_data_node
goto error;
}
curitem->text = astring_dupc(itemnode->value);
-
+
/* read the attributes */
if (xml_get_attribute(itemnode, "value") == NULL)
{
@@ -553,7 +553,7 @@ static cheat_parameter *cheat_parameter_load(const char *filename, xml_data_node
goto error;
}
curitem->value = xml_get_attribute_int(itemnode, "value", 0);
-
+
/* add to the end of the list */
*itemtailptr = curitem;
itemtailptr = &curitem->next;
@@ -568,7 +568,7 @@ error:
/*-------------------------------------------------
cheat_parameter_save - save a single cheat
- parameter
+ parameter
-------------------------------------------------*/
static void cheat_parameter_save(mame_file *cheatfile, const cheat_parameter *param)
@@ -592,7 +592,7 @@ static void cheat_parameter_save(mame_file *cheatfile, const cheat_parameter *pa
else
{
const parameter_item *curitem;
-
+
mame_fprintf(cheatfile, ">\n");
for (curitem = param->itemlist; curitem != NULL; curitem = curitem->next)
mame_fprintf(cheatfile, "\t\t\t<item value=\"%d\">%s</item>\n", (UINT32)curitem->value, astring_c(curitem->text));
@@ -602,33 +602,33 @@ static void cheat_parameter_save(mame_file *cheatfile, const cheat_parameter *pa
/*-------------------------------------------------
- cheat_parameter_free - free a single cheat
- parameter
+ cheat_parameter_free - free a single cheat
+ parameter
-------------------------------------------------*/
static void cheat_parameter_free(cheat_parameter *param)
{
if (param->name != NULL)
astring_free(param->name);
-
+
while (param->itemlist != NULL)
{
parameter_item *item = param->itemlist;
param->itemlist = item->next;
-
+
if (item->text != NULL)
astring_free(item->text);
free(item);
}
-
+
free(param);
}
-
+
/*-------------------------------------------------
cheat_script_load - load a single cheat
- script and create the underlying data
- structures
+ script and create the underlying data
+ structures
-------------------------------------------------*/
static cheat_script *cheat_script_load(const char *filename, xml_data_node *scriptnode, cheat_entry *cheat)
@@ -637,11 +637,11 @@ static cheat_script *cheat_script_load(const char *filename, xml_data_node *scri
xml_data_node *entrynode;
cheat_script *script;
const char *state;
-
+
/* allocate memory for it */
script = malloc_or_die(sizeof(*script));
memset(script, 0, sizeof(*script));
-
+
/* read the core attributes */
script->state = SCRIPT_STATE_RUN;
state = xml_get_attribute_string(scriptnode, "state", "run");
@@ -656,21 +656,21 @@ static cheat_script *cheat_script_load(const char *filename, xml_data_node *scri
mame_printf_error("%s.xml(%d): invalid script state '%s'\n", filename, scriptnode->line, state);
goto error;
}
-
+
/* iterate over nodes within the script */
entrytailptr = &script->entrylist;
for (entrynode = scriptnode->child; entrynode != NULL; entrynode = entrynode->next)
{
script_entry *curentry = NULL;
-
+
/* handle action nodes */
if (strcmp(entrynode->name, "action") == 0)
curentry = script_entry_load(filename, entrynode, cheat, TRUE);
-
+
/* handle output nodes */
else if (strcmp(entrynode->name, "output") == 0)
curentry = script_entry_load(filename, entrynode, cheat, FALSE);
-
+
/* anything else is ignored */
else
{
@@ -686,7 +686,7 @@ static cheat_script *cheat_script_load(const char *filename, xml_data_node *scri
entrytailptr = &curentry->next;
}
return script;
-
+
error:
cheat_script_free(script);
return NULL;
@@ -695,7 +695,7 @@ error:
/*-------------------------------------------------
cheat_script_save - save a single cheat
- script
+ script
-------------------------------------------------*/
static void cheat_script_save(mame_file *cheatfile, const cheat_script *script)
@@ -713,19 +713,19 @@ static void cheat_script_save(mame_file *cheatfile, const cheat_script *script)
case SCRIPT_STATE_CHANGE: mame_fprintf(cheatfile, " state=\"change\""); break;
}
mame_fprintf(cheatfile, ">\n");
-
+
/* output entries */
for (entry = script->entrylist; entry != NULL; entry = entry->next)
script_entry_save(cheatfile, entry);
-
+
/* close the tag */
mame_fprintf(cheatfile, "\t\t</script>\n");
}
/*-------------------------------------------------
- cheat_script_free - free a single cheat
- script
+ cheat_script_free - free a single cheat
+ script
-------------------------------------------------*/
static void cheat_script_free(cheat_script *script)
@@ -736,15 +736,15 @@ static void cheat_script_free(cheat_script *script)
script->entrylist = entry->next;
script_entry_free(entry);
}
-
+
free(script);
}
/*-------------------------------------------------
script_entry_load - load a single action
- or output create the underlying data
- structures
+ or output create the underlying data
+ structures
-------------------------------------------------*/
static script_entry *script_entry_load(const char *filename, xml_data_node *entrynode, cheat_entry *cheat, int isaction)
@@ -752,11 +752,11 @@ static script_entry *script_entry_load(const char *filename, xml_data_node *entr
const char *expression;
script_entry *entry;
EXPRERR experr;
-
+
/* allocate memory for it */
entry = malloc_or_die(sizeof(*entry));
memset(entry, 0, sizeof(*entry));
-
+
/* read the condition if present */
expression = xml_get_attribute_string(entrynode, "condition", NULL);
if (expression != NULL)
@@ -768,7 +768,7 @@ static script_entry *script_entry_load(const char *filename, xml_data_node *entr
goto error;
}
}
-
+
/* if this is an action, parse the expression */
if (isaction)
{
@@ -785,14 +785,14 @@ static script_entry *script_entry_load(const char *filename, xml_data_node *entr
goto error;
}
}
-
+
/* otherwise, parse the attributes and arguments */
else
{
output_argument **argtailptr;
const char *align, *format;
xml_data_node *argnode;
-
+
/* extract format */
format = xml_get_attribute_string(entrynode, "format", NULL);
if (format == NULL || format[0] == 0)
@@ -815,7 +815,7 @@ static script_entry *script_entry_load(const char *filename, xml_data_node *entr
mame_printf_error("%s.xml(%d): invalid alignment '%s' specified\n", filename, entrynode->line, align);
goto error;
}
-
+
/* then parse arguments */
argtailptr = &entry->arglist;
for (argnode = xml_get_sibling(entrynode->child, "argument"); argnode != NULL; argnode = xml_get_sibling(argnode->next, "argument"))
@@ -825,10 +825,10 @@ static script_entry *script_entry_load(const char *filename, xml_data_node *entr
/* allocate memory for it */
curarg = malloc_or_die(sizeof(*curarg));
memset(curarg, 0, sizeof(*curarg));
-
+
/* first extract attributes */
curarg->count = xml_get_attribute_int(argnode, "count", 1);
-
+
/* read the expression */
expression = argnode->value;
if (expression == NULL || expression[0] == 0)
@@ -847,7 +847,7 @@ static script_entry *script_entry_load(const char *filename, xml_data_node *entr
*argtailptr = curarg;
argtailptr = &curarg->next;
}
-
+
/* validate the format against the arguments */
if (!validate_format(filename, entrynode->line, entry))
goto error;
@@ -862,13 +862,13 @@ error:
/*-------------------------------------------------
script_entry_save - save a single action
- or output
+ or output
-------------------------------------------------*/
static void script_entry_save(mame_file *cheatfile, const script_entry *entry)
{
astring *tempstring = astring_alloc();
-
+
/* output an action */
if (entry->format == NULL)
{
@@ -881,7 +881,7 @@ static void script_entry_save(mame_file *cheatfile, const script_entry *entry)
quote_astring(astring_cpyc(tempstring, expression_original_string(entry->expression)), FALSE);
mame_fprintf(cheatfile, ">%s</action>\n", astring_c(tempstring));
}
-
+
/* output an output */
else
{
@@ -899,12 +899,12 @@ static void script_entry_save(mame_file *cheatfile, const script_entry *entry)
mame_fprintf(cheatfile, " align=\"right\"");
if (entry->arglist == NULL)
mame_fprintf(cheatfile, " />\n");
-
+
/* output arguments */
else
{
const output_argument *curarg;
-
+
mame_fprintf(cheatfile, ">\n");
for (curarg = entry->arglist; curarg != NULL; curarg = curarg->next)
{
@@ -917,14 +917,14 @@ static void script_entry_save(mame_file *cheatfile, const script_entry *entry)
mame_fprintf(cheatfile, "\t\t\t</output>\n");
}
}
-
+
astring_free(tempstring);
}
/*-------------------------------------------------
- script_entry_free - free a single script
- entry
+ script_entry_free - free a single script
+ entry
-------------------------------------------------*/
static void script_entry_free(script_entry *entry)
@@ -935,17 +935,17 @@ static void script_entry_free(script_entry *entry)
expression_free(entry->expression);
if (entry->format != NULL)
astring_free(entry->format);
-
+
while (entry->arglist != NULL)
{
output_argument *curarg = entry->arglist;
entry->arglist = curarg->next;
-
+
if (curarg->expression != NULL)
expression_free(curarg->expression);
free(curarg);
}
-
+
free(entry);
}
@@ -957,7 +957,7 @@ static void script_entry_free(script_entry *entry)
/*-------------------------------------------------
quote_astring - quote a string so that it
- is valid to embed in an XML document
+ is valid to embed in an XML document
-------------------------------------------------*/
static astring *quote_astring(astring *string, int isattribute)
@@ -972,7 +972,7 @@ static astring *quote_astring(astring *string, int isattribute)
/*-------------------------------------------------
validate_format - check that a format string
- has the correct number and type of arguments
+ has the correct number and type of arguments
-------------------------------------------------*/
static int validate_format(const char *filename, int line, const script_entry *entry)
@@ -981,12 +981,12 @@ static int validate_format(const char *filename, int line, const script_entry *e
const output_argument *curarg;
int argsprovided;
int argscounted;
-
+
/* first count arguments */
argsprovided = 0;
for (curarg = entry->arglist; curarg != NULL; curarg = curarg->next)
argsprovided += curarg->count;
-
+
/* now scan the string for valid argument usage */
p = strchr(p, '%');
argscounted = 0;
@@ -996,7 +996,7 @@ static int validate_format(const char *filename, int line, const script_entry *e
p++;
while (strchr("lh0123456789.-+ #", *p) != NULL)
p++;
-
+
/* look for a valid type */
if (strchr("cdiouxX", *p) == NULL)
{
@@ -1008,7 +1008,7 @@ static int validate_format(const char *filename, int line, const script_entry *e
/* look for the next one */
p = strchr(p, '%');
}
-
+
/* did we match? */
if (argscounted < argsprovided)
{
@@ -1026,7 +1026,7 @@ static int validate_format(const char *filename, int line, const script_entry *e
/*-------------------------------------------------
cheat_variable_get - return the value of a
- cheat variable
+ cheat variable
-------------------------------------------------*/
static UINT64 cheat_variable_get(void *ref)
@@ -1037,7 +1037,7 @@ static UINT64 cheat_variable_get(void *ref)
/*-------------------------------------------------
cheat_variable_set - set the value of a
- cheat variable
+ cheat variable
-------------------------------------------------*/
static void cheat_variable_set(void *ref, UINT64 value)
diff --git a/src/emu/cpu/dsp56k/dsp56dsm.c b/src/emu/cpu/dsp56k/dsp56dsm.c
index be348104997..7390e16da0c 100644
--- a/src/emu/cpu/dsp56k/dsp56dsm.c
+++ b/src/emu/cpu/dsp56k/dsp56dsm.c
@@ -253,7 +253,7 @@ static unsigned assemble_no_parallel_move_ALU_opcode(char* buffer, const UINT16
{
/* All operations are of length 1 */
unsigned opSize = 1;
-
+
/* Recovered strings */
char arg_str[128] = "";
char opcode_str[128] = "";
@@ -264,7 +264,7 @@ static unsigned assemble_no_parallel_move_ALU_opcode(char* buffer, const UINT16
/* First, decode the Data ALU opcode */
decode_data_ALU_opcode(BITS(op,0x00ff), opcode_str, arg_str, d_register);
-
+
/* Finally, assemble the full opcode */
pad_string(11, opcode_str);
sprintf(buffer, "%s%s", opcode_str, arg_str);
@@ -276,7 +276,7 @@ static unsigned assemble_parallel_register_to_register_moveALU_opcode(char* buff
{
/* All operations are of length 1 */
unsigned opSize = 1;
-
+
/* Recovered strings */
char arg_str[128] = "";
char opcode_str[128] = "";
@@ -288,7 +288,7 @@ static unsigned assemble_parallel_register_to_register_moveALU_opcode(char* buff
/* First, decode the Data ALU opcode */
decode_data_ALU_opcode(BITS(op,0x00ff), opcode_str, arg_str, d_register);
-
+
/* Next, decode the X Memory Data Move */
decode_register_to_register_data_move(BITS(op,0xff00), parallel_move_str, d_register);
@@ -310,21 +310,21 @@ static unsigned assemble_coorperative_x_memory_data_move_ALU_opcode(char* buffer
char opcode_str[128] = "";
char parallel_move_str[128] = "";
char d_register[128] = "";
-
+
/* Init */
sprintf(buffer, " ");
/* First, decode the Data ALU opcode */
decode_data_ALU_opcode(BITS(op,0x00ff), opcode_str, arg_str, d_register);
-
+
/* Next, decode the X Memory Data Move */
decode_parallel_cooperative_x_memory_data_move(BITS(op,0xff00), parallel_move_str, d_register);
-
+
/* Finally, assemble the full opcode */
pad_string(11, opcode_str);
pad_string(15, arg_str);
sprintf(buffer, "%s%s%s", opcode_str, arg_str, parallel_move_str);
-
+
return opSize;
}
@@ -759,7 +759,7 @@ static void decode_data_ALU_opcode(const UINT16 op_byte, char* opcode_str, char*
break;
}
}
-
+
/* For the cooperative x data memory move */
sprintf(d_register, "%s", D);
}
@@ -1690,7 +1690,7 @@ static void decode_dual_x_memory_data_read(const UINT16 op, char* parallel_move_
assemble_eas_from_m_table(BITS(op,0x1800), Rnum, 3, ea1, ea2);
/* TODO : Should the ^F's be replaced? */
-
+
if (Rnum == -1)
{
sprintf(ea1, "(!!)!");
@@ -1716,7 +1716,7 @@ static void decode_register_to_register_data_move(const UINT16 op_byte, char* pa
else
sprintf(D, "A");
}
-
+
sprintf(parallel_move_str, "%s,%s", S, D);
}
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c
index 1eadfdccdee..ef6bc2be419 100644
--- a/src/emu/cpu/dsp56k/dsp56k.c
+++ b/src/emu/cpu/dsp56k/dsp56k.c
@@ -5,28 +5,28 @@
Written by Andrew Gardner
****************************************************************************
-
+
Note:
This CPU emulator is very much a work-in-progress.
- DONE:
- 1: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, , , , , , ,18, , ,
-
- TODO:
- X 1-6 Explore CORE naming scheme.
- - 1-9 paragraph 1 : memory access timings
- - 1-9 Data ALU arithmetic operations generally use fractional two's complement arithmetic
- (Unsigned numbers are only supported by the multiply and multiply-accumulate instruction)
- - 1-9 For fractional arithmetic, the 31-bit product is added to the 40-bit contents of A or B. No pipeline!
- - 1-10 Two types of rounding: convergent rounding and two's complement rounding. See status register bit R.
- - 1-10 Logic unit is 16-bits wide and works on MSP portion of accum register
- - 1-10 The AGU can implement three types of arithmetic: linear, modulo, and reverse carry.
- - 1-12 "Two external interrupt pins!!!"
- - 1-12 Take care of all interrupt priority (IPR) stuff!
- - 1-19 Memory WAIT states
- - 1-20 The timer's interesting!
- - 1-21 Vectored exception requests on the Host Interface!
+ DONE:
+ 1: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, , , , , , ,18, , ,
+
+ TODO:
+ X 1-6 Explore CORE naming scheme.
+ - 1-9 paragraph 1 : memory access timings
+ - 1-9 Data ALU arithmetic operations generally use fractional two's complement arithmetic
+ (Unsigned numbers are only supported by the multiply and multiply-accumulate instruction)
+ - 1-9 For fractional arithmetic, the 31-bit product is added to the 40-bit contents of A or B. No pipeline!
+ - 1-10 Two types of rounding: convergent rounding and two's complement rounding. See status register bit R.
+ - 1-10 Logic unit is 16-bits wide and works on MSP portion of accum register
+ - 1-10 The AGU can implement three types of arithmetic: linear, modulo, and reverse carry.
+ - 1-12 "Two external interrupt pins!!!"
+ - 1-12 Take care of all interrupt priority (IPR) stuff!
+ - 1-19 Memory WAIT states
+ - 1-20 The timer's interesting!
+ - 1-21 Vectored exception requests on the Host Interface!
***************************************************************************/
#include "debugger.h"
@@ -54,33 +54,33 @@ typedef struct
// **** Dsp56k side **** //
// Host Control Register
UINT16* hcr;
-
+
// Host Status Register
UINT16* hsr;
-
+
// Host Transmit/Receive Data
UINT16* htrx;
-
+
// **** Host CPU side **** //
// Interrupt Control Register
UINT8 icr;
-
+
// Command Vector Register
UINT8 cvr;
-
+
// Interrupt Status Register
UINT8 isr;
-
+
// Interrupt Vector Register
UINT8 ivr;
-
+
// Transmit / Receive Registers
UINT8 trxh;
UINT8 trxl;
-
+
// HACK - Host interface bootstrap write offset
UINT16 bootstrap_offset;
-
+
} dsp56k_host_interface;
// 1-9 ALU
@@ -89,11 +89,11 @@ typedef struct
// Four 16-bit input registers (can be accessed as 2 32-bit registers)
PAIR x;
PAIR y;
-
+
// Two 32-bit accumulator registers + 8-bit accumulator extension registers
PAIR64 a;
PAIR64 b;
-
+
// An accumulation shifter
// One data bus shifter/limiter
// A parallel, single cycle, non-pipelined Multiply-Accumulator (MAC) unit
@@ -108,22 +108,22 @@ typedef struct
UINT16 r1;
UINT16 r2;
UINT16 r3;
-
+
// Four offset registers
UINT16 n0;
UINT16 n1;
UINT16 n2;
UINT16 n3;
-
+
// Four modifier registers
UINT16 m0;
UINT16 m1;
UINT16 m2;
UINT16 m3;
-
+
// Used in loop processing
UINT16 temp;
-
+
// Basics
} dsp56k_agu;
@@ -135,30 +135,30 @@ typedef struct
// Loop Address
UINT16 la;
-
+
// Loop Counter
UINT16 lc;
-
+
// Status Register
UINT16 sr;
-
+
// Operating Mode Register
UINT16 omr;
-
+
// Stack Pointer
UINT16 sp;
-
+
// Stack (TODO: 15-level?)
PAIR ss[16];
-
+
// Controls IRQ processing
void (*service_interrupts)(void);
// A list of pending interrupts (indices into dsp56k_interrupt_sources array)
INT8 pending_interrupts[32];
-
+
// Basics
-
+
// Other PCU internals
UINT16 reset_vector;
@@ -169,36 +169,36 @@ typedef struct
{
// PROGRAM CONTROLLER
dsp56k_pcu PCU;
-
+
// ADR ALU (AGU)
dsp56k_agu AGU;
-
+
// CLOCK GEN
- //static emu_timer *dsp56k_timer; // 1-5, 1-8 - Clock gen
+ //static emu_timer *dsp56k_timer; // 1-5, 1-8 - Clock gen
// DATA ALU
dsp56k_data_alu ALU;
-
+
// OnCE
// IBS and BITFIELD UNIT
-
+
// Host Interface
dsp56k_host_interface HI;
-
+
// IRQ line states
UINT8 modA_state;
UINT8 modB_state;
UINT8 modC_state;
UINT8 reset_state;
-
+
// HACK - Bootstrap mode state variable.
UINT8 bootstrap_mode;
-
+
UINT8 repFlag; // Knowing if we're in a 'repeat' state (dunno how the processor does this)
UINT32 repAddr; // The address of the instruction to repeat...
-
+
/* MAME internal stuff */
UINT32 ppc;
UINT32 op;
@@ -289,7 +289,7 @@ static void set_irq_line(int irqline, int state)
// TODO: 1-12 Get this triggering right
if (irqa_trigger())
logerror("DSP56k IRQA is set to fire on the \"Negative Edge\".\n");
-
+
if (state != CLEAR_LINE)
core.modA_state = TRUE;
else
@@ -298,12 +298,12 @@ static void set_irq_line(int irqline, int state)
if (core.reset_state != TRUE)
dsp56k_add_pending_interrupt("IRQA");
break;
-
+
case DSP56K_IRQ_MODB:
// TODO: 1-12 Get this triggering right
if (irqb_trigger())
logerror("DSP56k IRQB is set to fire on the \"Negative Edge\".\n");
-
+
if (state != CLEAR_LINE)
core.modB_state = TRUE;
else
@@ -312,36 +312,36 @@ static void set_irq_line(int irqline, int state)
if (core.reset_state != TRUE)
dsp56k_add_pending_interrupt("IRQB");
break;
-
+
case DSP56K_IRQ_MODC:
if (state != CLEAR_LINE)
core.modC_state = TRUE;
else
core.modC_state = FALSE;
-
+
// TODO : Set bus mode or whatever
break;
-
+
case DSP56K_IRQ_RESET:
if (state != CLEAR_LINE)
core.reset_state = TRUE;
else
{
/* If it changes state from asserted to cleared. Call the reset function. */
- if (core.reset_state == TRUE)
+ if (core.reset_state == TRUE)
dsp56k_reset();
-
+
core.reset_state = FALSE;
}
// dsp56k_add_pending_interrupt("Hardware RESET");
break;
-
+
default:
logerror("DSP56k setting some weird irq line : %d", irqline);
break;
}
-
+
// If the reset line isn't asserted, service interrupts
// TODO: Is it right to immediately service interrupts?
if (core.reset_state != TRUE)
@@ -382,17 +382,17 @@ static void dsp56k_init(int index, int clock, const void *_config, int (*irqcall
// HACK - You're not in bootstrap mode upon bootup
core.bootstrap_mode = BOOTSTRAP_OFF;
-
+
// Clear the irq states
core.modA_state = FALSE;
core.modB_state = FALSE;
core.modC_state = FALSE;
core.reset_state = FALSE;
-
+
/* Save the core's state */
// state_save_register_item("dsp56k", index, modA_state);
// ...
-
+
//core.config = _config;
//core.irq_callback = irqcallback;
}
@@ -403,10 +403,10 @@ static void dsp56k_reset(void)
core.interrupt_cycles = 0;
core.ppc = 0x0000;
-
+
core.repFlag = 0;
core.repAddr = 0x0000;
-
+
pcu_reset();
mem_reset();
//agu_reset();
@@ -472,7 +472,7 @@ extern offs_t dsp56k_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UIN
****************************************************************************/
static ADDRESS_MAP_START( dsp56156_program_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0000,0x07ff) AM_RAM AM_BASE(&dsp56k_program_ram) // 1-5
-// AM_RANGE(0x2f00,0x2fff) AM_ROM // 1-5 PROM reserved memory. Is this the right spot for it?
+// AM_RANGE(0x2f00,0x2fff) AM_ROM // 1-5 PROM reserved memory. Is this the right spot for it?
ADDRESS_MAP_END
static ADDRESS_MAP_START( dsp56156_x_data_map, ADDRESS_SPACE_DATA, 16 )
@@ -493,10 +493,10 @@ static void dsp56k_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_INPUT_STATE + DSP56K_IRQ_MODB: set_irq_line(DSP56K_IRQ_MODB, info->i); break;
case CPUINFO_INT_INPUT_STATE + DSP56K_IRQ_MODC: set_irq_line(DSP56K_IRQ_MODC, info->i); break;
case CPUINFO_INT_INPUT_STATE + DSP56K_IRQ_RESET: set_irq_line(DSP56K_IRQ_RESET, info->i); break;
-
+
case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + DSP56K_PC: PC = info->i & 0xffff; break;
-
+
case CPUINFO_INT_REGISTER + DSP56K_SR: SR = info->i & 0xffff; break;
case CPUINFO_INT_REGISTER + DSP56K_LC: LC = info->i & 0xffff; break;
case CPUINFO_INT_REGISTER + DSP56K_LA: LA = info->i & 0xffff; break;
@@ -527,8 +527,8 @@ static void dsp56k_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + DSP56K_M2: M2 = info->i & 0xffff; break;
case CPUINFO_INT_REGISTER + DSP56K_M3: M3 = info->i & 0xffff; break;
- /* case CPUINFO_INT_REGISTER + DSP56K_TEMP: TEMP = info->i & 0xffff; break; */
- /* case CPUINFO_INT_REGISTER + DSP56K_STATUS: STATUS = info->i & 0xff; break; */
+ /* case CPUINFO_INT_REGISTER + DSP56K_TEMP: TEMP = info->i & 0xffff; break; */
+ /* case CPUINFO_INT_REGISTER + DSP56K_STATUS: STATUS = info->i & 0xff; break; */
/* The CPU stack */
case CPUINFO_INT_REGISTER + DSP56K_ST0: ST0 = info->i & 0xffffffff; break;
@@ -573,7 +573,7 @@ void dsp56k_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = -1; break;
- case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
@@ -615,8 +615,8 @@ void dsp56k_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + DSP56K_M2: info->i = M2; break;
case CPUINFO_INT_REGISTER + DSP56K_M3: info->i = M3; break;
- /* case CPUINFO_INT_REGISTER + DSP56K_TEMP: info->i = TEMP; break; */
- /* case CPUINFO_INT_REGISTER + DSP56K_STATUS: info->i = STATUS; break; */
+ /* case CPUINFO_INT_REGISTER + DSP56K_TEMP: info->i = TEMP; break; */
+ /* case CPUINFO_INT_REGISTER + DSP56K_STATUS: info->i = STATUS; break; */
// The CPU stack
case CPUINFO_INT_REGISTER + DSP56K_ST0: info->i = ST0; break;
@@ -669,7 +669,7 @@ void dsp56k_get_info(UINT32 state, cpuinfo *info)
/* Status Register */
LF_bit() ? "L" : ".",
FV_bit() ? "F" : ".",
-
+
S_bit() ? "S" : ".",
L_bit() ? "L" : ".",
E_bit() ? "E" : ".",
@@ -678,7 +678,7 @@ void dsp56k_get_info(UINT32 state, cpuinfo *info)
Z_bit() ? "Z" : ".",
V_bit() ? "V" : ".",
C_bit() ? "C" : ".",
-
+
/* Stack Pointer */
UF_bit() ? "U" : ".",
SE_bit() ? "S" : ".");
@@ -712,8 +712,8 @@ void dsp56k_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_STR_REGISTER + DSP56K_M2: sprintf(info->s, "M2 : %04x", M2); break;
case CPUINFO_STR_REGISTER + DSP56K_M3: sprintf(info->s, "M3 : %04x", M3); break;
- /* case CPUINFO_STR_REGISTER + DSP56K_TEMP: sprintf(info->s, "TMP: %04x", TEMP); break; */
- /* case CPUINFO_STR_REGISTER + DSP56K_STATUS: sprintf(info->s, "STS: %02x", STATUS); break; */
+ /* case CPUINFO_STR_REGISTER + DSP56K_TEMP: sprintf(info->s, "TMP: %04x", TEMP); break; */
+ /* case CPUINFO_STR_REGISTER + DSP56K_STATUS: sprintf(info->s, "STS: %02x", STATUS); break; */
// The CPU stack
case CPUINFO_STR_REGISTER + DSP56K_ST0: sprintf(info->s, "ST0 : %08x", ST0); break;
diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/emu/cpu/dsp56k/dsp56k.h
index 26902223be6..11f7ee0e695 100644
--- a/src/emu/cpu/dsp56k/dsp56k.h
+++ b/src/emu/cpu/dsp56k/dsp56k.h
@@ -65,11 +65,11 @@ enum
// For Debugger and opcodes
enum parallelMoveType
-{
- PARALLEL_TYPE_XMDM,
- PARALLEL_TYPE_XMDM_SPECIAL,
- PARALLEL_TYPE_NODM,
- PARALLEL_TYPE_ARU,
+{
+ PARALLEL_TYPE_XMDM,
+ PARALLEL_TYPE_XMDM_SPECIAL,
+ PARALLEL_TYPE_NODM,
+ PARALLEL_TYPE_ARU,
PARALLEL_TYPE_RRDM
};
diff --git a/src/emu/cpu/dsp56k/dsp56mem.c b/src/emu/cpu/dsp56k/dsp56mem.c
index 0285cf6a87c..62ba428491f 100644
--- a/src/emu/cpu/dsp56k/dsp56mem.c
+++ b/src/emu/cpu/dsp56k/dsp56mem.c
@@ -23,7 +23,7 @@ static void mem_reset(void)
{
// Reset the HI registers
dsp56k_host_interface_reset();
-
+
// Reset the IO registers
dsp56k_io_reset();
}
@@ -37,58 +37,58 @@ static READ16_HANDLER( peripheral_register_r )
{
// Port B Control Register (PBC)
case 0xffc0: break;
-
+
// Port C Control Register (PCC)
case 0xffc1: break;
-
+
// Port B Data Direction Register (PBDDR)
case 0xffc2: break;
-
+
// Port C Data Direction Register (PCDDR)
case 0xffc3: break;
-
+
// HCR: Host Control Register
case 0xffc4: break;
-
+
// COCR
case 0xffc8: break;
-
+
// reserved for test
case 0xffc9: break;
-
+
// CRA-SSI0 Control Register A
case 0xffd0: break;
-
+
// CRB-SSI0 Control Register B
case 0xffd1: break;
-
+
// CRA-SSI1 Control Register A
case 0xffd8: break;
-
+
// CRB-SSI1 Control Register B
case 0xffd9: break;
-
+
// PLCR
case 0xffdc: break;
-
+
// reserved for future use
case 0xffdd: break;
-
+
// BCR: Bus Control Register
case 0xffde: break;
-
+
// IPR: Interrupt Priority Register
case 0xffdf: break;
-
+
// Port B Data Register (PBD)
case 0xffe2: break;
-
+
// Port C Data Register (PCD)
case 0xffe3: break;
-
+
// HSR: Host Status Register
case 0xffe4: break;
-
+
// HTX/HRX: Host TX/RX Register
case 0xffe5:
// 5-5
@@ -103,62 +103,62 @@ static READ16_HANDLER( peripheral_register_r )
break;
// COSR
case 0xffe8: break;
-
+
// CRX/CTX
case 0xffe9: break;
-
+
// Timer Control Register (TCR)
case 0xffec: break;
-
+
// Timer Count Register (TCTR)
case 0xffed: break;
-
+
// Timer Compare Register (TCPR)
case 0xffee: break;
-
+
// Timer Preload Register (TPR)
case 0xffef: break;
-
+
// SR/TSR SSI0 Status Register
case 0xfff0: break;
-
+
// TX/RX SSI0 Tx/RX Registers
case 0xfff1: break;
-
+
// RSMA0 SSI0 Register
case 0xfff2: break;
-
+
// RSMB0 SSI0 Register
case 0xfff3: break;
-
+
// TSMA0 SSI0 Register
case 0xfff4: break;
-
+
// TSMB0 SSI0 Register
case 0xfff5: break;
-
+
// SR/TSR SSI1 Status Register
case 0xfff8: break;
-
+
// TX/RX SSI1 TX/RX Registers
case 0xfff9: break;
-
+
// RSMA1 SSI1 Register
case 0xfffa: break;
-
+
// RSMB1 SSI1 Register
case 0xfffb: break;
-
+
// TSMA1 SSI1 Register
case 0xfffc: break;
-
+
// TSMB1 SSI1 Register
case 0xfffd: break;
-
+
// Reserved for on-chip emulation
case 0xffff: break;
}
-
+
// Its primary behavior is RAM
return dsp56k_peripheral_ram[offset];
}
@@ -177,140 +177,140 @@ static WRITE16_HANDLER( peripheral_register_w )
case 0xffc0:
PBC_set(data);
break;
-
+
// Port C Control Register (PCC)
case 0xffc1:
PCC_set(data);
break;
-
+
// Port B Data Direction Register (PBDDR)
- case 0xffc2:
+ case 0xffc2:
PBDDR_set(data);
break;
-
+
// Port C Data Direction Register (PCDDR)
- case 0xffc3:
+ case 0xffc3:
PCDDR_set(data);
break;
-
+
// HCR: Host Control Register
case 0xffc4:
HCR_set(data);
break;
-
+
// COCR
case 0xffc8: break;
-
+
// reserved for test
case 0xffc9:
logerror("DSP56k : Warning write to 0xffc9 reserved for test.\n");
break;
-
+
// CRA-SSI0 Control Register A
case 0xffd0: break;
-
+
// CRB-SSI0 Control Register B
case 0xffd1: break;
-
+
// CRA-SSI1 Control Register A
case 0xffd8: break;
-
+
// CRB-SSI1 Control Register B
case 0xffd9: break;
-
+
// PLCR
case 0xffdc: break;
-
+
// reserved for future use
- case 0xffdd:
+ case 0xffdd:
logerror("DSP56k : Warning write to 0xffdd reserved for future use.\n");
break;
-
+
// BCR: Bus Control Register
case 0xffde:
BCR_set(data);
break;
-
+
// IPR: Interrupt Priority Register
- case 0xffdf:
+ case 0xffdf:
IPR_set(data);
break;
-
+
// Port B Data Register (PBD)
- case 0xffe2:
+ case 0xffe2:
PBD_set(data);
break;
-
+
// Port C Data Register (PCD)
- case 0xffe3:
+ case 0xffe3:
PCD_set(data);
break;
-
+
// HSR: Host Status Register
case 0xffe4: break;
-
+
// HTX/HRX: Host TX/RX Register
case 0xffe5:
HTX = data;
HTDE_bit_set(0); // 5-5
break;
-
+
// COSR
case 0xffe8: break;
-
+
// CRX/CTX
case 0xffe9: break;
-
+
// Timer Control Register (TCR)
case 0xffec: break;
-
+
// Timer Count Register (TCTR)
case 0xffed: break;
-
+
// Timer Compare Register (TCPR)
case 0xffee: break;
-
+
// Timer Preload Register (TPR)
case 0xffef: break;
-
+
// SR/TSR SSI0 Status Register
case 0xfff0: break;
-
+
// TX/RX SSI0 Tx/RX Registers
case 0xfff1: break;
-
+
// RSMA0 SSI0 Register
case 0xfff2: break;
-
+
// RSMB0 SSI0 Register
case 0xfff3: break;
-
+
// TSMA0 SSI0 Register
case 0xfff4: break;
-
+
// TSMB0 SSI0 Register
case 0xfff5: break;
-
+
// SR/TSR SSI1 Status Register
case 0xfff8: break;
-
+
// TX/RX SSI1 TX/RX Registers
case 0xfff9: break;
-
+
// RSMA1 SSI1 Register
case 0xfffa: break;
-
+
// RSMB1 SSI1 Register
case 0xfffb: break;
-
+
// TSMA1 SSI1 Register
case 0xfffc: break;
-
+
// TSMB1 SSI1 Register
case 0xfffd: break;
-
+
// Reserved for on-chip emulation
- case 0xffff:
+ case 0xffff:
logerror("DSP56k : Warning write to 0xffff reserved for on-chip emulation.\n");
break;
}
@@ -344,7 +344,7 @@ static void HF3_bit_set(UINT16 value)
value = value & 0x01;
HCR &= ~(0x0010);
HCR |= (value << 4);
-
+
HF3_bit_host_set(value);
}
static void HF2_bit_set(UINT16 value)
@@ -352,7 +352,7 @@ static void HF2_bit_set(UINT16 value)
value = value & 0x01;
HCR &= ~(0x0008);
HCR |= (value << 3);
-
+
HF2_bit_host_set(value);
}
static void HCIE_bit_set(UINT16 value)
@@ -404,11 +404,11 @@ static void HF0_bit_set(UINT16 value)
HSR |= (value << 3);
}
static void HCP_bit_set(UINT16 value)
-{
+{
value = value & 0x01;
- HSR &= ~(0x0004);
+ HSR &= ~(0x0004);
HSR |= (value << 2);
-
+
// TODO: Define Host Command through the IRQ structure
if (value && HCIE_bit())
dsp56k_add_pending_interrupt("Host Command");
@@ -422,11 +422,11 @@ static void HTDE_bit_set(UINT16 value)
// 5-10 If HTIE bit is set, whip out a Host Transmit Data interrupt
if (value && HTIE_bit())
dsp56k_add_pending_interrupt("Host Transmit Data");
-
+
// 5-5 If both me and RXDF are cleared, transmit data to the host
if (!value && !RXDF_bit())
dsp56k_host_interface_HTX_to_host();
-}
+}
static void HRDF_bit_set(UINT16 value)
{
value = value & 0x01;
@@ -436,7 +436,7 @@ static void HRDF_bit_set(UINT16 value)
// 5-10 If HRIE is set, whip out a Host Receive Data interrupt
if (value && HRIE_bit())
dsp56k_add_pending_interrupt("Host Receive Data");
-
+
// 5-5 If both me and TXDE are cleared, transmit data to the dsp56k
if (!value && !TXDE_bit())
dsp56k_host_interface_host_to_HTX();
@@ -472,7 +472,7 @@ static void ICR_set(UINT8 value)
static void HF1_bit_host_set(UINT8 value)
{
value = value & 0x01;
- ICR &= ~(0x10);
+ ICR &= ~(0x10);
ICR |= (value << 4);
HF1_bit_set(value); // 5-14
@@ -480,7 +480,7 @@ static void HF1_bit_host_set(UINT8 value)
static void HF0_bit_host_set(UINT8 value)
{
value = value & 0x01;
- ICR &= ~(0x08);
+ ICR &= ~(0x08);
ICR |= (value << 3);
HF0_bit_set(value); // 5-13
@@ -488,13 +488,13 @@ static void HF0_bit_host_set(UINT8 value)
static void TREQ_bit_set(UINT8 value)
{
value = value & 0x01;
- ICR &= ~(0x02);
+ ICR &= ~(0x02);
ICR |= (value << 1);
}
static void RREQ_bit_set(UINT8 value)
{
value = value & 0x01;
- ICR &= ~(0x01);
+ ICR &= ~(0x01);
ICR |= (value << 0);
// 5-12
@@ -517,14 +517,14 @@ static void CVR_set(UINT8 value)
}
static void HC_bit_set(UINT8 value)
-{
+{
value = value & 0x01;
- CVR &= ~(0x80);
+ CVR &= ~(0x80);
CVR |= (value << 7);
-
+
// TODO: 5-9 Do I push a host-command interrupt here? Doesn't seem like it, but maybe i'll have to poll for it somewhere else?
// TODO: 5-9 The exception routine clears this bit after it executes.
-
+
HCP_bit_set(value); // 5-9 & 5-11
}
static void HV_bits_set(UINT8 value)
@@ -559,7 +559,7 @@ static void TXDE_bit_set(UINT8 value)
value = value & 0x01;
ISR &= ~(0x0002);
ISR |= (value << 1);
-
+
// If both me and the HRDF are cleared, transmit data to the dsp56k
if (!value && !HRDF_bit())
dsp56k_host_interface_host_to_HTX();
@@ -574,7 +574,7 @@ static void RXDF_bit_set(UINT8 value)
// If both me and HTDE are cleared, transmit data to the host
if (!value && !HTDE_bit())
dsp56k_host_interface_HTX_to_host();
-}
+}
// TODO: 5-11 What is the host processor Initialize function?
@@ -585,13 +585,13 @@ static void dsp56k_host_interface_reset(void)
core.HI.hcr = &dsp56k_peripheral_ram[A2O(0xffc4)];
core.HI.hsr = &dsp56k_peripheral_ram[A2O(0xffe4)];
core.HI.htrx = &dsp56k_peripheral_ram[A2O(0xffe5)];
-
+
// The Bootstrap hack is initialized to write to address 0x0000
core.HI.bootstrap_offset = 0x0000;
/* HCR */
HCR_set(0x0000); // 5-10
-
+
/* HSR */
HRDF_bit_set(0); // 5-11
HTDE_bit_set(1); // 5-11
@@ -603,7 +603,7 @@ static void dsp56k_host_interface_reset(void)
/* CVR*/
HV_bits_set(0x16); // 5-7
HC_bit_set(0); // 5-9
-
+
/* TODO: ISR (at least) */
}
@@ -613,10 +613,10 @@ void dsp56k_host_interface_write(UINT8 offset, UINT8 data)
{
/* Not exactly correct since the bootstrap hack doesn't need this to be true */
/*
- if (!host_interface_active())
- logerror("Dsp56k : Host interface write called without HI being set active by the PBC.\n");
- */
-
+ if (!host_interface_active())
+ logerror("Dsp56k : Host interface write called without HI being set active by the PBC.\n");
+ */
+
switch (offset)
{
// Interrupt Control Register (ICR)
@@ -636,30 +636,30 @@ void dsp56k_host_interface_write(UINT8 offset, UINT8 data)
}
ICR_set(data);
break;
-
+
// Command Vector Register (CVR)
case 0x01:
CVR_set(data);
break;
-
+
// Interrupt status register (ISR) - Read only!
case 0x02:
- logerror("DSP56k : Interrupt status register is read only.\n");
+ logerror("DSP56k : Interrupt status register is read only.\n");
break;
-
+
// Interrupt vector register (IVR)
case 0x03: break;
// Not used
case 0x04:
- logerror("DSP56k : Address 0x4 on the host side of the host interface is not used.\n");
+ logerror("DSP56k : Address 0x4 on the host side of the host interface is not used.\n");
break;
-
+
// Reserved
case 0x05: break;
logerror("DSP56k : Address 0x5 on the host side of the host interface is reserved.\n");
break;
-
+
// Transmit byte register - high byte (TXH)
case 0x06:
// HACK
@@ -669,13 +669,13 @@ void dsp56k_host_interface_write(UINT8 offset, UINT8 data)
dsp56k_program_ram[core.HI.bootstrap_offset] |= (data << 8);
break; /* Probably the right thing to do, given this is a hack */
}
-
+
if (TXDE_bit()) // 5-5
{
TXH = data;
}
break;
-
+
// Transmit byte register - low byte (TXL)
case 0x07:
// HACK
@@ -684,7 +684,7 @@ void dsp56k_host_interface_write(UINT8 offset, UINT8 data)
dsp56k_program_ram[core.HI.bootstrap_offset] &= 0xff00;
dsp56k_program_ram[core.HI.bootstrap_offset] |= data;
core.HI.bootstrap_offset++;
-
+
if (core.HI.bootstrap_offset == 0x800)
{
core.bootstrap_mode = BOOTSTRAP_OFF;
@@ -698,7 +698,7 @@ void dsp56k_host_interface_write(UINT8 offset, UINT8 data)
TXDE_bit_set(0);
}
break;
-
+
default: logerror("DSP56k : dsp56k_host_interface_write called with invalid address 0x%02x.\n", offset);
}
}
@@ -707,37 +707,37 @@ UINT8 dsp56k_host_interface_read(UINT8 offset)
{
/* Not exactly correct since the bootstrap hack doesn't need this to be true */
/*
- if (!host_interface_active())
- logerror("Dsp56k : Host interface write called without HI being set active by the PBC.\n");
- */
+ if (!host_interface_active())
+ logerror("Dsp56k : Host interface write called without HI being set active by the PBC.\n");
+ */
switch (offset)
{
// Interrupt Control Register (ICR)
- case 0x00:
+ case 0x00:
return ICR;
break;
-
+
// Command Vector Register (CVR)
- case 0x01:
+ case 0x01:
return CVR;
break;
-
+
// Interrupt status register (ISR)
- case 0x02:
+ case 0x02:
return ISR;
break;
-
+
// Interrupt vector register (IVR)
- case 0x03:
+ case 0x03:
return IVR;
break;
-
+
// Read zeroes
case 0x04:
return 0x00;
break;
-
+
// Reserved
case 0x05:
logerror("DSP56k : Address 0x5 on the host side of the host interface is reserved.\n");
@@ -751,7 +751,7 @@ UINT8 dsp56k_host_interface_read(UINT8 offset)
else
return RXH;
break;
-
+
// Receive byte register - low byte (RXL)
case 0x07:
// 5-5
@@ -764,10 +764,10 @@ UINT8 dsp56k_host_interface_read(UINT8 offset)
return value;
}
break;
-
+
default: logerror("DSP56k : dsp56k_host_interface_read called with invalid address 0x%02x.\n", offset);
}
-
+
/* Shouldn't get here */
return 0xff;
}
@@ -813,7 +813,7 @@ static void RH_bit_set(UINT16 value)
value = value & 0x0001;
BCR &= ~(0x8000);
BCR |= (value << 15);
-
+
// TODO: 4-6 Assert BR pin?
}
static void BS_bit_set(UINT16 value)
@@ -821,7 +821,7 @@ static void BS_bit_set(UINT16 value)
value = value & 0x0001;
BCR &= ~(0x4000);
BCR |= (value << 14);
-
+
// TODO: 4-6 Respond to BR pin?
}
static void external_x_wait_states_set(UINT16 value)
@@ -843,7 +843,7 @@ static void PBC_set(UINT16 value)
{
if (value & 0xfffe)
logerror("Dsp56k : Attempting to set reserved bits in the PBC. Ignoring.\n");
-
+
value = value & 0x0001;
PBC &= ~(0x0001);
PBC |= (value << 0);
diff --git a/src/emu/cpu/dsp56k/dsp56pcu.c b/src/emu/cpu/dsp56k/dsp56pcu.c
index 153c6c352fa..c58269d98ad 100644
--- a/src/emu/cpu/dsp56k/dsp56pcu.c
+++ b/src/emu/cpu/dsp56k/dsp56pcu.c
@@ -18,7 +18,7 @@ static void LF_bit_set(UINT8 value)
SR &= ~(0x8000);
SR |= (value << 15);
}
-//static UINT8 I_bits_set(void) { }
+//static UINT8 I_bits_set(void) { }
static void N_bit_set(UINT8 value)
{
value = value & 0x01;
@@ -40,7 +40,7 @@ static void V_bit_set(UINT8 value)
static void C_bit_set(UINT8 value)
{
value = value & 0x01;
- SR &= ~(0x0001);
+ SR &= ~(0x0001);
SR |= (value << 0);
}
@@ -89,10 +89,10 @@ static void pcu_reset(void)
case 0x00:
logerror("Dsp56k in Special Bootstrap Mode 1\n");
- // HACK - We don't need to put the bootstrap mode on here since
+ // HACK - We don't need to put the bootstrap mode on here since
// we'll simulate it entirely in this function
core.bootstrap_mode = BOOTSTRAP_OFF;
-
+
// HACK - Simply copy over 0x1000 bytes of data located at program memory 0xc000.
// This, in actuality, is handled with the internal boot ROM.
for (i = 0; i < 0x800; i++)
@@ -109,10 +109,10 @@ static void pcu_reset(void)
UINT8 mem_value_high = program_read_byte_16be(mem_offset);
dsp56k_program_ram[i] = (mem_value_high << 8) || mem_value_low;
}
-
+
// HACK - Set the PC to 0x0000 as per the boot ROM.
PC = 0x0000;
-
+
// HACK - All done! Set the Operating Mode to 2 as per the boot ROM.
MB_bit_set(1);
MA_bit_set(0);
@@ -137,7 +137,7 @@ static void pcu_reset(void)
core.bootstrap_mode = BOOTSTRAP_HI;
logerror("DSP56k : Currently in (hacked) bootstrap mode - reading from Host Interface.\n");
}
-
+
// HACK - Set the PC to 0x0000 as per the boot ROM.
PC = 0x0000;
@@ -164,7 +164,7 @@ static void pcu_reset(void)
// Set registers properly
// 1-17 Clear Interrupt Priority Register (IPR)
IPR = 0x0000;
-
+
// Clear out the pending interrupt list
dsp56k_clear_pending_interrupts();
}
@@ -180,9 +180,9 @@ static void pcu_service_interrupts(void)
// Count list of pending interrupts
int num_servicable = dsp56k_count_pending_interrupts();
-
+
if (num_servicable == 0) return;
-
+
// Sort list
dsp56k_sort_pending_interrupts(num_servicable);
@@ -191,12 +191,12 @@ static void pcu_service_interrupts(void)
{
// Get the priority of the interrupt - a return value of -1 means disabled!
INT8 priority = dsp56k_get_irq_priority(core.PCU.pending_interrupts[i]);
-
+
// 1-12 Make sure you're not masked out against the Interrupt Mask Bits (disabled is handled for free here)
if (priority >= I_bits())
{
// If you're acceptable to go, execute the interrupt
-
+
// TODO: 5-7 Remember the host command input has a floating vector. Do it up right.
// TODO: 5-9 5-11 Gotta' Clear HI (HCP & HC) when taking this exception too!
}
@@ -212,7 +212,7 @@ static void dsp56k_add_pending_interrupt(const char* name)
{
int i;
int irq_index = dsp56k_get_irq_index_by_tag(name);
-
+
for (i = 0; i < 32; i++)
{
if (core.PCU.pending_interrupts[i] == -1)
@@ -291,21 +291,21 @@ static int dsp56k_count_pending_interrupts(void)
{
numI++;
}
-
+
return numI;
}
static void dsp56k_sort_pending_interrupts(int num)
{
int i, j;
-
+
// We're going to be sorting the priorities
int priority_list[32];
for (i = 0; i < num; i++)
{
priority_list[i] = dsp56k_get_irq_priority(core.PCU.pending_interrupts[i]);
}
-
+
// Bubble sort should be good enough for us
for (i = 0; i < num; i++)
{
@@ -314,12 +314,12 @@ static void dsp56k_sort_pending_interrupts(int num)
if (priority_list[j] > priority_list[j+1])
{
int holder;
-
+
// Swap priorities
holder = priority_list[j+1];
priority_list[j+1] = priority_list[j];
priority_list[j] = holder;
-
+
// Swap irq indices.
holder = core.PCU.pending_interrupts[j+1];
core.PCU.pending_interrupts[j+1] = core.PCU.pending_interrupts[j];
@@ -327,7 +327,7 @@ static void dsp56k_sort_pending_interrupts(int num)
}
}
}
-
+
// TODO: 1-17 Now sort each of the priority levels within their categories.
}
@@ -342,7 +342,7 @@ static INT8 dsp56k_get_irq_priority(int index)
case 2: return 3; // Stack Error
case 3: return 3; // Reserved
case 4: return 3; // SWI
-
+
// Poll the IPR for these guys.
case 5: return irqa_ipl(); // IRQA
case 6: return irqb_ipl(); // IRQB
@@ -363,7 +363,7 @@ static INT8 dsp56k_get_irq_priority(int index)
case 21: return host_ipl(); // Host Transmit Data
case 22: return host_ipl(); // Host Command 0 (Default)
case 23: return codec_ipl(); // Codec Receive/Transmit
- case 24: return host_ipl(); // Host Command 1 // TODO: Are all host ipl's the same?
+ case 24: return host_ipl(); // Host Command 1 // TODO: Are all host ipl's the same?
case 25: return host_ipl(); // Host Command 2
case 26: return host_ipl(); // Host Command 3
case 27: return host_ipl(); // Host Command 4
@@ -371,10 +371,10 @@ static INT8 dsp56k_get_irq_priority(int index)
case 29: return host_ipl(); // Host Command 6
case 30: return host_ipl(); // Host Command 7
case 31: return host_ipl(); // Host Command 8
-
+
default: break;
}
-
+
return -1;
}
diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c
index bc9f7b67022..f0382683ad3 100644
--- a/src/emu/cpu/sh2/sh2drc.c
+++ b/src/emu/cpu/sh2/sh2drc.c
@@ -2229,7 +2229,7 @@ static int generate_group_3(drcuml_block *block, compiler_state *compiler, const
save_fast_iregs(block);
UML_CALLC(block, cfunc_SUBV, desc->opptr.w);
load_fast_iregs(block);
-#endif
+#endif
return TRUE;
break;
@@ -2250,7 +2250,7 @@ static int generate_group_3(drcuml_block *block, compiler_state *compiler, const
save_fast_iregs(block);
UML_CALLC(block, cfunc_ADDV, desc->opptr.w);
load_fast_iregs(block);
-#endif
+#endif
return TRUE;
break;
}
diff --git a/src/emu/debug/express.c b/src/emu/debug/express.c
index 67cdf6360d9..735964d1580 100644
--- a/src/emu/debug/express.c
+++ b/src/emu/debug/express.c
@@ -525,7 +525,7 @@ static int parse_memory_operator(parsed_expression *expr, const char *buffer, to
int length;
*flags = 0;
-
+
/* if there is a '.', it means we have a name */
dot = strrchr(buffer, '.');
if (dot != NULL)
@@ -536,7 +536,7 @@ static int parse_memory_operator(parsed_expression *expr, const char *buffer, to
*flags |= index << TIN_MEMORY_INDEX_SHIFT;
buffer = dot + 1;
}
-
+
/* length 2 means space then size */
length = (int)strlen(buffer);
if (length == 2)
@@ -1619,7 +1619,7 @@ static char *add_expression_string(parsed_expression *expr, const char *string,
memcpy(expstring->string, string, length);
expstring->string[length] = 0;
expr->stringlist = expstring;
-
+
/* return a pointer to the copied string */
if (index != NULL)
*index = expstring->index;
@@ -1635,11 +1635,11 @@ static char *add_expression_string(parsed_expression *expr, const char *string,
static const char *get_expression_string(parsed_expression *expr, UINT16 index)
{
expression_string *expstring;
-
+
/* a 0 index is always invalid */
if (index == 0)
return NULL;
-
+
/* scan for the string with the matching index */
for (expstring = expr->stringlist; expstring != NULL; expstring = expstring->next)
if (expstring->index == index)
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index bbd215e632f..d684c1fed8d 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -506,7 +506,7 @@ static void device_list_stop(running_machine *machine)
/* free allocated memory for the token */
if (device->token != NULL)
free(device->token);
-
+
/* reset all runtime fields */
device->token = NULL;
device->machine = NULL;
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index f744fc088bb..53f150b2c95 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -56,7 +56,7 @@ enum
/* --- the following bits of info are returned as pointers --- */
DEVINFO_PTR_FIRST = 0x10000,
-
+
DEVINFO_PTR_ROM_REGION = DEVINFO_PTR_FIRST, /* R/O: pointer to device-specific ROM region */
DEVINFO_PTR_DEVICE_SPECIFIC = 0x18000, /* R/W: device-specific values start here */
diff --git a/src/emu/mame.c b/src/emu/mame.c
index c8870d01571..194766de76f 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -763,7 +763,7 @@ UINT8 *memory_region_alloc(running_machine *machine, const char *name, UINT32 le
{
mame_private *mame = machine->mame_data;
region_info *info;
-
+
/* make sure we don't have a region of the same name */
for (info = mame->regions; info != NULL; info = info->next)
if (astring_cmpc(info->name, name) == 0)
@@ -775,7 +775,7 @@ UINT8 *memory_region_alloc(running_machine *machine, const char *name, UINT32 le
info->name = astring_dupc(name);
info->length = length;
info->flags = flags;
-
+
/* hook us into the list */
mame->regions = info;
return info->base;
@@ -791,16 +791,16 @@ void memory_region_free(running_machine *machine, const char *name)
{
mame_private *mame = machine->mame_data;
region_info **infoptr;
-
+
/* find the region */
for (infoptr = &mame->regions; *infoptr != NULL; infoptr = &(*infoptr)->next)
if (astring_cmpc((*infoptr)->name, name) == 0)
{
region_info *deleteme = *infoptr;
-
+
/* remove us from the list */
*infoptr = deleteme->next;
-
+
/* free the region */
astring_free(deleteme->name);
free(deleteme);
@@ -818,7 +818,7 @@ UINT8 *memory_region(running_machine *machine, const char *name)
{
mame_private *mame = machine->mame_data;
region_info *info;
-
+
/* NULL tag always fails */
if (name == NULL)
return NULL;
@@ -827,7 +827,7 @@ UINT8 *memory_region(running_machine *machine, const char *name)
for (info = mame->regions; info != NULL; info = info->next)
if (astring_cmpc(info->name, name) == 0)
return info->base;
-
+
return NULL;
}
@@ -841,7 +841,7 @@ UINT32 memory_region_length(running_machine *machine, const char *name)
{
mame_private *mame = machine->mame_data;
region_info *info;
-
+
/* NULL tag always fails */
if (name == NULL)
return 0;
@@ -850,7 +850,7 @@ UINT32 memory_region_length(running_machine *machine, const char *name)
for (info = mame->regions; info != NULL; info = info->next)
if (astring_cmpc(info->name, name) == 0)
return info->length;
-
+
return 0;
}
@@ -864,7 +864,7 @@ UINT32 memory_region_flags(running_machine *machine, const char *name)
{
mame_private *mame = machine->mame_data;
region_info *info;
-
+
/* NULL tag always fails */
if (name == NULL)
return 0;
@@ -873,13 +873,13 @@ UINT32 memory_region_flags(running_machine *machine, const char *name)
for (info = mame->regions; info != NULL; info = info->next)
if (astring_cmpc(info->name, name) == 0)
return info->flags;
-
+
return 0;
}
/*-------------------------------------------------
- memory_region_next - the name of the next
+ memory_region_next - the name of the next
memory region (or the first if name == NULL)
-------------------------------------------------*/
@@ -887,7 +887,7 @@ const char *memory_region_next(running_machine *machine, const char *name)
{
mame_private *mame = machine->mame_data;
region_info *info;
-
+
/* if there's nothing in this class, fail immediately */
info = mame->regions;
if (info == NULL)
@@ -901,7 +901,7 @@ const char *memory_region_next(running_machine *machine, const char *name)
for ( ; info != NULL; info = info->next)
if (astring_cmpc(info->name, name) == 0)
return (info->next != NULL) ? astring_c(info->next->name) : NULL;
-
+
return NULL;
}
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 353bdfab617..4f0e2370b3a 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -922,7 +922,7 @@ const address_map *memory_get_address_map(int cpunum, int spacenum)
if (map->field != 0 && map->field != tmap.field) \
fatalerror("%s: %s included a mismatched address map (%s %d) for an existing map with %s %d!\n", driver->source_file, driver->name, #field, tmap.field, #field, map->field); \
} while (0)
-
+
#define check_entry_handler(handler) do { \
if (entry->handler.generic != NULL && entry->handler.generic != SMH_RAM) \
diff --git a/src/emu/romload.c b/src/emu/romload.c
index 4c2f21ea453..84fd2e1736c 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -422,7 +422,7 @@ static void display_rom_load_results(rom_load_data *romdata)
if (romdata->errors != 0)
{
const char *rgntag, *nextrgntag;
-
+
/* clean up any regions */
for (rgntag = memory_region_next(Machine, NULL); rgntag != NULL; rgntag = nextrgntag)
{
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index 071135dfe56..4c21650bcf1 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -1090,7 +1090,7 @@ INLINE INT32 AICA_UpdateSlot(struct _AICA *AICA, struct _SLOT *slot)
if (slot->adbase)
{
- cur_sample = slot->cur_sample; // may already contains current decoded sample
+ cur_sample = slot->cur_sample; // may already contains current decoded sample
// seek to the interpolation sample
while (curstep < steps_to_go)
diff --git a/src/emu/validity.c b/src/emu/validity.c
index 09f047dca0e..77d254f1155 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -541,7 +541,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
else
{
int rgnnum;
-
+
/* iterate over all regions found so far */
for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries); rgnnum++)
{
@@ -553,7 +553,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
currgn->length = ROMREGION_GETLENGTH(romp);
break;
}
-
+
/* fail if we hit a duplicate */
if (strcmp(rgninfo->entries[rgnnum].tag, region) == 0)
{
@@ -660,7 +660,7 @@ static int validate_cpu(int drivnum, const machine_config *config, region_info *
/* skip empty entries */
if (cpu->type == CPU_DUMMY)
continue;
-
+
/* check for valid tag */
if (cpu->tag == NULL || cpu->tag[0] == 0)
{
@@ -777,7 +777,7 @@ static int validate_cpu(int drivnum, const machine_config *config, region_info *
if (entry->region != NULL && entry->share == 0)
{
int rgnnum;
-
+
/* loop over entries in the class */
for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries); rgnnum++)
{
@@ -788,7 +788,7 @@ static int validate_cpu(int drivnum, const machine_config *config, region_info *
error = TRUE;
break;
}
-
+
/* if we hit a match, check against the length */
if (strcmp(rgninfo->entries[rgnnum].tag, entry->region) == 0)
{
@@ -980,7 +980,7 @@ static int validate_gfx(int drivnum, const machine_config *config, region_info *
error = TRUE;
break;
}
-
+
/* if we hit a match, check against the length */
if (strcmp(rgninfo->entries[rgnnum].tag, region) == 0)
{
diff --git a/src/lib/util/xmlfile.c b/src/lib/util/xmlfile.c
index 10d76fcca1e..66091fa3acf 100644
--- a/src/lib/util/xmlfile.c
+++ b/src/lib/util/xmlfile.c
@@ -619,7 +619,7 @@ static void expat_element_start(void *data, const XML_Char *name, const XML_Char
newnode = add_child(*curnode, name, NULL);
if (newnode == NULL)
return;
-
+
/* remember the line number */
newnode->line = XML_GetCurrentLineNumber(parse_info->parser);
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 6c03d10a732..a6fe984d3e1 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -149,7 +149,7 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
init_save_state();
atarijsa_reset();
-
+
/* initialize JSA III ADPCM */
{
static const char *regions[] = { "adpcm", "adcpml", "adpcmr" };
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 20ca68d9e1b..e6b5a86644f 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -47,7 +47,7 @@ static void trigger_sample(running_machine *machine, UINT8 data);
WRITE8_HANDLER( gottlieb_sh_w )
{
const device_config *riot = device_list_find_by_tag(machine->config->devicelist, RIOT6532, "riot");
-
+
/* identify rev1 boards by the presence of a 6532 RIOT device */
if (riot != NULL)
gottlieb1_sh_w(riot, data);
@@ -201,7 +201,7 @@ static void play_sample(const char *phonemes)
// 71 + 146 + 121 + 103 = 441 @ nominal (720kHz)
//
// B + AH1 + I3 + Y1
-// 71 + 146 + 55 + 80 =
+// 71 + 146 + 55 + 80 =
//
if (strcmp(phonemes, " HEH3LOOW AH1EH3I3YMTERI2NDAHN") == 0) /* Q-Bert - Hello, I am turned on */
sample_start(0, 42, 0);
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index a41f5a005ab..e2df7f2ec54 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -46,18 +46,18 @@ can take. Should the game reset????
2008-07:
-Verified dip locations for: btime (manual), bnj (dips listing), lnc (manual),
+Verified dip locations for: btime (manual), bnj (dips listing), lnc (manual),
zoar (manual), disco (dips listing). Names of disco switches in DIPLOC are
not confirmed (manual needed, in the meanwhile I put generic SW1 & SW2).
A few notes:
-* all the documents says that DSW1 bit 7 is related to the cocktail mode
- (either flipping the screen or changing the control panel)
-* according to manuals, btime & bnj Service dips should have a different
- effect, using 2 bits to access different tests (see commented out
- settings below)
-* how do country codes affect disco? are there other values other than
- the ones in the manual?
+* all the documents says that DSW1 bit 7 is related to the cocktail mode
+ (either flipping the screen or changing the control panel)
+* according to manuals, btime & bnj Service dips should have a different
+ effect, using 2 bits to access different tests (see commented out
+ settings below)
+* how do country codes affect disco? are there other values other than
+ the ones in the manual?
***************************************************************************/
@@ -416,11 +416,11 @@ static INPUT_PORTS_START( btime )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) )
/* Manual gives the following Test settings, but they don't seem to correspond to the actual effect */
-// PORT_DIPNAME( 0x30, 0x30, "Test Mode" ) PORT_DIPLOCATION("15D:5,6")
-// PORT_DIPSETTING( 0x30, DEF_STR( Off ) )
-// PORT_DIPSETTING( 0x00, "Sound I/O Board Only" )
-// PORT_DIPSETTING( 0x10, "Normal Test" )
-// PORT_DIPSETTING( 0x20, "Cross Hatch Only" )
+// PORT_DIPNAME( 0x30, 0x30, "Test Mode" ) PORT_DIPLOCATION("15D:5,6")
+// PORT_DIPSETTING( 0x30, DEF_STR( Off ) )
+// PORT_DIPSETTING( 0x00, "Sound I/O Board Only" )
+// PORT_DIPSETTING( 0x10, "Normal Test" )
+// PORT_DIPSETTING( 0x20, "Cross Hatch Only" )
PORT_SERVICE_DIPLOC( 0x10, IP_ACTIVE_LOW, "15D:5" )
PORT_DIPNAME( 0x20, 0x20, "Cross Hatch Pattern" ) PORT_DIPLOCATION("15D:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
@@ -428,9 +428,9 @@ static INPUT_PORTS_START( btime )
PORT_DIPNAME( 0x40, 0x00, "Control Panel" ) PORT_DIPLOCATION("15D:7")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
-// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("15D:8")
-// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
-// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
+// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("15D:8")
+// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
+// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_START_TAG("DSW2")
@@ -578,9 +578,9 @@ static INPUT_PORTS_START( zoar )
PORT_DIPNAME( 0x40, 0x00, "Control Panel" ) PORT_DIPLOCATION("SW I:7")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
-// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW I:8")
-// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
-// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
+// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW I:8")
+// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
+// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_START_TAG("DSW2")
@@ -655,9 +655,9 @@ static INPUT_PORTS_START( lnc )
PORT_DIPNAME( 0x40, 0x00, "Control Panel" ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
-// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:8")
-// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
-// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
+// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:8")
+// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
+// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_START_TAG("DSW2")
@@ -794,9 +794,9 @@ static INPUT_PORTS_START( mmonkey )
PORT_DIPNAME( 0x40, 0x00, "Control Panel" )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
-// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) )
-// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
-// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
+// PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) )
+// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
+// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_START_TAG("DSW2")
@@ -861,20 +861,20 @@ static INPUT_PORTS_START( bnj )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) )
/* Manual gives the following Test settings, but they don't seem to correspond to the actual effect */
-// PORT_DIPNAME( 0x30, 0x30, "Test Mode" ) PORT_DIPLOCATION("8D:5,6")
-// PORT_DIPSETTING( 0x30, DEF_STR( Off ) )
-// PORT_DIPSETTING( 0x00, "Video PC Board Only" )
-// PORT_DIPSETTING( 0x10, "Normal Test" )
-// PORT_DIPSETTING( 0x20, "No Effect" )
+// PORT_DIPNAME( 0x30, 0x30, "Test Mode" ) PORT_DIPLOCATION("8D:5,6")
+// PORT_DIPSETTING( 0x30, DEF_STR( Off ) )
+// PORT_DIPSETTING( 0x00, "Video PC Board Only" )
+// PORT_DIPSETTING( 0x10, "Normal Test" )
+// PORT_DIPSETTING( 0x20, "No Effect" )
PORT_SERVICE_DIPLOC( 0x10, IP_ACTIVE_LOW, "8D:5" )
PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x00, "8D:6" )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("8D:7")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
/* According to crazykong.com dips this should change the control layout */
-// PORT_DIPNAME( 0x80, 0x00, "Control Panel" ) PORT_DIPLOCATION("8D:8")
-// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
-// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
+// PORT_DIPNAME( 0x80, 0x00, "Control Panel" ) PORT_DIPLOCATION("8D:8")
+// PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
+// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_START_TAG("DSW2")
@@ -956,7 +956,7 @@ static INPUT_PORTS_START( disco )
PORT_DIPNAME( 0x10, 0x00, "Game Speed" ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x00, "Slow" )
PORT_DIPSETTING( 0x10, "Fast" )
- PORT_DIPNAME( 0xe0, 0x00, "Country Code" ) PORT_DIPLOCATION("SW2:6,7,8")
+ PORT_DIPNAME( 0xe0, 0x00, "Country Code" ) PORT_DIPLOCATION("SW2:6,7,8")
PORT_DIPSETTING( 0x00, "A" )
PORT_DIPSETTING( 0x20, "B" )
PORT_DIPSETTING( 0x40, "C" )
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 0c4080ab6bc..0d370a4c91a 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -3672,7 +3672,7 @@ static MACHINE_DRIVER_START( qsound )
/* sound hardware */
MDRV_SPEAKER_REMOVE("mono")
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
-
+
MDRV_SOUND_REMOVE("2151")
MDRV_SOUND_REMOVE("oki")
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 44846552185..37797bd6a45 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -7,21 +7,21 @@ driver by Luca Elia
Hardware info (29/07/2008 f205v):
Chips:
- 1x missing main CPU (u1)(from the socket I would say it's a 68000)
- 1x A40MX04-PL84 (u29)
- 1x AD-65 (equivalent to M6295) (u9)(sound)
- 1x MC1458P (u10)(sound)
- 1x TDA2003 (u8)(sound)
- 1x oscillator 10.000MHz (QZ1)
- 1x oscillator 16.000000 (QZ2)
+ 1x missing main CPU (u1)(from the socket I would say it's a 68000)
+ 1x A40MX04-PL84 (u29)
+ 1x AD-65 (equivalent to M6295) (u9)(sound)
+ 1x MC1458P (u10)(sound)
+ 1x TDA2003 (u8)(sound)
+ 1x oscillator 10.000MHz (QZ1)
+ 1x oscillator 16.000000 (QZ2)
ROMs:
- 1x AT27C020 (1)
- 2x M27C4001 (2,3)
- 2x AT49F010 (4,5)
- 2x DS1230Y (non volatile SRAM)
+ 1x AT27C020 (1)
+ 2x M27C4001 (2,3)
+ 2x AT49F010 (4,5)
+ 2x DS1230Y (non volatile SRAM)
Notes:
- 1x 28x2 edge connector
- 1x trimmer (volume)
+ 1x 28x2 edge connector
+ 1x trimmer (volume)
- This hardware is almost identical to that in magic10.c
@@ -150,7 +150,7 @@ static UINT16 out[3];
static void show_out(void)
{
-// popmessage("%04x %04x %04x", out[0], out[1], out[2]);
+// popmessage("%04x %04x %04x", out[0], out[1], out[2]);
}
static WRITE16_HANDLER( galaxi_500000_w )
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index d64f5818bbc..cb790a86032 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -209,23 +209,23 @@
A) Hold Type: (DIP SW 3-8 OFF)
- The game selects and holds automatically favorable cards after DEAL button is pressed.
- Selects can be cancelled pressing the CANCEL button.
+ The game selects and holds automatically favorable cards after DEAL button is pressed.
+ Selects can be cancelled pressing the CANCEL button.
- B) Discard type: (DIP SW 3-8 ON)
- Starts game as Hold type, however Non-Held card(s) will be
- automatically recalled by pressing DEAL button. Also even one
- card is discarded, all HELD cards are disappeared and returns
- to normal game.
+ B) Discard type: (DIP SW 3-8 ON)
+ Starts game as Hold type, however Non-Held card(s) will be
+ automatically recalled by pressing DEAL button. Also even one
+ card is discarded, all HELD cards are disappeared and returns
+ to normal game.
Note 2: Always reset memory when JACKPOT points are changed.
-
+
Note 3: Always reset memory when BONUS points are changed.
-
+
Note 4: Always reset memory FOR PERCENTAGE changes.
-
+
Note 5: COIN B is 5 times COIN A. KEY IN is 10 times coin A.
-
+
Note 6: Each time a game is won, the woman will take one of her clothes off.
When all the clothes are taken off, a bonus point ten times the BET number
will be scored. This bonus cannot be scored if there is no woman's figure.
@@ -235,18 +235,18 @@
This card will change by pressing the DOUBLE UP SW. Anticipate the
number of the next card which will turned up and stop. When the
game is won by pressing BIG or SMALL, and the anticipated card and
- the turned up card happens to be the same number, then the scored
+ the turned up card happens to be the same number, then the scored
points will be four times greater.
- * During FEVER, BET greater than the BET points achieved during FEVER cannot
+ * During FEVER, BET greater than the BET points achieved during FEVER cannot
be scored.
-
+
* The KEY OUT consists of two steps. During first OUT, points over 100 will
- become cleared and during the second OUT, points below 100 will become
+ become cleared and during the second OUT, points below 100 will become
cleared.
-
+
*****************************************************************************************
@@ -382,7 +382,7 @@ static WRITE8_HANDLER( ym2149_portb_w )
//static WRITE8_HANDLER( debug_w )
//{
-// popmessage("written : %02X", data);
+// popmessage("written : %02X", data);
//}
static WRITE8_HANDLER(lamps_a_w)
@@ -452,7 +452,7 @@ static ADDRESS_MAP_START( lucky74_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf003) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports 0 & 1 */
AM_RANGE(0xf080, 0xf083) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) /* DSW 1, 2 & 3 */
AM_RANGE(0xf0c0, 0xf0c3) AM_DEVREADWRITE(PPI8255, "ppi8255_3", ppi8255_r, ppi8255_w) /* DSW 4 */
-// AM_RANGE(0xf100, 0xf100) AM_WRITE(debug_w) /* seems to be sounds commands */
+// AM_RANGE(0xf100, 0xf100) AM_WRITE(debug_w) /* seems to be sounds commands */
AM_RANGE(0xf200, 0xf203) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports 2 & 4 */
AM_RANGE(0xf400, 0xf400) AM_WRITE(AY8910_control_port_0_w)
AM_RANGE(0xf600, 0xf600) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) /* YM2149 (Input Port 1) */
@@ -823,7 +823,7 @@ static MACHINE_DRIVER_START( lucky74 )
MDRV_CPU_ADD("main", Z80, CPU_CLOCK) /* guess */
MDRV_CPU_PROGRAM_MAP(lucky74_map, 0)
MDRV_CPU_IO_MAP(lucky74_portmap,0)
-// MDRV_CPU_VBLANK_INT("main", nmi_interrupt)
+// MDRV_CPU_VBLANK_INT("main", nmi_interrupt)
MDRV_CPU_PERIODIC_INT(nmi_interrupt,120)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 45720894e37..92b403ba31d 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -95,7 +95,7 @@ Notes:
TS 2008.06.14:
- Addedd sound emulation - atomboy and fghtbskt req different interrupt (T1)
- timing than wilytowr, otherwise music/fx tempo is too fast.
+ timing than wilytowr, otherwise music/fx tempo is too fast.
Music tempo and pitch verified on real pcb.
- Extra space in atomboy 2764 eproms is filled with garbage z80 code
(taken from one of code roms, but from different offset)
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 27e1ac06a49..01b6dad217d 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1811,7 +1811,7 @@ INPUT_PORTS_END
#define ROM_LOAD64_WORD(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(6))
#define ROM_LOAD64_WORD_SWAP(name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE| ROM_SKIP(6))
#define ROM_LOAD_VROM(name, offset, length, hash) ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_SKIP(14) )
-//#define ROM_REGION64_BE(length,rclass,rtag,flags) ROM_REGION(length, rclass, rtype, (flags) | ROMREGION_64BIT | ROMREGION_BE)
+//#define ROM_REGION64_BE(length,rclass,rtag,flags) ROM_REGION(length, rclass, rtype, (flags) | ROMREGION_64BIT | ROMREGION_BE)
ROM_START( lemans24 ) /* step 1.5 */
ROM_REGION64_BE( 0x4800000, "user1", 0 ) /* program + data ROMs */
@@ -4404,7 +4404,7 @@ static MACHINE_DRIVER_START( model3_15 )
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
-
+
MDRV_SOUND_ADD("scsp2", SCSP, 0)
MDRV_SOUND_CONFIG(scsp2_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
@@ -4442,7 +4442,7 @@ static MACHINE_DRIVER_START( model3_20 )
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
-
+
MDRV_SOUND_ADD("scsp2", SCSP, 0)
MDRV_SOUND_CONFIG(scsp2_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
@@ -4481,7 +4481,7 @@ static MACHINE_DRIVER_START( model3_21 )
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
-
+
MDRV_SOUND_ADD("scsp2", SCSP, 0)
MDRV_SOUND_CONFIG(scsp2_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 4b899258e24..248024345b8 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -2419,10 +2419,10 @@ it sends bsec_ver, and if it's ok, then the next commands are the session key ch
if you want to have the encryption described somewhere so it's not lost. it's simple:
unsigned char Enc(unsigned char val,unsigned char n)
{
- val^=Key[8+n];
- val+=Key[n];
+ val^=Key[8+n];
+ val+=Key[n];
- return val;
+ return val;
}
do for each value in the message to send
@@ -2533,7 +2533,7 @@ DRIVER_INIT( sfz3ugd )
{
// get from key file instead
naomi_game_decrypt( 0x4FF16D1A9E0BFBCDULL, memory_region(machine,"user1"), memory_region_length(machine,"user1"));
-// naomi_write_keyfile();
+// naomi_write_keyfile();
}
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 0356cf3a5f2..5ad5f1e47b1 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -207,12 +207,12 @@ READ32_HANDLER( dsp_host_interface_r )
if (mem_mask == 0xff000000) {} /* High byte */
value = dsp56k_host_interface_read(hi_addr);
-
+
if (mem_mask == 0x0000ff00) { value <<= 8; }
if (mem_mask == 0xff000000) { value <<= 24; }
-
+
logerror("Dsp HI Read %08x (HI %04x) = %08x\n", mem_mask, hi_addr, value);
-
+
return value;
}
@@ -226,7 +226,7 @@ static WRITE32_HANDLER( shared_ram_write )
0xc000 +((offset<<1)+1),
mem_mask,
activecpu_get_pc());
-
+
/* write to the current dsp56k word */
if (mem_mask | (0xffff0000))
{
@@ -245,23 +245,23 @@ static WRITE32_HANDLER( dsp_w_lines )
logerror("2w %08x %08x %08x\n", offset, mem_mask, data);
/* 0x01000000 is the reset line - 0 is high, 1 is low */
- if ((data >> 24) & 0x01)
+ if ((data >> 24) & 0x01)
{
- logerror("RESET CLEARED\n");
+ logerror("RESET CLEARED\n");
cpunum_set_input_line(machine, mame_find_cpu_index(machine, "dsp"), DSP56K_IRQ_RESET, CLEAR_LINE);
}
else
{
logerror("RESET ASSERTED\n");
cpunum_set_input_line(machine, mame_find_cpu_index(machine, "dsp"), DSP56K_IRQ_RESET, ASSERT_LINE);
-
+
/* A little hacky - I can't seem to set these lines anywhere else where reset is asserted, so i do it here */
cpunum_set_input_line(machine, mame_find_cpu_index(machine, "dsp"), DSP56K_IRQ_MODA, ASSERT_LINE);
cpunum_set_input_line(machine, mame_find_cpu_index(machine, "dsp"), DSP56K_IRQ_MODB, CLEAR_LINE);
}
-
+
/* 0x04000000 is the ??? line */
-
+
}
static WRITE32_HANDLER( dsp_host_interface_w )
@@ -271,10 +271,10 @@ static WRITE32_HANDLER( dsp_host_interface_w )
if (mem_mask == 0x0000ff00) { hi_addr++; } /* Low byte */
if (mem_mask == 0xff000000) {} /* High byte */
-
+
if (mem_mask == 0x0000ff00) { hi_data = (data & 0x0000ff00) >> 8; }
if (mem_mask == 0xff000000) { hi_data = (data & 0xff000000) >> 24; }
-
+
logerror("write %08x %08x %08x (HI %04x)\n", offset, mem_mask, data, hi_addr);
dsp56k_host_interface_write(hi_addr, hi_data);
}
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index faa149941c9..a94a9b2cee5 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -174,8 +174,8 @@ static GFXDECODE_START( progolf )
GFXDECODE_ENTRY( NULL, 0x2000, charlayout, 0, 4 ) /* char set #1 */
GFXDECODE_ENTRY( NULL, 0x2000, spritelayout, 0, 4 ) /* sprites */
-// GFXDECODE_ENTRY( "gfx2", 0x0000, progolf_charlayout2, 0, 8 ) /* sprites */
-// GFXDECODE_ENTRY( "gfx2", 0x0000, progolf_spritelayout2, 0, 8 ) /* sprites */
+// GFXDECODE_ENTRY( "gfx2", 0x0000, progolf_charlayout2, 0, 8 ) /* sprites */
+// GFXDECODE_ENTRY( "gfx2", 0x0000, progolf_spritelayout2, 0, 8 ) /* sprites */
GFXDECODE_END
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index c931f769e74..ddf96689b73 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -1567,9 +1567,9 @@ static INPUT_PORTS_START( cachat )
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x02, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( On ) )
TAITO_DSWA_BITS_2_TO_3
TAITO_COINAGE_JAPAN_NEW
@@ -1630,9 +1630,9 @@ static INPUT_PORTS_START( tubeit )
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x02, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( On ) )
TAITO_DSWA_BITS_2_TO_3
TAITO_COINAGE_WORLD
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 00e86000ae1..5e20a311a90 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -804,7 +804,7 @@ MACHINE_DRIVER_END
ROM_START( geebee )
ROM_REGION( 0x10000, "main", 0 )
ROM_LOAD( "geebee.1k", 0x0000, 0x1000, CRC(8a5577e0) SHA1(356d33e19c6b4f519816ee4b65ff9b59d6c1b565) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "geebee.3a", 0x0000, 0x0400, CRC(f257b21b) SHA1(c788fd923438f1bffbff9ff3cd4c5c8b547c0c14) )
ROM_END
@@ -815,7 +815,7 @@ ROM_START( geebeeb )
ROM_LOAD( "2.1p", 0x0400, 0x0400, CRC(0bc4d4ca) SHA1(46028ce1dbf46e49b921cfabec78cded914af358) )
ROM_LOAD( "3.1s", 0x0800, 0x0400, CRC(7899b4c1) SHA1(70f609f9873f1a4d9c8a90361c7519bdd24ad9ea) )
ROM_LOAD( "4.1t", 0x0c00, 0x0400, CRC(0b6e6fcb) SHA1(e7c3e8a13e3d2be6cfb6675fb57cc4a2fda6bec2) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "geebee.3a", 0x0000, 0x0400, CRC(f257b21b) SHA1(c788fd923438f1bffbff9ff3cd4c5c8b547c0c14) )
ROM_END
@@ -823,7 +823,7 @@ ROM_END
ROM_START( geebeeg )
ROM_REGION( 0x10000, "main", 0 )
ROM_LOAD( "geebee.1k", 0x0000, 0x1000, CRC(8a5577e0) SHA1(356d33e19c6b4f519816ee4b65ff9b59d6c1b565) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "geebee.3a", 0x0000, 0x0400, CRC(f257b21b) SHA1(c788fd923438f1bffbff9ff3cd4c5c8b547c0c14) )
ROM_END
@@ -832,7 +832,7 @@ ROM_START( navarone )
ROM_REGION( 0x10000, "main", 0 )
ROM_LOAD( "navalone.p1", 0x0000, 0x0800, CRC(5a32016b) SHA1(d856d069eba470a81341de0bf47eca2a629a69a6) )
ROM_LOAD( "navalone.p2", 0x0800, 0x0800, CRC(b1c86fe3) SHA1(0293b742806c1517cb126443701115a3427fc60a) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "navalone.chr", 0x0000, 0x0800, CRC(b26c6170) SHA1(ae0aec2b60e1fd3b212e311afb1c588b2b286433) )
ROM_END
@@ -841,7 +841,7 @@ ROM_START( kaitei )
ROM_REGION( 0x10000, "main", 0 )
ROM_LOAD( "kaitein.p1", 0x0000, 0x0800, CRC(d88e10ae) SHA1(76d6cd46b6e59e528e7a8fff9965375a1446a91d) )
ROM_LOAD( "kaitein.p2", 0x0800, 0x0800, CRC(aa9b5763) SHA1(64a6c8f25b0510841dcce0b57505731aa0deeda7) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "kaitein.chr", 0x0000, 0x0800, CRC(3125af4d) SHA1(9e6b161636665ee48d6bde2d5fc412fde382c687) )
ROM_END
@@ -854,7 +854,7 @@ ROM_START( kaiteik )
ROM_LOAD( "kaitei_2.1p", 0x1400, 0x0400, CRC(5eeb0fff) SHA1(91cb84a9af8e4df4e6c896e7655199328b7da30b) )
ROM_LOAD( "kaitei_3.1s", 0x1800, 0x0400, CRC(5dff4df7) SHA1(c179c93a559a0d18db3092c842634de02f3f03ea) )
ROM_LOAD( "kaitei_4.1t", 0x1c00, 0x0400, CRC(e5f303d6) SHA1(6dd57e0b17f51d101c6c5dbfeadb7418098cc440) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "kaitei_5.bin", 0x0000, 0x0400, CRC(60fdb795) SHA1(723e635eed9937a28bee0b7978413984651ee87f) )
ROM_LOAD( "kaitei_6.bin", 0x0400, 0x0400, CRC(21399ace) SHA1(0ad49be2c9bdab2f9dc41c7348d1d4b4b769e3c4) )
@@ -864,7 +864,7 @@ ROM_START( sos )
ROM_REGION( 0x10000, "main", 0 )
ROM_LOAD( "sos.p1", 0x0000, 0x0800, CRC(f70bdafb) SHA1(e71d552ccc9adad48225bdb4d62c31c5741a3e95) )
ROM_LOAD( "sos.p2", 0x0800, 0x0800, CRC(58e9c480) SHA1(0eeb5982183d0e9f9dbae04839b604a0c22b420e) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "sos.chr", 0x0000, 0x0800, CRC(66f983e4) SHA1(b3cf8bff4ac6b554d3fc06eeb8227b3b2a0dd554) )
ROM_END
@@ -872,7 +872,7 @@ ROM_END
ROM_START( bombbee )
ROM_REGION( 0x10000, "main", 0 )
ROM_LOAD( "bombbee.1k", 0x0000, 0x2000, CRC(9f8cd7af) SHA1(0d6e1ee5519660d1498eb7a093872ed5034423f2) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "bombbee.4c", 0x0000, 0x0800, CRC(5f37d569) SHA1(d5e3fb4c5a1612a6e568c8970161b0290b88993f) )
ROM_END
@@ -880,7 +880,7 @@ ROM_END
ROM_START( cutieq )
ROM_REGION( 0x10000, "main", 0 )
ROM_LOAD( "cutieq.1k", 0x0000, 0x2000, CRC(6486cdca) SHA1(914c36487fba2dd57c3fd1f011b2225d2baac2bf) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "cutieq.4c", 0x0000, 0x0800, CRC(0e1618c9) SHA1(456e9b3d6bae8b4af7778a38e4f40bb6736b0690) )
ROM_END
@@ -891,7 +891,7 @@ ROM_START( warpwarp )
ROM_LOAD( "g-09602n.2m", 0x1000, 0x1000, CRC(de8355dd) SHA1(133d137711d79aaeb45cd3ee041c0be3b73e1b2f) )
ROM_LOAD( "g-09603n.1p", 0x2000, 0x1000, CRC(bdd1dec5) SHA1(bb3d9d1500e31bb271a394facaec7adc3c987e5e) )
ROM_LOAD( "g-09613n.1t", 0x3000, 0x0800, CRC(af3d77ef) SHA1(5b79aabbe14c2997e0b1a9276c483ae76814a63a) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "g-9611n.4c", 0x0000, 0x0800, CRC(380994c8) SHA1(0cdf6a05db52c423365bff9c9df6d93ac885794e) )
ROM_END
@@ -902,7 +902,7 @@ ROM_START( warpwarr )
ROM_LOAD( "g-09602.2m", 0x1000, 0x1000, CRC(398bb87b) SHA1(74373336288dc13d59e6f7e7c718aa51d857b087) )
ROM_LOAD( "g-09603.1p", 0x2000, 0x1000, CRC(6b962fc4) SHA1(0291d0c574a1048e52121ca57e01098bff04da40) )
ROM_LOAD( "g-09613.1t", 0x3000, 0x0800, CRC(60a67e76) SHA1(af65e7bf16a5e69fee05c0134e3b8d5bca142402) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "g-9611.4c", 0x0000, 0x0800, CRC(00e6a326) SHA1(67b7ab5b7b2c9a97d4d690d88561da48b86bc66e) )
ROM_END
@@ -913,7 +913,7 @@ ROM_START( warpwar2 )
ROM_LOAD( "g-09602.2m", 0x1000, 0x1000, CRC(398bb87b) SHA1(74373336288dc13d59e6f7e7c718aa51d857b087) )
ROM_LOAD( "g-09603.1p", 0x2000, 0x1000, CRC(6b962fc4) SHA1(0291d0c574a1048e52121ca57e01098bff04da40) )
ROM_LOAD( "g-09612.1t", 0x3000, 0x0800, CRC(b91e9e79) SHA1(378323d83c550b3acabc83dba946ab089b9195cb) )
-
+
ROM_REGION( 0x800, "gfx1", 0 )
ROM_LOAD( "g-9611.4c", 0x0000, 0x0800, CRC(00e6a326) SHA1(67b7ab5b7b2c9a97d4d690d88561da48b86bc66e) )
ROM_END
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 2e09f2ee730..9018cfde82e 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1958,7 +1958,7 @@ MTR-BAM* - DIP42 32MBit maskROMs
SEC - CAT702 security IC
CN3/CN5 - Connectors for ? (controls?)
IDE-40 - 40 Pin flat cable connector for IDE HDD
- HDD is 3.5" Quantum Fireball CR 4.3AT
+ HDD is 3.5" Quantum Fireball CR 4.3AT
*/
@@ -1967,19 +1967,19 @@ static WRITE32_HANDLER( bam2_sec_w )
znsecsel_w( machine, offset, data, mem_mask );
}
-/*
- H8/3644 MCU comms: there are 4 16-bit read/write ports
-
- Port 0: (R) unknown
- Port 0: (W) bank for mask ROMs
- Port 1: (R) MCU status: bit 3 = busy, bit 2 = command successful, bits 1 & 0 = error
- Port 1: (W) MCU command (0x0000 = execute)
- Port 2: (R) unknown
- Port 2: (W) MIPS writes alternating 0xffff/0xfffe, possibly to watchdog the H8?
- Port 3: (R) unknown
- Port 3: (W) unknown
-
- 8007f538 = detected device type. 0 = CDROM, 1 = HDD.
+/*
+ H8/3644 MCU comms: there are 4 16-bit read/write ports
+
+ Port 0: (R) unknown
+ Port 0: (W) bank for mask ROMs
+ Port 1: (R) MCU status: bit 3 = busy, bit 2 = command successful, bits 1 & 0 = error
+ Port 1: (W) MCU command (0x0000 = execute)
+ Port 2: (R) unknown
+ Port 2: (W) MIPS writes alternating 0xffff/0xfffe, possibly to watchdog the H8?
+ Port 3: (R) unknown
+ Port 3: (W) unknown
+
+ 8007f538 = detected device type. 0 = CDROM, 1 = HDD.
*/
static UINT32 bam2_mcu_command;
@@ -2010,7 +2010,7 @@ static READ32_HANDLER( bam2_mcu_r )
case 1:
logerror("MCU status read @ PC %08x mask %08x\n", activecpu_get_pc(), mem_mask);
-
+
switch (bam2_mcu_command)
{
case 0x7f: // first drive check
@@ -2022,7 +2022,7 @@ static READ32_HANDLER( bam2_mcu_r )
return 4; // return OK
break;
}
-
+
return 0;
}
@@ -2030,7 +2030,7 @@ static READ32_HANDLER( bam2_unk_r )
{
return 0;
}
-
+
static DRIVER_INIT( bam2 )
{
memory_install_read32_handler ( machine, 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f3fffff, 0, 0, SMH_BANK1 );
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index bebf99528be..d9544b57900 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -445,7 +445,7 @@ WRITE64_HANDLER( ta_fifo_poly_w )
u2f(tafifo_buff[8]), u2f(tafifo_buff[9]));
mame_printf_verbose("\n");
#endif
- }
+ }
else if (state_ta.global_paratype == 5)
{
#if DEBUG_PVRDLIST
diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c
index b021486cf7e..397c5812db6 100644
--- a/src/mame/video/lucky74.c
+++ b/src/mame/video/lucky74.c
@@ -129,7 +129,7 @@ WRITE8_HANDLER( bg_colorram_w )
//WRITE8_HANDLER( flip_scrn_w )
//{
-// flip_screen_set(data & 0x40);
+// flip_screen_set(data & 0x40);
//}
diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c
index 5ca32708d6f..acd20e1144e 100644
--- a/src/osd/windows/debugwin.c
+++ b/src/osd/windows/debugwin.c
@@ -1778,7 +1778,7 @@ static void memory_determine_combo_items(running_machine *machine)
ci->cpunum = cpunum;
ci->spacenum = spacenum;
ci->prefsize = MIN(cpuinfo->space[spacenum].databytes, 8);
-
+
t_tag = tstring_from_utf8(machine->config->cpu[cpunum].tag);
t_name = tstring_from_utf8(cpunum_name(cpunum));
t_space = tstring_from_utf8(address_space_names[spacenum]);
@@ -1786,7 +1786,7 @@ static void memory_determine_combo_items(running_machine *machine)
free(t_space),
free(t_name);
free(t_tag);
-
+
*tail = ci;
tail = &ci->next;
}
@@ -1800,7 +1800,7 @@ static void memory_determine_combo_items(running_machine *machine)
UINT8 little_endian = ((flags & ROMREGION_ENDIANMASK) == ROMREGION_LE);
UINT8 width = 1 << ((flags & ROMREGION_WIDTHMASK) >> 8);
TCHAR *t_tag;
-
+
memset(ci, 0, sizeof(*ci));
ci->base = memory_region(machine, rgntag);
ci->length = memory_region_length(machine, rgntag);
diff --git a/src/version.c b/src/version.c
index 0fa36f33ea4..7073a1ba537 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,4 +9,4 @@
***************************************************************************/
-const char build_version[] = "0.126u2 ("__DATE__")";
+const char build_version[] = "0.126u3 ("__DATE__")";