From bc0a035a69948ba3c1abe11314a93835a3b12b54 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Fri, 6 Mar 2015 22:07:39 +1100 Subject: (MESS) mbee : more things (nw) --- src/mess/drivers/mbee.c | 32 ++++++++++++++++++-------------- src/mess/includes/mbee.h | 1 - src/mess/machine/mbee.c | 11 +---------- src/mess/video/mbee.c | 6 +++--- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c index 673ba0222ae..609ffdd337e 100644 --- a/src/mess/drivers/mbee.c +++ b/src/mess/drivers/mbee.c @@ -118,7 +118,9 @@ - 256tc: At the menu, if F2 pressed to activate the Monitor, the emulated machine crashes due to a bug in z80pio emulation. - - 256tc: Keyboard ROM U60 needs to be dumped. + - 256tc: the Intro disk doesn't work + + - 256tc, Teleterm: Keyboard CPU inbuilt ROM needs to be dumped. - 128k, 64k: PALs need to be dumped for the bankswitching. - Teleterm: keyboard has problems. The schematic shows it using the old-style keyboard, @@ -128,6 +130,8 @@ directly to the Z80PIO. However there's little info to be found. PIO B3 to ground activates the mouse pointer in Shell v3.01. + - Hard drive (10MB) & controller + *******************************************************************************/ #include "includes/mbee.h" @@ -143,7 +147,7 @@ static ADDRESS_MAP_START(mbee_mem, AS_PROGRAM, 8, mbee_state) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x3fff) AM_RAM + AM_RANGE(0x0000, 0x7fff) AM_RAM AM_RANGE(0x8000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(video_low_r, video_low_w) AM_RANGE(0xf800, 0xffff) AM_READWRITE(video_high_r, video_high_w) @@ -653,8 +657,8 @@ static MACHINE_CONFIG_START( mbee, mbee_state ) MCFG_MC6845_ADDR_CHANGED_CB(mbee_state, crtc_update_addr) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(mbee_state, crtc_vs)) - MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 2) - MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 2) + MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 3) + MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 3) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("z80pio", z80pio_device, strobe_a)) @@ -860,7 +864,7 @@ ROM_START( mbeeic ) ROM_LOAD_OPTIONAL( "82s123.ic16", 0x0020, 0x0020, CRC(4e779985) SHA1(cd2579cf65032c30b3fe7d6d07b89d4633687481) ) /* video switching prom, not needed for emulation purposes */ ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_END ROM_START( mbeepc ) @@ -886,7 +890,7 @@ ROM_START( mbeepc ) ROM_LOAD_OPTIONAL( "82s123.ic16", 0x0020, 0x0020, CRC(4e779985) SHA1(cd2579cf65032c30b3fe7d6d07b89d4633687481) ) /* video switching prom, not needed for emulation purposes */ ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_END ROM_START( mbeepc85 ) @@ -916,7 +920,7 @@ ROM_START( mbeepc85 ) ROM_LOAD_OPTIONAL( "82s123.ic16", 0x0020, 0x0020, CRC(4e779985) SHA1(cd2579cf65032c30b3fe7d6d07b89d4633687481) ) /* video switching prom, not needed for emulation purposes */ ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_END ROM_START( mbeepc85b ) @@ -947,7 +951,7 @@ ROM_START( mbeepc85b ) ROM_LOAD_OPTIONAL( "82s123.ic16", 0x0020, 0x0020, CRC(4e779985) SHA1(cd2579cf65032c30b3fe7d6d07b89d4633687481) ) /* video switching prom, not needed for emulation purposes */ ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_END ROM_START( mbeepc85s ) @@ -976,7 +980,7 @@ ROM_START( mbeepc85s ) ROM_LOAD_OPTIONAL( "82s123.ic16", 0x0020, 0x0020, CRC(4e779985) SHA1(cd2579cf65032c30b3fe7d6d07b89d4633687481) ) /* video switching prom, not needed for emulation purposes */ ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_END ROM_START( mbeett ) @@ -1030,7 +1034,7 @@ ROM_START( mbeeppc ) ROM_RELOAD( 0x0000, 0x1000 ) ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_REGION( 0x0800, "attrib", ROMREGION_ERASE00 ) ROM_END @@ -1047,7 +1051,7 @@ ROM_START( mbee56 ) ROM_LOAD_OPTIONAL( "82s123.ic16", 0x0020, 0x0020, CRC(4e779985) SHA1(cd2579cf65032c30b3fe7d6d07b89d4633687481) ) /* video switching prom, not needed for emulation purposes */ ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_END ROM_START( mbee128 ) // Standard 128k (CIAB is the same thing with half the ram) @@ -1068,7 +1072,7 @@ ROM_START( mbee128 ) // Standard 128k (CIAB is the same thing with half the ram) ROM_LOAD_OPTIONAL( "82s123.ic16", 0x0020, 0x0020, CRC(4e779985) SHA1(cd2579cf65032c30b3fe7d6d07b89d4633687481) ) /* video switching prom, not needed for emulation purposes */ ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_END ROM_START( mbee128p ) // Premium 128K @@ -1096,7 +1100,7 @@ ROM_START( mbee128p ) // Premium 128K ROM_RELOAD( 0x0000, 0x1000 ) ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_REGION( 0x0800, "attrib", ROMREGION_ERASE00 ) ROM_END @@ -1118,7 +1122,7 @@ ROM_START( mbee256 ) // 256tc ROM_COPY( "gfx", 0x1000, 0x0000, 0x1000 ) ROM_REGION( 0x0800, "videoram", ROMREGION_ERASE00 ) - ROM_REGION( 0x0800, "colorram", ROMREGION_ERASE00 ) + ROM_REGION( 0x0800, "colorram", ROMREGION_ERASEVAL(2)) ROM_REGION( 0x0800, "attrib", ROMREGION_ERASE00 ) ROM_END diff --git a/src/mess/includes/mbee.h b/src/mess/includes/mbee.h index 50bda848e11..2cf47160adc 100644 --- a/src/mess/includes/mbee.h +++ b/src/mess/includes/mbee.h @@ -129,7 +129,6 @@ private: bool m_b7_rtc; bool m_b7_vs; bool m_b2; - bool m_is_mbeett; UINT8 m_framecnt; UINT8 m_08; UINT8 m_0a; diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c index 7ebe08fb26f..2fdc74dcf5a 100644 --- a/src/mess/machine/mbee.c +++ b/src/mess/machine/mbee.c @@ -482,9 +482,8 @@ MACHINE_RESET_MEMBER( mbee_state, mbeett ) DRIVER_INIT_MEMBER( mbee_state, mbee ) { - m_size = 0x4000; + m_size = 0x8000; m_has_oldkb = 1; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbeeic ) @@ -495,7 +494,6 @@ DRIVER_INIT_MEMBER( mbee_state, mbeeic ) m_size = 0x8000; m_has_oldkb = 1; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbeepc ) @@ -509,7 +507,6 @@ DRIVER_INIT_MEMBER( mbee_state, mbeepc ) m_size = 0x8000; m_has_oldkb = 1; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbeepc85 ) @@ -523,7 +520,6 @@ DRIVER_INIT_MEMBER( mbee_state, mbeepc85 ) m_size = 0x8000; m_has_oldkb = 1; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbeeppc ) @@ -540,14 +536,12 @@ DRIVER_INIT_MEMBER( mbee_state, mbeeppc ) m_size = 0x8000; m_has_oldkb = 1; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbee56 ) { m_size = 0xe000; m_has_oldkb = 1; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbee128 ) @@ -569,7 +563,6 @@ DRIVER_INIT_MEMBER( mbee_state, mbee128 ) m_size = 0x8000; m_has_oldkb = 1; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbee256 ) @@ -593,7 +586,6 @@ DRIVER_INIT_MEMBER( mbee_state, mbee256 ) m_size = 0x8000; m_has_oldkb = 0; - m_is_mbeett = 0; } DRIVER_INIT_MEMBER( mbee_state, mbeett ) @@ -609,7 +601,6 @@ DRIVER_INIT_MEMBER( mbee_state, mbeett ) m_size = 0x8000; m_has_oldkb = 0; - m_is_mbeett = 1; } diff --git a/src/mess/video/mbee.c b/src/mess/video/mbee.c index 8ee91d79787..c9097c057bd 100644 --- a/src/mess/video/mbee.c +++ b/src/mess/video/mbee.c @@ -479,9 +479,9 @@ PALETTE_INIT_MEMBER( mbee_state, premium ) /* set up 8 low intensity colours */ for (i = 0; i < 8; i++) { - r = BIT(i, 0) ? 0xa0 : 0; - g = BIT(i, 1) ? 0xa0 : 0; - b = BIT(i, 2) ? 0xa0 : 0; + r = BIT(i, 0) ? 0xc0 : 0; + g = BIT(i, 1) ? 0xc0 : 0; + b = BIT(i, 2) ? 0xc0 : 0; palette.set_pen_color(i, rgb_t(r, g, b)); } -- cgit v1.2.3