summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/h8
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/cpu/h8')
-rw-r--r--src/emu/cpu/h8/h8.c76
-rw-r--r--src/emu/cpu/h8/h8.h2
-rw-r--r--src/emu/cpu/h8/h8.lst10
-rw-r--r--src/emu/cpu/h8/h83002.h2
-rw-r--r--src/emu/cpu/h8/h83006.h2
-rw-r--r--src/emu/cpu/h8/h83008.h2
-rw-r--r--src/emu/cpu/h8/h83048.h2
-rw-r--r--src/emu/cpu/h8/h83337.c4
-rw-r--r--src/emu/cpu/h8/h83337.h8
-rw-r--r--src/emu/cpu/h8/h8_adc.c6
-rw-r--r--src/emu/cpu/h8/h8_adc.h2
-rw-r--r--src/emu/cpu/h8/h8_intc.c12
-rw-r--r--src/emu/cpu/h8/h8_intc.h8
-rw-r--r--src/emu/cpu/h8/h8_port.c10
-rw-r--r--src/emu/cpu/h8/h8_port.h2
-rw-r--r--src/emu/cpu/h8/h8_sci.c61
-rw-r--r--src/emu/cpu/h8/h8_sci.h2
-rw-r--r--src/emu/cpu/h8/h8_timer16.c34
-rw-r--r--src/emu/cpu/h8/h8_timer16.h14
-rw-r--r--src/emu/cpu/h8/h8_timer8.c12
-rw-r--r--src/emu/cpu/h8/h8_timer8.h6
-rw-r--r--src/emu/cpu/h8/h8s2245.c48
-rw-r--r--src/emu/cpu/h8/h8s2245.h2
-rw-r--r--src/emu/cpu/h8/h8s2320.c96
-rw-r--r--src/emu/cpu/h8/h8s2320.h2
-rw-r--r--src/emu/cpu/h8/h8s2357.c96
-rw-r--r--src/emu/cpu/h8/h8s2357.h2
-rw-r--r--src/emu/cpu/h8/h8s2655.c96
-rw-r--r--src/emu/cpu/h8/h8s2655.h2
29 files changed, 310 insertions, 311 deletions
diff --git a/src/emu/cpu/h8/h8.c b/src/emu/cpu/h8/h8.c
index 20bffeb7852..5835d911fcb 100644
--- a/src/emu/cpu/h8/h8.c
+++ b/src/emu/cpu/h8/h8.c
@@ -252,26 +252,26 @@ void h8_device::state_string_export(const device_state_entry &entry, astring &st
case STATE_GENFLAGS:
if(has_exr)
string.printf("%c%c %c%c%c%c%c%c%c%c",
- (EXR & EXR_T) ? 'T' : '-',
- '0' + (EXR & EXR_I),
- (CCR & F_I) ? 'I' : '-',
- (CCR & F_UI) ? 'u' : '-',
- (CCR & F_H) ? 'H' : '-',
- (CCR & F_U) ? 'U' : '-',
- (CCR & F_N) ? 'N' : '-',
- (CCR & F_Z) ? 'Z' : '-',
- (CCR & F_V) ? 'V' : '-',
- (CCR & F_C) ? 'C' : '-');
+ (EXR & EXR_T) ? 'T' : '-',
+ '0' + (EXR & EXR_I),
+ (CCR & F_I) ? 'I' : '-',
+ (CCR & F_UI) ? 'u' : '-',
+ (CCR & F_H) ? 'H' : '-',
+ (CCR & F_U) ? 'U' : '-',
+ (CCR & F_N) ? 'N' : '-',
+ (CCR & F_Z) ? 'Z' : '-',
+ (CCR & F_V) ? 'V' : '-',
+ (CCR & F_C) ? 'C' : '-');
else
- string.printf("%c%c%c%c%c%c%c%c",
- (CCR & F_I) ? 'I' : '-',
- (CCR & F_UI) ? 'u' : '-',
- (CCR & F_H) ? 'H' : '-',
- (CCR & F_U) ? 'U' : '-',
- (CCR & F_N) ? 'N' : '-',
- (CCR & F_Z) ? 'Z' : '-',
- (CCR & F_V) ? 'V' : '-',
- (CCR & F_C) ? 'C' : '-');
+ string.printf("%c%c%c%c%c%c%c%c",
+ (CCR & F_I) ? 'I' : '-',
+ (CCR & F_UI) ? 'u' : '-',
+ (CCR & F_H) ? 'H' : '-',
+ (CCR & F_U) ? 'U' : '-',
+ (CCR & F_N) ? 'N' : '-',
+ (CCR & F_Z) ? 'Z' : '-',
+ (CCR & F_V) ? 'V' : '-',
+ (CCR & F_C) ? 'C' : '-');
break;
case H8_R0:
case H8_R1:
@@ -554,7 +554,7 @@ UINT8 h8_device::read8(UINT32 adr)
void h8_device::write8(UINT32 adr, UINT8 data)
{
- // logerror("W %06x %02x\n", adr & 0xffffff, data);
+ // logerror("W %06x %02x\n", adr & 0xffffff, data);
icount--;
program->write_byte(adr, data);
}
@@ -567,7 +567,7 @@ UINT16 h8_device::read16(UINT32 adr)
void h8_device::write16(UINT32 adr, UINT16 data)
{
- // logerror("W %06x %04x\n", adr & 0xfffffe, data);
+ // logerror("W %06x %04x\n", adr & 0xfffffe, data);
icount--;
program->write_word(adr & ~1, data);
}
@@ -644,7 +644,7 @@ UINT8 h8_device::do_addx8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT8 h8_device::do_subx8(UINT8 v1, UINT8 v2)
@@ -662,7 +662,7 @@ UINT8 h8_device::do_subx8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT8 h8_device::do_inc8(UINT8 v1, UINT8 v2)
@@ -675,7 +675,7 @@ UINT8 h8_device::do_inc8(UINT8 v1, UINT8 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80)
CCR |= F_V;
- return res;
+ return res;
}
UINT16 h8_device::do_inc16(UINT16 v1, UINT16 v2)
@@ -688,7 +688,7 @@ UINT16 h8_device::do_inc16(UINT16 v1, UINT16 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x8000)
CCR |= F_V;
- return res;
+ return res;
}
UINT32 h8_device::do_inc32(UINT32 v1, UINT32 v2)
@@ -701,7 +701,7 @@ UINT32 h8_device::do_inc32(UINT32 v1, UINT32 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80000000)
CCR |= F_V;
- return res;
+ return res;
}
UINT8 h8_device::do_add8(UINT8 v1, UINT8 v2)
@@ -719,7 +719,7 @@ UINT8 h8_device::do_add8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT16 h8_device::do_add16(UINT16 v1, UINT16 v2)
@@ -737,7 +737,7 @@ UINT16 h8_device::do_add16(UINT16 v1, UINT16 v2)
if(res & 0x10000)
CCR |= F_C;
return res;
-
+
}
UINT32 h8_device::do_add32(UINT32 v1, UINT32 v2)
@@ -754,7 +754,7 @@ UINT32 h8_device::do_add32(UINT32 v1, UINT32 v2)
CCR |= F_V;
if(res & U64(0x100000000))
CCR |= F_C;
- return res;
+ return res;
}
UINT8 h8_device::do_dec8(UINT8 v1, UINT8 v2)
@@ -767,7 +767,7 @@ UINT8 h8_device::do_dec8(UINT8 v1, UINT8 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80)
CCR |= F_V;
- return res;
+ return res;
}
UINT16 h8_device::do_dec16(UINT16 v1, UINT16 v2)
@@ -780,7 +780,7 @@ UINT16 h8_device::do_dec16(UINT16 v1, UINT16 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x8000)
CCR |= F_V;
- return res;
+ return res;
}
UINT32 h8_device::do_dec32(UINT32 v1, UINT32 v2)
@@ -793,7 +793,7 @@ UINT32 h8_device::do_dec32(UINT32 v1, UINT32 v2)
CCR |= F_N;
if((v1^v2) & (v1^res) & 0x80000000)
CCR |= F_V;
- return res;
+ return res;
}
UINT8 h8_device::do_sub8(UINT8 v1, UINT8 v2)
@@ -811,7 +811,7 @@ UINT8 h8_device::do_sub8(UINT8 v1, UINT8 v2)
if(res & 0x100)
CCR |= F_C;
return res;
-
+
}
UINT16 h8_device::do_sub16(UINT16 v1, UINT16 v2)
@@ -829,7 +829,7 @@ UINT16 h8_device::do_sub16(UINT16 v1, UINT16 v2)
if(res & 0x10000)
CCR |= F_C;
return res;
-
+
}
UINT32 h8_device::do_sub32(UINT32 v1, UINT32 v2)
@@ -846,7 +846,7 @@ UINT32 h8_device::do_sub32(UINT32 v1, UINT32 v2)
CCR |= F_V;
if(res & U64(0x100000000))
CCR |= F_C;
- return res;
+ return res;
}
UINT8 h8_device::do_shal8(UINT8 v)
@@ -1017,7 +1017,7 @@ UINT8 h8_device::do_shal2_8(UINT8 v)
if(v & 0x40)
CCR |= F_C;
if((v & 0xc0) == 0x40 || (v & 0xc0) == 0x80 ||
- (v & 0x60) == 0x20 || (v & 0x60) == 0x40)
+ (v & 0x60) == 0x20 || (v & 0x60) == 0x40)
CCR |= F_V;
v <<= 2;
if(!v)
@@ -1033,7 +1033,7 @@ UINT16 h8_device::do_shal2_16(UINT16 v)
if(v & 0x4000)
CCR |= F_C;
if((v & 0xc000) == 0x4000 || (v & 0xc000) == 0x8000 ||
- (v & 0x6000) == 0x2000 || (v & 0x6000) == 0x4000)
+ (v & 0x6000) == 0x2000 || (v & 0x6000) == 0x4000)
CCR |= F_V;
v <<= 2;
if(!v)
@@ -1049,7 +1049,7 @@ UINT32 h8_device::do_shal2_32(UINT32 v)
if(v & 0x40000000)
CCR |= F_C;
if((v & 0xc0000000) == 0x40000000 || (v & 0xc0000000) == 0x80000000 ||
- (v & 0x60000000) == 0x20000000 || (v & 0x60000000) == 0x40000000)
+ (v & 0x60000000) == 0x20000000 || (v & 0x60000000) == 0x40000000)
CCR |= F_V;
v <<= 2;
if(!v)
diff --git a/src/emu/cpu/h8/h8.h b/src/emu/cpu/h8/h8.h
index b43c319809d..38d8b3b9561 100644
--- a/src/emu/cpu/h8/h8.h
+++ b/src/emu/cpu/h8/h8.h
@@ -499,7 +499,7 @@ enum {
H8_E6,
H8_E7,
H8_CCR,
- H8_EXR,
+ H8_EXR,
};
#endif
diff --git a/src/emu/cpu/h8/h8.lst b/src/emu/cpu/h8/h8.lst
index 22c3e6f994f..3ec1f46fbe4 100644
--- a/src/emu/cpu/h8/h8.lst
+++ b/src/emu/cpu/h8/h8.lst
@@ -937,7 +937,7 @@ macro jsr32 %opc %spreg
}
r8_w(IR[0], do_add8(TMP1, TMP2));
prefetch();
-
+
0f80 ff88 0 mov.l r32h r32l h
TMP1 = r32_r(IR[0] >> 4);
set_nzv32(TMP1);
@@ -1303,7 +1303,7 @@ macro jsr32 %opc %spreg
}
r8_w(IR[0], do_add8(TMP1, TMP2));
prefetch();
-
+
1f80 ff88 0 cmp.l r32h r32l h
do_sub32(r32_r(IR[0]), r32_r(IR[0] >> 4));
prefetch();
@@ -2206,19 +2206,19 @@ macro jsr32 %opc %spreg
7000 ff80 0 bset imm3 r8l
TMP1 = r8_r(IR[0]);
bset IR[0] >> 4
- r8_w(IR[0], TMP1);
+ r8_w(IR[0], TMP1);
prefetch();
7100 ff80 0 bnot imm3 r8l
TMP1 = r8_r(IR[0]);
bnot IR[0] >> 4
- r8_w(IR[0], TMP1);
+ r8_w(IR[0], TMP1);
prefetch();
7200 ff80 0 bclr imm3 r8l
TMP1 = r8_r(IR[0]);
bclr IR[0] >> 4
- r8_w(IR[0], TMP1);
+ r8_w(IR[0], TMP1);
prefetch();
7300 ff80 0 btst imm3 r8l
diff --git a/src/emu/cpu/h8/h83002.h b/src/emu/cpu/h8/h83002.h
index 010846729c3..f3d9745c321 100644
--- a/src/emu/cpu/h8/h83002.h
+++ b/src/emu/cpu/h8/h83002.h
@@ -54,7 +54,7 @@ public:
h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83006.h b/src/emu/cpu/h8/h83006.h
index 4bea038b541..9d2061dcd3e 100644
--- a/src/emu/cpu/h8/h83006.h
+++ b/src/emu/cpu/h8/h83006.h
@@ -56,7 +56,7 @@ public:
h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83008.h b/src/emu/cpu/h8/h83008.h
index 9be1b6b978f..699f7453897 100644
--- a/src/emu/cpu/h8/h83008.h
+++ b/src/emu/cpu/h8/h83008.h
@@ -56,7 +56,7 @@ public:
h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83048.h b/src/emu/cpu/h8/h83048.h
index 7ece527222a..d3bcf295d11 100644
--- a/src/emu/cpu/h8/h83048.h
+++ b/src/emu/cpu/h8/h83048.h
@@ -63,7 +63,7 @@ public:
h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8h_intc_device> intc;
diff --git a/src/emu/cpu/h8/h83337.c b/src/emu/cpu/h8/h83337.c
index a6768de88e6..2a4f261a517 100644
--- a/src/emu/cpu/h8/h83337.c
+++ b/src/emu/cpu/h8/h83337.c
@@ -95,9 +95,9 @@ DEVICE_ADDRESS_MAP_START(map, 16, h83337_device)
AM_RANGE(0xff90, 0xff91) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tier_r, tier_w, 0xff00)
AM_RANGE(0xff90, 0xff91) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tsr_r, tsr_w, 0x00ff)
AM_RANGE(0xff92, 0xff93) AM_DEVREADWRITE( "timer16:0", h8_timer16_channel_device, tcnt_r, tcnt_w )
-// AM_RANGE(0xff94, 0xff95) AM_DEVREADWRITE( "timer16:0", h8_timer16_channel_device, ocr_r, ocr_w )
+// AM_RANGE(0xff94, 0xff95) AM_DEVREADWRITE( "timer16:0", h8_timer16_channel_device, ocr_r, ocr_w )
AM_RANGE(0xff96, 0xff97) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tcr_r, tcr_w, 0xff00)
-// AM_RANGE(0xff96, 0xff97) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tocr_r, tocr_w, 0x00ff)
+// AM_RANGE(0xff96, 0xff97) AM_DEVREADWRITE8("timer16:0", h8_timer16_channel_device, tocr_r, tocr_w, 0x00ff)
AM_RANGE(0xff98, 0xff9f) AM_DEVREAD( "timer16:0", h8_timer16_channel_device, tgr_r )
AM_RANGE(0xffac, 0xffad) AM_DEVREADWRITE8("port1", h8_port_device, pcr_r, pcr_w, 0xff00)
diff --git a/src/emu/cpu/h8/h83337.h b/src/emu/cpu/h8/h83337.h
index 393068c4da0..ed5467cd801 100644
--- a/src/emu/cpu/h8/h83337.h
+++ b/src/emu/cpu/h8/h83337.h
@@ -63,13 +63,13 @@ public:
h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(wscr_r);
- DECLARE_WRITE8_MEMBER(wscr_w);
+ DECLARE_WRITE8_MEMBER(wscr_w);
DECLARE_READ8_MEMBER(stcr_r);
- DECLARE_WRITE8_MEMBER(stcr_w);
+ DECLARE_WRITE8_MEMBER(stcr_w);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
DECLARE_READ8_MEMBER(mdcr_r);
- DECLARE_WRITE8_MEMBER(mdcr_w);
+ DECLARE_WRITE8_MEMBER(mdcr_w);
protected:
required_device<h8_intc_device> intc;
diff --git a/src/emu/cpu/h8/h8_adc.c b/src/emu/cpu/h8/h8_adc.c
index 8def493ef86..644f8608a31 100644
--- a/src/emu/cpu/h8/h8_adc.c
+++ b/src/emu/cpu/h8/h8_adc.c
@@ -124,7 +124,7 @@ void h8_adc_device::device_reset()
mode = IDLE;
channel = 0;
count = 0;
- next_event = 0;
+ next_event = 0;
mode_update();
analog_powered = !analog_power_control;
adtrg = true;
@@ -188,7 +188,7 @@ void h8_adc_device::start_conversion()
count = start_count;
sampling();
conversion_wait(true, !analog_powered);
- analog_powered = true;
+ analog_powered = true;
}
void h8_adc_device::timeout(UINT64 current_time)
@@ -450,7 +450,7 @@ void h8_adc_2655_device::mode_update()
if(adcsr & 0x03) {
mode |= BUFFER;
-
+
}
if(adcsr & 0x08) {
diff --git a/src/emu/cpu/h8/h8_adc.h b/src/emu/cpu/h8/h8_adc.h
index 6d0cef502f5..314af72c24b 100644
--- a/src/emu/cpu/h8/h8_adc.h
+++ b/src/emu/cpu/h8/h8_adc.h
@@ -43,7 +43,7 @@
#include "h8.h"
#include "h8_intc.h"
-#define MCFG_H8_ADC_GENERIC_ADD( _tag, _type, intc, vect ) \
+#define MCFG_H8_ADC_GENERIC_ADD( _tag, _type, intc, vect ) \
MCFG_DEVICE_ADD( _tag, _type, 0 ) \
downcast<h8_adc_device *>(device)->set_info(intc, vect);
diff --git a/src/emu/cpu/h8/h8_intc.c b/src/emu/cpu/h8/h8_intc.c
index 18570794a63..b563cdb63ae 100644
--- a/src/emu/cpu/h8/h8_intc.c
+++ b/src/emu/cpu/h8/h8_intc.c
@@ -280,10 +280,10 @@ void h8h_intc_device::update_irq_types()
const int h8h_intc_device::vector_to_slot[64] = {
-1, -1, -1, -1, -1, -1, -1, -1, // NMI at 7
-1, -1, -1, -1, 0, 1, 2, 2, // IRQ 0-3
- 3, 3, 3, 3, 4, 4, 4, 4, // IRQ 4-5, (reservedx2), WOVI, CMI, (reserved), ADI
- 5, 5, 5, 5, 6, 6, 6, 6, // IMIA0, IMIB0, OVI0, (reserved), IMIA1, IMIB1, OVI1, (reserved)
- 7, 7, 7, 7, 8, 8, 8, 8, // IMIA2, IMIB2, OVI2, (reserved), CMIA0, CMIB0, CMIx1, TOVI0/1
- 9, 9, 9, 9, 10, 10, 10, 10, // CMIA2, CMIB2, CMIx3, TOVI2/3, DEND0A, DEND0B, DEND1A, DEND1B
+ 3, 3, 3, 3, 4, 4, 4, 4, // IRQ 4-5, (reservedx2), WOVI, CMI, (reserved), ADI
+ 5, 5, 5, 5, 6, 6, 6, 6, // IMIA0, IMIB0, OVI0, (reserved), IMIA1, IMIB1, OVI1, (reserved)
+ 7, 7, 7, 7, 8, 8, 8, 8, // IMIA2, IMIB2, OVI2, (reserved), CMIA0, CMIB0, CMIx1, TOVI0/1
+ 9, 9, 9, 9, 10, 10, 10, 10, // CMIA2, CMIB2, CMIx3, TOVI2/3, DEND0A, DEND0B, DEND1A, DEND1B
11, 11, 11, 11, 12, 12, 12, 12, // (reservedx4), ERI0, RXI0, TXI0, TEI0
13, 13, 13, 13, 14, 14, 14, 14 // ERI1, RXI1, TXI1, TEI1, ERI2, RXI2, TXI2, TEI2
};
@@ -342,8 +342,8 @@ WRITE8_MEMBER(h8s_intc_device::iprk_w)
const int h8s_intc_device::vector_to_slot[92] = {
-1, -1, -1, -1, -1, -1, -1, -1, // NMI at 7
-1, -1, -1, -1, -1, -1, -1, -1,
- 0, 1, 2, 2, 3, 3, 4, 4, // IRQ 0-7
- 5, 6, 7, 8, 9, 9, 9, 9, // SWDTEND, WOVI, CMI, (reserved), ADI
+ 0, 1, 2, 2, 3, 3, 4, 4, // IRQ 0-7
+ 5, 6, 7, 8, 9, 9, 9, 9, // SWDTEND, WOVI, CMI, (reserved), ADI
10, 10, 10, 10, 10, 10, 10, 10, // TGI0A, TGI0B, TGI0C, TGI0D, TGI0V
11, 11, 11, 11, 12, 12, 12, 12, // TGI1A, TGI1B, TGI1V, TGI1U, TGI2A, TGI2B, TGI2V, TGI2U
13, 13, 13, 13, 13, 13, 13, 13, // TGI3A, TGI3B, TGI3C, TGI3D, TGI3V
diff --git a/src/emu/cpu/h8/h8_intc.h b/src/emu/cpu/h8/h8_intc.h
index d0b2e2420af..bc28b26d604 100644
--- a/src/emu/cpu/h8/h8_intc.h
+++ b/src/emu/cpu/h8/h8_intc.h
@@ -42,13 +42,13 @@
#include "h8.h"
-#define MCFG_H8_INTC_ADD( _tag ) \
+#define MCFG_H8_INTC_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, H8_INTC, 0 )
-#define MCFG_H8H_INTC_ADD( _tag ) \
+#define MCFG_H8H_INTC_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, H8H_INTC, 0 )
-#define MCFG_H8S_INTC_ADD( _tag ) \
+#define MCFG_H8S_INTC_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, H8S_INTC, 0 )
@@ -100,7 +100,7 @@ public:
h8h_intc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(isr_r);
- DECLARE_WRITE8_MEMBER(isr_w);
+ DECLARE_WRITE8_MEMBER(isr_w);
DECLARE_READ8_MEMBER(icr_r);
DECLARE_WRITE8_MEMBER(icr_w);
DECLARE_READ8_MEMBER(icrc_r);
diff --git a/src/emu/cpu/h8/h8_port.c b/src/emu/cpu/h8/h8_port.c
index 7694f571c7b..db78d88e589 100644
--- a/src/emu/cpu/h8/h8_port.c
+++ b/src/emu/cpu/h8/h8_port.c
@@ -18,21 +18,21 @@ void h8_port_device::set_info(int _address, UINT8 _default_ddr, UINT8 _mask)
WRITE8_MEMBER(h8_port_device::ddr_w)
{
- // logerror("%s: ddr_w %02x\n", tag(), data);
+ // logerror("%s: ddr_w %02x\n", tag(), data);
ddr = data;
update_output();
}
WRITE8_MEMBER(h8_port_device::dr_w)
{
- // logerror("%s: dr_w %02x\n", tag(), data);
+ // logerror("%s: dr_w %02x\n", tag(), data);
dr = data;
update_output();
}
READ8_MEMBER(h8_port_device::dr_r)
{
- // logerror("%s: dr_r %02x\n", tag(), (dr | mask) & 0xff);
+ // logerror("%s: dr_r %02x\n", tag(), (dr | mask) & 0xff);
return dr | mask;
}
@@ -41,8 +41,8 @@ READ8_MEMBER(h8_port_device::port_r)
UINT8 res = mask | (dr & ddr);
if((ddr & ~mask) != UINT8(~mask))
res |= io->read_word(address) & ~ddr;
-
- // logerror("%s: port_r %02x (%02x %02x)\n", tag(), res, ddr & ~mask, UINT8(~mask));
+
+ // logerror("%s: port_r %02x (%02x %02x)\n", tag(), res, ddr & ~mask, UINT8(~mask));
return res;
}
diff --git a/src/emu/cpu/h8/h8_port.h b/src/emu/cpu/h8/h8_port.h
index 2407929d14b..10df3d8a3e2 100644
--- a/src/emu/cpu/h8/h8_port.h
+++ b/src/emu/cpu/h8/h8_port.h
@@ -42,7 +42,7 @@
#include "h8.h"
-#define MCFG_H8_PORT_ADD( _tag, address, ddr, mask ) \
+#define MCFG_H8_PORT_ADD( _tag, address, ddr, mask ) \
MCFG_DEVICE_ADD( _tag, H8_PORT, 0 ) \
downcast<h8_port_device *>(device)->set_info(address, ddr, mask);
diff --git a/src/emu/cpu/h8/h8_sci.c b/src/emu/cpu/h8/h8_sci.c
index 0db62806588..e5213bc109b 100644
--- a/src/emu/cpu/h8/h8_sci.c
+++ b/src/emu/cpu/h8/h8_sci.c
@@ -32,13 +32,13 @@ WRITE8_MEMBER(h8_sci_device::smr_w)
{
smr = data;
logerror("%s: smr_w %02x %s %c%c%c%s /%d (%06x)\n", tag(), data,
- data & SMR_CA ? "sync" : "async",
- data & SMR_CHR ? '7' : '8',
- data & SMR_PE ? data & SMR_OE ? 'o' : 'e' : 'n',
- data & SMR_STOP ? '2' : '1',
- data & SMR_MP ? " mp" : "",
- 1 << 2*(data & SMR_CKS),
- cpu->pc());
+ data & SMR_CA ? "sync" : "async",
+ data & SMR_CHR ? '7' : '8',
+ data & SMR_PE ? data & SMR_OE ? 'o' : 'e' : 'n',
+ data & SMR_STOP ? '2' : '1',
+ data & SMR_MP ? " mp" : "",
+ 1 << 2*(data & SMR_CKS),
+ cpu->pc());
clock_update();
}
@@ -64,14 +64,14 @@ READ8_MEMBER(h8_sci_device::brr_r)
WRITE8_MEMBER(h8_sci_device::scr_w)
{
logerror("%s: scr_w %02x%s%s%s%s%s%s clk=%d (%06x)\n", tag(), data,
- data & SCR_TIE ? " txi" : "",
- data & SCR_RIE ? " rxi" : "",
- data & SCR_TE ? " tx" : "",
- data & SCR_RE ? " rx" : "",
- data & SCR_MPIE ? " mpi" : "",
- data & SCR_TEIE ? " tei" : "",
- data & SCR_CKE,
- cpu->pc());
+ data & SCR_TIE ? " txi" : "",
+ data & SCR_RIE ? " rxi" : "",
+ data & SCR_TE ? " tx" : "",
+ data & SCR_RE ? " rx" : "",
+ data & SCR_MPIE ? " mpi" : "",
+ data & SCR_TEIE ? " tei" : "",
+ data & SCR_CKE,
+ cpu->pc());
UINT8 delta = scr ^ data;
scr = data;
@@ -217,7 +217,7 @@ void h8_sci_device::device_start()
external_to_internal_ratio = (external_clock_period*cpu->clock()).as_double();
internal_to_external_ratio = 1/external_to_internal_ratio;
}
-
+
intc = siblingdevice<h8_intc_device>(intc_tag);
save_item(NAME(rdr));
save_item(NAME(tdr));
@@ -301,7 +301,7 @@ WRITE_LINE_MEMBER(h8_sci_device::clk_w)
case CLKM_EXTERNAL_SYNC:
if((!ext_clock_value) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(ext_clock_value && (clock_state & CLK_RX))
rx_raised_edge();
break;
@@ -324,16 +324,16 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
clock_base += fp;
}
assert(delta < fp);
-
+
bool new_clock = delta >= divider;
if(new_clock != clock_value) {
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
if(clock_state || clock_value)
clk_cb(clock_value);
@@ -359,16 +359,16 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
if(clock_mode == CLKM_INTERNAL_ASYNC_OUT && (clock_state || !clock_value))
clk_cb(clock_value);
}
}
-
+
event = clock_base + (clock_value ? fp : divider*8);
}
break;
@@ -385,14 +385,14 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
}
}
-
+
event = UINT64((clock_base + (clock_value ? 2 : 1))*external_to_internal_ratio)+1;
}
break;
@@ -409,14 +409,14 @@ UINT64 h8_sci_device::internal_update(UINT64 current_time)
cpu->synchronize();
if((!new_clock) && (clock_state & CLK_TX))
tx_dropped_edge();
-
+
else if(new_clock && (clock_state & CLK_RX))
rx_raised_edge();
-
+
clock_value = new_clock;
}
}
-
+
event = UINT64((clock_base + (clock_value ? 16 : 8))*external_to_internal_ratio)+1;
}
break;
@@ -503,7 +503,7 @@ void h8_sci_device::tx_start()
}
clock_start(CLK_TX);
}
-
+
void h8_sci_device::tx_dropped_edge()
{
logerror("%s: tx_dropped_edge state=%s bit=%d\n", tag(), state_names[tx_state], tx_bit);
@@ -676,4 +676,3 @@ void h8_sci_device::rx_raised_edge()
}
logerror("%s: -> state=%s, bit=%d\n", tag(), state_names[rx_state], rx_bit);
}
-
diff --git a/src/emu/cpu/h8/h8_sci.h b/src/emu/cpu/h8/h8_sci.h
index e0083a87676..bd508e44061 100644
--- a/src/emu/cpu/h8/h8_sci.h
+++ b/src/emu/cpu/h8/h8_sci.h
@@ -84,7 +84,7 @@ public:
template<class _Object> static devcb2_base &set_clk_cb(device_t &device, _Object object) { return downcast<h8_sci_device &>(device).clk_cb.set_callback(object); }
UINT64 internal_update(UINT64 current_time);
-
+
protected:
enum {
ST_IDLE, ST_START, ST_BIT, ST_PARITY, ST_STOP, ST_LAST_TICK,
diff --git a/src/emu/cpu/h8/h8_timer16.c b/src/emu/cpu/h8/h8_timer16.c
index 92ec7f932b2..abf89b42c16 100644
--- a/src/emu/cpu/h8/h8_timer16.c
+++ b/src/emu/cpu/h8/h8_timer16.c
@@ -94,14 +94,14 @@ WRITE8_MEMBER(h8_timer16_channel_device::tier_w)
tier = data;
tier_update();
logerror("%s: irq %c%c%c%c%c%c trigger=%d\n",
- tag(),
- ier & IRQ_A ? 'a' : '.',
- ier & IRQ_B ? 'b' : '.',
- ier & IRQ_C ? 'c' : '.',
- ier & IRQ_D ? 'd' : '.',
- ier & IRQ_V ? 'v' : '.',
- ier & IRQ_U ? 'u' : '.',
- ier & IRQ_TRIG ? 1 : 0);
+ tag(),
+ ier & IRQ_A ? 'a' : '.',
+ ier & IRQ_B ? 'b' : '.',
+ ier & IRQ_C ? 'c' : '.',
+ ier & IRQ_D ? 'd' : '.',
+ ier & IRQ_V ? 'v' : '.',
+ ier & IRQ_U ? 'u' : '.',
+ ier & IRQ_TRIG ? 1 : 0);
recalc_event();
}
@@ -218,11 +218,11 @@ void h8_timer16_channel_device::update_counter(UINT64 cur_time)
tcnt = tt % counter_cycle;
if(0)
logerror("%s: Updating %d (%ld %ld) (%ld %ld) -> %d/%d\n",
- tag(),
- ott,
- long(last_clock_update), long(cur_time),
- long(base_time), long(new_time),
- tt, tcnt);
+ tag(),
+ ott,
+ long(last_clock_update), long(cur_time),
+ long(base_time), long(new_time),
+ tt, tcnt);
for(int i=0; i<tgr_count; i++)
if((ier & (1 << i)) && (tt == tgr[i] || tcnt == tgr[i]) && interrupt[i] != -1) {
@@ -284,7 +284,7 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
if(0)
logerror("%s: tcnt=%d tgr%c=%d cycle=%d -> delay=%d\n",
- tag(), tcnt, 'a'+i, tgr[i], counter_cycle, new_delay);
+ tag(), tcnt, 'a'+i, tgr[i], counter_cycle, new_delay);
if(event_delay > new_delay)
event_delay = new_delay;
}
@@ -292,10 +292,10 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
event_time = ((((cur_time + (1ULL << clock_divider) - phase) >> clock_divider) + event_delay - 1) << clock_divider) + phase;
else
event_time = 0;
-
+
if(event_time && 0)
logerror("%s: next event in %d cycles (%ld)\n", tag(), int(event_time - cpu->get_cycle()), long(event_time));
-
+
} else {
logerror("decrementing counter\n");
exit(1);
@@ -622,7 +622,7 @@ void h8s_timer16_channel_device::set_chain(const char *_chain_tag)
}
void h8s_timer16_channel_device::set_info(int _tgr_count, UINT8 _tier_mask, const char *intc, int irq_base,
- int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7)
+ int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7)
{
tgr_count = _tgr_count;
tbr_count = 0;
diff --git a/src/emu/cpu/h8/h8_timer16.h b/src/emu/cpu/h8/h8_timer16.h
index 210951ead97..2f3c581fe55 100644
--- a/src/emu/cpu/h8/h8_timer16.h
+++ b/src/emu/cpu/h8/h8_timer16.h
@@ -43,23 +43,23 @@
#include "h8.h"
#include "h8_intc.h"
-#define MCFG_H8_TIMER16_ADD( _tag, _count, _tstr ) \
- MCFG_DEVICE_ADD( _tag, H8_TIMER16, 0 ) \
+#define MCFG_H8_TIMER16_ADD( _tag, _count, _tstr ) \
+ MCFG_DEVICE_ADD( _tag, H8_TIMER16, 0 ) \
downcast<h8_timer16_device *>(device)->set_info(_count, _tstr);
#define MCFG_H8_TIMER16_CHANNEL_ADD( _tag, tgr_count, tbr_count, intc, irq_base ) \
- MCFG_DEVICE_ADD( _tag, H8_TIMER16_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8_TIMER16_CHANNEL, 0 ) \
downcast<h8_timer16_channel_device *>(device)->set_info(tgr_count, tbr_count, intc, irq_base);
#define MCFG_H8H_TIMER16_CHANNEL_ADD( _tag, tgr_count, tbr_count, intc, irq_base ) \
- MCFG_DEVICE_ADD( _tag, H8H_TIMER16_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8H_TIMER16_CHANNEL, 0 ) \
downcast<h8h_timer16_channel_device *>(device)->set_info(tgr_count, tbr_count, intc, irq_base);
#define MCFG_H8S_TIMER16_CHANNEL_ADD( _tag, tgr_count, tier_mask, intc, irq_base, t0, t1, t2, t3, t4, t5, t6, t7 ) \
- MCFG_DEVICE_ADD( _tag, H8S_TIMER16_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8S_TIMER16_CHANNEL, 0 ) \
downcast<h8s_timer16_channel_device *>(device)->set_info(tgr_count, tier_mask, intc, irq_base, t0, t1, t2, t3, t4, t5, t6, t7);
-#define MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN( _tag ) \
+#define MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN( _tag ) \
downcast<h8s_timer16_channel_device *>(device)->set_chain(_tag);
class h8_timer16_channel_device : public device_t {
@@ -180,7 +180,7 @@ public:
virtual ~h8s_timer16_channel_device();
void set_info(int tgr_count, UINT8 _tier_mask, const char *intc, int irq_base,
- int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7);
+ int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7);
void set_chain(const char *chain_tag);
protected:
diff --git a/src/emu/cpu/h8/h8_timer8.c b/src/emu/cpu/h8/h8_timer8.c
index 7f6f7178686..074085b5f06 100644
--- a/src/emu/cpu/h8/h8_timer8.c
+++ b/src/emu/cpu/h8/h8_timer8.c
@@ -92,7 +92,7 @@ void h8_timer8_channel_device::update_tcr()
clock_type = INPUT_UPDOWN;
clock_divider = 0;
logerror("%s: clock external both edges", tag());
- break;
+ break;
}
switch(tcr & TCR_CCLR) {
@@ -118,9 +118,9 @@ void h8_timer8_channel_device::update_tcr()
}
logerror(", irq=%c%c%c\n",
- tcr & TCR_CMIEB ? 'b' : '-',
- tcr & TCR_CMIEA ? 'a' : '-',
- tcr & TCR_OVIE ? 'o' : '-');
+ tcr & TCR_CMIEB ? 'b' : '-',
+ tcr & TCR_CMIEA ? 'a' : '-',
+ tcr & TCR_OVIE ? 'o' : '-');
}
READ8_MEMBER(h8_timer8_channel_device::tcsr_r)
@@ -223,7 +223,7 @@ void h8_timer8_channel_device::update_counter(UINT64 cur_time)
if(tt == tcor[0] || tcnt == tcor[0]) {
if(chained_timer)
chained_timer->chained_timer_tcora();
-
+
if(!(tcsr & TCSR_CMFA)) {
tcsr |= TCSR_CMFA;
if(tcr & TCR_CMIEA)
@@ -317,7 +317,7 @@ void h8_timer8_channel_device::timer_tick()
if(tcnt == tcor[0]) {
if(chained_timer)
chained_timer->chained_timer_tcora();
-
+
if(!(tcsr & TCSR_CMFA)) {
tcsr |= TCSR_CMFA;
if(tcr & TCR_CMIEA)
diff --git a/src/emu/cpu/h8/h8_timer8.h b/src/emu/cpu/h8/h8_timer8.h
index 0b8915a87cf..fb73a7eb17e 100644
--- a/src/emu/cpu/h8/h8_timer8.h
+++ b/src/emu/cpu/h8/h8_timer8.h
@@ -44,11 +44,11 @@
#include "h8_intc.h"
#define MCFG_H8_TIMER8_CHANNEL_ADD( _tag, intc, irq_ca, irq_cb, irq_v, div1, div2, div3, div4, div5, div6 ) \
- MCFG_DEVICE_ADD( _tag, H8_TIMER8_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8_TIMER8_CHANNEL, 0 ) \
downcast<h8_timer8_channel_device *>(device)->set_info(intc, irq_ca, irq_cb, irq_v, div1, div2, div3, div4, div5, div6);
#define MCFG_H8H_TIMER8_CHANNEL_ADD( _tag, intc, irq_ca, irq_cb, irq_v, chain, chain_mode, has_adte, has_ice ) \
- MCFG_DEVICE_ADD( _tag, H8H_TIMER8_CHANNEL, 0 ) \
+ MCFG_DEVICE_ADD( _tag, H8H_TIMER8_CHANNEL, 0 ) \
downcast<h8h_timer8_channel_device *>(device)->set_info(intc, irq_ca, irq_cb, irq_v, chain, chain_mode, has_adte, has_ice);
class h8_timer8_channel_device : public device_t {
@@ -95,7 +95,7 @@ protected:
TCSR_ADTE = 0x10,
TCSR_OVF = 0x20,
TCSR_CMFA = 0x40,
- TCSR_CMFB = 0x80
+ TCSR_CMFB = 0x80
};
enum {
diff --git a/src/emu/cpu/h8/h8s2245.c b/src/emu/cpu/h8/h8s2245.c
index ee1aefaac9f..91a0f5bead9 100644
--- a/src/emu/cpu/h8/h8s2245.c
+++ b/src/emu/cpu/h8/h8s2245.c
@@ -101,33 +101,33 @@ static MACHINE_CONFIG_FRAGMENT(h8s2245)
MCFG_H8H_TIMER8_CHANNEL_ADD("timer8_1", "intc", 68, 69, 70, "timer8_0", h8_timer8_channel_device::CHAIN_A, false, false)
MCFG_H8_TIMER16_ADD("timer16", 3, 0x00)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:0", 4, 0x60, "intc", 32,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:1", 2, 0x4c, "intc", 40,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:2")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:2", 2, 0x4c, "intc", 44,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024)
MCFG_H8_SCI_ADD("sci0", "intc", 80, 81, 82, 83)
MCFG_H8_SCI_ADD("sci1", "intc", 84, 85, 86, 87)
MCFG_H8_SCI_ADD("sci2", "intc", 88, 89, 90, 91)
diff --git a/src/emu/cpu/h8/h8s2245.h b/src/emu/cpu/h8/h8s2245.h
index 8b1f0c2136b..d0b7108641c 100644
--- a/src/emu/cpu/h8/h8s2245.h
+++ b/src/emu/cpu/h8/h8s2245.h
@@ -63,7 +63,7 @@ public:
h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8s_intc_device> intc;
diff --git a/src/emu/cpu/h8/h8s2320.c b/src/emu/cpu/h8/h8s2320.c
index 8121b9e4fbb..83e27aaa9f3 100644
--- a/src/emu/cpu/h8/h8s2320.c
+++ b/src/emu/cpu/h8/h8s2320.c
@@ -145,61 +145,61 @@ static MACHINE_CONFIG_FRAGMENT(h8s2320)
MCFG_H8H_TIMER8_CHANNEL_ADD("timer8_1", "intc", 68, 69, 70, "timer8_0", h8_timer8_channel_device::CHAIN_A, false, false)
MCFG_H8_TIMER16_ADD("timer16", 6, 0x00)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:0", 4, 0x60, "intc", 32,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:1", 2, 0x4c, "intc", 40,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:2")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:2", 2, 0x4c, "intc", 44,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:3", 4, 0x60, "intc", 48,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::DIV_1024,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::DIV_4096)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::DIV_1024,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::DIV_4096)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:4", 2, 0x4c, "intc", 56,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:5")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:5", 2, 0x4c, "intc", 60,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8_SCI_ADD("sci0", "intc", 80, 81, 82, 83)
MCFG_H8_SCI_ADD("sci1", "intc", 84, 85, 86, 87)
MCFG_H8_SCI_ADD("sci2", "intc", 88, 89, 90, 91)
diff --git a/src/emu/cpu/h8/h8s2320.h b/src/emu/cpu/h8/h8s2320.h
index 924e117150c..0df2d0761a4 100644
--- a/src/emu/cpu/h8/h8s2320.h
+++ b/src/emu/cpu/h8/h8s2320.h
@@ -68,7 +68,7 @@ public:
h8s2320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8s_intc_device> intc;
diff --git a/src/emu/cpu/h8/h8s2357.c b/src/emu/cpu/h8/h8s2357.c
index e3274ab098d..ceb04b7ebfa 100644
--- a/src/emu/cpu/h8/h8s2357.c
+++ b/src/emu/cpu/h8/h8s2357.c
@@ -123,61 +123,61 @@ static MACHINE_CONFIG_FRAGMENT(h8s2357)
MCFG_H8H_TIMER8_CHANNEL_ADD("timer8_1", "intc", 68, 69, 70, "timer8_0", h8_timer8_channel_device::CHAIN_A, false, false)
MCFG_H8_TIMER16_ADD("timer16", 6, 0x00)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:0", 4, 0x60, "intc", 32,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:1", 2, 0x4c, "intc", 40,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:2")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:2", 2, 0x4c, "intc", 44,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:3", 4, 0x60, "intc", 48,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::DIV_1024,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::DIV_4096)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::DIV_1024,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::DIV_4096)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:4", 2, 0x4c, "intc", 56,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:5")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:5", 2, 0x4c, "intc", 60,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8_SCI_ADD("sci0", "intc", 80, 81, 82, 83)
MCFG_H8_SCI_ADD("sci1", "intc", 84, 85, 86, 87)
MCFG_H8_SCI_ADD("sci2", "intc", 88, 89, 90, 91)
diff --git a/src/emu/cpu/h8/h8s2357.h b/src/emu/cpu/h8/h8s2357.h
index 35a51551388..b38f90e7737 100644
--- a/src/emu/cpu/h8/h8s2357.h
+++ b/src/emu/cpu/h8/h8s2357.h
@@ -65,7 +65,7 @@ public:
h8s2357_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8s_intc_device> intc;
diff --git a/src/emu/cpu/h8/h8s2655.c b/src/emu/cpu/h8/h8s2655.c
index d6775e32a01..6f3e8778bb3 100644
--- a/src/emu/cpu/h8/h8s2655.c
+++ b/src/emu/cpu/h8/h8s2655.c
@@ -96,61 +96,61 @@ static MACHINE_CONFIG_FRAGMENT(h8s2655)
MCFG_H8H_TIMER8_CHANNEL_ADD("timer8_1", "intc", 68, 69, 70, "timer8_0", h8_timer8_channel_device::CHAIN_A, false, false)
MCFG_H8_TIMER16_ADD("timer16", 6, 0x00)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:0", 4, 0x60, "intc", 32,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:1", 2, 0x4c, "intc", 40,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:2")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:2", 2, 0x4c, "intc", 44,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_B,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_B,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:3", 4, 0x60, "intc", 48,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::DIV_1024,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::DIV_4096)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::DIV_1024,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::DIV_4096)
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:4", 2, 0x4c, "intc", 56,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_1024,
- h8_timer16_channel_device::CHAIN)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_1024,
+ h8_timer16_channel_device::CHAIN)
MCFG_H8S_TIMER16_CHANNEL_SET_CHAIN("timer16:5")
MCFG_H8S_TIMER16_CHANNEL_ADD("timer16:5", 2, 0x4c, "intc", 60,
- h8_timer16_channel_device::DIV_1,
- h8_timer16_channel_device::DIV_4,
- h8_timer16_channel_device::DIV_16,
- h8_timer16_channel_device::DIV_64,
- h8_timer16_channel_device::INPUT_A,
- h8_timer16_channel_device::INPUT_C,
- h8_timer16_channel_device::DIV_256,
- h8_timer16_channel_device::INPUT_D)
+ h8_timer16_channel_device::DIV_1,
+ h8_timer16_channel_device::DIV_4,
+ h8_timer16_channel_device::DIV_16,
+ h8_timer16_channel_device::DIV_64,
+ h8_timer16_channel_device::INPUT_A,
+ h8_timer16_channel_device::INPUT_C,
+ h8_timer16_channel_device::DIV_256,
+ h8_timer16_channel_device::INPUT_D)
MCFG_H8_SCI_ADD("sci0", "intc", 80, 81, 82, 83)
MCFG_H8_SCI_ADD("sci1", "intc", 84, 85, 86, 87)
MCFG_H8_SCI_ADD("sci2", "intc", 88, 89, 90, 91)
diff --git a/src/emu/cpu/h8/h8s2655.h b/src/emu/cpu/h8/h8s2655.h
index 52c5f9ecdcf..ca90c99d777 100644
--- a/src/emu/cpu/h8/h8s2655.h
+++ b/src/emu/cpu/h8/h8s2655.h
@@ -57,7 +57,7 @@ public:
h8s2655_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(syscr_r);
- DECLARE_WRITE8_MEMBER(syscr_w);
+ DECLARE_WRITE8_MEMBER(syscr_w);
protected:
required_device<h8s_intc_device> intc;