summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-10-04 05:08:50 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-10-04 05:08:50 +0000
commitaff6be5877df225249d9afb36ed658efed0a89e5 (patch)
treecff7f54ff79782c7304b59354900119050155269 /src/emu
parent844ea6b37e87f4d602489dc2083209a199f28733 (diff)
Cleanups and version bump.
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/m68000/m68k_in.c6
-rw-r--r--src/emu/sound/disc_dev.c8
-rw-r--r--src/emu/sound/disc_mth.c2
-rw-r--r--src/emu/sound/disc_sys.c16
-rw-r--r--src/emu/sound/discrete.c14
-rw-r--r--src/emu/sound/discrete.h8
6 files changed, 27 insertions, 27 deletions
diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c
index b5c0b28b588..68b837ef533 100644
--- a/src/emu/cpu/m68000/m68k_in.c
+++ b/src/emu/cpu/m68000/m68k_in.c
@@ -7997,7 +7997,7 @@ M68KMAKE_OP(pea, 32, ., .)
M68KMAKE_OP(pflush, 32, ., .)
{
- if ((CPU_TYPE_IS_040_PLUS(m68k->cpu_type)) && (m68k->has_pmmu))
+ if ((CPU_TYPE_IS_040_PLUS(m68k->cpu_type)) && (m68k->has_pmmu))
{
// Nothing to do, unless address translation cache is emulated
logerror("680x0: unhandled PFLUSH\n");
@@ -8010,8 +8010,8 @@ M68KMAKE_OP(pmove, 32, ., .)
{
UINT16 modes;
UINT32 ea;
-
- modes = m68ki_read_imm_16(m68k);
+
+ modes = m68ki_read_imm_16(m68k);
ea = M68KMAKE_GET_EA_AY_32;
if ((CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type)) && (m68k->has_pmmu))
diff --git a/src/emu/sound/disc_dev.c b/src/emu/sound/disc_dev.c
index b6fb4b8f96d..1a02fa6f36d 100644
--- a/src/emu/sound/disc_dev.c
+++ b/src/emu/sound/disc_dev.c
@@ -523,8 +523,8 @@ static DISCRETE_STEP(dsd_555_mstbl)
v_cap = context->cap_voltage;
/* Sometimes a switching network is used to setup the capacitance.
- * These may select 'no' capacitor, causing oscillation to stop.
- */
+ * These may select 'no' capacitor, causing oscillation to stop.
+ */
if (DSD_555_MSTBL__C == 0)
{
context->flip_flop = 0;
@@ -545,7 +545,7 @@ static DISCRETE_STEP(dsd_555_mstbl)
/* Has it charged past upper limit? */
/* If trigger is still enabled, then we keep charging,
- * regardless of threshold. */
+ * regardless of threshold. */
if ((v_cap_next >= context->threshold) && !trigger)
{
dt = DSD_555_MSTBL__R * DSD_555_MSTBL__C * log(1.0 / (1.0 - ((v_cap_next - context->threshold) / (context->v_charge - v_cap))));
@@ -1491,7 +1491,7 @@ static const struct
double osc_stop[6];
} ne566 =
{
- /* 10 10.5 11 11.5 12 13 14 15 B+ */
+ /* 10 10.5 11 11.5 12 13 14 15 B+ */
{3.364, /*3.784,*/ 4.259, /*4.552,*/ 4.888, 5.384, 5.896, 6.416}, /* c_high */
{1.940, /*2.100,*/ 2.276, /*2.404,*/ 2.580, 2.880, 3.180, 3.488}, /* c_low */
{4.352, /*4.144,*/ 4.080, /*4.260,*/ 4.500, 4.960, 5.456, 5.940}, /* sqr_low */
diff --git a/src/emu/sound/disc_mth.c b/src/emu/sound/disc_mth.c
index bfb74f14ff7..839dc74c12b 100644
--- a/src/emu/sound/disc_mth.c
+++ b/src/emu/sound/disc_mth.c
@@ -1464,7 +1464,7 @@ static DISCRETE_RESET(dst_oneshot)
context->last_trig = 0;
context->type = DST_ONESHOT__TYPE;
-
+
node->output[0] = (context->type & DISC_OUT_ACTIVE_LOW) ? DST_ONESHOT__AMP : 0;
}
diff --git a/src/emu/sound/disc_sys.c b/src/emu/sound/disc_sys.c
index 1488338b2ad..48580ca40a9 100644
--- a/src/emu/sound/disc_sys.c
+++ b/src/emu/sound/disc_sys.c
@@ -70,7 +70,7 @@ static void task_check(discrete_task *task, const discrete_task *dest_task)
found = i;
break;
}
-
+
if (found<0)
{
if (task->numbuffered >= DISCRETE_MAX_TASK_OUTPUTS)
@@ -86,8 +86,8 @@ static void task_check(discrete_task *task, const discrete_task *dest_task)
/* register into source list */
source = auto_alloc(dest_node->info->device->machine, discrete_source_node);
- linked_list_add(dest_node->info,
- (linked_list_entry **) (FPTR) &dest_task->source_list,
+ linked_list_add(dest_node->info,
+ (linked_list_entry **) (FPTR) &dest_task->source_list,
source);
source->task = task;
source->output_node = i;
@@ -106,20 +106,20 @@ static DISCRETE_START( dso_task_start )
{
discrete_task *task = (discrete_task *) node->context;
const linked_list_entry *task_entry;
-
+
task->task_group = (int) DISCRETE_INPUT(0);
-
+
if (task->task_group < 0 || task->task_group >= DISCRETE_MAX_TASK_GROUPS)
fatalerror("discrete_dso_task: illegal task_group %d", task->task_group);
-
+
for (task_entry = node->info->task_list; task_entry != NULL; task_entry = task_entry->next)
{
discrete_task *dest_task = (discrete_task *) task_entry->ptr;
-
+
if (task->task_group > dest_task->task_group)
task_check(dest_task, task);
}
-
+
}
static DISCRETE_STEP( dso_task_end )
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 93f6475dc7b..90cac78ab55 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -676,7 +676,7 @@ static void *task_callback(void *param, int threadid)
discrete_source_node *sn = (discrete_source_node *) entry->ptr;
sn->ptr = sn->task->node_buf[sn->output_node];
}
-
+
samples = ti->samples;
while (samples-- > 0)
{
@@ -782,14 +782,14 @@ static void init_nodes(discrete_info *info, const linked_list_entry *block_list,
if (block->type == DSO_TASK_START)
has_tasks = 1;
}
-
+
if (!has_tasks)
{
/* set up a main task */
task_node_list = NULL;
task_node_list_ptr = &task_node_list;
}
-
+
/* loop over all nodes */
for (entry = block_list; entry != NULL; entry = entry->next)
{
@@ -916,9 +916,9 @@ static void init_nodes(discrete_info *info, const linked_list_entry *block_list,
if (!has_tasks)
{
- /* make sure we have one simple task
- * No need to create a node since there are no dependencies.
- */
+ /* make sure we have one simple task
+ * No need to create a node since there are no dependencies.
+ */
task = auto_alloc_clear(info->device->machine, discrete_task);
task->numbuffered = 0;
task->list = task_node_list;
@@ -926,7 +926,7 @@ static void init_nodes(discrete_info *info, const linked_list_entry *block_list,
task->source_list = NULL;
linked_list_tail_add(info, &task_list_ptr, task);
}
-
+
/* if no outputs, give an error */
if (linked_list_count(info->output_list) == 0)
fatalerror("init_nodes() - Couldn't find an output node");
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 763df9e8e18..35a5823cf52 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -3599,7 +3599,7 @@ enum
#define DISC_SCHMITT_OSC_ENAB_IS_NOR 0x06
#define DISC_SCHMITT_OSC_ENAB_MASK 0x06 /* Bits that define output enable type.
- * Used only internally in module. */
+ * Used only internally in module. */
/* 555 Common output flags */
#define DISC_555_OUT_DC 0x00
@@ -3621,7 +3621,7 @@ enum
#define DISC_555_OUT_COUNT_R_X 0x07
#define DISC_555_OUT_MASK 0x07 /* Bits that define output type.
- * Used only internally in module. */
+ * Used only internally in module. */
#define DISC_555_ASTABLE_HAS_FAST_CHARGE_DIODE 0x80
#define DISCRETE_555_CC_TO_DISCHARGE_PIN 0x00
@@ -3639,7 +3639,7 @@ enum
#define DISC_566_OUT_COUNT_F_X 0x50
#define DISC_566_OUT_COUNT_R_X 0x60
#define DISC_566_OUT_MASK 0x70 /* Bits that define output type.
- * Used only internally in module. */
+ * Used only internally in module. */
/* LS624 output flags */
#define DISC_LS624_OUT_ENERGY 0x01
@@ -3760,7 +3760,7 @@ struct _discrete_task
double *node_buf[DISCRETE_MAX_TASK_OUTPUTS];
node_description *nodes[DISCRETE_MAX_TASK_OUTPUTS];
double *source[DISCRETE_MAX_TASK_OUTPUTS];
-
+
/* list of source nodes */
linked_list_entry *source_list; /* discrete_source_node */
};