summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/cpu/sh4/sh4comn.c4
-rw-r--r--src/emu/sound/asc.c1
-rw-r--r--src/mame/audio/dsbz80.c3
-rw-r--r--src/mame/drivers/bfm_sc4h.c5
-rw-r--r--src/mame/drivers/model3.c1
-rw-r--r--src/mame/machine/mathbox.c2
-rw-r--r--src/mame/video/konicdev.c4
-rw-r--r--src/mess/drivers/gba.c13
-rw-r--r--src/mess/drivers/mac.c4
-rw-r--r--src/mess/drivers/ng_aes.c3
-rw-r--r--src/mess/machine/8530scc.c4
-rw-r--r--src/mess/machine/lisa.c6
-rw-r--r--src/mess/machine/pmd85.c1
-rw-r--r--src/mess/machine/rx01.c4
-rw-r--r--src/mess/video/bbc.c4
-rw-r--r--src/mess/video/mac.c4
-rw-r--r--src/mess/video/nubus_48gc.c2
-rw-r--r--src/mess/video/nubus_wsportrait.c1
-rw-r--r--src/mess/video/stic.c1
19 files changed, 21 insertions, 46 deletions
diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c
index 6b88909d26a..8776cd38520 100644
--- a/src/emu/cpu/sh4/sh4comn.c
+++ b/src/emu/cpu/sh4/sh4comn.c
@@ -911,13 +911,10 @@ READ32_HANDLER( sh4_internal_r )
{
case VERSION:
return PVR_SH7091; // 0x040205c1, this is what a real SH7091 in a Dreamcast returns - the later Naomi BIOSes check and care!
- break;
case PRR:
return 0;
- break;
case IPRD:
return 0x00000000; // SH7750 ignores writes here and always returns zero
- break;
case RTCNT:
if ((sh4->m[RTCSR] >> 3) & 7)
{ // activated
@@ -927,7 +924,6 @@ READ32_HANDLER( sh4_internal_r )
}
else
return sh4->m[RTCNT];
- break;
/*********************************************************************************************************************
INTC (Interrupt Controller)
diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c
index 4d2707cbd7f..20a21e5edcd 100644
--- a/src/emu/sound/asc.c
+++ b/src/emu/sound/asc.c
@@ -362,7 +362,6 @@ READ8_MEMBER( asc_device::read )
}
return rv;
- break;
default:
break;
diff --git a/src/mame/audio/dsbz80.c b/src/mame/audio/dsbz80.c
index 66dac1d8b5a..dd5beacf91d 100644
--- a/src/mame/audio/dsbz80.c
+++ b/src/mame/audio/dsbz80.c
@@ -140,13 +140,10 @@ READ8_MEMBER(dsbz80_device::mpeg_pos_r)
{
case 0:
return (mp_prg>>16)&0xff;
- break;
case 1:
return (mp_prg>>8)&0xff;
- break;
case 2:
return mp_prg&0xff;
- break;
}
return 0;
diff --git a/src/mame/drivers/bfm_sc4h.c b/src/mame/drivers/bfm_sc4h.c
index d51dfd74b6a..c048e5c1afa 100644
--- a/src/mame/drivers/bfm_sc4h.c
+++ b/src/mame/drivers/bfm_sc4h.c
@@ -125,8 +125,6 @@ READ16_MEMBER(sc4_state::sc4_mem_r)
case 1:
return sc4_cs1_r(space,offset,mem_mask);
-
-
case 2:
base = 0x800000/2;
end = base + 0x10000 / 2;
@@ -225,12 +223,9 @@ READ16_MEMBER(sc4_state::sc4_mem_r)
return 0x0000;
}
- break;
-
case 4:
logerror("%08x maincpu read access offset %08x mem_mask %04x cs %d\n", pc, offset*2, mem_mask, cs);
return 0x0000;//0xffff;
- break;
default:
logerror("%08x maincpu read access offset %08x mem_mask %04x cs %d (invalid?)\n", pc, offset*2, mem_mask, cs);
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 3658cd1a3ca..27428c4cee0 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1518,7 +1518,6 @@ READ64_MEMBER(model3_state::model3_sys_r)
case 0x18/8:
// printf("read irq_state %x (PC %x)\n", m_irq_state, cpu_get_pc(&space.device()));
return (UINT64)m_irq_state<<56 | 0xff000000;
- break;
}
logerror("Unknown model3 sys_r: offs %08X mask %08X\n", offset, (UINT32)mem_mask);
diff --git a/src/mame/machine/mathbox.c b/src/mame/machine/mathbox.c
index 331f1b1f983..ac4d9c695f9 100644
--- a/src/mame/machine/mathbox.c
+++ b/src/mame/machine/mathbox.c
@@ -230,7 +230,7 @@ WRITE8_DEVICE_HANDLER( mathbox_go_w )
REG5 = (REG5 & 0x00ff) | (data << 8);
REGf = 0x0000; /* do everything in one step */
goto step_048;
- break;
+ //break; // never reached
case 0x1c:
/* window test? */
diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c
index 139e03e1a4e..ba5accc953c 100644
--- a/src/mame/video/konicdev.c
+++ b/src/mame/video/konicdev.c
@@ -10390,8 +10390,8 @@ READ32_DEVICE_HANDLER( k001604_reg_r )
switch (offset)
{
- case 0x54/4: return device->machine().rand() << 16; break;
- case 0x5c/4: return device->machine().rand() << 16 | device->machine().rand(); break;
+ case 0x54/4: return device->machine().rand() << 16;
+ case 0x5c/4: return device->machine().rand() << 16 | device->machine().rand();
}
return k001604->reg[offset];
diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c
index 9f009c7581b..aab07da694e 100644
--- a/src/mess/drivers/gba.c
+++ b/src/mess/drivers/gba.c
@@ -832,7 +832,7 @@ READ32_MEMBER(gba_state::gba_io_r)
break;
case 0x00a0/4:
case 0x00a4/4:
- return 0; // (does this actually do anything on real h/w?)
+ retval = 0; // (does this actually do anything on real h/w?)
break;
case 0x00b0/4:
case 0x00b4/4:
@@ -852,11 +852,12 @@ READ32_MEMBER(gba_state::gba_io_r)
#if 0
if (((offset-0xb0/4) % 3) == 2)
{
- return m_dma_regs[offset-(0xb0/4)] & 0xff000000;
+ retval = m_dma_regs[offset-(0xb0/4)] & 0xff000000;
}
+ else
#endif
- return m_dma_regs[offset-(0xb0/4)];
+ retval = m_dma_regs[offset-(0xb0/4)];
}
break;
case 0x0100/4:
@@ -901,7 +902,7 @@ READ32_MEMBER(gba_state::gba_io_r)
elapsed = 0;
}
- return (m_timer_regs[timer] & 0xffff0000) | (elapsed & 0xffff);
+ retval = (m_timer_regs[timer] & 0xffff0000) | (elapsed & 0xffff);
}
break;
case 0x0120/4:
@@ -943,9 +944,9 @@ READ32_MEMBER(gba_state::gba_io_r)
case 0x0130/4:
if( (mem_mask) & 0x0000ffff ) // KEYINPUT
{
- return ioport("IN0")->read();
+ retval = ioport("IN0")->read();
}
- if( (mem_mask) & 0xffff0000 )
+ else if( (mem_mask) & 0xffff0000 )
{
verboselog(machine(), 2, "GBA IO Register Read: KEYCNT (%08x) = %04x\n", 0x04000000 + ( offset << 2 ) + 2, m_KEYCNT );
retval |= m_KEYCNT << 16;
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index 26c003d99ce..b96dfb9e0f1 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -257,12 +257,12 @@ READ8_MEMBER ( mac_state::mac_rbv_r )
{
case 13: // IFR
// printf("Read IER = %02x (PC=%x) 2=%02x\n", m_rbv_ier, cpu_get_pc(m_maincpu), m_rbv_regs[2]);
- return m_rbv_ifr;
+ data = m_rbv_ifr;
break;
case 14: // IER
// printf("Read IFR = %02x (PC=%x) 2=%02x\n", m_rbv_ifr, cpu_get_pc(m_maincpu), m_rbv_regs[2]);
- return m_rbv_ier;
+ data = m_rbv_ier;
break;
default:
diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c
index 0dc87424dc0..ab6a44574f3 100644
--- a/src/mess/drivers/ng_aes.c
+++ b/src/mess/drivers/ng_aes.c
@@ -903,7 +903,6 @@ READ16_MEMBER(ng_aes_state::neocd_control_r)
case 0x8c/2:
case 0x8e/2:
return m_neocd_ctrl.dma_mode[offset-(0x7e/2)];
- break;
case 0x105/2:
return m_neocd_ctrl.area_sel;
case 0x11c/2:
@@ -911,10 +910,8 @@ READ16_MEMBER(ng_aes_state::neocd_control_r)
return 0x0600; // we'll just force USA region for now
case 0x1a0/2:
return m_neocd_ctrl.spr_bank_sel;
- break;
case 0x1a2/2:
return m_neocd_ctrl.pcm_bank_sel;
- break;
default:
logerror("CTRL: Read offset %04x\n",offset);
}
diff --git a/src/mess/machine/8530scc.c b/src/mess/machine/8530scc.c
index c1c7091fea9..f464abd3636 100644
--- a/src/mess/machine/8530scc.c
+++ b/src/mess/machine/8530scc.c
@@ -488,12 +488,12 @@ READ8_MEMBER( scc8530_t::reg_r)
case 2:
/* Channel B (Printer Port) Data */
- return channel[1].rxData;
+ result = channel[1].rxData;
break;
case 3:
/* Channel A (Modem Port) Data */
- return channel[0].rxData;
+ result = channel[0].rxData;
break;
}
return result;
diff --git a/src/mess/machine/lisa.c b/src/mess/machine/lisa.c
index 5aff73d9a3d..a85ac230efa 100644
--- a/src/mess/machine/lisa.c
+++ b/src/mess/machine/lisa.c
@@ -1858,19 +1858,19 @@ READ16_MEMBER(lisa_state::lisa_IO_r)
switch ((offset & 0x0600) >> 9)
{
case 0: /* serial ports control */
- return m_scc->reg_r(space, offset&7);
+ answer = m_scc->reg_r(space, offset&7);
break;
case 2: /* parallel port */
/* 1 VIA located at 0xD901 */
if (ACCESSING_BITS_0_7)
- return via_1->read(space, (offset >> 2) & 0xf);
+ answer = via_1->read(space, (offset >> 2) & 0xf);
break;
case 3: /* keyboard/mouse cops via */
/* 1 VIA located at 0xDD81 */
if (ACCESSING_BITS_0_7)
- return via_0->read(space, offset & 0xf);
+ answer = via_0->read(space, offset & 0xf);
break;
}
}
diff --git a/src/mess/machine/pmd85.c b/src/mess/machine/pmd85.c
index fe4da215e02..aa2b1ccf5ec 100644
--- a/src/mess/machine/pmd85.c
+++ b/src/mess/machine/pmd85.c
@@ -707,7 +707,6 @@ WRITE8_MEMBER(pmd85_state::mato_io_w)
{
case 0x80: /* Motherboard 8255 */
return machine().device<i8255_device>("ppi8255_0")->write(space, offset & 0x03, data);
- break;
}
break;
}
diff --git a/src/mess/machine/rx01.c b/src/mess/machine/rx01.c
index 940e3c977bb..133745b9a93 100644
--- a/src/mess/machine/rx01.c
+++ b/src/mess/machine/rx01.c
@@ -100,8 +100,8 @@ void rx01_device::device_reset()
READ16_MEMBER( rx01_device::read )
{
switch(offset & 1) {
- case 0: return status_read(); break;
- default: return data_read(); break;
+ case 0: return status_read();
+ default: return data_read();
}
}
diff --git a/src/mess/video/bbc.c b/src/mess/video/bbc.c
index e113a04c4be..1e157562168 100644
--- a/src/mess/video/bbc.c
+++ b/src/mess/video/bbc.c
@@ -323,8 +323,8 @@ READ8_MEMBER(bbc_state::bbc_6845_r)
switch (offset&1)
{
- case 0: return mc6845->status_r(space,0); break;
- case 1: return mc6845->register_r(space,0); break;
+ case 0: return mc6845->status_r(space,0);
+ case 1: return mc6845->register_r(space,0);
}
return 0;
}
diff --git a/src/mess/video/mac.c b/src/mess/video/mac.c
index f21cabd0513..aea6b857e7b 100644
--- a/src/mess/video/mac.c
+++ b/src/mess/video/mac.c
@@ -720,19 +720,15 @@ READ32_MEMBER(mac_state::dafb_r)
{
case 0x1c: // inverse of monitor sense
return 7; // 21" color 2-page
- break;
case 0x24: // SCSI 539x #1 status
return m_dafb_scsi1_drq<<9;
- break;
case 0x28: // SCSI 539x #2 status
return m_dafb_scsi2_drq<<9;
- break;
case 0x108: // IRQ/VBL status
return m_dafb_int_status;
- break;
case 0x10c: // clear cursor scanline int
m_dafb_int_status &= ~4;
diff --git a/src/mess/video/nubus_48gc.c b/src/mess/video/nubus_48gc.c
index f2e32f802eb..101bddf2a45 100644
--- a/src/mess/video/nubus_48gc.c
+++ b/src/mess/video/nubus_48gc.c
@@ -342,12 +342,10 @@ READ32_MEMBER( jmfb_device::mac_48gc_r )
case 0:
return 0x0c00; // sense 13" RGB for now
// return 0x0000; // sense "RGB Kong" monitor
- break;
case 0x1c0/4:
m_toggle ^= 0xffffffff;
return m_toggle;
- break;
}
return 0;
diff --git a/src/mess/video/nubus_wsportrait.c b/src/mess/video/nubus_wsportrait.c
index fae910c67fe..ad6ad125189 100644
--- a/src/mess/video/nubus_wsportrait.c
+++ b/src/mess/video/nubus_wsportrait.c
@@ -299,7 +299,6 @@ READ32_MEMBER( nubus_wsportrait_device::wsportrait_r )
case 0x4004:
m_toggle ^= 0x00010000;
return m_toggle | 0xfffc0000; // bit 0 = vbl status, bits 1-3 = monitor type
- break;
}
return 0;
}
diff --git a/src/mess/video/stic.c b/src/mess/video/stic.c
index 2dbd7d43944..7fb098e877b 100644
--- a/src/mess/video/stic.c
+++ b/src/mess/video/stic.c
@@ -54,7 +54,6 @@ READ16_MEMBER( intv_state::intv_stic_r )
/*** fall through ***/
case STIC_DER:
return 0x3FFF;
- break;
case STIC_CSR + STIC_CSR0:
case STIC_CSR + STIC_CSR1:
case STIC_CSR + STIC_CSR2: