diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 61d4f85e8be..79820f3d57a 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -1,35 +1,38 @@
-/***********************************************************************************************************
+/***************************************************************************
 
-Midnight Landing (c) 1987 Taito Corporation
+    Midnight Landing
 
-driver by Tomasz Slanina, Phil Bennett & Angelo Salese, based on early work by David Haywood
+    driver by Tomasz Slanina, Phil Bennett & Angelo Salese
 
-Dual 68k + 2xZ80 + TMS32025 DSP
-YM2151, msm5205
-TC0140SYT, other Taito ICs unknown
-no other hardware info..
+    Based on early work by David Haywood
 
-TODO:
-- Analog controls are very stiff;
-- Palette banking;
-- Comms between the five CPUs;
-- What is the unknown ROM ml_b0936 for?;
-- Emulate 'mecha drive' (motors);
-- Needs a custom artwork for the cloche status;
-- clean-ups!
 
-************************************************************************************************************/
+    To do:
+        * Find Japanese version
+        * Determine correct CPU and video timings
+        * Unknown sound writes (volume and body sonic control?)
+        * Better document mecha drive CPU
+
+****************************************************************************/
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms32025/tms32025.h"
 #include "cpu/z80/z80.h"
 #include "includes/taitoipt.h"
+#include "machine/z80ctc.h"
 #include "audio/taitosnd.h"
 #include "sound/2151intf.h"
 #include "sound/msm5205.h"
 
 
+
+/*************************************
+ *
+ *  Driver state
+ *
+ *************************************/
+
 class mlanding_state : public driver_device
 {
 public:
@@ -41,16 +44,19 @@ public:
 	mlanding_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_subcpu(*this, "sub"),
+		m_subcpu(*this, "subcpu"),
 		m_dsp(*this, "dsp"),
 		m_audiocpu(*this, "audiocpu"),
-		m_mechacpu(*this, "z80sub"),
-		m_msm(*this, "msm"),
-		m_adpcm_rom(*this, "adpcm"),
+		m_mechacpu(*this, "mechacpu"),
+		m_msm1(*this, "msm1"),
+		m_msm2(*this, "msm2"),
+		m_ctc(*this, "ctc"),
+		m_msm1_rom(*this, "adpcm1"),
+		m_msm2_rom(*this, "adpcm2"),
 		m_g_ram(*this, "g_ram"),
-		m_ml_tileram(*this, "ml_tileram"),
+		m_cha_ram(*this, "cha_ram"),
 		m_dma_ram(*this, "dma_ram"),
-		m_ml_dotram(*this, "ml_dotram"),
+		m_dot_ram(*this, "dot_ram"),
 		m_power_ram(*this, "power_ram")
 	{ }
 
@@ -59,49 +65,62 @@ public:
 	required_device<cpu_device> m_dsp;
 	required_device<cpu_device> m_audiocpu;
 	required_device<cpu_device> m_mechacpu;
-	required_device<msm5205_device> m_msm;
-	required_memory_region m_adpcm_rom;
+	required_device<msm5205_device> m_msm1;
+	required_device<msm5205_device> m_msm2;
+	required_device<z80ctc_device> m_ctc;
 
-	required_shared_ptr<UINT16> m_g_ram;
-	required_shared_ptr<UINT16> m_ml_tileram;
-	required_shared_ptr<UINT16> m_dma_ram;
-	required_shared_ptr<UINT16> m_ml_dotram;
-	required_shared_ptr<UINT8> m_power_ram;
+	required_memory_region m_msm1_rom;
+	required_memory_region m_msm2_rom;
+
+	required_shared_ptr<UINT16>	m_g_ram;
+	required_shared_ptr<UINT16>	m_cha_ram;
+	required_shared_ptr<UINT16>	m_dma_ram;
+	required_shared_ptr<UINT16>	m_dot_ram;
+	required_shared_ptr<UINT8>	m_power_ram;
+
+	UINT8	m_dma_busy;
+	UINT16	m_dsp_hold_signal;
+
+	UINT32	m_msm_pos[2];
+	UINT8	m_msm_reset[2];
+	UINT8	m_msm_nibble[2];
+	UINT8	m_msm2_vck;
+	UINT8	m_msm2_vck2;
 
-	UINT32 m_adpcm_pos;
-	UINT32 m_adpcm_address;
-	UINT8 m_adpcm_trigger;
-	UINT8 m_pal_fg_bank;
-	int m_dma_active;
-	UINT16 m_dsp_HOLD_signal;
-	DECLARE_WRITE16_MEMBER(ml_tileram_w);
-	DECLARE_READ16_MEMBER(ml_tileram_r);
-	DECLARE_READ16_MEMBER(io1_r);
-	DECLARE_WRITE16_MEMBER(ml_output_w);
-	DECLARE_WRITE16_MEMBER(ml_sub_reset_w);
-	DECLARE_READ16_MEMBER(ml_analog1_lsb_r);
-	DECLARE_READ16_MEMBER(ml_analog2_lsb_r);
-	DECLARE_READ16_MEMBER(ml_analog3_lsb_r);
-	DECLARE_READ16_MEMBER(ml_analog1_msb_r);
-	DECLARE_READ16_MEMBER(ml_analog2_msb_r);
-	DECLARE_READ16_MEMBER(ml_analog3_msb_r);
-	DECLARE_READ16_MEMBER(ml_power_ram_r);
-	DECLARE_WRITE16_MEMBER(ml_power_ram_w);
-	DECLARE_READ16_MEMBER(ml_dotram_r);
-	DECLARE_WRITE16_MEMBER(ml_dotram_w);
-	DECLARE_READ16_MEMBER(dsp_HOLD_signal_r);
-	DECLARE_READ8_MEMBER(test_r);
-	DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
-	DECLARE_WRITE8_MEMBER(ml_adpcm_address_lo_w);
-	DECLARE_WRITE8_MEMBER(ml_adpcm_address_hi_w);
-	DECLARE_WRITE8_MEMBER(ml_adpcm_start_w);
-	DECLARE_WRITE8_MEMBER(ml_adpcm_stop_w);
-	virtual void machine_reset();
 	virtual void machine_start();
-	virtual void video_start();
+	virtual void machine_reset();
+
+	DECLARE_WRITE16_MEMBER(dma_start_w);
+	DECLARE_WRITE16_MEMBER(dma_stop_w);
+	DECLARE_WRITE16_MEMBER(output_w);
+	DECLARE_READ16_MEMBER(input_r);
+	DECLARE_READ16_MEMBER(analog1_lsb_r);
+	DECLARE_READ16_MEMBER(analog2_lsb_r);
+	DECLARE_READ16_MEMBER(analog3_lsb_r);
+	DECLARE_READ16_MEMBER(analog1_msb_r);
+	DECLARE_READ16_MEMBER(analog2_msb_r);
+	DECLARE_READ16_MEMBER(analog3_msb_r);
+	DECLARE_READ16_MEMBER(power_ram_r);
+	DECLARE_WRITE16_MEMBER(power_ram_w);
+
+	DECLARE_WRITE16_MEMBER(dsp_control_w);
+	DECLARE_READ16_MEMBER(dsp_hold_signal_r);
+
+	DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
+	DECLARE_WRITE8_MEMBER(msm5205_1_start_w);
+	DECLARE_WRITE8_MEMBER(msm5205_1_stop_w);
+	DECLARE_WRITE8_MEMBER(msm5205_1_addr_lo_w);
+	DECLARE_WRITE8_MEMBER(msm5205_1_addr_hi_w);
+	DECLARE_WRITE8_MEMBER(msm5205_2_start_w);
+	DECLARE_WRITE8_MEMBER(msm5205_2_stop_w);
+	DECLARE_WRITE_LINE_MEMBER(msm5205_1_vck);
+	DECLARE_WRITE_LINE_MEMBER(z80ctc_to0);
+
+	DECLARE_READ8_MEMBER(motor_r);
+
 	UINT32 screen_update_mlanding(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	int start_dma();
-	DECLARE_WRITE_LINE_MEMBER(ml_msm5205_vck);
+	UINT32 exec_dma();
+	void msm5205_update(int chip);
 
 protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
@@ -109,285 +128,321 @@ protected:
 
 
 
-void mlanding_state::video_start()
+/*************************************
+ *
+ *  Initialization
+ *
+ *************************************/
+
+void mlanding_state::machine_start()
 {
+	// Register state for saving
+	save_item(NAME(m_dma_busy));
+	save_item(NAME(m_dsp_hold_signal));
+	save_item(NAME(m_msm_pos));
+	save_item(NAME(m_msm_reset));
+	save_item(NAME(m_msm_nibble));
+	save_item(NAME(m_msm2_vck));
+	save_item(NAME(m_msm2_vck2));
 }
 
-// 000: ???????
-// 256: Cockpit
-// 512: control centre screen
-// 768: plane landing sequence
+
+void mlanding_state::machine_reset()
+{
+	m_subcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+	m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+	m_mechacpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+
+	m_dsp_hold_signal = 0;
+
+	m_msm_reset[0] = 0;
+	m_msm_reset[1] = 0;
+	m_msm1->reset_w(1);
+	m_msm2->reset_w(1);
+	m_msm2_vck = 0;
+	m_msm2_vck2 = 0;
+}
+
+
+
+/*************************************
+ *
+ *  Video update
+ *
+ *************************************/
+
 UINT32 mlanding_state::screen_update_mlanding(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	int x, y;
+	const pen_t *pens = machine().pens;
 
-	for (y = cliprect.min_y; y <= cliprect.max_y; ++y)
+	for (UINT32 y = cliprect.min_y; y <= cliprect.max_y; ++y)
 	{
-		UINT16 *src = &m_g_ram[y * 512/2 + cliprect.min_x];
+		UINT16 *src = &m_g_ram[(112 + y) * 512 + cliprect.min_x];
 		UINT16 *dst = &bitmap.pix16(y, cliprect.min_x);
 
-		for (x = cliprect.min_x; x <= cliprect.max_x; x += 2)
+		for (UINT32 x = cliprect.min_x; x <= cliprect.max_x; ++x)
 		{
-			UINT16 srcpix = *src++;
-
-			*dst++ = machine().pens[256+(srcpix & 0xff) + (m_pal_fg_bank & 1 ? 0x100 : 0x000)];
-			*dst++ = machine().pens[256+(srcpix >> 8) + (m_pal_fg_bank & 1 ? 0x100 : 0x000)];
+			*dst++ = pens[*src++ & 0x3fff];
 		}
 	}
 
 	return 0;
 }
 
-/* Return the number of pixels processed for timing purposes? */
-int mlanding_state::start_dma()
+
+
+/*************************************
+ *
+ *  Video DMA
+ *
+ *************************************/
+
+WRITE16_MEMBER(mlanding_state::dma_start_w)
 {
-	/* Traverse the DMA RAM list */
-	int offs;
+	UINT32 pixels = exec_dma();
 
-	for (offs = 0; offs < 0x2000; offs +=4)
+	if (pixels)
 	{
-		UINT16 code;
-		UINT16 x;
-		UINT16 y;
-		UINT16 colour;
-		UINT16 dx;
-		UINT16 dy;
+		m_dma_busy = 1;
 
-		int j, k;
+		// This is a rather crude estimate!
+		timer_set(attotime::from_hz(16000000) * pixels, TIMER_DMA_COMPLETE);
+	}
+}
 
+
+WRITE16_MEMBER(mlanding_state::dma_stop_w)
+{
+	m_dma_busy = 0;
+	timer_set(attotime::never);
+}
+
+
+/*
+		FEDCBA9876543210
+
+	0	...xxxxx xxxxxxxx		Tile index
+		..x..... ........		Clear mode
+		.x...... ........		Clear pixel/palette data
+		x....... ........		Transparent/opaque mode
+
+	1	.......x xxxxxxxx		X Coordinate
+		xxxxx... ........		Width in 8x8 tiles
+
+	2	.......x xxxxxxxx		Y Coordinate
+		.....xx. ........		Unused
+		xxxxx... ........		Height in 8x8 tiles
+
+	3	........ ....xxxx		Colour
+*/
+UINT32 mlanding_state::exec_dma()
+{
+	UINT32 pixcnt = 0;
+	UINT32 dma_words = m_dma_ram.bytes() / 2;
+	UINT32 gram_mask = m_g_ram.bytes() - 1;
+
+	// Process the entries in DMA RAM
+	for (UINT32 offs = 0; offs < dma_words; offs += 4)
+	{
 		UINT16 attr = m_dma_ram[offs];
 
 		if (attr == 0)
 			continue;
 
-		x = m_dma_ram[offs + 1];
-		y = m_dma_ram[offs + 2];
-		colour = m_dma_ram[offs + 3];
+		UINT16 code = attr & 0x1fff;
 
-		dx = x >> 11;
-		dy = y >> 11;
-		dx &= 0x1f;
-		dy &= 0x1f;
-		dx++;
-		dy++;
+		UINT16 xword = m_dma_ram[offs + 1];
+		UINT16 yword = m_dma_ram[offs + 2];
 
-		x &= 0x1ff;
-		y &= 0x1ff;
+		UINT16 x = xword & 0x1ff;
+		UINT16 y = yword & 0x1ff;
+		UINT16 sx = ((xword >> 11) & 0x1f) + 1;
+		UINT16 sy = ((yword >> 11) & 0x1f) + 1;
 
-#if 0
-		printf("OFFS: %.8x\n", offs*2);
-		printf("CODE: %.4x %s\n", attr, ~attr & 0x8000 ? "TRANS" : "    ");
-		printf("X   : %.3d\n", x);
-		printf("Y   : %.3d\n", y);
-		printf("DX  : %.3d (%d)\n", dx, dx*8);
-		printf("DY  : %.3d (%d)\n", dy, dx*8);
-		printf("COL : %.4x\n", colour);
-#endif
+		UINT8 colour = m_dma_ram[offs + 3] & 0xff;
 
-		code = attr & 0x1fff;
-
-		if (code)
+		if ((attr & 0x2000) == 0)
 		{
-			for(j = 0; j < dx; j++)
-			{
-				for(k = 0; k < dy; k++)
-				{
-					int x1, y1;
+			// Normal draw mode
+			UINT8 basepix = colour << 4;
 
-					// Draw the 8x8 chunk
-					for (y1 = 0; y1 < 8; ++y1)
+			for (UINT32 j = 0; j < sx; ++j)
+			{
+				for (UINT32 k = 0; k < sy; ++k)
+				{
+					// Draw an 8x8 tile
+					for (UINT32 y1 = 0; y1 < 8; ++y1)
 					{
-						UINT16 *src = &m_ml_tileram[(code * 2 * 8) + y1*2];
-						UINT16 *dst = &m_g_ram[(y + k*8+y1)*512/2 + (j*8+x)/2];
+						UINT16 *src = &m_cha_ram[(code * 2 * 8) + y1 * 2];
+						UINT32 byteaddr = ((y + k * 8 + y1) * 512 + (j * 8 + x)) * 2;
+
+						UINT8 *pixdata = reinterpret_cast<UINT8 *>(m_g_ram.target()) + BYTE_XOR_BE(1);
 
 						UINT8 p2 = *src & 0xff;
 						UINT8 p1 = *src++ >> 8;
 						UINT8 p4 = *src;
 						UINT8 p3 = *src++ >> 8;
 
-						// DRAW 8 pixels
-						for (x1 = 0; x1 < 8; x1++)
+						// Draw 8 pixels
+						for (UINT32 x1 = 0; x1 < 8; ++x1)
 						{
-							UINT16 pix1, pix2;
+							UINT16 pix = (BIT(p4, x1) << 3) | (BIT(p3, x1) << 2) | (BIT(p2, x1) << 1) | BIT(p1, x1);
 
-							pix1 = (BIT(p4, x1) << 3) | (BIT(p3, x1) << 2) | (BIT(p2, x1) << 1) | BIT(p1, x1);
-							x1++;
-							pix2 = (BIT(p4, x1) << 3) | (BIT(p3, x1) << 2) | (BIT(p2, x1) << 1) | BIT(p1, x1);
-
-							if (~attr & 0x8000)
+							if ((attr & 0x8000) == 0)
 							{
-								if (pix1)
+								// Transparency mode
+								if (pix)
 								{
-									*dst = (*dst & 0xff00) | ((colour << 4) | pix1);
-								}
-								if (pix2)
-								{
-									*dst = (*dst & 0x00ff) | (((colour << 4) | pix2) << 8);
+									pixdata[byteaddr & gram_mask] = basepix | pix;
 								}
 							}
 							else
 							{
-								*dst = (((colour << 4) | pix2) << 8) | ((colour << 4) | pix1);
+								pixdata[byteaddr & gram_mask] = basepix | pix;
 							}
 
-							dst++;
+							byteaddr += 2;
+							++pixcnt;
 						}
 					}
-					code++;
+					++code;
 				}
 			}
 		}
 		else
 		{
-			int y1;
-			UINT16 clear_colour = (colour << 12) | (colour << 4);
-
-			for(y1 = 0; y1 < dy*8; y1++)
+			// Set pixel or palette data
+			for (UINT32 y1 = 0; y1 < sy * 8; ++y1)
 			{
-				int x1;
-				UINT16 *dst = &m_g_ram[((y + y1) * 512/2) + x/2];
+				UINT32 byteaddr = (((y + y1) * 512) + x) * 2;
 
-				for(x1 = 0; x1 < dx*8; x1+=2)
+				if ((attr & 0x4000) == 0)
 				{
-					*dst++ = clear_colour;
+					// Clear pixel data
+					UINT8 *pixdata = reinterpret_cast<UINT8 *>(m_g_ram.target()) + BYTE_XOR_BE(1);
+
+					for (UINT32 x1 = 0; x1 < sx * 8; ++x1)
+					{
+						pixdata[byteaddr & gram_mask] = colour;
+						byteaddr += 2;
+						++pixcnt;
+					}
+				}
+				else
+				{
+					// Clear palette data
+					UINT8 *paldata = reinterpret_cast<UINT8 *>(m_g_ram.target()) + BYTE_XOR_BE(0);
+
+					for (UINT32 x1 = 0; x1 < sx * 8; ++x1)
+					{
+						paldata[byteaddr & gram_mask] = colour;
+						byteaddr += 2;
+						++pixcnt;
+					}
 				}
 			}
 		}
 	}
-	return 1;
+
+	return pixcnt;
 }
 
-WRITE16_MEMBER(mlanding_state::ml_tileram_w)
-{
-	COMBINE_DATA(&m_ml_tileram[offset]);
-}
-
-READ16_MEMBER(mlanding_state::ml_tileram_r)
-{
-	return m_ml_tileram[offset];
-}
-
-
-READ16_MEMBER(mlanding_state::io1_r)//240006
-{
-	/*
-	fedcba9876543210
-	               x  - mecha driver status
-	              x   - ???
-	             x    - test 2
-	            x     - ???
-	x                 - video status
-	    other bits = language(german, japan, english), video test
-	*/
-// multiplexed? or just overriden?
-
-	UINT8 swa = ioport("DSWA")->read();
-	UINT8 swb = ioport("DSWB")->read() & 0x7f;
-	return m_dma_active << 15 | swb << 8 | swa;
-}
-
-/* output */
-WRITE16_MEMBER(mlanding_state::ml_output_w)
-{
-	/*
-	x--- ---- palette fg bankswitch
-	---x ---- coin lockout?
-	---- x--- coin counter B
-	---- -x-- coin counter A
-	*/
-//  popmessage("%04x",data);
-
-	m_pal_fg_bank = (data & 0x80)>>7;
-}
-
-WRITE8_MEMBER(mlanding_state::sound_bankswitch_w)
-{
-	// unused? assume audiocpu prg bankswitch leftover
-}
-
-WRITE_LINE_MEMBER(mlanding_state::ml_msm5205_vck)
-{
-	UINT8 data = m_adpcm_rom->base()[m_adpcm_pos];
-	m_msm->data_w(m_adpcm_trigger ? (data & 0xf) : (data >> 4));
-	m_adpcm_pos = (m_adpcm_pos + m_adpcm_trigger) & 0x7ffff;
-	m_adpcm_trigger ^= 1;
-}
 
 void mlanding_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
 	switch (id)
 	{
-	case TIMER_DMA_COMPLETE:
-		m_dma_active = 0;
-		break;
-	default:
-		assert_always(FALSE, "Unknown id in mlanding_state::device_timer");
+		case TIMER_DMA_COMPLETE:
+			m_dma_busy = 0;
+			break;
+
+		default:
+			assert_always(FALSE, "Unknown id in mlanding_state::device_timer");
 	}
 }
 
-/* TODO: this uses many bits */
-WRITE16_MEMBER(mlanding_state::ml_sub_reset_w)
+
+
+/*************************************
+ *
+ *  I/O
+ *
+ *************************************/
+
+READ16_MEMBER(mlanding_state::input_r)
 {
-	int pixels;
+	/*
+		FEDCBA98 76543210
+		........ xxxxxxxx	DSWA
+		.xxxxxxx ........	DSWB
+		x....... ........	DMA busy
+	*/
 
-	// Return the number of pixels drawn?
-	pixels = start_dma();
-
-	if (pixels)
-	{
-		m_dma_active = 1;
-		timer_set(attotime::from_msec(20), TIMER_DMA_COMPLETE);
-	}
-
-	// 0 (falling edge?) starts cpus in this order:
-
-	if (!(data & 0x40)) // $09b0 d6: sub cpu
-		m_subcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
-
-	if (!(data & 0x80)) // $0950 d7: dsp?
-	{
-		m_dsp->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
-		m_dsp_HOLD_signal = data & 0x80;
-	}
-
-	if (!(data & 0x20)) // $0950 d5: sound cpu?
-		m_audiocpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
-
-	if (!(data & 0x10)) // $09e0 d4: mecha cpu
-		m_mechacpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
+	UINT8 dswa = ioport("DSWA")->read();
+	UINT8 dswb = ioport("DSWB")->read() & 0x7f;
+	return m_dma_busy << 15 | dswb << 8 | dswa;
 }
 
 
-READ16_MEMBER(mlanding_state::ml_analog1_lsb_r)
+WRITE16_MEMBER(mlanding_state::output_w)
 {
-	return ioport("STICK1")->read() & 0xff;
+	/*
+		76543210
+		x.......	Start lamp?
+		.x......	/Mecha CPU reset
+		..x.....	? (Briefly transitions from 1 to 0 at $5040, after pressing start)
+		...x....	/Sub CPU reset
+		....x...	Coin counter B
+		.....x..	Coin counter A
+		......x.	/Coin lockout B
+		.......x	/Coin lockout A
+	*/
+	m_subcpu->set_input_line(INPUT_LINE_RESET, data & 0x10 ? CLEAR_LINE : ASSERT_LINE);
+	m_mechacpu->set_input_line(INPUT_LINE_RESET, data & 0x40 ? CLEAR_LINE : ASSERT_LINE);
 }
 
-READ16_MEMBER(mlanding_state::ml_analog2_lsb_r)
+
+
+/*************************************
+ *
+ *  Analog controls
+ *
+ *************************************/
+
+READ16_MEMBER(mlanding_state::analog1_msb_r)
 {
-	return ioport("STICK2")->read() & 0xff;
+	return (ioport("THROTTLE")->read() >> 4) & 0xff;
 }
 
-READ16_MEMBER(mlanding_state::ml_analog3_lsb_r)
+
+READ16_MEMBER(mlanding_state::analog2_msb_r)
 {
-	return ioport("STICK3")->read() & 0xff;
+	return (ioport("STICK_X")->read() >> 4) & 0xff;
 }
 
-/* high bits of analog inputs + "limiters"/ADC converters. */
-READ16_MEMBER(mlanding_state::ml_analog1_msb_r)
+
+READ16_MEMBER(mlanding_state::analog3_msb_r)
 {
-	// d0-d3: counter 1 high bits
-	// d4: handle left
-	// d5: slot down
-	// d6: slot up
-	// d7: ?
-	UINT8 throttle = ioport("STICK1")->read();
-	UINT16 x = ioport("STICK2")->read();
+	return (ioport("STICK_Y")->read() >> 4) & 0xff;
+}
 
-	UINT8 res = 0xf0;
 
-	if (throttle & 0x80)
-		res ^= 0x2f;
+READ16_MEMBER(mlanding_state::analog1_lsb_r)
+{
+	/*
+		76543210
+		....xxxx	Counter 1 bits 3-0
+		...x....	Handle left
+		..x.....	Slot down
+		.x......	Slot up
+	*/
+	UINT16 throttle = ioport("THROTTLE")->read();
+	UINT16 x = ioport("STICK_X")->read();
+
+	UINT8 res = 0x70 | (throttle & 0x0f);
+
+	if (throttle & 0x800)
+		res ^= 0x20;
 	else if (throttle > 0)
 		res ^= 0x40;
 
@@ -397,24 +452,30 @@ READ16_MEMBER(mlanding_state::ml_analog1_msb_r)
 	return res;
 }
 
-READ16_MEMBER(mlanding_state::ml_analog2_msb_r)
+
+READ16_MEMBER(mlanding_state::analog2_lsb_r)
 {
-	// d0-d3: counter 2 high bits
-	// d4-d7: ?
-	return (ioport("STICK2")->read() >> 8 & 0x0f) | 0xf0;
+	/*
+		76543210
+		....xxxx	Counter 2 bits 3-0
+	*/
+	return ioport("STICK_X")->read() & 0x0f;
 }
 
-READ16_MEMBER(mlanding_state::ml_analog3_msb_r)
-{
-	// d0-d3: counter 3 high bits
-	// d4: handle up
-	// d5: handle right
-	// d6: handle down
-	// d7: ?
-	UINT16 x = ioport("STICK2")->read();
-	UINT16 y = ioport("STICK3")->read();
 
-	UINT8 res = (y >> 8 & 0x0f) | 0xf0;
+READ16_MEMBER(mlanding_state::analog3_lsb_r)
+{
+	/*
+		76543210
+		....xxxx	Counter 3 bits 3-0
+		...x....	Handle up
+		..x.....	Handle right
+		.x......	Handle down
+	*/
+	UINT16 x = ioport("STICK_X")->read();
+	UINT16 y = ioport("STICK_Y")->read();
+
+	UINT8 res = 0x70 | (y & 0x0f);
 
 	if (y & 0x800)
 		res ^= 0x40;
@@ -428,157 +489,310 @@ READ16_MEMBER(mlanding_state::ml_analog3_msb_r)
 }
 
 
+/*************************************
+ *
+ *  DSP control
+ *
+ *************************************/
 
-
-READ16_MEMBER(mlanding_state::ml_power_ram_r)
+READ16_MEMBER(mlanding_state::dsp_hold_signal_r)
 {
-	return m_power_ram[offset * 2] << 8 | m_power_ram[offset * 2 + 1];
+	return m_dsp_hold_signal;
 }
 
-WRITE16_MEMBER(mlanding_state::ml_power_ram_w)
+
+WRITE16_MEMBER(mlanding_state::dsp_control_w)
+{
+	/*
+		1 after zeroing 'dot' RAM
+		3 after uploading DSP program
+	*/
+	m_dsp->set_input_line(INPUT_LINE_RESET, data & 0x2 ? CLEAR_LINE : ASSERT_LINE);
+}
+
+
+
+/*************************************
+ *
+ *  Sound
+ *
+ *************************************/
+
+WRITE8_MEMBER(mlanding_state::sound_bankswitch_w)
+{
+	// Unused?
+}
+
+
+void mlanding_state::msm5205_update(int chip)
+{
+	if (m_msm_reset[chip])
+		return;
+
+	const UINT8 *rom = chip ? m_msm2_rom->base() : m_msm1_rom->base();
+	UINT8 data = rom[m_msm_pos[chip]];
+	msm5205_device *msm = chip ? m_msm2 : m_msm1;
+
+	msm->data_w((m_msm_nibble[chip] ? data : data >> 4) & 0xf);
+
+	if (m_msm_nibble[chip])
+		++m_msm_pos[chip];
+
+	m_msm_nibble[chip] ^= 1;
+}
+
+
+WRITE_LINE_MEMBER(mlanding_state::msm5205_1_vck)
+{
+	msm5205_update(0);
+}
+
+
+WRITE_LINE_MEMBER(mlanding_state::z80ctc_to0)
+{
+	if (m_msm2_vck2 && !state)
+	{
+		// CTC output is divided by 2
+		if (m_msm2_vck)
+		{
+			m_msm2->vclk_w(1);
+		}
+		else
+		{
+			// Update on falling edge of /VCK
+			msm5205_update(1);
+
+			// Handle looping
+			if (m_msm_pos[1] == 0x2000)
+			{
+				m_msm_pos[1] = 0;
+				m_msm2->reset_w(1);
+				m_msm2->vclk_w(0);
+				m_msm2->reset_w(0);
+			}
+			else
+			{
+				m_msm2->vclk_w(0);
+			}
+		}
+
+		m_msm2_vck ^= 1;
+	}
+	m_msm2_vck2 = state;
+}
+
+
+WRITE8_MEMBER(mlanding_state::msm5205_1_start_w)
+{
+	m_msm_reset[0] = 0;
+	m_msm1->reset_w(0);
+}
+
+
+WRITE8_MEMBER(mlanding_state::msm5205_1_stop_w)
+{
+	m_msm_reset[0] = 1;
+	m_msm_nibble[0] = 0;
+	m_msm_pos[0] &= ~0xff;
+	m_msm1->reset_w(1);
+}
+
+
+WRITE8_MEMBER(mlanding_state::msm5205_1_addr_lo_w)
+{
+	m_msm_pos[0] &= ~0x0ff00;
+	m_msm_pos[0] |= data << 8;
+}
+
+
+WRITE8_MEMBER(mlanding_state::msm5205_1_addr_hi_w)
+{
+	m_msm_pos[0] &= ~0x70000;
+	m_msm_pos[0] |= (data & 7) << 16;
+}
+
+
+WRITE8_MEMBER(mlanding_state::msm5205_2_start_w)
+{
+	m_msm_reset[1] = 0;
+	m_msm2->reset_w(0);
+}
+
+
+WRITE8_MEMBER(mlanding_state::msm5205_2_stop_w)
+{
+	m_msm_reset[1] = 1;
+	m_msm_nibble[1] = 0;
+	m_msm2->reset_w(1);
+}
+
+
+
+/*************************************
+ *
+ *  Mecha drive (motorized cabinet)
+ *
+ *************************************/
+
+READ16_MEMBER(mlanding_state::power_ram_r)
+{
+	return m_power_ram[offset];
+}
+
+
+WRITE16_MEMBER(mlanding_state::power_ram_w)
 {
 	if (ACCESSING_BITS_0_7)
-		m_power_ram[offset * 2 + 1] = data & 0xff;
-	if (ACCESSING_BITS_8_15)
-		m_power_ram[offset * 2] = data >> 8;
+		m_power_ram[offset] = data & 0xff;
 }
 
-static ADDRESS_MAP_START( mlanding_mem, AS_PROGRAM, 16, mlanding_state )
+
+READ8_MEMBER(mlanding_state::motor_r)
+{
+	/*
+		9001: RIGHT MOTOR: 1F=UP, 00=STOP, 2F=DOWN
+		9003: LEFT MOTOR:  1F=UP, 00=STOP, 2F=DOWN
+
+		9800: xxxx .... - Counter R 3-0
+		9801: .... xxxx - Counter R 7-4
+		   ...x .... - SW R
+		9802: xxxx .... - Counter L 3-0
+		9803: .... xxxx - Counter L 7-4
+		9804: .... .... -
+		9805: ...x .... - SW L
+	*/
+
+	return 0x10;
+}
+
+
+
+/*************************************
+ *
+ *  Main CPU memory handlers
+ *
+ *************************************/
+
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, mlanding_state )
 	AM_RANGE(0x000000, 0x05ffff) AM_ROM
 	AM_RANGE(0x080000, 0x08ffff) AM_RAM
-
-	AM_RANGE(0x100000, 0x17ffff) AM_RAM AM_SHARE("g_ram") // 512kB G RAM - enough here for double buffered 512x400x8 frame
-	AM_RANGE(0x180000, 0x1bffff) AM_READWRITE(ml_tileram_r, ml_tileram_w) AM_SHARE("ml_tileram")
+	AM_RANGE(0x100000, 0x17ffff) AM_RAM AM_SHARE("g_ram")
+	AM_RANGE(0x180000, 0x1bffff) AM_RAM AM_SHARE("cha_ram")
 	AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM AM_SHARE("dma_ram")
-	AM_RANGE(0x1c4000, 0x1cffff) AM_RAM AM_SHARE("share1")
-
-	AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(ml_sub_reset_w)
-//  AM_RANGE(0x1d0002, 0x1d0003) AM_WRITENOP // ?
-
-	AM_RANGE(0x2d0000, 0x2d0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, tc0140syt_port_w, 0x00ff)
-	AM_RANGE(0x2d0002, 0x2d0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
-
+	AM_RANGE(0x1c4000, 0x1cffff) AM_RAM AM_SHARE("sub_com_ram")
+	AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(dma_start_w)
+	AM_RANGE(0x1d0002, 0x1d0003) AM_WRITE(dma_stop_w)
 	AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
-	AM_RANGE(0x280000, 0x2807ff) AM_READWRITE(ml_power_ram_r, ml_power_ram_w)
-
+	AM_RANGE(0x240004, 0x240005) AM_READNOP // Watchdog
+	AM_RANGE(0x240006, 0x240007) AM_READ(input_r)
+	AM_RANGE(0x280000, 0x280fff) AM_READWRITE(power_ram_r, power_ram_w)
 	AM_RANGE(0x290000, 0x290001) AM_READ_PORT("IN1")
 	AM_RANGE(0x290002, 0x290003) AM_READ_PORT("IN0")
-
-	AM_RANGE(0x240004, 0x240005) AM_READNOP // watchdog?
-	AM_RANGE(0x240006, 0x240007) AM_READ(io1_r) // vblank ?
-	AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(ml_output_w)
-
-	AM_RANGE(0x2b0000, 0x2b0001) AM_READ(ml_analog1_lsb_r)
-	AM_RANGE(0x2b0002, 0x2b0003) AM_READ(ml_analog1_msb_r)
-	AM_RANGE(0x2b0004, 0x2b0005) AM_READ(ml_analog2_lsb_r)
-	AM_RANGE(0x2b0006, 0x2b0007) AM_READ(ml_analog2_msb_r)
-
-	AM_RANGE(0x2c0000, 0x2c0001) AM_READ(ml_analog3_lsb_r)
-	AM_RANGE(0x2c0002, 0x2c0003) AM_READ(ml_analog3_msb_r)
+	AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(output_w)
+	AM_RANGE(0x2b0000, 0x2b0001) AM_READ(analog1_msb_r)
+	AM_RANGE(0x2b0002, 0x2b0003) AM_READ(analog1_lsb_r)
+	AM_RANGE(0x2b0004, 0x2b0005) AM_READ(analog2_msb_r)
+	AM_RANGE(0x2b0006, 0x2b0007) AM_READ(analog2_lsb_r)
+	AM_RANGE(0x2c0000, 0x2c0001) AM_READ(analog3_msb_r)
+	AM_RANGE(0x2c0002, 0x2c0003) AM_READ(analog3_lsb_r)
+	AM_RANGE(0x2d0000, 0x2d0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, tc0140syt_port_w, 0x00ff)
+	AM_RANGE(0x2d0002, 0x2d0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
 ADDRESS_MAP_END
 
 
-/* Sub CPU Map */
 
-static ADDRESS_MAP_START( mlanding_sub_mem, AS_PROGRAM, 16, mlanding_state )
+/*************************************
+ *
+ *  Sub CPU memory handlers
+ *
+ *************************************/
+
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16, mlanding_state )
 	AM_RANGE(0x000000, 0x01ffff) AM_ROM
 	AM_RANGE(0x040000, 0x043fff) AM_RAM
-	AM_RANGE(0x050000, 0x0503ff) AM_RAM AM_SHARE("share3")
+	AM_RANGE(0x050000, 0x0503ff) AM_RAM AM_SHARE("dsp_prog")
+	AM_RANGE(0x060000, 0x060001) AM_WRITE(dsp_control_w)
 	AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM AM_SHARE("dma_ram")
-	AM_RANGE(0x1c4000, 0x1cffff) AM_RAM AM_SHARE("share1")
-	AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("ml_dotram")
+	AM_RANGE(0x1c4000, 0x1cffff) AM_RAM AM_SHARE("sub_com_ram")
+	AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("dot_ram")
 ADDRESS_MAP_END
 
 
-WRITE8_MEMBER(mlanding_state::ml_adpcm_start_w)
-{
-	m_adpcm_pos = m_adpcm_address << 8;
-	m_adpcm_trigger = 0;
-	m_msm->reset_w(0);
-}
 
-WRITE8_MEMBER(mlanding_state::ml_adpcm_stop_w)
-{
-	m_msm->reset_w(1);
-}
+/*************************************
+ *
+ *  DSP memory handlers
+ *
+ *************************************/
 
-WRITE8_MEMBER(mlanding_state::ml_adpcm_address_lo_w)
-{
-	m_adpcm_address = (m_adpcm_address & 0x700) | data;
-}
+static ADDRESS_MAP_START( dsp_map_prog, AS_PROGRAM, 16, mlanding_state )
+	AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("dsp_prog")
+ADDRESS_MAP_END
 
-WRITE8_MEMBER(mlanding_state::ml_adpcm_address_hi_w)
-{
-	m_adpcm_address = (m_adpcm_address & 0x0ff) | (data << 8 & 0x700);
-}
+static ADDRESS_MAP_START( dsp_map_data, AS_DATA, 16, mlanding_state )
+	AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("dot_ram")
+ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( mlanding_z80_mem, AS_PROGRAM, 8, mlanding_state )
+static ADDRESS_MAP_START( dsp_map_io, AS_IO, 16, mlanding_state )
+	AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(dsp_hold_signal_r)
+	AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITENOP
+ADDRESS_MAP_END
+
+
+
+/*************************************
+ *
+ *  Audio CPU memory handlers
+ *
+ *************************************/
+
+static ADDRESS_MAP_START( audio_map_prog, AS_PROGRAM, 8, mlanding_state )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x8fff) AM_RAM
 	AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write)
 	AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("tc0140syt", tc0140syt_device, tc0140syt_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, tc0140syt_slave_comm_r, tc0140syt_slave_comm_w)
-	AM_RANGE(0xb000, 0xb000) AM_WRITENOP // ?
-	AM_RANGE(0xc000, 0xc000) AM_WRITENOP // ?
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(ml_adpcm_start_w)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(ml_adpcm_stop_w)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(ml_adpcm_address_lo_w)
-	AM_RANGE(0xf200, 0xf200) AM_WRITE(ml_adpcm_address_hi_w)
-	AM_RANGE(0xf400, 0xf400) AM_WRITENOP // ?
-	AM_RANGE(0xf600, 0xf600) AM_WRITENOP // ?
-	AM_RANGE(0xf800, 0xf800) AM_WRITENOP // ?
-	AM_RANGE(0xfa00, 0xfa00) AM_WRITENOP // ?
+	AM_RANGE(0xb000, 0xb000) AM_WRITE(msm5205_2_start_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(msm5205_2_stop_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(msm5205_1_start_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(msm5205_1_stop_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(msm5205_1_addr_lo_w)
+	AM_RANGE(0xf200, 0xf200) AM_WRITE(msm5205_1_addr_hi_w)
+	AM_RANGE(0xf400, 0xf400) AM_WRITENOP
+	AM_RANGE(0xf600, 0xf600) AM_WRITENOP // MSM5205 2 volume?
+	AM_RANGE(0xf800, 0xf800) AM_WRITENOP
+	AM_RANGE(0xfa00, 0xfa00) AM_WRITENOP
 ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( mlanding_z80_io, AS_IO, 8, mlanding_state )
+static ADDRESS_MAP_START( audio_map_io, AS_IO, 8, mlanding_state )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITENOP // ?
+	AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ctc", z80ctc_device, read, write)
 ADDRESS_MAP_END
 
 
-READ16_MEMBER(mlanding_state::ml_dotram_r)
-{
-	return m_ml_dotram[offset];
-}
 
-WRITE16_MEMBER(mlanding_state::ml_dotram_w)
-{
-	m_ml_dotram[offset] = data;
-}
+/*************************************
+ *
+ *  Mecha CPU memory handlers
+ *
+ *************************************/
 
-READ16_MEMBER(mlanding_state::dsp_HOLD_signal_r)
-{
-	return m_dsp_HOLD_signal;
-}
-
-
-READ8_MEMBER(mlanding_state::test_r)
-{
-	return machine().rand();
-}
-
-//mecha driver ?
-static ADDRESS_MAP_START( mlanding_z80_sub_mem, AS_PROGRAM, 8, mlanding_state )
+static ADDRESS_MAP_START( mecha_map_prog, AS_PROGRAM, 8, mlanding_state )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0x8800, 0x8fff) AM_RAM AM_SHARE("power_ram")
-
-	//AM_RANGE(0x9000, 0x9001) AM_READ(test_r)
-	AM_RANGE(0x9800, 0x9805) AM_READ(test_r)
+	AM_RANGE(0x9000, 0x9001) AM_WRITENOP
+	AM_RANGE(0x9000, 0x9003) AM_WRITENOP
+	AM_RANGE(0x9800, 0x9805) AM_READ(motor_r)
 ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( DSP_map_program, AS_PROGRAM, 16, mlanding_state )
-	AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share3")
-ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( DSP_map_data, AS_DATA, 16, mlanding_state )
-	AM_RANGE(0x0000, 0x1fff) AM_READWRITE(ml_dotram_r,ml_dotram_w)
-ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( DSP_map_io, AS_IO, 16, mlanding_state )
-	AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(dsp_HOLD_signal_r)
-//  AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE(dsp_HOLDA_signal_w)
-ADDRESS_MAP_END
+/*************************************
+ *
+ *  Port definitions
+ *
+ *************************************/
 
 static INPUT_PORTS_START( mlanding )
 	PORT_START("DSWA")
@@ -616,156 +830,155 @@ static INPUT_PORTS_START( mlanding )
 	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SWB:3")
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, "$2001-3") PORT_DIPLOCATION("SWB:4")
-	PORT_DIPSETTING(    0x08, "H" )
-	PORT_DIPSETTING(    0x00, "L" )
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:4")
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x10, 0x10, "Test Mode 2") PORT_DIPLOCATION("SWB:5")
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, "$2001-5") PORT_DIPLOCATION("SWB:6")
-	PORT_DIPSETTING(    0x20, "H" )
-	PORT_DIPSETTING(    0x00, "L" )
+	PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SWB:6" )
 	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SWB:7") // probably not meant to be used on German version?
 	PORT_DIPSETTING(    0x40, DEF_STR( Japanese ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( English ) )
-	PORT_DIPNAME( 0x80, 0x80, "$2001-7") PORT_DIPLOCATION("SWB:8")
-	PORT_DIPSETTING(    0x80, "H" )
-	PORT_DIPSETTING(    0x00, "L" )
+	PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SWB:8" )
 
 	PORT_START("IN0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Door") PORT_TOGGLE
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("IN1")
-	PORT_DIPNAME( 0x01, 0x01, "SYSTEM" )
+	PORT_DIPNAME( 0x01, 0x01, "Coin A Enable" )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x02, 0x02, "Coin B Enable" )
 	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("STICK1")    /* Stick 1 (3) */
-	PORT_BIT( 0x00ff, 0x0000, IPT_AD_STICK_Z ) PORT_MINMAX(0x0080,0x007f) PORT_SENSITIVITY(100) PORT_KEYDELTA(0x10) PORT_PLAYER(1) PORT_REVERSE
+	PORT_START("THROTTLE")
+	PORT_BIT( 0x0fff, 0x0000, IPT_AD_STICK_Z ) PORT_MINMAX(0x00800, 0x07ff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_REVERSE
 
-	PORT_START("STICK2")    /* Stick 2 (4) */
-	PORT_BIT( 0x0fff, 0x0000, IPT_AD_STICK_X ) PORT_MINMAX(0x0800,0x07ff) PORT_SENSITIVITY(100) PORT_KEYDELTA(0x80) PORT_PLAYER(1)
+	PORT_START("STICK_X")
+	PORT_BIT( 0x0fff, 0x0000, IPT_AD_STICK_X ) PORT_MINMAX(0x00800, 0x07ff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1)
 
-	PORT_START("STICK3")    /* Stick 3 (5) */
-	PORT_BIT( 0x0fff, 0x0000, IPT_AD_STICK_Y ) PORT_MINMAX(0x0800,0x07ff) PORT_SENSITIVITY(100) PORT_KEYDELTA(0x80) PORT_PLAYER(1)
+	PORT_START("STICK_Y")
+	PORT_BIT( 0x0fff, 0x0000, IPT_AD_STICK_Y ) PORT_MINMAX(0x00800, 0x07ff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1)
 INPUT_PORTS_END
 
-static const msm5205_interface msm5205_config =
-{
-	DEVCB_DRIVER_LINE_MEMBER(mlanding_state,ml_msm5205_vck), /* VCK function */
-	MSM5205_S48_4B      /* 8 kHz */
-};
+
+
+/*************************************
+ *
+ *  Device configuration
+ *
+ *************************************/
 
 static const tc0140syt_interface mlanding_tc0140syt_intf =
 {
 	"maincpu", "audiocpu"
 };
 
-void mlanding_state::machine_reset()
-{
-	m_subcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-	m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-	m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-	m_mechacpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
 
-	m_msm->reset_w(1);
-	m_dsp_HOLD_signal = 0;
-}
-
-void mlanding_state::machine_start()
+static Z80CTC_INTERFACE( ctc_intf )
 {
-	m_adpcm_pos = 0;
-	m_adpcm_address = 0;
-	m_adpcm_trigger = 0;
-}
+	DEVCB_NULL,	// Interrupt handler
+	DEVCB_DRIVER_LINE_MEMBER(mlanding_state, z80ctc_to0), // ZC/TO0 callback
+	DEVCB_NULL, // ZC/TO1 callback
+	DEVCB_NULL	// ZC/TO2 callback
+};
+
+
+static const msm5205_interface msm5205_1_config =
+{
+	DEVCB_DRIVER_LINE_MEMBER(mlanding_state, msm5205_1_vck), // VCK function
+	MSM5205_S48_4B		// 8 kHz, 4-bit
+};
+
+
+static const msm5205_interface msm5205_2_config =
+{
+	DEVCB_NULL,			// VCK function
+	MSM5205_SEX_4B		// Slave mode, 4-bit
+};
+
+
+
+/*************************************
+ *
+ *  Machine driver
+ *
+ *************************************/
 
 static MACHINE_CONFIG_START( mlanding, mlanding_state )
 
 	/* basic machine hardware */
-	MCFG_CPU_ADD("maincpu", M68000, 12000000 ) /* 12 MHz ??? (guess) */
-	MCFG_CPU_PROGRAM_MAP(mlanding_mem)
+	MCFG_CPU_ADD("maincpu", M68000, 10000000) // ?
+	MCFG_CPU_PROGRAM_MAP(main_map)
 	MCFG_CPU_VBLANK_INT_DRIVER("screen", mlanding_state, irq6_line_hold)
 
-	MCFG_CPU_ADD("sub", M68000, 12000000 ) /* 12 MHz ??? (guess) */
-	MCFG_CPU_PROGRAM_MAP(mlanding_sub_mem)
-	MCFG_CPU_PERIODIC_INT_DRIVER(mlanding_state, irq6_line_hold, 7*60) /* ??? */
+	MCFG_CPU_ADD("subcpu", M68000, 10000000) // ?
+	MCFG_CPU_PROGRAM_MAP(sub_map)
 
-	MCFG_CPU_ADD("audiocpu", Z80, 4000000 ) /* 4 MHz ??? (guess) */
-	MCFG_CPU_PROGRAM_MAP(mlanding_z80_mem)
-	MCFG_CPU_IO_MAP(mlanding_z80_io)
+	MCFG_CPU_ADD("audiocpu", Z80, 4000000) // ?
+	MCFG_CPU_PROGRAM_MAP(audio_map_prog)
+	MCFG_CPU_IO_MAP(audio_map_io)
 
-	MCFG_CPU_ADD("z80sub", Z80, 4000000 ) /* 4 MHz ??? (guess) */
-	MCFG_CPU_PROGRAM_MAP(mlanding_z80_sub_mem)
+	MCFG_CPU_ADD("mechacpu", Z80, 4000000) // ?
+	MCFG_CPU_PROGRAM_MAP(mecha_map_prog)
 	MCFG_CPU_VBLANK_INT_DRIVER("screen", mlanding_state, irq0_line_hold)
 
-	MCFG_CPU_ADD("dsp", TMS32025, 24000000) /* 24 MHz ??? (guess) */
-	MCFG_CPU_PROGRAM_MAP(DSP_map_program)
-	MCFG_CPU_DATA_MAP(DSP_map_data)
-	MCFG_CPU_IO_MAP(DSP_map_io)
+	MCFG_CPU_ADD("dsp", TMS32025, 40000000) // ?
+	MCFG_CPU_PROGRAM_MAP(dsp_map_prog)
+	MCFG_CPU_DATA_MAP(dsp_map_data)
+	MCFG_CPU_IO_MAP(dsp_map_io)
+
+	MCFG_Z80CTC_ADD("ctc", 4000000, ctc_intf)
+	MCFG_TC0140SYT_ADD("tc0140syt", mlanding_tc0140syt_intf)
 
-	//MCFG_QUANTUM_PERFECT_CPU("maincpu")
 	MCFG_QUANTUM_TIME(attotime::from_hz(600))
 
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
-	MCFG_SCREEN_REFRESH_RATE(60)
-	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-	MCFG_SCREEN_SIZE(512, 512)
-	MCFG_SCREEN_VISIBLE_AREA(0, 511, 14*8, 511)
+
+	// Estimated
+	MCFG_SCREEN_RAW_PARAMS(16000000, 640, 0, 512, 462, 0, 400)
 	MCFG_SCREEN_UPDATE_DRIVER(mlanding_state, screen_update_mlanding)
 
-	MCFG_PALETTE_LENGTH(512*16)
+	MCFG_PALETTE_LENGTH(32768)
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
 	MCFG_YM2151_ADD("ymsnd", 4000000)
 	MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
-	MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(mlanding_state,sound_bankswitch_w))
+	MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(mlanding_state, sound_bankswitch_w))
 	MCFG_SOUND_ROUTE(0, "mono", 0.50)
 	MCFG_SOUND_ROUTE(1, "mono", 0.50)
 
-	MCFG_SOUND_ADD("msm", MSM5205, 384000)
-	MCFG_SOUND_CONFIG(msm5205_config)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+	MCFG_SOUND_ADD("msm1", MSM5205, 384000)
+	MCFG_SOUND_CONFIG(msm5205_1_config)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
-	MCFG_TC0140SYT_ADD("tc0140syt", mlanding_tc0140syt_intf)
+	MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+	MCFG_SOUND_CONFIG(msm5205_2_config)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 MACHINE_CONFIG_END
 
+
+
+/*************************************
+ *
+ *  ROM definition(s)
+ *
+ *************************************/
+
 ROM_START( mlanding )
-	ROM_REGION( 0x60000, "maincpu", 0 ) /* 68000 */
+	ROM_REGION( 0x60000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "ml_b0929.epr", 0x00000, 0x10000, CRC(ab3f38f3) SHA1(4357112ca11a8e7bfe08ba99ac3bddac046c230a))
 	ROM_LOAD16_BYTE( "ml_b0928.epr", 0x00001, 0x10000, CRC(21e7a8f6) SHA1(860d3861d4375866cd27d426d546ddb2894a6629) )
 	ROM_LOAD16_BYTE( "ml_b0927.epr", 0x20000, 0x10000, CRC(b02f1805) SHA1(b8050f955c7070dc9b962db329b5b0ee8b2acb70) )
@@ -773,28 +986,33 @@ ROM_START( mlanding )
 	ROM_LOAD16_BYTE( "ml_b0925.epr", 0x40000, 0x10000, CRC(ff59f049) SHA1(aba490a28aba03728415f34d321fd599c31a5fde) )
 	ROM_LOAD16_BYTE( "ml_b0924.epr", 0x40001, 0x10000, CRC(9bc3e1b0) SHA1(6d86804327df11a513a0f06dceb57b83b34ac007) )
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* z80 */
-	ROM_LOAD( "ml_b0935.epr", 0x00000, 0x08000, CRC(b85915c5) SHA1(656e97035ae304f84e90758d0dd6f0616c40f1db) )
-
-	ROM_REGION( 0x40000, "gfx1", ROMREGION_ERASE00 )
-
-	ROM_REGION( 0x20000, "sub", 0 ) /* 68000 */
+	ROM_REGION( 0x20000, "subcpu", 0 )
 	ROM_LOAD16_BYTE( "ml_b0923.epr", 0x00000, 0x10000, CRC(81b2c871) SHA1(a085bc528c63834079469db6ae263a5b9b984a7c) )
 	ROM_LOAD16_BYTE( "ml_b0922.epr", 0x00001, 0x10000, CRC(36923b42) SHA1(c31d7c45a563cfc4533379f69f32889c79562534) )
 
-	ROM_REGION( 0x10000, "z80sub", 0 ) /* z80 */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "ml_b0935.epr", 0x00000, 0x08000, CRC(b85915c5) SHA1(656e97035ae304f84e90758d0dd6f0616c40f1db) )
+
+	ROM_REGION( 0x10000, "mechacpu", 0 )
 	ROM_LOAD( "ml_b0937.epr", 0x00000, 0x08000, CRC(4bdf15ed) SHA1(b960208e63cede116925e064279a6cf107aef81c) )
 
-	ROM_REGION( 0x80000, "adpcm", ROMREGION_ERASEFF )
+	ROM_REGION( 0x80000, "adpcm1", 0 )
 	ROM_LOAD( "ml_b0934.epr", 0x00000, 0x10000, CRC(0899666f) SHA1(032e3ddd4caa48f82592570616e16c084de91f3e) )
 	ROM_LOAD( "ml_b0933.epr", 0x10000, 0x10000, CRC(f5cac954) SHA1(71abdc545e0196ad4d357af22dd6312d10a1323f) )
 	ROM_LOAD( "ml_b0932.epr", 0x20000, 0x10000, CRC(4721dc59) SHA1(faad75d577344e9ba495059040a2cf0647567426) )
 	ROM_LOAD( "ml_b0931.epr", 0x30000, 0x10000, CRC(9c4a82bf) SHA1(daeac620c636013a36595ce9f37e84e807f88977) )
 	ROM_LOAD( "ml_b0930.epr", 0x40000, 0x10000, CRC(214a30e2) SHA1(3dcc3a89ed52e4dbf232d2a92a3e64975b46c2dd) )
 
-	ROM_REGION( 0x2000, "unknown", 0 )
+	ROM_REGION( 0x2000, "adpcm2", 0 )
 	ROM_LOAD( "ml_b0936.epr", 0x00000, 0x02000, CRC(51fd3a77) SHA1(1fcbadf1877e25848a1d1017322751560a4823c0) )
 ROM_END
 
 
-GAME( 1987, mlanding, 0, mlanding, mlanding, driver_device, 0, ROT0, "Taito America Corporation", "Midnight Landing (Germany)", GAME_NOT_WORKING|GAME_IMPERFECT_GRAPHICS )
+
+/*************************************
+ *
+ *  Game driver(s)
+ *
+ *************************************/
+
+GAME( 1987, mlanding, 0, mlanding, mlanding, driver_device, 0, ROT0, "Taito America Corporation", "Midnight Landing (Germany)", GAME_SUPPORTS_SAVE )