From cf941cb00617eb4b060c11cc3e6aab734be4e273 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Wed, 26 Mar 2014 08:55:33 +0000 Subject: [PATCH] h8: Sort out UE polarity [O. Galibert] --- src/emu/cpu/h8/h83002.c | 20 ++++++++++---------- src/emu/cpu/h8/h83006.c | 20 ++++++++++---------- src/emu/cpu/h8/h83048.c | 20 ++++++++++---------- src/mame/drivers/namcos23.c | 2 -- 4 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/emu/cpu/h8/h83002.c b/src/emu/cpu/h8/h83002.c index 412e02eb1db..2e79647e805 100644 --- a/src/emu/cpu/h8/h83002.c +++ b/src/emu/cpu/h8/h83002.c @@ -139,30 +139,24 @@ void h83002_device::execute_set_input(int inputnum, int state) int h83002_device::trapa_setup() { if(syscr & 0x08) - CCR |= F_I|F_UI; - else CCR |= F_I; + else + CCR |= F_I|F_UI; return 8; } void h83002_device::irq_setup() { if(syscr & 0x08) - CCR |= F_I|F_UI; - else CCR |= F_I; + else + CCR |= F_I|F_UI; } void h83002_device::update_irq_filter() { switch(syscr & 0x08) { case 0x00: - if(CCR & F_I) - intc->set_filter(2, -1); - else - intc->set_filter(0, -1); - break; - case 0x08: if((CCR & (F_I|F_UI)) == (F_I|F_UI)) intc->set_filter(2, -1); else if(CCR & F_I) @@ -170,6 +164,12 @@ void h83002_device::update_irq_filter() else intc->set_filter(0, -1); break; + case 0x08: + if(CCR & F_I) + intc->set_filter(2, -1); + else + intc->set_filter(0, -1); + break; } } diff --git a/src/emu/cpu/h8/h83006.c b/src/emu/cpu/h8/h83006.c index c95bba799ad..4385a452486 100644 --- a/src/emu/cpu/h8/h83006.c +++ b/src/emu/cpu/h8/h83006.c @@ -159,30 +159,24 @@ void h83006_device::execute_set_input(int inputnum, int state) int h83006_device::trapa_setup() { if(syscr & 0x08) - CCR |= F_I|F_UI; - else CCR |= F_I; + else + CCR |= F_I|F_UI; return 8; } void h83006_device::irq_setup() { if(syscr & 0x08) - CCR |= F_I|F_UI; - else CCR |= F_I; + else + CCR |= F_I|F_UI; } void h83006_device::update_irq_filter() { switch(syscr & 0x08) { case 0x00: - if(CCR & F_I) - intc->set_filter(2, -1); - else - intc->set_filter(0, -1); - break; - case 0x08: if((CCR & (F_I|F_UI)) == (F_I|F_UI)) intc->set_filter(2, -1); else if(CCR & F_I) @@ -190,6 +184,12 @@ void h83006_device::update_irq_filter() else intc->set_filter(0, -1); break; + case 0x08: + if(CCR & F_I) + intc->set_filter(2, -1); + else + intc->set_filter(0, -1); + break; } } diff --git a/src/emu/cpu/h8/h83048.c b/src/emu/cpu/h8/h83048.c index f8df547f6ee..8b1e963ed5a 100644 --- a/src/emu/cpu/h8/h83048.c +++ b/src/emu/cpu/h8/h83048.c @@ -207,30 +207,24 @@ void h83048_device::execute_set_input(int inputnum, int state) int h83048_device::trapa_setup() { if(syscr & 0x08) - CCR |= F_I|F_UI; - else CCR |= F_I; + else + CCR |= F_I|F_UI; return 8; } void h83048_device::irq_setup() { if(syscr & 0x08) - CCR |= F_I|F_UI; - else CCR |= F_I; + else + CCR |= F_I|F_UI; } void h83048_device::update_irq_filter() { switch(syscr & 0x08) { case 0x00: - if(CCR & F_I) - intc->set_filter(2, -1); - else - intc->set_filter(0, -1); - break; - case 0x08: if((CCR & (F_I|F_UI)) == (F_I|F_UI)) intc->set_filter(2, -1); else if(CCR & F_I) @@ -238,6 +232,12 @@ void h83048_device::update_irq_filter() else intc->set_filter(0, -1); break; + case 0x08: + if(CCR & F_I) + intc->set_filter(2, -1); + else + intc->set_filter(0, -1); + break; } } diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index d301826ddf6..f424188d7f2 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -3376,7 +3376,6 @@ static MACHINE_CONFIG_START( s23, namcos23_state ) MCFG_CPU_ADD("subcpu", H83002, S23_H8CLOCK ) MCFG_CPU_PROGRAM_MAP( s23h8rwmap ) MCFG_CPU_IO_MAP( s23h8iomap ) - MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos23_state, irq1_line_pulse) MCFG_TIMER_DRIVER_ADD_PERIODIC("jvs_timer", namcos23_state, jvs_timer, attotime::from_hz(S23_JVSCLOCK/8*2)) @@ -3463,7 +3462,6 @@ static MACHINE_CONFIG_START( ss23, namcos23_state ) MCFG_CPU_ADD("subcpu", H83002, S23_H8CLOCK ) MCFG_CPU_PROGRAM_MAP( s23h8rwmap ) MCFG_CPU_IO_MAP( s23h8iomap ) - MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos23_state, irq1_line_pulse) MCFG_TIMER_DRIVER_ADD_PERIODIC("jvs_timer", namcos23_state, jvs_timer, attotime::from_hz(S23_JVSCLOCK/8*2))