summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/drivers/orion.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mess/drivers/orion.c')
-rw-r--r--src/mess/drivers/orion.c38
1 files changed, 13 insertions, 25 deletions
diff --git a/src/mess/drivers/orion.c b/src/mess/drivers/orion.c
index 3516d311a77..69c2c5da82c 100644
--- a/src/mess/drivers/orion.c
+++ b/src/mess/drivers/orion.c
@@ -9,15 +9,10 @@
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/i8085/i8085.h"
-#include "sound/ay8910.h"
-#include "sound/wave.h"
+#include "includes/orion.h"
#include "imagedev/cassette.h"
-#include "imagedev/cartslot.h"
#include "formats/smx_dsk.h"
#include "formats/rk_cas.h"
-#include "includes/orion.h"
/* Address maps */
@@ -124,7 +119,7 @@ static MACHINE_CONFIG_START( orion128, orion_state )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("orion_cass")
- MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
+ MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
@@ -134,9 +129,9 @@ static MACHINE_CONFIG_START( orion128, orion_state )
MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", orion_state::orion_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","orion_flop")
- MCFG_CARTSLOT_ADD("cart")
- MCFG_CARTSLOT_INTERFACE("orion_cart")
- MCFG_SOFTWARE_LIST_ADD("cart_list","orion_cart")
+ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "orion_cart")
+
+ MCFG_SOFTWARE_LIST_ADD("cart_list", "orion_cart")
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -203,7 +198,7 @@ static MACHINE_CONFIG_START( orionz80, orion_state )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("orion_cass")
- MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
+ MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
@@ -213,9 +208,9 @@ static MACHINE_CONFIG_START( orionz80, orion_state )
MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", orion_state::orion_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","orion_flop")
- MCFG_CARTSLOT_ADD("cart")
- MCFG_CARTSLOT_INTERFACE("orion_cart")
- MCFG_SOFTWARE_LIST_ADD("cart_list","orion_cart")
+ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "orion_cart")
+
+ MCFG_SOFTWARE_LIST_ADD("cart_list", "orion_cart")
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -278,7 +273,7 @@ static MACHINE_CONFIG_START( orionpro, orion_state )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
MCFG_CASSETTE_INTERFACE("orion_cass")
- MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
+ MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
@@ -289,9 +284,9 @@ static MACHINE_CONFIG_START( orionpro, orion_state )
MCFG_SOFTWARE_LIST_ADD("flop_list","orionpro_flop")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop128_list","orion_flop")
- MCFG_CARTSLOT_ADD("cart")
- MCFG_CARTSLOT_INTERFACE("orion_cart")
- MCFG_SOFTWARE_LIST_ADD("cart_list","orion_cart")
+ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "orion_cart")
+
+ MCFG_SOFTWARE_LIST_ADD("cart_list", "orion_cart")
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -307,13 +302,11 @@ ROM_START( orion128 )
ROMX_LOAD( "m2rk.bin", 0x0f800, 0x0800, CRC(2025c234) SHA1(caf86918629be951fe698cddcdf4589f07e2fb96), ROM_BIOS(1) )
ROM_SYSTEM_BIOS( 1, "m2_2rk", "Version 3.2.2 rk" )
ROMX_LOAD( "m2_2rk.bin", 0x0f800, 0x0800, CRC(fc662351) SHA1(7c6de67127fae5869281449de1c503597c0c058e), ROM_BIOS(2) )
- ROM_CART_LOAD("cart", 0x10000, 0x10000, ROM_OPTIONAL)
ROM_END
ROM_START( orionms )
ROM_REGION( 0x30000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "ms7007.bin", 0x0f800, 0x0800, CRC(c6174ba3) SHA1(8f9a42c3e09684718fe4121a8408e7860129d26f) )
- ROM_CART_LOAD("cart", 0x10000, 0x10000, ROM_OPTIONAL)
ROM_END
ROM_START( orionz80 )
@@ -330,13 +323,11 @@ ROM_START( orionz80 )
ROMX_LOAD( "m35zrkd.bin", 0x0f800, 0x0800, CRC(9368b38f) SHA1(64a77f22119d40c9b18b64d78ad12acc6fff9efb), ROM_BIOS(5) )
ROM_SYSTEM_BIOS( 5, "peter", "Peterburg '91" )
ROMX_LOAD( "peter.bin", 0x0f800, 0x0800, CRC(df9b1d8c) SHA1(c7f1e074e58ad1c1799cf522161b4f4cffa5aefa), ROM_BIOS(6) )
- ROM_CART_LOAD("cart", 0x10000, 0x10000, ROM_OPTIONAL)
ROM_END
ROM_START( orionide )
ROM_REGION( 0x30000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "m35zrkh.bin", 0x0f800, 0x0800, CRC(b7745f28) SHA1(c3bd3e662db7ec56ecbab54bf6b3a4c26200d0bb) )
- ROM_CART_LOAD("cart", 0x10000, 0x10000, ROM_OPTIONAL)
ROM_END
ROM_START( orionzms )
@@ -347,18 +338,15 @@ ROM_START( orionzms )
ROMX_LOAD( "m34zms.bin", 0x0f800, 0x0800, CRC(0f87a80b) SHA1(ab1121092e61268d8162ed8a7d4fd081016a409a), ROM_BIOS(2) )
ROM_SYSTEM_BIOS( 2, "m35zmsd", "Version 3.5 zmsd" )
ROMX_LOAD( "m35zmsd.bin", 0x0f800, 0x0800, CRC(f714ff37) SHA1(fbe9514adb3384aff146cbedd4fede37ce9591e1), ROM_BIOS(3) )
- ROM_CART_LOAD("cart", 0x10000, 0x10000, ROM_OPTIONAL)
ROM_END
ROM_START( orionidm )
ROM_REGION( 0x30000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "m35zmsh.bin", 0x0f800, 0x0800, CRC(01e66df4) SHA1(8c785a3c32fe3eacda73ec79157b41a6e4b63ba8) )
- ROM_CART_LOAD("cart", 0x10000, 0x10000, ROM_OPTIONAL)
ROM_END
ROM_START( orionpro )
ROM_REGION( 0x32000, "maincpu", ROMREGION_ERASEFF )
- ROM_CART_LOAD("cart", 0x10000, 0x10000, ROM_OPTIONAL)
ROM_SYSTEM_BIOS( 0, "ver21", "Version 2.1" )
ROMX_LOAD( "rom1-210.bin", 0x20000, 0x2000, CRC(8e1a0c78) SHA1(61c8a5ed596ce7e3fd32da920dcc80dc5375b421), ROM_BIOS(1) )
ROMX_LOAD( "rom2-210.bin", 0x22000, 0x10000, CRC(7cb7a49b) SHA1(601f3dd61db323407c4874fd7f23c10dccac0209), ROM_BIOS(1) )