summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Angelo Salese <angelosa@users.noreply.github.com>2011-09-06 13:39:18 +0000
committer Angelo Salese <angelosa@users.noreply.github.com>2011-09-06 13:39:18 +0000
commitc0b3576488b11336c6379a12d6b2e3e2f6337d99 (patch)
tree02e0cbbecba525baf7add93dd3527736005770a5 /src/emu
parent7150db5043d9fb09a84f92e7e2537743ac1b0744 (diff)
Cleanups and version bumpmame0143u5
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/m37710/m37710.c30
-rw-r--r--src/emu/cpu/m37710/m37710op.h8
-rw-r--r--src/emu/cpu/m68000/m68k_in.c22
-rw-r--r--src/emu/cpu/m68000/m68kcpu.h2
-rw-r--r--src/emu/cpu/m68000/m68kmake.c2
-rw-r--r--src/emu/diserial.c12
-rw-r--r--src/emu/diserial.h34
-rw-r--r--src/emu/imagedev/floppy.h2
-rw-r--r--src/emu/imagedev/serial.c14
-rw-r--r--src/emu/imagedev/serial.h8
-rw-r--r--src/emu/machine/6551acia.c6
-rw-r--r--src/emu/machine/6551acia.h12
-rw-r--r--src/emu/machine/i8251.c4
-rw-r--r--src/emu/machine/i8251.h14
-rw-r--r--src/emu/machine/idectrl.c4
-rw-r--r--src/emu/sound/es5503.c2
-rw-r--r--src/emu/sound/es5503.h4
-rw-r--r--src/emu/sound/k051649.c2
-rw-r--r--src/emu/video/psx.c12
19 files changed, 97 insertions, 97 deletions
diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c
index d8a18431d61..6a0c9877db5 100644
--- a/src/emu/cpu/m37710/m37710.c
+++ b/src/emu/cpu/m37710/m37710.c
@@ -66,22 +66,22 @@ extern const int m37710_irq_levels[M37710_LINE_MAX];
const int m37710_irq_levels[M37710_LINE_MAX] =
{
// maskable
- 0x70, // ADC 0
+ 0x70, // ADC 0
0x73, // UART 1 XMIT 1
0x74, // UART 1 RECV 2
0x71, // UART 0 XMIT 3
0x72, // UART 0 RECV 4
- 0x7c, // Timer B2 5
- 0x7b, // Timer B1 6
- 0x7a, // Timer B0 7
- 0x79, // Timer A4 8
- 0x78, // Timer A3 9
- 0x77, // Timer A2 10
- 0x76, // Timer A1 11
- 0x75, // Timer A0 12
- 0x7f, // IRQ 2 13
- 0x7e, // IRQ 1 14
- 0x7d, // IRQ 0 15
+ 0x7c, // Timer B2 5
+ 0x7b, // Timer B1 6
+ 0x7a, // Timer B0 7
+ 0x79, // Timer A4 8
+ 0x78, // Timer A3 9
+ 0x77, // Timer A2 10
+ 0x76, // Timer A1 11
+ 0x75, // Timer A0 12
+ 0x7f, // IRQ 2 13
+ 0x7e, // IRQ 1 14
+ 0x7d, // IRQ 0 15
// non-maskable
0, // watchdog
@@ -94,11 +94,11 @@ const int m37710_irq_levels[M37710_LINE_MAX] =
static const int m37710_irq_vectors[M37710_LINE_MAX] =
{
// maskable
- 0xffd6, // A-D converter
+ 0xffd6, // A-D converter
0xffd8, // UART1 transmit
- 0xffda, // UART1 receive
+ 0xffda, // UART1 receive
0xffdc, // UART0 transmit
- 0xffde, // UART0 receive
+ 0xffde, // UART0 receive
0xffe0, // Timer B2
0xffe2, // Timer B1
0xffe4, // Timer B0
diff --git a/src/emu/cpu/m37710/m37710op.h b/src/emu/cpu/m37710/m37710op.h
index 64b025f5a3f..2fbf1765f00 100644
--- a/src/emu/cpu/m37710/m37710op.h
+++ b/src/emu/cpu/m37710/m37710op.h
@@ -521,7 +521,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
if (SRC&0x40) \
{ m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
+ { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
#else // FLAG_SET_X
#define OP_PSH(MODE) \
SRC = OPER_8_##MODE(cpustate); \
@@ -541,7 +541,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
if (SRC&0x40) \
{ m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
+ { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
#endif // FLAG_SET_X
#else // FLAG_SET_M
#if FLAG_SET_X
@@ -563,7 +563,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
if (SRC&0x40) \
{ m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
+ { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
#else // FLAG_SET_X
#define OP_PSH(MODE) \
SRC = OPER_8_##MODE(cpustate); \
@@ -583,7 +583,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
if (SRC&0x40) \
{ m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \
if (SRC&0x80) \
- { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
+ { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); }
#endif // FLAG_SET_X
#endif // FLAG_SET_M
diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c
index 8dd59051f0a..eb6ef39c092 100644
--- a/src/emu/cpu/m68000/m68k_in.c
+++ b/src/emu/cpu/m68000/m68k_in.c
@@ -530,10 +530,10 @@ cmpm 32 . . 1011...110001... .......... U U U U U U 20 20 9
cinv 32 . . 11110100..0..... .......... . . . . U . . . . . 16 . 040 only
cpush 32 . . 11110100..1..... .......... . . . . U . . . . . 16 . 040 only
cpbcc 32 . . 1111...01....... .......... . . U U . . . . 4 4 . . cpXXX only for 020/030, not on 040!
-cpdbcc 32 . . 1111...001001... .......... . . U U . . . . 4 4 . .
-cpgen 32 . . 1111...000...... .......... . . U U . . . . 4 4 . .
-cpscc 32 . . 1111...001...... .......... . . U U . . . . 4 4 . .
-cptrapcc 32 . . 1111...001111... .......... . . U U . . . . 4 4 . .
+cpdbcc 32 . . 1111...001001... .......... . . U U . . . . 4 4 . .
+cpgen 32 . . 1111...000...... .......... . . U U . . . . 4 4 . .
+cpscc 32 . . 1111...001...... .......... . . U U . . . . 4 4 . .
+cptrapcc 32 . . 1111...001111... .......... . . U U . . . . 4 4 . .
dbt 16 . . 0101000011001... .......... U U U U U U 12 12 6 6 6 6
dbf 16 . . 0101000111001... .......... U U U U U U 12 12 6 6 6 6
dbcc 16 . . 0101....11001... .......... U U U U U U 12 12 6 6 6 6
@@ -595,7 +595,7 @@ move 8 pi7 d 0001111011000... .......... U U U U U U 8 8 4
move 8 pi7 . 0001111011...... A+-DXWLdxI U U U U U U 8 8 4 4 4 4
move 8 pd d 0001...100000... .......... U U U U U U 8 8 5 5 5 5
move 8 pd . 0001...100...... A+-DXWLdxI U U U U U U 8 8 5 5 5 5
-move 8 pd7 d 0001111100000... .......... U U U U U U 8 8 5 5 5 5
+move 8 pd7 d 0001111100000... .......... U U U U U U 8 8 5 5 5 5
move 8 pd7 . 0001111100...... A+-DXWLdxI U U U U U U 8 8 5 5 5 5
move 8 di d 0001...101000... .......... U U U U U U 12 12 5 5 5 5
move 8 di . 0001...101...... A+-DXWLdxI U U U U U U 12 12 5 5 5 5
@@ -636,7 +636,7 @@ move 32 ai d 0010...010000... .......... U U U U U U 12 12 4
move 32 ai a 0010...010001... .......... U U U U U U 12 12 4 4 4 4
move 32 ai . 0010...010...... A+-DXWLdxI U U U U U U 12 12 4 4 4 4
move 32 pi d 0010...011000... .......... U U U U U U 12 12 4 4 4 4
-move 32 pi a 0010...011001... .......... U U U U U U 12 12 4 4 4 4
+move 32 pi a 0010...011001... .......... U U U U U U 12 12 4 4 4 4
move 32 pi . 0010...011...... A+-DXWLdxI U U U U U U 12 12 4 4 4 4
move 32 pd d 0010...100000... .......... U U U U U U 12 14 5 5 5 5
move 32 pd a 0010...100001... .......... U U U U U U 12 14 5 5 5 5
@@ -652,7 +652,7 @@ move 32 aw a 0010000111001... .......... U U U U U U 16 16 4
move 32 aw . 0010000111...... A+-DXWLdxI U U U U U U 16 16 4 4 4 4
move 32 al d 0010001111000... .......... U U U U U U 20 20 6 6 6 6
move 32 al a 0010001111001... .......... U U U U U U 20 20 6 6 6 6
-move 32 al . 0010001111...... A+-DXWLdxI U U U U U U 20 20 6 6 6 6
+move 32 al . 0010001111...... A+-DXWLdxI U U U U U U 20 20 6 6 6 6
movea 16 . d 0011...001000... .......... U U U U U U 4 4 2 2 2 2
movea 16 . a 0011...001001... .......... U U U U U U 4 4 2 2 2 2
movea 16 . . 0011...001...... A+-DXWLdxI U U U U U U 4 4 2 2 2 2
@@ -669,7 +669,7 @@ move 16 tos d 0100011011000... .......... S S S S S S 12 12 8
move 16 tos . 0100011011...... A+-DXWLdxI S S S S S S 12 12 8 8 8 8
move 32 fru . 0100111001101... .......... S S S S S S 4 6 2 2 2 2
move 32 tou . 0100111001100... .......... S S S S S S 4 6 2 2 2 2
-movec 32 cr . 0100111001111010 .......... . S S S S S . 12 6 6 6 6
+movec 32 cr . 0100111001111010 .......... . S S S S S . 12 6 6 6 6
movec 32 rc . 0100111001111011 .......... . S S S S S . 10 12 12 12 12
movem 16 re pd 0100100010100... .......... U U U U U U 8 8 4 4 4 4
movem 16 re . 0100100010...... A..DXWL... U U U U U U 8 8 4 4 4 4
@@ -708,7 +708,7 @@ neg 32 . d 0100010010000... .......... U U U U U U 6 6 2
neg 32 . . 0100010010...... A+-DXWL... U U U U U U 12 12 4 4 4 4
negx 8 . d 0100000000000... .......... U U U U U U 4 4 2 2 2 2
negx 8 . . 0100000000...... A+-DXWL... U U U U U U 8 8 4 4 4 4
-negx 16 . d 0100000001000... .......... U U U U U U 4 4 2 2 2 2
+negx 16 . d 0100000001000... .......... U U U U U U 4 4 2 2 2 2
negx 16 . . 0100000001...... A+-DXWL... U U U U U U 8 8 4 4 4 4
negx 32 . d 0100000010000... .......... U U U U U U 6 6 2 2 2 2
negx 32 . . 0100000010...... A+-DXWL... U U U U U U 12 12 4 4 4 4
@@ -754,7 +754,7 @@ ror 32 r . 1110...010111... .......... U U U U U U 8 8 8
ror 16 . . 1110011011...... A+-DXWL... U U U U U U 8 8 7 7 7 7
rol 8 s . 1110...100011... .......... U U U U U U 6 6 8 8 8 8
rol 16 s . 1110...101011... .......... U U U U U U 6 6 8 8 8 8
-rol 32 s . 1110...110011... .......... U U U U U U 8 8 8 8 8 8
+rol 32 s . 1110...110011... .......... U U U U U U 8 8 8 8 8 8
rol 8 r . 1110...100111... .......... U U U U U U 6 6 8 8 8 8
rol 16 r . 1110...101111... .......... U U U U U U 6 6 8 8 8 8
rol 32 r . 1110...110111... .......... U U U U U U 8 8 8 8 8 8
@@ -782,7 +782,7 @@ sbcd 8 rr . 1000...100000... .......... U U U U U U 6 6 4
sbcd 8 mm ax7 1000111100001... .......... U U U U U U 18 18 16 16 16 16
sbcd 8 mm ay7 1000...100001111 .......... U U U U U U 18 18 16 16 16 16
sbcd 8 mm axy7 1000111100001111 .......... U U U U U U 18 18 16 16 16 16
-sbcd 8 mm . 1000...100001... .......... U U U U U U 18 18 16 16 16 16
+sbcd 8 mm . 1000...100001... .......... U U U U U U 18 18 16 16 16 16
st 8 . d 0101000011000... .......... U U U U U U 6 4 4 4 4 4
st 8 . . 0101000011...... A+-DXWL... U U U U U U 8 8 6 6 6 6
sf 8 . d 0101000111000... .......... U U U U U U 4 4 4 4 4 4
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h
index 14c3bc07228..9b55b94710c 100644
--- a/src/emu/cpu/m68000/m68kcpu.h
+++ b/src/emu/cpu/m68000/m68kcpu.h
@@ -215,7 +215,7 @@ typedef struct _m68ki_cpu_core m68ki_cpu_core;
#define REG_DA(M) (M)->dar /* easy access to data and address regs */
#define REG_D(M) (M)->dar
#define REG_A(M) ((M)->dar+8)
-#define REG_PPC(M) (M)->ppc
+#define REG_PPC(M) (M)->ppc
#define REG_PC(M) (M)->pc
#define REG_SP_BASE(M) (M)->sp
#define REG_USP(M) (M)->sp[0]
diff --git a/src/emu/cpu/m68000/m68kmake.c b/src/emu/cpu/m68000/m68kmake.c
index 2d0d518c05e..dcee12cea4f 100644
--- a/src/emu/cpu/m68000/m68kmake.c
+++ b/src/emu/cpu/m68000/m68kmake.c
@@ -805,7 +805,7 @@ static void add_opcode_output_table_entry(opcode_struct* op, char* name)
*ptr = *op;
- sprintf( ptr->name, "_m68ki_cpu_core::%s", name);
+ sprintf( ptr->name, "_m68ki_cpu_core::%s", name);
ptr->bits = num_bits(ptr->op_mask);
}
diff --git a/src/emu/diserial.c b/src/emu/diserial.c
index 1ee83d548a3..5e4cdfa37da 100644
--- a/src/emu/diserial.c
+++ b/src/emu/diserial.c
@@ -49,7 +49,7 @@ void device_serial_interface::set_data_frame(int num_data_bits, int stop_bit_cou
m_df_word_length = num_data_bits;
m_df_stop_bit_count = stop_bit_count;
m_df_parity = parity_code;
-
+
m_rcv_bit_count = m_df_word_length + m_df_stop_bit_count;
if (m_df_parity != SERIAL_PARITY_NONE)
@@ -280,7 +280,7 @@ void device_serial_interface::transmit_register_send_bit()
data = transmit_register_get_data_bit();
- /* set tx data bit */
+ /* set tx data bit */
m_connection_state &=~SERIAL_STATE_TX_DATA;
m_connection_state|=(data<<5);
@@ -318,13 +318,13 @@ static UINT8 serial_connection_spin_bits(UINT8 input_status)
void device_serial_interface::serial_connection_out()
{
-
+
if (m_other_connection!=NULL)
{
UINT8 state_at_other_end = serial_connection_spin_bits(m_connection_state);
m_other_connection->input_callback(state_at_other_end);
- }
+ }
}
bool device_serial_interface::is_receive_register_full()
@@ -376,12 +376,12 @@ void serial_source_device::device_start()
}
void serial_source_device::input_callback(UINT8 state)
-{
+{
m_input_state = state;
}
void serial_source_device::send_bit(UINT8 data)
-{
+{
set_out_data_bit(data);
serial_connection_out();
}
diff --git a/src/emu/diserial.h b/src/emu/diserial.h
index e76d1722e29..4b2482b6c22 100644
--- a/src/emu/diserial.h
+++ b/src/emu/diserial.h
@@ -81,51 +81,51 @@ public:
// construction/destruction
device_serial_interface(const machine_config &mconfig, device_t &device);
virtual ~device_serial_interface();
-
+
virtual void input_callback(UINT8 state) = 0;
-
+
void set_data_frame(int num_data_bits, int stop_bit_count, int parity_code);
- void receive_register_reset();
+ void receive_register_reset();
void receive_register_update_bit(int bit);
void receive_register_extract();
-
-
+
+
void transmit_register_reset();
void transmit_register_add_bit(int bit);
void transmit_register_setup(UINT8 data_byte);
UINT8 transmit_register_get_data_bit();
void transmit_register_send_bit();
-
+
UINT8 serial_helper_get_parity(UINT8 data) { return m_serial_parity_table[data]; }
UINT8 get_in_data_bit() { return ((m_input_state & SERIAL_STATE_RX_DATA)>>4) & 1; }
void set_out_data_bit(UINT8 data) { m_connection_state &=~SERIAL_STATE_TX_DATA; m_connection_state |=(data<<5); }
void serial_connection_out();
-
+
bool is_receive_register_full();
bool is_transmit_register_empty();
-
+
UINT8 get_received_char() { return m_rcv_byte_received; }
-
+
void set_other_connection(device_serial_interface *other_connection);
-
+
void connect(device_serial_interface *other_connection);
protected:
UINT8 m_input_state;
UINT8 m_connection_state;
-private:
+private:
UINT8 m_serial_parity_table[256];
- // Data frame
+ // Data frame
// length of word in bits
UINT8 m_df_word_length;
// parity state
UINT8 m_df_parity;
// number of stop bits
- UINT8 m_df_stop_bit_count;
-
+ UINT8 m_df_stop_bit_count;
+
// Receive register
/* data */
UINT16 m_rcv_register_data;
@@ -137,7 +137,7 @@ private:
UINT8 m_rcv_bit_count;
/* the byte of data received */
UINT8 m_rcv_byte_received;
-
+
// Transmit register
/* data */
UINT16 m_tra_register_data;
@@ -153,7 +153,7 @@ private:
class serial_source_device : public device_t,
- public device_serial_interface
+ public device_serial_interface
{
public:
// construction/destruction
@@ -163,7 +163,7 @@ public:
void send_bit(UINT8 data);
protected:
// device-level overrides
- virtual void device_start();
+ virtual void device_start();
};
extern const device_type SERIAL_SOURCE;
diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h
index a06a4375c30..20d7e5db27f 100644
--- a/src/emu/imagedev/floppy.h
+++ b/src/emu/imagedev/floppy.h
@@ -18,7 +18,7 @@ struct floppy_interface
{
devcb_write_line m_out_idx_cb; /* index */
- const floppy_format_type *m_formats;
+ const floppy_format_type *m_formats;
const char * m_interface;
device_image_display_info_func m_device_displayinfo;
device_image_load_func m_load_func;
diff --git a/src/emu/imagedev/serial.c b/src/emu/imagedev/serial.c
index df9b07d9a87..85714e5da07 100644
--- a/src/emu/imagedev/serial.c
+++ b/src/emu/imagedev/serial.c
@@ -71,7 +71,7 @@ static TIMER_CALLBACK(serial_device_baud_rate_callback)
has updated state
-------------------------------------------------*/
void serial_image_device::input_callback(UINT8 state)
-{
+{
m_input_state = state;
}
@@ -82,7 +82,7 @@ void serial_image_device::input_callback(UINT8 state)
void serial_image_device::device_start()
{
set_data_frame(m_data_bits, m_stop_bits,m_parity);
-
+
m_timer = machine().scheduler().timer_alloc(FUNC(serial_device_baud_rate_callback), this);
/* signal to other end it is clear to send! */
@@ -92,14 +92,14 @@ void serial_image_device::device_start()
/* signal to other end data is ready to be accepted */
/* set /dtr */
m_connection_state |= SERIAL_STATE_DTR;
-
+
set_out_data_bit(1);
serial_connection_out();
transmit_register_reset();
receive_register_reset();
-
+
set_transmit_state(m_transmit_on_start ? 1 :0);
-
+
device_serial_interface *intf = NULL;
device_t *dev = machine().device(m_tag_connected);
if (dev!=NULL && dev->interface(intf)) {
@@ -283,7 +283,7 @@ int serial_image_device::load_internal(unsigned char **ptr, int *pDataSize)
call_load
-------------------------------------------------*/
bool serial_image_device::call_load()
-{
+{
int data_length;
unsigned char *data;
/* load file and setup transmit data */
@@ -304,7 +304,7 @@ void serial_image_device::call_unload()
{
/* stop transmit */
set_transmit_state(0);
-
+
/* free streams */
data_stream_free(&m_transmit);
data_stream_free(&m_receive);
diff --git a/src/emu/imagedev/serial.h b/src/emu/imagedev/serial.h
index ce7c2614abc..ba494e8649d 100644
--- a/src/emu/imagedev/serial.h
+++ b/src/emu/imagedev/serial.h
@@ -75,7 +75,7 @@ public:
void sent_char();
void set_transmit_state(int state);
int load_internal(unsigned char **ptr, int *pDataSize);
-
+
// data stream
int data_stream_get_data_bit_from_data_byte(serial_data_stream *stream);
void data_stream_reset(serial_data_stream *stream);
@@ -85,17 +85,17 @@ protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
-
+
private:
/* transmit data bit-stream */
serial_data_stream m_transmit;
/* receive data bit-stream */
serial_data_stream m_receive;
-
+
int m_transmit_state;
/* baud rate timer */
- emu_timer *m_timer;
+ emu_timer *m_timer;
};
diff --git a/src/emu/machine/6551acia.c b/src/emu/machine/6551acia.c
index 28410abb94a..ed02358b391 100644
--- a/src/emu/machine/6551acia.c
+++ b/src/emu/machine/6551acia.c
@@ -41,7 +41,7 @@ acia6551_device::acia6551_device(const machine_config &mconfig, const char *tag,
has updated state
-------------------------------------------------*/
void acia6551_device::input_callback(UINT8 state)
-{
+{
m_input_state = state;
}
@@ -230,7 +230,7 @@ READ8_MEMBER(acia6551_device::read)
-------------------------------------------------*/
void acia6551_device::update_data_form()
-{
+{
int word_length = 8-((m_control_register>>5) & 0x03);
int stop_bit_count = (m_control_register>>7)+1;
int parity = 0;
@@ -242,7 +242,7 @@ void acia6551_device::update_data_form()
{
parity = SERIAL_PARITY_NONE;
}
-
+
set_data_frame(word_length, stop_bit_count, parity);
}
diff --git a/src/emu/machine/6551acia.h b/src/emu/machine/6551acia.h
index 9f3ccb30dd3..ce09c0f1420 100644
--- a/src/emu/machine/6551acia.h
+++ b/src/emu/machine/6551acia.h
@@ -32,22 +32,22 @@ public:
/* read data register */
DECLARE_READ8_MEMBER(read);
-
+
/* write data register */
DECLARE_WRITE8_MEMBER(write);
-
+
void receive_character(UINT8 ch);
-
+
void timer_callback();
-
+
virtual void input_callback(UINT8 state);
protected:
// device-level overrides
virtual void device_start();
-
+
void refresh_ints();
void update_data_form();
-
+
private:
UINT8 m_transmit_data_register;
UINT8 m_receive_data_register;
diff --git a/src/emu/machine/i8251.c b/src/emu/machine/i8251.c
index d8553e3ecc8..f06d800d9eb 100644
--- a/src/emu/machine/i8251.c
+++ b/src/emu/machine/i8251.c
@@ -2,7 +2,7 @@
i8251.c
- Intel 8251 Universal Synchronous/Asynchronous Receiver Transmitter code
+ Intel 8251 Universal Synchronous/Asynchronous Receiver Transmitter code
*********************************************************************/
@@ -278,7 +278,7 @@ void i8251_device::update_tx_empty()
//-------------------------------------------------
void i8251_device::device_reset()
-{
+{
LOG(("I8251: Reset\n"));
/* what is the default setup when the 8251 has been reset??? */
diff --git a/src/emu/machine/i8251.h b/src/emu/machine/i8251.h
index a0839e15bfb..359fa4a626e 100644
--- a/src/emu/machine/i8251.h
+++ b/src/emu/machine/i8251.h
@@ -14,12 +14,12 @@
CONSTANTS
***************************************************************************/
-#define I8251_EXPECTING_MODE 0x01
-#define I8251_EXPECTING_SYNC_BYTE 0x02
+#define I8251_EXPECTING_MODE 0x01
+#define I8251_EXPECTING_SYNC_BYTE 0x02
-#define I8251_STATUS_FRAMING_ERROR 0x20
-#define I8251_STATUS_OVERRUN_ERROR 0x10
-#define I8251_STATUS_PARITY_ERROR 0x08
+#define I8251_STATUS_FRAMING_ERROR 0x20
+#define I8251_STATUS_OVERRUN_ERROR 0x10
+#define I8251_STATUS_PARITY_ERROR 0x08
#define I8251_STATUS_TX_EMPTY 0x04
#define I8251_STATUS_RX_READY 0x02
#define I8251_STATUS_TX_READY 0x01
@@ -57,7 +57,7 @@ struct i8251_interface
// ======================> i8251_device
class i8251_device : public device_t,
- public device_serial_interface,
+ public device_serial_interface,
public i8251_interface
{
public:
@@ -83,7 +83,7 @@ public:
void receive_clock();
void receive_character(UINT8 ch);
-
+
virtual void input_callback(UINT8 state);
protected:
// device-level overrides
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 55713848473..1a1c726a591 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -1893,7 +1893,7 @@ static DEVICE_START( ide_controller )
} else if (config->hardware != NULL) {
ide->hardware = (ide_hardware *)config->hardware;
ide->hardware->get_info(ide->device, ide->features, ide->num_cylinders, ide->num_sectors, ide->num_heads);
- ide_generate_features (ide);
+ ide_generate_features (ide);
}
/* create a timer for timing status */
@@ -2003,7 +2003,7 @@ static DEVICE_RESET( ide_controller )
}
} else if (ide->hardware != NULL) {
ide->hardware->get_info(ide->device, ide->features, ide->num_cylinders, ide->num_sectors, ide->num_heads);
- ide_generate_features (ide);
+ ide_generate_features (ide);
}
/* reset the drive state */
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index eaa5dfa52ee..10ff3d81955 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -159,7 +159,7 @@ void es5503_device::sound_stream_update(sound_stream &stream, stream_sample_t **
{
ES5503Osc *pOsc = &oscillators[osc];
- mixp = &mix[0];
+ mixp = &mix[0];
if (!(pOsc->control & 1))
{
diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h
index 20ebc610945..0f4e9f03369 100644
--- a/src/emu/sound/es5503.h
+++ b/src/emu/sound/es5503.h
@@ -21,7 +21,7 @@
// ======================> es5503_device
-class es5503_device : public device_t,
+class es5503_device : public device_t,
public device_sound_interface,
public device_memory_interface
{
@@ -77,7 +77,7 @@ private:
UINT32 wavetblpointer;
UINT8 wavetblsize;
UINT8 resolution;
-
+
UINT32 accumulator;
UINT8 irqpend;
} ES5503Osc;
diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c
index b3e6e062b7e..fd764f4d140 100644
--- a/src/emu/sound/k051649.c
+++ b/src/emu/sound/k051649.c
@@ -194,7 +194,7 @@ READ8_DEVICE_HANDLER ( k051649_waveform_r )
if (info->test & 0xc0)
{
info->stream->update();
-
+
if (offset >= 0x60)
offset += (info->channel_list[3 + (info->test >> 6 & 1)].counter >> FREQ_BITS);
else if (info->test & 0x40)
diff --git a/src/emu/video/psx.c b/src/emu/video/psx.c
index 2699843a943..5283733541e 100644
--- a/src/emu/video/psx.c
+++ b/src/emu/video/psx.c
@@ -3643,12 +3643,12 @@ void psxgpu_device::vblank(screen_device &screen, bool vblank_state)
#if 1
/* HACK for sianniv
- OG: sianniv does the bios startup, then loads the main program, clears the bss zone,
- then starts it. More or less. Meanwhile, it somehow forgets to disable vblank,
- and the vblank routine happens to be in said bss zone. 2-3 vbls happen during that
- initialization, with insta-crash effects.
- What happens on the real hardware? Screen turned off disabling vbl indirectly perhaps?
- */
+ OG: sianniv does the bios startup, then loads the main program, clears the bss zone,
+ then starts it. More or less. Meanwhile, it somehow forgets to disable vblank,
+ and the vblank routine happens to be in said bss zone. 2-3 vbls happen during that
+ initialization, with insta-crash effects.
+ What happens on the real hardware? Screen turned off disabling vbl indirectly perhaps?
+ */
if(!strcmp(machine().system().name, "sianniv")) {
UINT32 pc = cpu_get_pc(machine().device("maincpu"));
if((pc >= 0x80010018 && pc <= 0x80010028) || pc == 0x8002a4f0 || pc == 0x8002a4f4)