summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-12-28 09:04:00 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-12-28 09:04:00 +0000
commitbd24fb23c10ca9fbf63e2191dc8e58a87b83b325 (patch)
tree5ba5c3cffeb38fb8f492e030130268c4bcbafb4d /src/emu/machine
parent6763b10bf005f0bcd1ba23e440d652b31dcac447 (diff)
Results of running the latest srcclean.
Diffstat (limited to 'src/emu/machine')
-rw-r--r--src/emu/machine/6532riot.c6
-rw-r--r--src/emu/machine/6850acia.c4
-rw-r--r--src/emu/machine/74181.c2
-rw-r--r--src/emu/machine/7474.c8
-rw-r--r--src/emu/machine/8255ppi.c40
-rw-r--r--src/emu/machine/8257dma.c2
-rw-r--r--src/emu/machine/am53cf96.c2
-rw-r--r--src/emu/machine/eeprom.c2
-rw-r--r--src/emu/machine/generic.c10
-rw-r--r--src/emu/machine/idectrl.c6
-rw-r--r--src/emu/machine/idectrl.h2
-rw-r--r--src/emu/machine/laserdsc.h2
-rw-r--r--src/emu/machine/ldcore.c2
-rw-r--r--src/emu/machine/ldpr8210.c4
-rw-r--r--src/emu/machine/ldv1000.c2
-rw-r--r--src/emu/machine/ldvp931.c2
-rw-r--r--src/emu/machine/roc10937.c4
-rw-r--r--src/emu/machine/roc10937.h2
-rw-r--r--src/emu/machine/scsicd.c2
-rw-r--r--src/emu/machine/scsihd.c2
-rw-r--r--src/emu/machine/smc91c9x.c2
-rw-r--r--src/emu/machine/timekpr.c10
-rw-r--r--src/emu/machine/z80ctc.c10
-rw-r--r--src/emu/machine/z80dma.c8
24 files changed, 68 insertions, 68 deletions
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 25aeeba48fa..2a2ce8175d2 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -40,7 +40,7 @@ struct _riot6532_port
{
UINT8 in;
UINT8 out;
- UINT8 ddr;
+ UINT8 ddr;
devcb_resolved_read8 in_func;
devcb_resolved_write8 out_func;
};
@@ -60,8 +60,8 @@ struct _riot6532_state
UINT8 irqstate;
UINT8 irqenable;
- UINT8 pa7dir; /* 0x80 = high-to-low, 0x00 = low-to-high */
- UINT8 pa7prev;
+ UINT8 pa7dir; /* 0x80 = high-to-low, 0x00 = low-to-high */
+ UINT8 pa7prev;
UINT8 timershift;
UINT8 timerstate;
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index 7b96301ffb6..d68dac4c986 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -92,8 +92,8 @@ struct _acia6850_t
int brk;
int first_reset;
int status_read;
- enum serial_state rx_state;
- enum serial_state tx_state;
+ enum serial_state rx_state;
+ enum serial_state tx_state;
emu_timer *rx_timer;
emu_timer *tx_timer;
diff --git a/src/emu/machine/74181.c b/src/emu/machine/74181.c
index f7456de7218..3d15e4241f1 100644
--- a/src/emu/machine/74181.c
+++ b/src/emu/machine/74181.c
@@ -10,7 +10,7 @@
-#define TTL74181_MAX_CHIPS (2)
+#define TTL74181_MAX_CHIPS (2)
#define TTL74181_INPUT_TOTAL (14)
#define TTL74181_OUTPUT_TOTAL (8)
diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c
index bcfbeccfc4a..195a27ea1cc 100644
--- a/src/emu/machine/7474.c
+++ b/src/emu/machine/7474.c
@@ -79,22 +79,22 @@ void ttl7474_update(const device_config *device)
if (!state->preset && state->clear) /* line 1 in truth table */
{
- state->output = 1;
+ state->output = 1;
state->output_comp = 0;
}
else if (state->preset && !state->clear) /* line 2 in truth table */
{
- state->output = 0;
+ state->output = 0;
state->output_comp = 1;
}
else if (!state->preset && !state->clear) /* line 3 in truth table */
{
- state->output = 1;
+ state->output = 1;
state->output_comp = 1;
}
else if (!state->last_clock && state->clock) /* line 4 in truth table */
{
- state->output = state->d;
+ state->output = state->d;
state->output_comp = !state->d;
}
diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c
index c96206ee7fc..d7bbb5572d3 100644
--- a/src/emu/machine/8255ppi.c
+++ b/src/emu/machine/8255ppi.c
@@ -163,7 +163,7 @@ INLINE void ppi8255_get_handshake_signals(ppi8255_t *ppi8255, int is_read, UINT8
}
}
else if (ppi8255->group_a_mode == 2)
- {
+ {
handshake |= ppi8255->obf_a ? 0x00 : 0x80;
handshake |= ppi8255->ibf_a ? 0x20 : 0x00;
handshake |= ((ppi8255->obf_a && ppi8255->inte_1) || (ppi8255->ibf_a && ppi8255->inte_2)) ? 0x08 : 0x00;
@@ -172,20 +172,20 @@ INLINE void ppi8255_get_handshake_signals(ppi8255_t *ppi8255, int is_read, UINT8
/* group B */
if (ppi8255->group_b_mode == 1)
- {
+ {
if (ppi8255->port_b_dir)
{
handshake |= ppi8255->ibf_b ? 0x02 : 0x00;
handshake |= (ppi8255->ibf_b && ppi8255->inte_b) ? 0x01 : 0x00;
mask |= 0x03;
- }
+ }
else
- {
+ {
handshake |= ppi8255->obf_b ? 0x00 : 0x02;
handshake |= (ppi8255->obf_b && ppi8255->inte_b) ? 0x01 : 0x00;
mask |= 0x03;
}
- }
+ }
*result &= ~mask;
*result |= handshake & mask;
@@ -337,11 +337,11 @@ WRITE8_DEVICE_HANDLER( ppi8255_w )
offset %= 4;
- switch( offset )
- {
- case 0: /* Port A write */
+ switch( offset )
+ {
+ case 0: /* Port A write */
case 1: /* Port B write */
- case 2: /* Port C write */
+ case 2: /* Port C write */
ppi8255->latch[offset] = data;
ppi8255_write_port(device, offset);
@@ -363,7 +363,7 @@ WRITE8_DEVICE_HANDLER( ppi8255_w )
}
break;
}
- break;
+ break;
case 3: /* Control word */
if (data & 0x80)
@@ -372,14 +372,14 @@ WRITE8_DEVICE_HANDLER( ppi8255_w )
}
else
{
- /* bit set/reset */
- int bit;
+ /* bit set/reset */
+ int bit;
- bit = (data >> 1) & 0x07;
+ bit = (data >> 1) & 0x07;
- if (data & 1)
+ if (data & 1)
ppi8255->latch[2] |= (1<<bit); /* set bit */
- else
+ else
ppi8255->latch[2] &= ~(1<<bit); /* reset bit */
if (ppi8255->group_b_mode == 1)
@@ -461,20 +461,20 @@ static void set_mode(const device_config *device, int data, int call_handlers)
if (ppi8255->group_a_mode == 3)
ppi8255->group_a_mode = 2;
- /* Port A direction */
+ /* Port A direction */
if (ppi8255->group_a_mode == 2)
ppi8255->in_mask[0] = 0xFF, ppi8255->out_mask[0] = 0xFF; /* bidirectional */
else
if (ppi8255->port_a_dir)
ppi8255->in_mask[0] = 0xFF, ppi8255->out_mask[0] = 0x00; /* input */
else
- ppi8255->in_mask[0] = 0x00, ppi8255->out_mask[0] = 0xFF; /* output */
+ ppi8255->in_mask[0] = 0x00, ppi8255->out_mask[0] = 0xFF; /* output */
- /* Port B direction */
+ /* Port B direction */
if (ppi8255->port_b_dir)
ppi8255->in_mask[1] = 0xFF, ppi8255->out_mask[1] = 0x00; /* input */
else
- ppi8255->in_mask[1] = 0x00, ppi8255->out_mask[1] = 0xFF; /* output */
+ ppi8255->in_mask[1] = 0x00, ppi8255->out_mask[1] = 0xFF; /* output */
/* Port C upper direction */
if (ppi8255->port_ch_dir)
@@ -482,7 +482,7 @@ static void set_mode(const device_config *device, int data, int call_handlers)
else
ppi8255->in_mask[2] = 0x00, ppi8255->out_mask[2] = 0xF0; /* output */
- /* Port C lower direction */
+ /* Port C lower direction */
if (ppi8255->port_cl_dir)
ppi8255->in_mask[2] |= 0x0F; /* input */
else
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index 1bd5c531336..f263b1894bc 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -188,7 +188,7 @@ static TIMER_CALLBACK( dma8257_timerproc )
{
i8257->drq &= ~(0x01 << channel);
dma8257_update_status(device);
- if (!(DMA_MODE_AUTOLOAD(i8257->mode) && channel==2)) {
+ if (!(DMA_MODE_AUTOLOAD(i8257->mode) && channel==2)) {
if (DMA_MODE_TCSTOP(i8257->mode)) {
i8257->mode &= ~(0x01 << channel);
}
diff --git a/src/emu/machine/am53cf96.c b/src/emu/machine/am53cf96.c
index f5a9b0d24a1..d8423561b8a 100644
--- a/src/emu/machine/am53cf96.c
+++ b/src/emu/machine/am53cf96.c
@@ -161,7 +161,7 @@ WRITE32_HANDLER( am53cf96_w )
xfer_state = 0;
timer_set( space->machine, ATTOTIME_IN_HZ( 16384 ), NULL, 0, am53cf96_irq );
break;
- case 0x42: // select with ATN steps
+ case 0x42: // select with ATN steps
timer_set( space->machine, ATTOTIME_IN_HZ( 16384 ), NULL, 0, am53cf96_irq );
if ((fifo[1] == 0) || (fifo[1] == 0x48) || (fifo[1] == 0x4b))
{
diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c
index f985e6145a6..7c9fcd75760 100644
--- a/src/emu/machine/eeprom.c
+++ b/src/emu/machine/eeprom.c
@@ -88,7 +88,7 @@ static int eeprom_command_match(const char *buf, const char *cmd, int len)
{
case '0':
case '1':
- if (b == c) { cmd++; }
+ if (b == c) { cmd++; }
else { buf++; len--; }
break;
default: return 0;
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 71b06b336a5..fb43c68c165 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -32,16 +32,16 @@ static void interrupt_reset(running_machine *machine);
struct _generic_machine_private
{
/* tickets and coin counters */
- UINT32 dispensed_tickets;
- UINT32 coin_count[COIN_COUNTERS];
- UINT32 coinlockedout[COIN_COUNTERS];
- UINT32 lastcoin[COIN_COUNTERS];
+ UINT32 dispensed_tickets;
+ UINT32 coin_count[COIN_COUNTERS];
+ UINT32 coinlockedout[COIN_COUNTERS];
+ UINT32 lastcoin[COIN_COUNTERS];
/* memory card status */
int memcard_inserted;
/* interrupt status for up to 8 CPUs */
- UINT8 interrupt_enable[8];
+ UINT8 interrupt_enable[8];
};
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 58f16119a8a..4c8b668c32b 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -466,7 +466,7 @@ static void ide_generate_features(ide_state *ide)
ide->features[ 8*2+1] = 0;
ide->features[ 9*2+0] = 0; /* 9: vendor-specific */
ide->features[ 9*2+1] = 0;
- swap_strncpy(&ide->features[10*2+0], /* 10-19: serial number */
+ swap_strncpy(&ide->features[10*2+0], /* 10-19: serial number */
"00000000000000000000", 10);
ide->features[20*2+0] = 0; /* 20: vendor-specific */
ide->features[20*2+1] = 0;
@@ -474,9 +474,9 @@ static void ide_generate_features(ide_state *ide)
ide->features[21*2+1] = 0;
ide->features[22*2+0] = 4; /* 22: # of vendor-specific bytes on read/write long commands */
ide->features[22*2+1] = 0;
- swap_strncpy(&ide->features[23*2+0], /* 23-26: firmware revision */
+ swap_strncpy(&ide->features[23*2+0], /* 23-26: firmware revision */
"1.0", 4);
- swap_strncpy(&ide->features[27*2+0], /* 27-46: model number */
+ swap_strncpy(&ide->features[27*2+0], /* 27-46: model number */
"MAME Compressed Hard Disk", 20);
ide->features[47*2+0] = 0x01; /* 47: read/write multiple support */
ide->features[47*2+1] = 0x80;
diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h
index f9515ecc4e1..b67a5875f66 100644
--- a/src/emu/machine/idectrl.h
+++ b/src/emu/machine/idectrl.h
@@ -24,7 +24,7 @@
typedef struct _ide_config ide_config;
struct _ide_config
{
- void (*interrupt)(const device_config *device, int state);
+ void (*interrupt)(const device_config *device, int state);
const char *master; /* name of master region (defaults to device tag) */
const char *slave; /* name of slave region (defaults to NULL) */
const char *bmcpu; /* name of bus master CPU */
diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h
index 3d74571a3df..b2e7f29633d 100644
--- a/src/emu/machine/laserdsc.h
+++ b/src/emu/machine/laserdsc.h
@@ -225,4 +225,4 @@ int laserdisc_get_type(const device_config *device);
void laserdisc_set_type(const device_config *device, int type);
-#endif /* __LASERDSC_H__ */
+#endif /* __LASERDSC_H__ */
diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c
index 0e244362051..9a1d42d2514 100644
--- a/src/emu/machine/ldcore.c
+++ b/src/emu/machine/ldcore.c
@@ -1658,7 +1658,7 @@ DEVICE_GET_INFO( laserdisc )
/* --- the following bits of info are returned as pointers to data or functions --- */
case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(laserdisc); break;
- case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(laserdisc); break;
+ case DEVINFO_FCT_STOP: info->stop = DEVICE_STOP_NAME(laserdisc); break;
case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(laserdisc); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c
index 0ee447c87b6..47320671d72 100644
--- a/src/emu/machine/ldpr8210.c
+++ b/src/emu/machine/ldpr8210.c
@@ -112,8 +112,8 @@ struct _ldplayer_data
attotime slowtrg; /* time of the last SLOW TRG */
pioneer_pia pia; /* PIA state */
UINT8 vsync; /* live VSYNC state */
- UINT8 port1; /* 8049 port 1 state */
- UINT8 port2; /* 8049 port 2 state */
+ UINT8 port1; /* 8049 port 1 state */
+ UINT8 port2; /* 8049 port 2 state */
/* Simutrek-specific data */
simutrek_data simutrek; /* Simutrek-specific data */
diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c
index 48fd46ab614..df074f9044d 100644
--- a/src/emu/machine/ldv1000.c
+++ b/src/emu/machine/ldv1000.c
@@ -65,7 +65,7 @@ struct _ldplayer_data
/* I/O port states */
UINT8 counter_start; /* starting value for counter */
- UINT8 counter; /* current counter value */
+ UINT8 counter; /* current counter value */
UINT8 portc0; /* port C on PPI 0 */
UINT8 portb1; /* port B on PPI 1 */
UINT8 portc1; /* port C on PPI 1 */
diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c
index a1a076744fa..05cd8ffdef0 100644
--- a/src/emu/machine/ldvp931.c
+++ b/src/emu/machine/ldvp931.c
@@ -50,7 +50,7 @@ struct _ldplayer_data
/* low-level emulation data */
const device_config *cpu; /* CPU index of the 8049 */
const device_config *tracktimer; /* timer device */
- vp931_data_ready_func data_ready_cb; /* data ready callback */
+ vp931_data_ready_func data_ready_cb; /* data ready callback */
/* I/O port states */
UINT8 out0; /* output 0 state */
diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c
index bd00d833247..62650a2e96c 100644
--- a/src/emu/machine/roc10937.c
+++ b/src/emu/machine/roc10937.c
@@ -218,7 +218,7 @@ UINT32 *ROC10937_set_outputs(int id)
if ( ROC10937_get_segments(id)[val] & 0x0002 ) roc10937[id].outputs[cursor] |= 0x0002;
else roc10937[id].outputs[cursor] &= ~0x0002;
if ( ROC10937_get_segments(id)[val] & 0x0004 ) roc10937[id].outputs[cursor] |= 0x0004;
- else roc10937[id].outputs[cursor] &= ~0x0004;
+ else roc10937[id].outputs[cursor] &= ~0x0004;
if ( ROC10937_get_segments(id)[val] & 0x0008 ) roc10937[id].outputs[cursor] |= 0x0008;
else roc10937[id].outputs[cursor] &= ~0x0008;
if ( ROC10937_get_segments(id)[val] & 0x0010 ) roc10937[id].outputs[cursor] |= 0x0010;
@@ -238,7 +238,7 @@ UINT32 *ROC10937_set_outputs(int id)
if ( ROC10937_get_segments(id)[val] & 0x1000 ) roc10937[id].outputs[cursor] |= 0x0800;
else roc10937[id].outputs[cursor] &= ~0x0800;
if ( ROC10937_get_segments(id)[val] & 0x2000 ) roc10937[id].outputs[cursor] |= 0x1000;
- else roc10937[id].outputs[cursor] &= ~0x1000;
+ else roc10937[id].outputs[cursor] &= ~0x1000;
if ( ROC10937_get_segments(id)[val] & 0x8000 ) roc10937[id].outputs[cursor] |= 0x2000;
else roc10937[id].outputs[cursor] &= ~0x2000;
if ( ROC10937_get_segments(id)[val] & 0x0200 ) roc10937[id].outputs[cursor] |= 0x4000;
diff --git a/src/emu/machine/roc10937.h b/src/emu/machine/roc10937.h
index 9b7d8516787..75e092e90e9 100644
--- a/src/emu/machine/roc10937.h
+++ b/src/emu/machine/roc10937.h
@@ -11,7 +11,7 @@
#define MAX_ROCK_ALPHAS 3 // max number of displays emulated
#define ROCKWELL10937 0 // Rockwell 10937
-#define MSC1937 0 // OKI MSC1937 clone of Rockwell 10937
+#define MSC1937 0 // OKI MSC1937 clone of Rockwell 10937
#define ROCKWELL10957 1 // Rockwell 10957
void ROC10937_init( int id, int type,int reversed ); // setup a display
diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c
index bb1fef6e439..f169bfade5e 100644
--- a/src/emu/machine/scsicd.c
+++ b/src/emu/machine/scsicd.c
@@ -22,7 +22,7 @@ typedef struct
UINT32 num_subblocks;
UINT32 cur_subblock;
UINT32 play_err_flag;
- cdrom_file *cdrom;
+ cdrom_file *cdrom;
} SCSICd;
static void phys_frame_to_msf(int phys_frame, int *m, int *s, int *f)
diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c
index dc69147bc4e..c098fe056de 100644
--- a/src/emu/machine/scsihd.c
+++ b/src/emu/machine/scsihd.c
@@ -17,7 +17,7 @@ typedef struct
{
UINT32 lba;
UINT32 blocks;
- hard_disk_file *disk;
+ hard_disk_file *disk;
} SCSIHd;
diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c
index dfaa13fcce6..8dab60f6271 100644
--- a/src/emu/machine/smc91c9x.c
+++ b/src/emu/machine/smc91c9x.c
@@ -123,7 +123,7 @@ struct _smc91c9x_state
UINT8 alloc_count;
/* transmit/receive FIFOs */
- UINT8 fifo_count;
+ UINT8 fifo_count;
UINT8 rx[ETHER_BUFFER_SIZE * ETHER_RX_BUFFERS];
UINT8 tx[ETHER_BUFFER_SIZE];
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index 2a7f8699ed6..67f4b8a0bf5 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -226,7 +226,7 @@ INLINE timekeeper_state *get_safe_token(const device_config *device)
{
assert(device != NULL);
assert(device->token != NULL);
- assert((device->type == M48T02) ||
+ assert((device->type == M48T02) ||
(device->type == M48T35) ||
(device->type == M48T58) ||
(device->type == MK48T08));
@@ -484,7 +484,7 @@ DEVICE_GET_INFO( m48t02 )
/* --- the following bits of info are returned as pointers to data or functions --- */
case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(m48t02); break;
- default: DEVICE_GET_INFO_CALL(timekeeper); break;
+ default: DEVICE_GET_INFO_CALL(timekeeper); break;
}
}
@@ -498,7 +498,7 @@ DEVICE_GET_INFO( m48t35 )
/* --- the following bits of info are returned as pointers to data or functions --- */
case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(m48t35); break;
- default: DEVICE_GET_INFO_CALL(timekeeper); break;
+ default: DEVICE_GET_INFO_CALL(timekeeper); break;
}
}
@@ -512,7 +512,7 @@ DEVICE_GET_INFO( m48t58 )
/* --- the following bits of info are returned as pointers to data or functions --- */
case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(m48t58); break;
- default: DEVICE_GET_INFO_CALL(timekeeper); break;
+ default: DEVICE_GET_INFO_CALL(timekeeper); break;
}
}
@@ -526,6 +526,6 @@ DEVICE_GET_INFO( mk48t08 )
/* --- the following bits of info are returned as pointers to data or functions --- */
case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(mk48t08); break;
- default: DEVICE_GET_INFO_CALL(timekeeper); break;
+ default: DEVICE_GET_INFO_CALL(timekeeper); break;
}
}
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index 4be12766a1e..bc869d6fba2 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -32,7 +32,7 @@
/* these are the bits of the incoming commands to the CTC */
#define INTERRUPT 0x80
-#define INTERRUPT_ON 0x80
+#define INTERRUPT_ON 0x80
#define INTERRUPT_OFF 0x00
#define MODE 0x40
@@ -78,10 +78,10 @@ struct _ctc_channel
devcb_resolved_write_line zc; /* zero crossing callbacks */
UINT8 notimer; /* no timer masks */
- UINT16 mode; /* current mode */
- UINT16 tconst; /* time constant */
- UINT16 down; /* down counter (clock mode only) */
- UINT8 extclk; /* current signal from the external clock */
+ UINT16 mode; /* current mode */
+ UINT16 tconst; /* time constant */
+ UINT16 down; /* down counter (clock mode only) */
+ UINT8 extclk; /* current signal from the external clock */
emu_timer * timer; /* array of active timers */
UINT8 int_state; /* interrupt status (for daisy chain) */
};
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index ef5b504cc32..a69a23d5433 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -107,13 +107,13 @@ struct _z80dma_t
emu_timer *timer;
- UINT16 regs[REGNUM(6,1)+1];
- UINT8 num_follow;
+ UINT16 regs[REGNUM(6,1)+1];
+ UINT8 num_follow;
UINT8 cur_follow;
- UINT8 regs_follow[4];
+ UINT8 regs_follow[4];
UINT8 read_num_follow;
UINT8 read_cur_follow;
- UINT8 read_regs_follow[7];
+ UINT8 read_regs_follow[7];
UINT8 status;
UINT8 dma_enabled;