summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-08-28 15:26:11 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-08-28 15:26:11 +0000
commita2caa558e2b663734dc9b0ac9c955dd681ec2b73 (patch)
tree27c1e744303f1e12724edd65e3fc3a5f03e5973c /src/emu
parent32d55f53b091ab971d0f3b816a2b0820dfbd39ff (diff)
Cleanups and version bump.mame0127u1
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/mcs48/mcs48.c76
-rw-r--r--src/emu/cpu/mcs48/mcs48.h26
-rw-r--r--src/emu/debug/debugcpu.c4
-rw-r--r--src/emu/machine/at28c16.c12
-rw-r--r--src/emu/machine/latch8.c16
-rw-r--r--src/emu/machine/latch8.h16
-rw-r--r--src/emu/rendersw.c14
-rw-r--r--src/emu/sound/disc_dev.c2
-rw-r--r--src/emu/sound/disc_mth.c8
-rw-r--r--src/emu/sound/disc_wav.c4
-rw-r--r--src/emu/sound/discrete.c2
-rw-r--r--src/emu/sound/discrete.h12
-rw-r--r--src/emu/ui.c4
-rw-r--r--src/emu/uimenu.c14
14 files changed, 105 insertions, 105 deletions
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c
index f5ba640a96a..7d97d6930ce 100644
--- a/src/emu/cpu/mcs48/mcs48.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -7,38 +7,38 @@ T0 output clock
/***************************************************************************
- mcs48.c
-
- Intel MCS-48 Portable Emulator
-
- Copyright Mirko Buffoni
- Based on the original work Copyright Dan Boris, an 8048 emulator
- You are not allowed to distribute this software commercially
+ mcs48.c
+
+ Intel MCS-48 Portable Emulator
+
+ Copyright Mirko Buffoni
+ Based on the original work Copyright Dan Boris, an 8048 emulator
+ You are not allowed to distribute this software commercially
****************************************************************************
- Note that the default internal divisor for this chip is by 3 and
- then again by 5, or by 15 total.
+ Note that the default internal divisor for this chip is by 3 and
+ then again by 5, or by 15 total.
****************************************************************************
- Chip RAM ROM I/O
- ---- --- --- ---
- 8021 64 1k 21 (ROM, reduced instruction set)
+ Chip RAM ROM I/O
+ ---- --- --- ---
+ 8021 64 1k 21 (ROM, reduced instruction set)
- 8035 64 0 27 (external ROM)
- 8041 64 1k 18 (ROM)
- 8048 64 1k 27 (ROM)
- 8648 64 1k 27 (OTPROM)
- 8741 64 1k 18 (EPROM)
- 8748 64 1k 27 (EPROM)
- 8884 64 1k
- N7751 128 2k
+ 8035 64 0 27 (external ROM)
+ 8041 64 1k 18 (ROM)
+ 8048 64 1k 27 (ROM)
+ 8648 64 1k 27 (OTPROM)
+ 8741 64 1k 18 (EPROM)
+ 8748 64 1k 27 (EPROM)
+ 8884 64 1k
+ N7751 128 2k
- 8039 128 0 27 (external ROM)
- 8049 128 2k 27 (ROM)
- 8749 128 2k 27 (EPROM)
- M58715 128 0 (external ROM)
+ 8039 128 0 27 (external ROM)
+ 8049 128 2k 27 (ROM)
+ 8749 128 2k 27 (EPROM)
+ M58715 128 0 (external ROM)
***************************************************************************/
@@ -331,7 +331,7 @@ INLINE void execute_call(UINT16 address)
/*-------------------------------------------------
- execute_jcc - perform the logic of a
+ execute_jcc - perform the logic of a
conditional jump instruction
-------------------------------------------------*/
@@ -599,7 +599,7 @@ static void ret(void) { pull_pc(); }
static void retr(void)
{
pull_pc_psw();
-
+
/* implicitly clear the IRQ in progress flip flop and re-check interrupts */
mcs48.irq_in_progress = FALSE;
check_irqs();
@@ -705,7 +705,7 @@ static const mcs48_opcode opcode_table[256]=
static void mcs48_init(int index, int clock, const void *config, int (*irqcallback)(int), UINT16 romsize)
{
memset(&mcs48, 0, sizeof(mcs48));
-
+
mcs48.irq_callback = irqcallback;
mcs48.int_rom_size = romsize;
@@ -803,18 +803,18 @@ static void check_irqs(void)
if (mcs48.irq_state && mcs48.xirq_enabled)
{
mcs48.irq_in_progress = TRUE;
-
+
/* transfer to location 0x03 */
push_pc_psw();
PC = 0x03;
change_pc(0x03);
mcs48.inst_cycles += 2;
-
+
/* indicate we took the external IRQ */
if (mcs48.irq_callback != NULL)
(*mcs48.irq_callback)(0);
}
-
+
/* timer overflow interrupts follow */
if (mcs48.timer_overflow && mcs48.tirq_enabled)
{
@@ -825,7 +825,7 @@ static void check_irqs(void)
PC = 0x07;
change_pc(0x07);
mcs48.inst_cycles += 2;
-
+
/* timer overflow flip-flop is reset once taken */
mcs48.timer_overflow = FALSE;
}
@@ -840,7 +840,7 @@ static void check_irqs(void)
static void burn_cycles(int count)
{
int timerover = FALSE;
-
+
/* if the timer is enabled, accumulate prescaler cycles */
if (mcs48.timecount_enabled & TIMER_ENABLED)
{
@@ -849,7 +849,7 @@ static void burn_cycles(int count)
mcs48.prescaler &= 0x1f;
timerover = (mcs48.timer == 0);
}
-
+
/* if the counter is enabled, poll the T1 test input once for each cycle */
else if (mcs48.timecount_enabled & COUNTER_ENABLED)
for ( ; count > 0; count--)
@@ -863,7 +863,7 @@ static void burn_cycles(int count)
if (timerover)
{
mcs48.timer_flag = TRUE;
-
+
/* according to the docs, if an overflow occurs with interrupts disabled, the overflow is not stored */
if (mcs48.tirq_enabled)
{
@@ -895,7 +895,7 @@ static int mcs48_execute(int cycles)
/* iterate over remaining cycles, guaranteeing at least one instruction */
do
{
- /* fetch next opcode */
+ /* fetch next opcode */
mcs48.prevpc = mcs48.pc;
debugger_instruction_hook(Machine, PC);
opcode = opcode_fetch(PC++);
@@ -903,7 +903,7 @@ static int mcs48_execute(int cycles)
/* process opcode and count cycles */
mcs48.inst_cycles = opcode_table[opcode].cycles;
(*opcode_table[opcode].function)();
-
+
/* burn the cycles */
mcs48_icount -= mcs48.inst_cycles;
if (mcs48.timecount_enabled != 0)
@@ -1005,7 +1005,7 @@ static void mcs48_set_info(UINT32 state, cpuinfo *info)
/*-------------------------------------------------
- mcs48_get_info - retrieve a piece of
+ mcs48_get_info - retrieve a piece of
information from the CPU core
-------------------------------------------------*/
@@ -1067,7 +1067,7 @@ static void mcs48_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_PTR_BURN: info->burn = NULL; break;
case CPUINFO_PTR_DISASSEMBLE: info->disassemble = mcs48_dasm; break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &mcs48_icount; break;
-
+
case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: /*info->internal_map8 = address_map_program_10bit;*/ break;
case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: /*info->internal_map8 = address_map_data_7bit;*/ break;
diff --git a/src/emu/cpu/mcs48/mcs48.h b/src/emu/cpu/mcs48/mcs48.h
index 852c90b7915..d7067abf987 100644
--- a/src/emu/cpu/mcs48/mcs48.h
+++ b/src/emu/cpu/mcs48/mcs48.h
@@ -1,12 +1,12 @@
/***************************************************************************
- mcs48.c
-
- Intel MCS-48 Portable Emulator
-
- Copyright Mirko Buffoni
- Based on the original work Copyright Dan Boris, an 8048 emulator
- You are not allowed to distribute this software commercially
+ mcs48.c
+
+ Intel MCS-48 Portable Emulator
+
+ Copyright Mirko Buffoni
+ Based on the original work Copyright Dan Boris, an 8048 emulator
+ You are not allowed to distribute this software commercially
***************************************************************************/
@@ -31,13 +31,13 @@ enum
MCS48_TC,
MCS48_P1,
MCS48_P2,
- MCS48_R0,
- MCS48_R1,
+ MCS48_R0,
+ MCS48_R1,
MCS48_R2,
- MCS48_R3,
- MCS48_R4,
- MCS48_R5,
- MCS48_R6,
+ MCS48_R3,
+ MCS48_R4,
+ MCS48_R5,
+ MCS48_R6,
MCS48_R7,
MCS48_EA
};
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 3336a597a5a..1c39303c642 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -2140,11 +2140,11 @@ UINT64 debug_read_opcode(offs_t address, int size, int arg)
static int expression_cpu_index(running_machine *machine, const char *tag)
{
int index;
-
+
for (index = 0; index < ARRAY_LENGTH(machine->config->cpu); index++)
if (machine->config->cpu[index].tag != NULL && mame_stricmp(machine->config->cpu[index].tag, tag) == 0)
return index;
-
+
return -1;
}
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index 57e8a1513d9..3a1354e4919 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -50,11 +50,11 @@ WRITE8_DEVICE_HANDLER( at28c16_w )
if( c->last_write >= 0 )
{
-// logerror( "%08x: at28c16_write( %d, %04x, %02x ) busy\n", activecpu_get_pc(), chip, offset, data );
+// logerror( "%08x: at28c16_write( %d, %04x, %02x ) busy\n", activecpu_get_pc(), chip, offset, data );
}
else if( c->oe_12v )
{
-// logerror( "%08x: at28c16_write( %d, %04x, %02x ) erase\n", activecpu_get_pc(), chip, offset, data );
+// logerror( "%08x: at28c16_write( %d, %04x, %02x ) erase\n", activecpu_get_pc(), chip, offset, data );
memset( c->data, 0xff, SIZE_DATA );
memset( c->id, 0xff, SIZE_ID );
c->last_write = 0xff;
@@ -62,7 +62,7 @@ WRITE8_DEVICE_HANDLER( at28c16_w )
}
else if( offset >= OFFSET_ID && c->a9_12v )
{
-// logerror( "%08x: at28c16_write( %d, %04x, %02x ) id\n", activecpu_get_pc(), chip, offset, data );
+// logerror( "%08x: at28c16_write( %d, %04x, %02x ) id\n", activecpu_get_pc(), chip, offset, data );
c->id[ offset - OFFSET_ID ] = data;
c->last_write = data;
timer_adjust_oneshot( c->write_timer, ATTOTIME_IN_USEC( 200 ), 0 );
@@ -83,12 +83,12 @@ READ8_DEVICE_HANDLER( at28c16_r )
if( c->last_write >= 0 )
{
-// logerror( "at28c16_read( %04x ) write status\n", offset );
+// logerror( "at28c16_read( %04x ) write status\n", offset );
return c->last_write ^ 0x80;
}
else if( offset >= OFFSET_ID && c->a9_12v )
{
-// logerror( "at28c16_read( %04x ) id\n", offset );
+// logerror( "at28c16_read( %04x ) id\n", offset );
return c->id[ offset - OFFSET_ID ];
}
else
@@ -124,7 +124,7 @@ static DEVICE_START(at28c16)
/* validate some basic stuff */
assert(device != NULL);
-// assert(device->static_config != NULL);
+// assert(device->static_config != NULL);
assert(device->inline_config == NULL);
assert(device->machine != NULL);
assert(device->machine->config != NULL);
diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c
index 5c3d10b8e01..5900a48ab53 100644
--- a/src/emu/machine/latch8.c
+++ b/src/emu/machine/latch8.c
@@ -35,7 +35,7 @@ static void update(const device_config *device, UINT8 new_val, UINT8 mask)
{
latch8_t *latch8 = get_safe_token(device);
UINT8 old_val = latch8->value;
-
+
latch8->value = (latch8->value & ~mask) | (new_val & mask);
if (latch8->has_node_map)
@@ -53,7 +53,7 @@ static TIMER_CALLBACK( latch8_timerproc )
const device_config *device = ptr;
UINT8 new_val = param & 0xFF;
UINT8 mask = param >> 8;
-
+
update(device, new_val, mask);
}
@@ -63,7 +63,7 @@ READ8_DEVICE_HANDLER( latch8_r )
{
latch8_t *latch8 = get_safe_token(device);
UINT8 res;
-
+
assert(offset == 0);
res = latch8->value;
@@ -119,14 +119,14 @@ WRITE8_DEVICE_HANDLER( latch8_reset)
}
/* read bit x */
-/* return (latch >> x) & 0x01 */
+/* return (latch >> x) & 0x01 */
INLINE UINT8 latch8_bitx_r(const device_config *device, offs_t offset, int bit)
{
latch8_t *latch8 = get_safe_token(device);
assert( offset == 0);
-
+
return (latch8->value >> bit) & 0x01;
}
@@ -158,7 +158,7 @@ INLINE void latch8_bitx_w(const device_config *device, int bit, offs_t offset, U
UINT8 masked_data = (((data >> bit) & 0x01) << offset);
assert( offset < 8);
-
+
/* No need to synchronize ? */
if (latch8->intf->nosync & mask)
update(device, masked_data, mask);
@@ -191,7 +191,7 @@ static DEVICE_START( latch8 )
latch8->intf = device->inline_config;
latch8->value = 0x0;
-
+
/* setup nodemap */
for (i=0; i<8; i++)
if (latch8->intf->node_map[i] )
@@ -203,7 +203,7 @@ static DEVICE_START( latch8 )
{
if (latch8->devices[i] != NULL)
fatalerror("Device %s: Bit %d already has a handler.\n", device->tag, i);
- latch8->devices[i] = devtag_get_device(device->machine,
+ latch8->devices[i] = devtag_get_device(device->machine,
latch8->intf->devread[i].type,
latch8->intf->devread[i].tag);
if (latch8->devices[i] == NULL)
diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h
index 66b05249c51..089fd587f41 100644
--- a/src/emu/machine/latch8.h
+++ b/src/emu/machine/latch8.h
@@ -1,15 +1,15 @@
/**********************************************************************
8 bit latch interface and emulation
-
+
Generic emulation of 74LS174/175, 74LS259 and other latches.
Apart from providing synched latch operation, these
latches can be configured to read their input bitwise from other
devices as well and individual bits can be connected to
discrete nodes.
-
+
Please see audio/dkong.c for examples.
-
+
**********************************************************************/
#ifndef __LATCH8_H_
@@ -36,7 +36,7 @@ typedef struct _latch8_config latch8_config;
struct _latch8_config
{
/* only for byte reads, does not affect bit reads and node_map */
- UINT32 maskout;
+ UINT32 maskout;
UINT32 xor; /* after mask */
UINT32 nosync;
UINT32 node_map[8];
@@ -57,11 +57,11 @@ struct _latch8_config
/* Bit mask specifying bits to be inverted */
#define MDRV_LATCH8_INVERT(_xor) \
- MDRV_DEVICE_CONFIG_DATA32(latch8_config, xor, _xor)
+ MDRV_DEVICE_CONFIG_DATA32(latch8_config, xor, _xor)
/* Bit mask specifying bits not needing cpu synchronization. */
#define MDRV_LATCH8_NOSYNC(_nosync) \
- MDRV_DEVICE_CONFIG_DATA32(latch8_config, nosync, _nosync)
+ MDRV_DEVICE_CONFIG_DATA32(latch8_config, nosync, _nosync)
/* Write bit to discrete node */
#define MDRV_LATCH8_DISCRETE_NODE(_bit, _node) \
@@ -110,7 +110,7 @@ WRITE8_DEVICE_HANDLER( latch8_w );
WRITE8_DEVICE_HANDLER( latch8_reset );
/* read bit x */
-/* return (latch >> x) & 0x01 */
+/* return (latch >> x) & 0x01 */
READ8_DEVICE_HANDLER( latch8_bit0_r );
READ8_DEVICE_HANDLER( latch8_bit1_r );
@@ -122,7 +122,7 @@ READ8_DEVICE_HANDLER( latch8_bit6_r );
READ8_DEVICE_HANDLER( latch8_bit7_r );
/* read inverted bit x */
-/* return (latch >> x) & 0x01 */
+/* return (latch >> x) & 0x01 */
READ8_DEVICE_HANDLER( latch8_bit0_q_r );
READ8_DEVICE_HANDLER( latch8_bit1_q_r );
diff --git a/src/emu/rendersw.c b/src/emu/rendersw.c
index ef9cc4ae5e9..596e7203cb9 100644
--- a/src/emu/rendersw.c
+++ b/src/emu/rendersw.c
@@ -126,7 +126,7 @@ INLINE float round_nearest(float f)
INLINE UINT8 clamp16_shift8(UINT32 x)
{
- return (((INT32) x < 0) ? 0 : (x > 65535 ? 255: x >> 8));
+ return (((INT32) x < 0) ? 0 : (x > 65535 ? 255: x >> 8));
}
INLINE UINT32 ycc_to_rgb(UINT32 ycc)
@@ -152,19 +152,19 @@ INLINE UINT32 ycc_to_rgb(UINT32 ycc)
R = clip(( 298 * Y - 298 * 16 + 409 * Cr - 409 * 128 + 128) >> 8)
G = clip(( 298 * Y - 298 * 16 - 100 * Cb + 100 * 128 - 208 * Cr + 208 * 128 + 128) >> 8)
B = clip(( 298 * Y - 298 * 16 + 516 * Cb - 516 * 128 + 128) >> 8)
-
+
Now combine constants:
-
+
R = clip(( 298 * Y + 409 * Cr - 56992) >> 8)
G = clip(( 298 * Y - 100 * Cb - 208 * Cr + 34784) >> 8)
B = clip(( 298 * Y + 516 * Cb - 70688) >> 8)
-
- Define common = 298 * y - 56992. This will save one addition
-
+
+ Define common = 298 * y - 56992. This will save one addition
+
R = clip(( common + 409 * Cr - 0) >> 8)
G = clip(( common - 100 * Cb - 208 * Cr + 91776) >> 8)
B = clip(( common + 516 * Cb - 13696) >> 8)
-
+
*/
UINT8 y = ycc;
UINT8 cb = ycc >> 8;
diff --git a/src/emu/sound/disc_dev.c b/src/emu/sound/disc_dev.c
index 4b39eb04eda..9764bede8b5 100644
--- a/src/emu/sound/disc_dev.c
+++ b/src/emu/sound/disc_dev.c
@@ -1068,7 +1068,7 @@ static void dsd_555_vco1_step(node_description *node)
else
{
/* if we are out of reset and the cap voltage is less then
- * the lower threshold, toggle f/f and start charging */
+ * the lower threshold, toggle f/f and start charging */
if (v_cap <= context->trigger)
{
if (context->flip_flop == 0)
diff --git a/src/emu/sound/disc_mth.c b/src/emu/sound/disc_mth.c
index dc0b07c0ae5..1cf808e8745 100644
--- a/src/emu/sound/disc_mth.c
+++ b/src/emu/sound/disc_mth.c
@@ -301,13 +301,13 @@ static void dst_dac_r1_step(node_description *node)
if ((x_time != 0) && (bit_val != ((context->last_data >> bit) & 0x01)))
{
/* there is x_time and a change in bit,
- * so anti-alias the current */
+ * so anti-alias the current */
i_bit *= bit_val ? x_time : 1.0 - x_time;
}
else
{
/* there is no x_time or a change in bit,
- * so 0 the current if the bit value is 0 */
+ * so 0 the current if the bit value is 0 */
if (bit_val == 0) i_bit = 0;
}
i_total += i_bit;
@@ -1014,7 +1014,7 @@ static void dst_mixer_step(node_description *node)
rTemp = info->r[bit];
connected = 1;
vTemp = DST_MIXER__IN(bit);
-
+
if (context->r_node[bit] != NULL)
{
/* a node has the posibility of being disconnected from the circuit. */
@@ -1049,7 +1049,7 @@ static void dst_mixer_step(node_description *node)
}
}
}
-
+
if (connected)
{
if (info->c[bit] != 0)
diff --git a/src/emu/sound/disc_wav.c b/src/emu/sound/disc_wav.c
index a3af5e420b5..b5f3c05dc8d 100644
--- a/src/emu/sound/disc_wav.c
+++ b/src/emu/sound/disc_wav.c
@@ -697,7 +697,7 @@ static void dss_note_reset(node_description *node)
context->clock_type = (int)DSS_NOTE__CLOCK_TYPE & DISC_CLK_MASK;
context->out_type = (int)DSS_NOTE__CLOCK_TYPE & DISC_OUT_MASK;
-
+
context->last = (DSS_NOTE__CLOCK != 0);
context->t_left = 0;
context->t_clock = 1.0 / DSS_NOTE__CLOCK;
@@ -754,7 +754,7 @@ static void dss_op_amp_osc_step(node_description *node)
case DISC_OP_AMP_OSCILLATOR_VCO_1:
/* Work out the charge rates. */
/* i is not a current. It is being used as a temp variable. */
- i = DSS_OP_AMP_OSC__VMOD1 * context->temp1;
+ i = DSS_OP_AMP_OSC__VMOD1 * context->temp1;
iCharge[0] = (DSS_OP_AMP_OSC__VMOD1 - i) / info->r1;
iCharge[1] = (i - (DSS_OP_AMP_OSC__VMOD1 * context->temp2)) / context->temp3;
break;
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 26cfbb8b05f..34816c54930 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -668,7 +668,7 @@ static void init_nodes(discrete_info *info, discrete_sound_block *block_list)
node->context = NULL;
info->discrete_input_streams++;
}
-
+
}
/* if no outputs, give an error */
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index e184dbb0838..ddd16583ec1 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -160,13 +160,13 @@
* Consider the following counter outputs vs DAC_R1
* calculations. The count changes from 9 to 10. It has
* been at the new state for 75% of the sample.
- *
+ *
* counter binary x_time -- DAC_R1 bit energy --
* out count D3 D2 D1 D0
* 9.0 1001 0.0 1.0 0.0 0.0 1.0
- * 10.75 1010 0.75 1.0 0.0 0.75 0.25
+ * 10.75 1010 0.75 1.0 0.0 0.75 0.25
* 10.0 1010 0.0 1.0 0.0 1.0 0.0
- *
+ *
* The DAC_R1 uses these energy calculations to scale the
* voltages created on each of its resistors. This
* anti-aliases the waveform no mater what the resistor
@@ -2968,7 +2968,7 @@
* address of discrete_555_cc_desc structure)
*
* discrete_555_cc_desc =
- * {
+ * {
* options; - bit mapped options
* v_pos; - B+ voltage of 555
* v_cc_source; - Voltage of the Constant Current source
@@ -2982,7 +2982,7 @@
* DEFAULT_555_HIGH - to use the normal output voltage based on v_pos
* or combine both as:
* DEFAULT_555_VALUES
- *
+ *
* Output Types:
* See DISCRETE_555_ASTABLE for description.
*
@@ -3745,7 +3745,7 @@ typedef struct _discrete_555_vco1_desc discrete_555_vco1_desc;
struct _discrete_555_vco1_desc
{
int options; /* bit mapped options */
- double r1, r2, r3, r4, c;
+ double r1, r2, r3, r4, c;
double v_pos; /* B+ voltage of 555 */
double v_charge; /* (ignored) */
double v_out_high; /* High output voltage of 555 (Defaults to v_pos - 1.2V) */
diff --git a/src/emu/ui.c b/src/emu/ui.c
index 303b520e72b..9293dd2ba1b 100644
--- a/src/emu/ui.c
+++ b/src/emu/ui.c
@@ -1225,8 +1225,8 @@ static UINT32 handler_ingame(running_machine *machine, UINT32 state)
return ui_set_handler(ui_menu_ui_handler, 0);
/* if the on-screen display isn't up and the user has toggled it, turn it on */
-// if ((machine->debug_flags & DEBUG_FLAG_ENABLED) == 0 && ui_input_pressed(machine, IPT_UI_ON_SCREEN_DISPLAY))
-// return ui_set_handler(ui_slider_ui_handler, 0);
+// if ((machine->debug_flags & DEBUG_FLAG_ENABLED) == 0 && ui_input_pressed(machine, IPT_UI_ON_SCREEN_DISPLAY))
+// return ui_set_handler(ui_slider_ui_handler, 0);
/* handle a reset request */
if (ui_input_pressed(machine, IPT_UI_RESET_MACHINE))
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index c990dec6003..ceb90266ee8 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -2667,14 +2667,14 @@ static void menu_sliders(running_machine *machine, ui_menu *menu, void *paramete
const slider_state *slider = event->itemref;
INT32 curvalue = (*slider->update)(machine, slider->arg, NULL, SLIDER_NOCHANGE);
INT32 increment = 0;
-
+
switch (event->iptkey)
{
/* toggle visibility */
case IPT_UI_ON_SCREEN_DISPLAY:
*hidden = !*hidden;
break;
-
+
/* decrease value */
case IPT_UI_LEFT:
if (input_code_pressed(KEYCODE_LALT) || input_code_pressed(KEYCODE_RALT))
@@ -2686,7 +2686,7 @@ static void menu_sliders(running_machine *machine, ui_menu *menu, void *paramete
else
increment = -slider->incval;
break;
-
+
/* increase value */
case IPT_UI_RIGHT:
if (input_code_pressed(KEYCODE_LALT) || input_code_pressed(KEYCODE_RALT))
@@ -2698,7 +2698,7 @@ static void menu_sliders(running_machine *machine, ui_menu *menu, void *paramete
else
increment = slider->incval;
break;
-
+
/* restore default */
case IPT_UI_SELECT:
increment = slider->defval - curvalue;
@@ -2721,7 +2721,7 @@ static void menu_sliders(running_machine *machine, ui_menu *menu, void *paramete
ui_menu_reset(menu, UI_MENU_RESET_REMEMBER_REF);
}
}
-
+
/* if we are selecting an invalid item and we are hidden, skip to the next one */
else if (*hidden)
{
@@ -2752,7 +2752,7 @@ static void menu_sliders_populate(running_machine *machine, ui_menu *menu)
{
astring *tempstring = astring_alloc();
const slider_state *curslider;
-
+
/* add all sliders */
for (curslider = ui_get_slider_list(); curslider != NULL; curslider = curslider->next)
{
@@ -2834,7 +2834,7 @@ static void menu_sliders_custom_render(running_machine *machine, ui_menu *menu,
/* draw the actual text */
ui_draw_text_full(astring_c(tempstring), space_width + UI_BOX_LR_BORDER, line_height + ui_height - UI_BOX_TB_BORDER - text_height, ui_width - 2.0f * UI_BOX_LR_BORDER,
JUSTIFY_CENTER, WRAP_WORD, DRAW_NORMAL, ARGB_WHITE, ARGB_BLACK, NULL, &text_height);
-
+
astring_free(tempstring);
}
}