summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/i8085/i8085.c2
-rw-r--r--src/emu/cpu/superfx/superfx.c26
-rw-r--r--src/emu/sound/disc_flt.c4
-rw-r--r--src/emu/sound/discrete.c34
-rw-r--r--src/emu/sound/discrete.h30
5 files changed, 48 insertions, 48 deletions
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index b5b858876c5..ef77031c623 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -1136,7 +1136,7 @@ static CPU_EXPORT_STATE( i808x )
case I8085_SID:
{
int sid = devcb_call_read_line(&cpustate->in_sid_func);
-
+
cpustate->ietemp = ((cpustate->IM & IM_SID) != 0);
cpustate->ietemp = (sid != 0);
}
diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c
index 7859ba86a5c..04b7c309b67 100644
--- a/src/emu/cpu/superfx/superfx.c
+++ b/src/emu/cpu/superfx/superfx.c
@@ -619,19 +619,19 @@ static void superfx_add_clocks_internal(superfx_state *cpustate, INT32 clocks)
{
//printf( "superfx_add_clocks: %d\n", clocks);
/*
- if(cpustate->romcl)
- {
- printf( "ROM is accessing\n" );
- printf( "romcl = %d, -= MIN(%d, %d) (= %d)\n", cpustate->romcl, clocks, cpustate->romcl, MIN(clocks, cpustate->romcl));
- cpustate->romcl -= MIN(clocks, cpustate->romcl);
- if(cpustate->romcl == 0)
- {
- cpustate->sfr &= ~SUPERFX_SFR_R;
- printf( "superfx_op_read: reading from rom, calling superfx_bus_read: %08x\n", (cpustate->rombr << 16) + cpustate->r[14] );
- cpustate->romdr = superfx_bus_read(cpustate, (cpustate->rombr << 16) + cpustate->r[14]);
- }
- }
- */
+ if(cpustate->romcl)
+ {
+ printf( "ROM is accessing\n" );
+ printf( "romcl = %d, -= MIN(%d, %d) (= %d)\n", cpustate->romcl, clocks, cpustate->romcl, MIN(clocks, cpustate->romcl));
+ cpustate->romcl -= MIN(clocks, cpustate->romcl);
+ if(cpustate->romcl == 0)
+ {
+ cpustate->sfr &= ~SUPERFX_SFR_R;
+ printf( "superfx_op_read: reading from rom, calling superfx_bus_read: %08x\n", (cpustate->rombr << 16) + cpustate->r[14] );
+ cpustate->romdr = superfx_bus_read(cpustate, (cpustate->rombr << 16) + cpustate->r[14]);
+ }
+ }
+ */
if(cpustate->ramcl)
{
diff --git a/src/emu/sound/disc_flt.c b/src/emu/sound/disc_flt.c
index 3625068b74c..5b8f89cfe3d 100644
--- a/src/emu/sound/disc_flt.c
+++ b/src/emu/sound/disc_flt.c
@@ -686,7 +686,7 @@ static DISCRETE_STEP(dst_rcdisc3)
else
diff = diff - (diff * context->exponent0);
}
- }
+ }
else
{
if( diff < 0 )
@@ -1102,7 +1102,7 @@ static DISCRETE_STEP(dst_rcfilter_sw)
break;
default:
rs = 0;
-
+
for (i = 0; i < 4; i++)
{
if (( bits & (1 << i)) != 0)
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 97f7d4ebf91..d323c90c050 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -132,7 +132,7 @@ static void *task_callback(void *param, int threadid)
ti->context->ptr[i] = &ti->context->node_buf[i][0];
samples = ti->samples;
- while (samples-- > 0)
+ while (samples-- > 0)
{
step_nodes_in_list(&ti->context->list);
}
@@ -162,7 +162,7 @@ static DISCRETE_STEP( dso_output )
{
stream_sample_t **output = (stream_sample_t **) &node->context;
double val;
-
+
/* Add gain to the output and put into the buffers */
/* Clipping will be handled by the main sound system */
val = DISCRETE_INPUT(0) * DISCRETE_INPUT(1);
@@ -200,10 +200,10 @@ static int linked_list_count(linked_list_entry *list)
{
int cnt = 0;
linked_list_entry *entry;
-
+
for (entry = list; entry != NULL; entry = entry->next)
cnt++;
-
+
return cnt;
}
@@ -239,7 +239,7 @@ static const discrete_module module_list[] =
{ DSO_TASK_START ,"DSO_TASK_START" , 0 ,0 ,NULL ,NULL },
{ DSO_TASK_END ,"DSO_TASK_END" , 0 ,0 ,dso_task_reset ,dso_task_step },
{ DSO_TASK_SYNC ,"DSO_TASK_SYNC" , 0 ,0 ,NULL ,NULL },
-
+
/* nop */
{ DSS_NOP ,"DSS_NOP" , 0 ,0 ,NULL ,NULL },
@@ -376,7 +376,7 @@ static void discrete_build_list(discrete_info *info, discrete_sound_block *intf,
else if (intf[node_count].type == DSO_REPLACE)
{
linked_list_entry *entry;
-
+
node_count++;
if (intf[node_count].type == DSS_NULL)
fatalerror("discrete_build_list: DISCRETE_REPLACE at end of node_list");
@@ -384,7 +384,7 @@ static void discrete_build_list(discrete_info *info, discrete_sound_block *intf,
for (entry = info->block_list; entry != NULL; entry = entry->next)
{
discrete_sound_block *block = (discrete_sound_block *) entry->ptr;
-
+
if (block->type != NODE_SPECIAL )
if (block->node == intf[node_count].node)
{
@@ -438,12 +438,12 @@ static void discrete_sanity_check(discrete_info *info)
{
linked_list_entry *entry;
int node_count = 0;
-
+
discrete_log(info, "discrete_start() - Doing node list sanity check");
for (entry = info->block_list; entry != NULL; entry = entry->next)
{
discrete_sound_block *block = (discrete_sound_block *) entry->ptr;
-
+
/* make sure we don't have too many nodes overall */
if (node_count > DISCRETE_MAX_NODES)
fatalerror("discrete_start() - Upper limit of %d nodes exceeded, have you terminated the interface block?", DISCRETE_MAX_NODES);
@@ -503,7 +503,7 @@ static DEVICE_START( discrete )
/* first pass through the nodes: sanity check, fill in the indexed_nodes, and make a total count */
discrete_sanity_check(info);
-
+
/* Start with empty lists */
info->node_list = NULL;
info->step_list = NULL;
@@ -524,9 +524,9 @@ static DEVICE_START( discrete )
info->discrete_stream = stream_create(device,linked_list_count(info->input_list), linked_list_count(info->output_list), info->sample_rate, info, discrete_stream_update);
/* allocate a queue */
-
+
info->queue = osd_work_queue_alloc(WORK_QUEUE_FLAG_MULTI | WORK_QUEUE_FLAG_HIGH_FREQ);
-
+
setup_disc_logs(info);
}
@@ -544,11 +544,11 @@ static DEVICE_STOP( discrete )
int log_num;
osd_work_queue_free(info->queue);
-
+
if (DISCRETE_PROFILING)
{
int count = 0;
- linked_list_entry *entry;
+ linked_list_entry *entry;
osd_ticks_t total = 0;
osd_ticks_t tresh;
@@ -783,13 +783,13 @@ static STREAM_UPDATE( discrete_stream_update )
if (samples == 0)
return;
-
+
/* Setup any output streams */
for (entry = info->output_list, outputnum = 0; entry != NULL; entry = entry->next, outputnum++)
{
((node_description *) entry->ptr)->context = (void *) outputs[outputnum];
}
-
+
/* Setup any input streams */
for (entry = info->input_list; entry != NULL; entry = entry->next)
{
@@ -851,7 +851,7 @@ static void init_nodes(discrete_info *info, linked_list_entry *block_list, const
linked_list_entry **task_list = &info->task_list;
linked_list_entry **output_list = &info->output_list;
linked_list_entry **input_list = &info->input_list;
-
+
/* loop over all nodes */
for (entry = block_list; entry != NULL; entry = entry->next)
{
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 5d9c266c13f..cd33c130d03 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -2272,7 +2272,7 @@
* IN1 >------------------------' |/
*
* --------------------------------------------------
- *
+ *
* DISC_OP_AMP_FILTER_IS_HIGH_PASS_1
* First Order High Pass Filter
*
@@ -2529,7 +2529,7 @@
* diode junction voltage)
*
* The polarity of the diode junction voltage determines the polarity of the diode.
- *
+ *
* Example config line
*
* DISCRETE_RCDISC3(NODE_11,NODE_10,10,100,220,CAP_U(1), 0.5)
@@ -3237,12 +3237,12 @@
* custom = address of specific initialization data
*
* In most case, you should be able to use
- *
+ *
* discrete_custom_info = {DISCRETE_CUSTOM_MODULE(basename, context type), custom}
- *
- * if you have used DISCRETE_STEP(basename) and DISCRETE_RESET(basename) to define
+ *
+ * if you have used DISCRETE_STEP(basename) and DISCRETE_RESET(basename) to define
* the step/reset procedures.
- *
+ *
* EXAMPLES: see Donkey Kong, Mario Bros.
*
***********************************************************************
@@ -3638,7 +3638,7 @@ struct _node_description
void * context; /* Contextual information specific to this node type */
const void * custom; /* Custom function specific initialisation data */
-
+
const discrete_module *module; /* Node's module info */
const discrete_sound_block *block; /* Points to the node's setup block. */
const discrete_info *info; /* Points to the parent */
@@ -3646,7 +3646,7 @@ struct _node_description
osd_ticks_t run_time;
};
-
+
/*************************************
*
* Core runtime info
@@ -3686,16 +3686,16 @@ struct _discrete_info
/* internal node tracking */
node_description **indexed_node;
-
+
/* list of all nodes */
linked_list_entry *node_list; /* node_description * */
-
+
/* list of nodes which step */
linked_list_entry *step_list; /* node_description * */
/* list of discrete blocks after prescan (IMPORT, DELETE, REPLACE) */
linked_list_entry *block_list; /* discrete_sound_block * */
-
+
/* tasks */
linked_list_entry *task_list; /* discrete_task_context * */
@@ -3723,9 +3723,9 @@ struct _discrete_info
node_description *wavelog_node[DISCRETE_MAX_WAVELOGS];
/* parallel tasks */
-
+
osd_work_queue *queue;
-
+
/* profiling */
int total_samples;
};
@@ -4224,7 +4224,7 @@ enum
DSO_IMPORT, /* import from another discrete block */
DSO_REPLACE, /* replace next node */
DSO_DELETE, /* delete nodes */
-
+
/* Marks end of this enum -- must be last entry ! */
DSO_LAST
};
@@ -4417,7 +4417,7 @@ enum
#define DISCRETE_TASK_END3(BNODE1,BNODE2,BNODE3) { NODE_SPECIAL, DSO_TASK_END , 3, { BNODE1,BNODE2,BNODE3 }, { BNODE1,BNODE2,BNODE3 }, NULL, "DISCRETE_TASK_END3" },
#define DISCRETE_TASK_END4(BNODE1,BNODE2,BNODE3,BNODE4) { NODE_SPECIAL, DSO_TASK_END , 4, { BNODE1,BNODE2,BNODE3,BNODE4 }, { BNODE1,BNODE2,BNODE3,BNODE4 }, NULL, "DISCRETE_TASK_END4" },
#define DISCRETE_TASK_END5(BNODE1,BNODE2,BNODE3,BNODE4,BNODE5) { NODE_SPECIAL, DSO_TASK_END , 5, { BNODE1,BNODE2,BNODE3,BNODE4,BNODE5 }, { BNODE1,BNODE2,BNODE3,BNODE4,BNODE5 }, NULL, "DISCRETE_TASK_END5" },
-//#define DISCRETE_TASK_SYNC() { NODE_SPECIAL, DSO_TASK_SYNC, 0, { 0 }, { 0 }, NULL, "DISCRETE_TASK_SYNC" },
+//#define DISCRETE_TASK_SYNC() { NODE_SPECIAL, DSO_TASK_SYNC, 0, { 0 }, { 0 }, NULL, "DISCRETE_TASK_SYNC" },
/* output */
#define DISCRETE_OUTPUT(OPNODE,GAIN) { NODE_SPECIAL, DSO_OUTPUT , 2, { OPNODE,NODE_NC }, { 0,GAIN }, NULL, "DISCRETE_OUTPUT" },