From dca0fff97b3ff6c1fdc7f9ea42ab9f28228f188f Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 10 Aug 2012 11:04:06 +0000
Subject: [PATCH] Some fixes imported from MESS side (nw)

---
 src/mame/includes/amiga.h    |  2 ++
 src/mame/includes/astrocde.h |  1 +
 src/mame/includes/dc.h       |  3 +++
 src/mame/includes/megadriv.h | 11 +++++++++--
 src/mame/includes/snes.h     |  2 ++
 src/mame/machine/mega32x.c   |  4 ++--
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index f755493708a..853581ef294 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -430,6 +430,8 @@ public:
 
 	DECLARE_CUSTOM_INPUT_MEMBER( amiga_joystick_convert );
 	DECLARE_DRIVER_INIT(mquake);
+	DECLARE_DRIVER_INIT(amiga);
+	DECLARE_DRIVER_INIT(cdtv);
 };
 
 
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index 659b378b631..4ec0cb3720d 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -115,6 +115,7 @@ public:
 	DECLARE_DRIVER_INIT(demndrgn);
 	DECLARE_DRIVER_INIT(ebases);
 	DECLARE_DRIVER_INIT(gorf);
+	DECLARE_DRIVER_INIT(astrocde);
 };
 
 
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index d1788724ef0..001c1407615 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -87,6 +87,9 @@ class dc_state : public driver_device
 	DECLARE_DRIVER_INIT(vf4evoct);
 	DECLARE_DRIVER_INIT(naomi_mp);
 	DECLARE_DRIVER_INIT(mvsc2);
+	DECLARE_DRIVER_INIT(dc);
+	DECLARE_DRIVER_INIT(dcus);
+	DECLARE_DRIVER_INIT(dcjp);
 };
 
 /*----------- defined in machine/dc.c -----------*/
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h
index ce4a97408ea..7598e18dad0 100644
--- a/src/mame/includes/megadriv.h
+++ b/src/mame/includes/megadriv.h
@@ -124,7 +124,6 @@ public:
 	DECLARE_DRIVER_INIT(megadriv);
 	DECLARE_DRIVER_INIT(megadrij);
 	DECLARE_DRIVER_INIT(mpnew);
-	
 };
 
 class md_boot_state : public md_base_state
@@ -368,6 +367,15 @@ public:
 	
 	DECLARE_DRIVER_INIT(hshavoc);
 	DECLARE_DRIVER_INIT(topshoot);
+	
+	DECLARE_DRIVER_INIT(genesis);
+	DECLARE_DRIVER_INIT(mess_md_common);
+	DECLARE_DRIVER_INIT(_32x);
+	DECLARE_DRIVER_INIT(md_eur);
+	DECLARE_DRIVER_INIT(md_jpn);
+	DECLARE_DRIVER_INIT(mess_32x);
+	DECLARE_DRIVER_INIT(mess_32x_eur);
+	DECLARE_DRIVER_INIT(mess_32x_jpn);
 };
 
 class pico_state : public md_cons_state
@@ -410,7 +418,6 @@ public:
 	_32x_state(const machine_config &mconfig, device_type type, const char *tag)
 	: md_base_state(mconfig, type, tag) { }
 
-	DECLARE_DRIVER_INIT(_32x);	
 };
 
 // Fifa96 needs the CPUs swapped for the gameplay to enter due to some race conditions
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 0a0e2bbfee7..57e36326e63 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -492,6 +492,8 @@ public:
 	DECLARE_DIRECT_UPDATE_MEMBER(snes_direct);
 	DECLARE_DRIVER_INIT(snes);
 	DECLARE_DRIVER_INIT(snes_hirom);	
+	DECLARE_DRIVER_INIT(snes_mess);
+	DECLARE_DRIVER_INIT(snesst);
 };
 
 /* Special chips, checked at init and used in memory handlers */
diff --git a/src/mame/machine/mega32x.c b/src/mame/machine/mega32x.c
index 91ae35ddee9..2e66d04acc4 100644
--- a/src/mame/machine/mega32x.c
+++ b/src/mame/machine/mega32x.c
@@ -1641,7 +1641,7 @@ ADDRESS_MAP_END
 
 
 
-DRIVER_INIT_MEMBER(_32x_state,_32x)
+DRIVER_INIT_MEMBER(md_cons_state,_32x)
 {
 	_32x_dram0 = auto_alloc_array(machine(), UINT16, 0x40000/2);
 	_32x_dram1 = auto_alloc_array(machine(), UINT16, 0x40000/2);
@@ -1708,7 +1708,7 @@ DRIVER_INIT_MEMBER(_32x_state,_32x)
 	sh2drc_set_options(machine().device("32x_master_sh2"), SH2DRC_COMPATIBLE_OPTIONS);
 	sh2drc_set_options(machine().device("32x_slave_sh2"), SH2DRC_COMPATIBLE_OPTIONS);
 
-	init_megadriv();
+	DRIVER_INIT_CALL(megadriv);
 }
 
 void _32x_check_irqs(running_machine& machine)