summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu
diff options
context:
space:
mode:
author Angelo Salese <angelosa@users.noreply.github.com>2012-04-08 14:12:02 +0000
committer Angelo Salese <angelosa@users.noreply.github.com>2012-04-08 14:12:02 +0000
commit35e09dd41cd03aff312a57959b893d3f6a028667 (patch)
tree8f3722f6d0de9c0df55b8fc84c939316460b692e /src/emu/cpu
parent8d66a9445a44da9438637aa17f3cd421564c8f5a (diff)
Clean-ups and version bumpmame0145u6
Diffstat (limited to 'src/emu/cpu')
-rw-r--r--src/emu/cpu/m68000/68307bus.c2
-rw-r--r--src/emu/cpu/m68000/68307ser.c4
-rw-r--r--src/emu/cpu/m68000/68307sim.c4
-rw-r--r--src/emu/cpu/m68000/68307sim.h2
-rw-r--r--src/emu/cpu/m68000/68307tmu.c10
-rw-r--r--src/emu/cpu/m68000/68340dma.c4
-rw-r--r--src/emu/cpu/m68000/68340sim.c2
-rw-r--r--src/emu/cpu/m68000/68340tmu.c2
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c30
9 files changed, 30 insertions, 30 deletions
diff --git a/src/emu/cpu/m68000/68307bus.c b/src/emu/cpu/m68000/68307bus.c
index f1ec4925609..801c75deb6d 100644
--- a/src/emu/cpu/m68000/68307bus.c
+++ b/src/emu/cpu/m68000/68307bus.c
@@ -26,7 +26,7 @@ READ16_HANDLER( m68307_internal_mbus_r )
return 0x0000;
}
}
-
+
return 0xffff;
}
diff --git a/src/emu/cpu/m68000/68307ser.c b/src/emu/cpu/m68000/68307ser.c
index 4b11e027609..b1be95379bb 100644
--- a/src/emu/cpu/m68000/68307ser.c
+++ b/src/emu/cpu/m68000/68307ser.c
@@ -27,7 +27,7 @@ READ16_HANDLER( m68307_internal_serial_r )
case m68307SER_UISR_UIMR:
logerror("%08x m68307_internal_serial_r %08x, (%04x) (UISR - Interrupt Status Register)\n", pc, offset*2,mem_mask);
return space->machine().rand() & 0x87;
-
+
default:
logerror("%08x m68307_internal_serial_r %08x, (%04x)\n", pc, offset*2,mem_mask);
break;
@@ -52,7 +52,7 @@ WRITE16_HANDLER( m68307_internal_serial_w )
case m68307SER_USR_UCSR:
logerror("%08x m68307_internal_serial_r %08x, (%04x) (UCSR - Clock Select Register)\n", pc, offset*2,mem_mask);
break;
-
+
case m68307SER_URB_UTB:
logerror("%08x m68307_internal_serial_w %08x, %04x (%04x) (UTB - Transmit Buffer)\n", pc, offset*2,data,mem_mask);
break;
diff --git a/src/emu/cpu/m68000/68307sim.c b/src/emu/cpu/m68000/68307sim.c
index 32500eacc69..302ae4a9ea3 100644
--- a/src/emu/cpu/m68000/68307sim.c
+++ b/src/emu/cpu/m68000/68307sim.c
@@ -18,7 +18,7 @@ READ16_HANDLER( m68307_internal_sim_r )
{
case m68307SIM_PADAT: return sim->read_padat(space, mem_mask);
case m68307SIM_PBDAT: return sim->read_pbdat(space, mem_mask);
-
+
case m68307SIM_LICR2: return (sim->m_licr2);
case m68307SIM_BR0: return (sim->m_br[0]);
@@ -97,7 +97,7 @@ WRITE16_HANDLER( m68307_internal_sim_w )
logerror("%08x m68307_internal_sim_w %08x, %04x (%04x) (Peripheral Interrupt Control Register - PICR)\n", pc, offset*2,data,mem_mask);
sim->write_picr(data,mem_mask);
break;
-
+
case m68307SIM_PIVR:
logerror("%08x m68307_internal_sim_w %08x, %04x (%04x) (Peripheral Interrupt Vector Register - PIVR)\n", pc, offset*2,data,mem_mask);
sim->write_pivr(data,mem_mask);
diff --git a/src/emu/cpu/m68000/68307sim.h b/src/emu/cpu/m68000/68307sim.h
index 76b26391288..ff8e447dd00 100644
--- a/src/emu/cpu/m68000/68307sim.h
+++ b/src/emu/cpu/m68000/68307sim.h
@@ -67,4 +67,4 @@ class m68307_sim
void write_pivr(UINT16 data, UINT16 mem_mask);
void reset(void);
-}; \ No newline at end of file
+};
diff --git a/src/emu/cpu/m68000/68307tmu.c b/src/emu/cpu/m68000/68307tmu.c
index 74370482e79..104a65c6738 100644
--- a/src/emu/cpu/m68000/68307tmu.c
+++ b/src/emu/cpu/m68000/68307tmu.c
@@ -22,13 +22,13 @@ READ16_HANDLER( m68307_internal_timer_r )
return timer->read_tcn(mem_mask, which);
break;
-
+
default:
logerror("%08x m68307_internal_timer_r %08x, (%04x)\n", pc, offset*2,mem_mask);
break;
}
}
-
+
return 0x0000;
}
@@ -106,7 +106,7 @@ static TIMER_CALLBACK( m68307_timer0_callback )
m68ki_cpu_core* m68k = m68k_get_safe_token(dev);
m68307_single_timer* tptr = &m68k->m68307TIMER->singletimer[0];
tptr->regs[m68307TIMER_TMR] |= 0x2;
-
+
m68307_timer0_interrupt(dev);
tptr->mametimer->adjust(m68k->device->cycles_to_attotime(20000));
@@ -118,7 +118,7 @@ static TIMER_CALLBACK( m68307_timer1_callback )
m68ki_cpu_core* m68k = m68k_get_safe_token(dev);
m68307_single_timer* tptr = &m68k->m68307TIMER->singletimer[1];
tptr->regs[m68307TIMER_TMR] |= 0x2;
-
+
m68307_timer1_interrupt(dev);
tptr->mametimer->adjust(m68k->device->cycles_to_attotime(20000));
@@ -133,7 +133,7 @@ static TIMER_CALLBACK( m68307_wd_timer_callback )
void m68307_timer::init(legacy_cpu_device *device)
{
m68307_single_timer* tptr;
-
+
tptr = &singletimer[0];
tptr->mametimer = device->machine().scheduler().timer_alloc(FUNC(m68307_timer0_callback), device);
diff --git a/src/emu/cpu/m68000/68340dma.c b/src/emu/cpu/m68000/68340dma.c
index f2b3f987d47..2d52f3473cc 100644
--- a/src/emu/cpu/m68000/68340dma.c
+++ b/src/emu/cpu/m68000/68340dma.c
@@ -15,7 +15,7 @@ READ32_HANDLER( m68340_internal_dma_r )
int pc = cpu_get_pc(&space->device());
logerror("%08x m68340_internal_dma_r %08x, (%08x)\n", pc, offset*4,mem_mask);
}
-
+
return 0x00000000;
}
@@ -24,7 +24,7 @@ WRITE32_HANDLER( m68340_internal_dma_w )
m68ki_cpu_core *m68k = m68k_get_safe_token(&space->device());
m68340_dma* dma = m68k->m68340DMA;
assert(dma != NULL);
-
+
if (dma)
{
int pc = cpu_get_pc(&space->device());
diff --git a/src/emu/cpu/m68000/68340sim.c b/src/emu/cpu/m68000/68340sim.c
index 8733586696b..7cb2f3a4466 100644
--- a/src/emu/cpu/m68000/68340sim.c
+++ b/src/emu/cpu/m68000/68340sim.c
@@ -9,7 +9,7 @@ READ32_HANDLER( m68340_internal_sim_r )
m68ki_cpu_core *m68k = m68k_get_safe_token(&space->device());
m68340_sim* sim = m68k->m68340SIM;
assert(sim != NULL);
-
+
if (sim)
{
int pc = cpu_get_pc(&space->device());
diff --git a/src/emu/cpu/m68000/68340tmu.c b/src/emu/cpu/m68000/68340tmu.c
index 90354e95b08..b68718fa47b 100644
--- a/src/emu/cpu/m68000/68340tmu.c
+++ b/src/emu/cpu/m68000/68340tmu.c
@@ -16,7 +16,7 @@ READ32_HANDLER( m68340_internal_timer_r )
int pc = cpu_get_pc(&space->device());
logerror("%08x m68340_internal_timer_r %08x, (%08x)\n", pc, offset*4,mem_mask);
}
-
+
return 0x00000000;
}
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 38c1750e134..4e40f69bd7c 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -1326,43 +1326,43 @@ int m68307_calc_cs(m68ki_cpu_core *m68k, offs_t address)
UINT16 m68k_memory_interface::simple_read_immediate_16_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_direct->read_decrypted_word(address);
}
UINT8 m68k_memory_interface::read_byte_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_space->read_byte(address);
}
UINT16 m68k_memory_interface::read_word_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_space->read_word(address);
}
UINT32 m68k_memory_interface::read_dword_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_space->read_dword(address);
}
void m68k_memory_interface::write_byte_m68307(offs_t address, UINT8 data)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
m_space->write_byte(address, data);
}
void m68k_memory_interface::write_word_m68307(offs_t address, UINT16 data)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
m_space->write_word(address, data);
}
void m68k_memory_interface::write_dword_m68307(offs_t address, UINT32 data)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
m_space->write_dword(address, data);
}
@@ -1956,7 +1956,7 @@ void m68307_timer1_interrupt(legacy_cpu_device *cpudev)
void m68307_serial_interrupt(legacy_cpu_device *cpudev)
{
- m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
+ m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
int prioritylevel = (m68k->m68307SIM->m_picr & 0x0070)>>4;
int vector = (m68k->m68307SERIAL->m_uivr);
m68307_set_interrupt(cpudev, prioritylevel, vector);
@@ -1964,7 +1964,7 @@ void m68307_serial_interrupt(legacy_cpu_device *cpudev)
void m68307_mbus_interrupt(legacy_cpu_device *cpudev)
{
- m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
+ m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
int prioritylevel = (m68k->m68307SIM->m_picr & 0x0007)>>0;
int vector = (m68k->m68307SIM->m_pivr & 0x00f0) | 0xd;
m68307_set_interrupt(cpudev, prioritylevel, vector);
@@ -1972,7 +1972,7 @@ void m68307_mbus_interrupt(legacy_cpu_device *cpudev)
void m68307_licr2_interrupt(legacy_cpu_device *cpudev)
{
- m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
+ m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
int prioritylevel = (m68k->m68307SIM->m_licr2 & 0x0007)>>0;
int vector = (m68k->m68307SIM->m_pivr & 0x00f0) | 0x9;
m68k->m68307SIM->m_licr2 |= 0x8;
@@ -2050,10 +2050,10 @@ static WRITE16_HANDLER( m68307_internal_base_w )
base = (m68k->m68307_base & 0x0fff) << 12;
//mask = (m68k->m68307_base & 0xe000) >> 13;
//if ( m68k->m68307_base & 0x1000 ) mask |= 7;
- m68k->internal->unmap_readwrite(base+0x000, base+0x04f);
- m68k->internal->unmap_readwrite(base+0x100, base+0x11f);
- m68k->internal->unmap_readwrite(base+0x120, base+0x13f);
- m68k->internal->unmap_readwrite(base+0x140, base+0x149);
+ m68k->internal->unmap_readwrite(base+0x000, base+0x04f);
+ m68k->internal->unmap_readwrite(base+0x100, base+0x11f);
+ m68k->internal->unmap_readwrite(base+0x120, base+0x13f);
+ m68k->internal->unmap_readwrite(base+0x140, base+0x149);
/* store new base address */
COMBINE_DATA(&m68k->m68307_base);
@@ -2061,7 +2061,7 @@ static WRITE16_HANDLER( m68307_internal_base_w )
/* install new internal handler */
base = (m68k->m68307_base & 0x0fff) << 12;
//mask = (m68k->m68307_base & 0xe000) >> 13;
- //if ( m68k->m68307_base & 0x1000 ) mask |= 7;
+ //if ( m68k->m68307_base & 0x1000 ) mask |= 7;
m68k->internal->install_legacy_readwrite_handler(base + 0x000, base + 0x04f, FUNC(m68307_internal_sim_r), FUNC(m68307_internal_sim_w));
m68k->internal->install_legacy_readwrite_handler(base + 0x100, base + 0x11f, FUNC(m68307_internal_serial_r), FUNC(m68307_internal_serial_w));
m68k->internal->install_legacy_readwrite_handler(base + 0x120, base + 0x13f, FUNC(m68307_internal_timer_r), FUNC(m68307_internal_timer_w));