diff options
-rw-r--r-- | src/devices/bus/gio/newport.cpp | 4 | ||||
-rw-r--r-- | src/devices/machine/68340.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/z80ne.cpp | 37 | ||||
-rw-r--r-- | src/mame/includes/z80ne.h | 1 |
4 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/bus/gio/newport.cpp b/src/devices/bus/gio/newport.cpp index 9c05b16da79..b4981790ad1 100644 --- a/src/devices/bus/gio/newport.cpp +++ b/src/devices/bus/gio/newport.cpp @@ -2794,12 +2794,14 @@ void newport_base_device::do_rex3_command() { case 0: // 4bpp color = m_rex3.m_color_vram & 0xf; + color |= color << 4; break; case 1: // 8bpp color = m_rex3.m_color_vram & 0xff; break; case 2: // 12bpp color = ((m_rex3.m_color_vram & 0xf00000) >> 12) | ((m_rex3.m_color_vram & 0xf000) >> 8) | ((m_rex3.m_color_vram & 0xf0) >> 4); + color |= color << 12; break; case 3: // 24bpp color = m_rex3.m_color_vram & 0xffffff; @@ -2873,12 +2875,14 @@ void newport_base_device::do_rex3_command() { case 0: // 4bpp color = m_rex3.m_color_vram & 0xf; + color |= color << 4; break; case 1: // 8bpp color = m_rex3.m_color_vram & 0xff; break; case 2: // 12bpp color = ((m_rex3.m_color_vram & 0xf00000) >> 12) | ((m_rex3.m_color_vram & 0xf000) >> 8) | ((m_rex3.m_color_vram & 0xf0) >> 4); + color |= color << 12; break; case 3: // 24bpp color = m_rex3.m_color_vram & 0xffffff; diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp index 5e4fc3fc121..312aabed99b 100644 --- a/src/devices/machine/68340.cpp +++ b/src/devices/machine/68340.cpp @@ -69,7 +69,7 @@ void m68340_cpu_device::update_ipl() void m68340_cpu_device::internal_vectors_r(address_map &map) { - map(0xfffff0, 0xffffff).r(FUNC(m68340_cpu_device::int_ack)).umask16(0x00ff); + map(0xfffffff0, 0xffffffff).r(FUNC(m68340_cpu_device::int_ack)).umask16(0x00ff); } diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index 1b08433a9d3..89e92492566 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -447,16 +447,8 @@ void z80ne_state::z80ne(machine_config &config) //SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass"); } -void z80ne_state::z80net(machine_config &config) +void z80ne_state::lx387(machine_config &config) { - z80ne(config); - - m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::z80net_mem); - m_maincpu->set_addrmap(AS_IO, &z80ne_state::z80net_io); - - MCFG_MACHINE_START_OVERRIDE(z80ne_state, z80net ) - MCFG_MACHINE_RESET_OVERRIDE(z80ne_state, z80net ) - KR2376_ST(config, m_lx387_kr2376, 50000); m_lx387_kr2376->x<0>().set_ioport("X0"); m_lx387_kr2376->x<1>().set_ioport("X1"); @@ -468,6 +460,19 @@ void z80ne_state::z80net(machine_config &config) m_lx387_kr2376->x<7>().set_ioport("X7"); m_lx387_kr2376->shift().set(FUNC(z80ne_state::lx387_shift_r)); m_lx387_kr2376->control().set(FUNC(z80ne_state::lx387_control_r)); +} + +void z80ne_state::z80net(machine_config &config) +{ + z80ne(config); + + m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::z80net_mem); + m_maincpu->set_addrmap(AS_IO, &z80ne_state::z80net_io); + + MCFG_MACHINE_START_OVERRIDE(z80ne_state, z80net ) + MCFG_MACHINE_RESET_OVERRIDE(z80ne_state, z80net ) + + lx387(config); /* video hardware */ SCREEN(config, "lx388", SCREEN_TYPE_RASTER); @@ -510,17 +515,7 @@ void z80ne_state::z80netb(machine_config &config) m_cassette2->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); m_cassette2->set_interface("z80ne_cass"); - KR2376_ST(config, m_lx387_kr2376, 50000); - m_lx387_kr2376->x<0>().set_ioport("X0"); - m_lx387_kr2376->x<1>().set_ioport("X1"); - m_lx387_kr2376->x<2>().set_ioport("X2"); - m_lx387_kr2376->x<3>().set_ioport("X3"); - m_lx387_kr2376->x<4>().set_ioport("X4"); - m_lx387_kr2376->x<5>().set_ioport("X5"); - m_lx387_kr2376->x<6>().set_ioport("X6"); - m_lx387_kr2376->x<7>().set_ioport("X7"); - m_lx387_kr2376->shift().set(FUNC(z80ne_state::lx387_shift_r)); - m_lx387_kr2376->control().set(FUNC(z80ne_state::lx387_control_r)); + lx387(config); /* video hardware */ SCREEN(config, "lx388", SCREEN_TYPE_RASTER); @@ -563,7 +558,7 @@ void z80netf_state::z80netf(machine_config &config) m_cassette2->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); m_cassette2->set_interface("z80ne_cass"); - KR2376_ST(config, m_lx387_kr2376, 50000); + lx387(config); /* video hardware */ SCREEN(config, "lx388", SCREEN_TYPE_RASTER); diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index 418fda1b6c5..2a640832a3d 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -92,6 +92,7 @@ public: { } + void lx387(machine_config &config); void z80net(machine_config &config); void z80ne(machine_config &config); void z80netb(machine_config &config); |