summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/machine
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2013-09-19 20:41:53 +0000
committer Curt Coder <curtcoder@mail.com>2013-09-19 20:41:53 +0000
commitc44e3354c2e4108b6a2ba9b860f4ea6157d89fea (patch)
tree3e1f4d13640b8b9a8677ae7b907a61b32803052f /src/mess/machine
parentd2938b8a390d88bc19ab6312b8efa61993efca80 (diff)
(MESS) Legacy removal. (nw)
Diffstat (limited to 'src/mess/machine')
-rw-r--r--src/mess/machine/c1541.h1
-rw-r--r--src/mess/machine/c1551.h1
-rw-r--r--src/mess/machine/c1571.h1
-rw-r--r--src/mess/machine/c1581.h1
-rw-r--r--src/mess/machine/c2031.c2
-rw-r--r--src/mess/machine/c2031.h5
-rw-r--r--src/mess/machine/c2040.h4
-rw-r--r--src/mess/machine/c64/exp.c75
-rw-r--r--src/mess/machine/c64/exp.h68
-rw-r--r--src/mess/machine/c64/ieee488.h1
-rw-r--r--src/mess/machine/c64/magic_voice.h1
-rw-r--r--src/mess/machine/c64/music64.h1
-rw-r--r--src/mess/machine/c64/sfx_sound_expander.h1
-rw-r--r--src/mess/machine/c64/supercpu.h1
-rw-r--r--src/mess/machine/c64/tdos.h1
-rw-r--r--src/mess/machine/c64/user.c15
-rw-r--r--src/mess/machine/c64/user.h12
-rw-r--r--src/mess/machine/c65.c356
-rw-r--r--src/mess/machine/c8280.h1
-rw-r--r--src/mess/machine/cbm.c359
-rw-r--r--src/mess/machine/cbm2exp.c11
-rw-r--r--src/mess/machine/cbm2exp.h8
-rw-r--r--src/mess/machine/cbm2user.c8
-rw-r--r--src/mess/machine/cbm2user.h4
-rw-r--r--src/mess/machine/cbmiec.c28
-rw-r--r--src/mess/machine/cbmiec.h23
-rw-r--r--src/mess/machine/cbmipt.c1219
-rw-r--r--src/mess/machine/cbmipt.h198
-rw-r--r--src/mess/machine/cmdhd.h1
-rw-r--r--src/mess/machine/d9060.h1
-rw-r--r--src/mess/machine/fd2000.h1
-rw-r--r--src/mess/machine/hardbox.h1
-rw-r--r--src/mess/machine/ieee488.c21
-rw-r--r--src/mess/machine/ieee488.h25
-rw-r--r--src/mess/machine/interpod.h5
-rw-r--r--src/mess/machine/petcass.c10
-rw-r--r--src/mess/machine/petcass.h7
-rw-r--r--src/mess/machine/petexp.c10
-rw-r--r--src/mess/machine/petexp.h7
-rw-r--r--src/mess/machine/petuser.c8
-rw-r--r--src/mess/machine/petuser.h4
-rw-r--r--src/mess/machine/plus4_sid.h1
-rw-r--r--src/mess/machine/plus4exp.c13
-rw-r--r--src/mess/machine/plus4exp.h8
-rw-r--r--src/mess/machine/plus4user.c9
-rw-r--r--src/mess/machine/plus4user.h6
-rw-r--r--src/mess/machine/serialbox.h1
-rw-r--r--src/mess/machine/shark.h1
-rw-r--r--src/mess/machine/softbox.h1
-rw-r--r--src/mess/machine/vic1010.h1
-rw-r--r--src/mess/machine/vic10exp.c10
-rw-r--r--src/mess/machine/vic10exp.h6
-rw-r--r--src/mess/machine/vic1112.h1
-rw-r--r--src/mess/machine/vic20exp.c17
-rw-r--r--src/mess/machine/vic20exp.h12
-rw-r--r--src/mess/machine/vic20user.c9
-rw-r--r--src/mess/machine/vic20user.h6
57 files changed, 797 insertions, 1812 deletions
diff --git a/src/mess/machine/c1541.h b/src/mess/machine/c1541.h
index b49ea04b88c..9647178737e 100644
--- a/src/mess/machine/c1541.h
+++ b/src/mess/machine/c1541.h
@@ -22,7 +22,6 @@
#include "machine/6821pia.h"
#include "machine/c64/bn1541.h"
#include "machine/cbmiec.h"
-#include "machine/cbmipt.h"
#include "machine/ctronics.h"
diff --git a/src/mess/machine/c1551.h b/src/mess/machine/c1551.h
index 16e5f8fb0fc..ce9005857c7 100644
--- a/src/mess/machine/c1551.h
+++ b/src/mess/machine/c1551.h
@@ -21,7 +21,6 @@
#include "machine/64h156.h"
#include "machine/6525tpi.h"
#include "machine/c1541.h"
-#include "machine/cbmipt.h"
#include "machine/pla.h"
#include "machine/plus4exp.h"
diff --git a/src/mess/machine/c1571.h b/src/mess/machine/c1571.h
index bca49da0de4..c297bf2d917 100644
--- a/src/mess/machine/c1571.h
+++ b/src/mess/machine/c1571.h
@@ -21,7 +21,6 @@
#include "machine/6522via.h"
#include "machine/c64/bn1541.h"
#include "machine/cbmiec.h"
-#include "machine/cbmipt.h"
#include "machine/isa.h"
#include "machine/mos6526.h"
#include "machine/wd_fdc.h"
diff --git a/src/mess/machine/c1581.h b/src/mess/machine/c1581.h
index c9ae7e03038..8512b961ee7 100644
--- a/src/mess/machine/c1581.h
+++ b/src/mess/machine/c1581.h
@@ -16,7 +16,6 @@
#include "cpu/m6502/m6502.h"
#include "formats/d81_dsk.h"
#include "machine/cbmiec.h"
-#include "machine/cbmipt.h"
#include "machine/mos6526.h"
#include "machine/wd_fdc.h"
diff --git a/src/mess/machine/c2031.c b/src/mess/machine/c2031.c
index 005e4ef78f5..ea3fd0e89b4 100644
--- a/src/mess/machine/c2031.c
+++ b/src/mess/machine/c2031.c
@@ -7,8 +7,6 @@
**********************************************************************/
-
-#include "c1541.h"
#include "c2031.h"
diff --git a/src/mess/machine/c2031.h b/src/mess/machine/c2031.h
index 8a7d5472a5d..33825619478 100644
--- a/src/mess/machine/c2031.h
+++ b/src/mess/machine/c2031.h
@@ -12,15 +12,12 @@
#ifndef __C2031__
#define __C2031__
-
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/flopdrv.h"
-#include "formats/d64_dsk.h"
-#include "formats/g64_dsk.h"
#include "machine/64h156.h"
#include "machine/6522via.h"
-#include "machine/cbmipt.h"
+#include "machine/c1541.h"
#include "machine/ieee488.h"
diff --git a/src/mess/machine/c2040.h b/src/mess/machine/c2040.h
index 922ab365dd1..0f7bec5e2db 100644
--- a/src/mess/machine/c2040.h
+++ b/src/mess/machine/c2040.h
@@ -12,7 +12,6 @@
#ifndef __C2040__
#define __C2040__
-
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m6504.h"
@@ -21,9 +20,8 @@
#include "formats/g64_dsk.h"
#include "machine/6522via.h"
#include "machine/6532riot.h"
-#include "machine/cbmipt.h"
-#include "machine/mos6530.h"
#include "machine/ieee488.h"
+#include "machine/mos6530.h"
diff --git a/src/mess/machine/c64/exp.c b/src/mess/machine/c64/exp.c
index 1014b4a707d..001ac89a422 100644
--- a/src/mess/machine/c64/exp.c
+++ b/src/mess/machine/c64/exp.c
@@ -375,3 +375,78 @@ int c64_expansion_slot_device::exrom_r(offs_t offset, int sphi2, int ba, int rw,
return state;
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( c64_expansion_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( c64_expansion_cards )
+ SLOT_INTERFACE("16k", C64_16KB)
+ SLOT_INTERFACE("cpm", C64_CPM)
+ SLOT_INTERFACE("dqbb", C64_DQBB)
+ SLOT_INTERFACE("easyflash", C64_EASYFLASH)
+ SLOT_INTERFACE("georam", C64_GEORAM)
+ SLOT_INTERFACE("ide64", C64_IDE64)
+ SLOT_INTERFACE("midimap", C64_MIDI_MAPLIN)
+ SLOT_INTERFACE("midins", C64_MIDI_NAMESOFT)
+ SLOT_INTERFACE("midipp", C64_MIDI_PASSPORT)
+ SLOT_INTERFACE("midisci", C64_MIDI_SCI)
+ SLOT_INTERFACE("midisiel", C64_MIDI_SIEL)
+ SLOT_INTERFACE("music64", C64_MUSIC64)
+ SLOT_INTERFACE("neoram", C64_NEORAM)
+ SLOT_INTERFACE("reu1700", C64_REU1700)
+ SLOT_INTERFACE("reu1750", C64_REU1750)
+ SLOT_INTERFACE("reu1764", C64_REU1764)
+ SLOT_INTERFACE("sfxse", C64_SFX_SOUND_EXPANDER)
+ SLOT_INTERFACE("supercpu", C64_SUPERCPU)
+ SLOT_INTERFACE("swiftlink", C64_SWIFTLINK)
+ SLOT_INTERFACE("turbo232", C64_TURBO232)
+
+ // the following need ROMs from the software list
+ SLOT_INTERFACE_INTERNAL("standard", C64_STD)
+ SLOT_INTERFACE_INTERNAL("comal80", C64_COMAL80)
+ SLOT_INTERFACE_INTERNAL("c128_comal80", C128_COMAL80)
+ SLOT_INTERFACE_INTERNAL("cs64", C64_CURRAH_SPEECH)
+ SLOT_INTERFACE_INTERNAL("dela_ep256", C64_DELA_EP256)
+ SLOT_INTERFACE_INTERNAL("ep64", C64_DELA_EP64)
+ SLOT_INTERFACE_INTERNAL("ep7x8", C64_DELA_EP7X8)
+ SLOT_INTERFACE_INTERNAL("dinamic", C64_DINAMIC)
+ SLOT_INTERFACE_INTERNAL("easycalcres", C64_EASY_CALC_RESULT)
+ SLOT_INTERFACE_INTERNAL("epyxfastload", C64_EPYX_FAST_LOAD)
+ SLOT_INTERFACE_INTERNAL("exos", C64_EXOS)
+ SLOT_INTERFACE_INTERNAL("fcc", C64_FCC)
+ SLOT_INTERFACE_INTERNAL("final", C64_FINAL)
+ SLOT_INTERFACE_INTERNAL("final3", C64_FINAL3)
+ SLOT_INTERFACE_INTERNAL("fun_play", C64_FUN_PLAY)
+ SLOT_INTERFACE_INTERNAL("ieee488", C64_IEEE488)
+ SLOT_INTERFACE_INTERNAL("kingsoft", C64_KINGSOFT)
+ SLOT_INTERFACE_INTERNAL("mach5", C64_MACH5)
+ SLOT_INTERFACE_INTERNAL("magic_desk", C64_MAGIC_DESK)
+ SLOT_INTERFACE_INTERNAL("magic_formel", C64_MAGIC_FORMEL)
+ SLOT_INTERFACE_INTERNAL("magic_voice", C64_MAGIC_VOICE)
+ SLOT_INTERFACE_INTERNAL("mikroasm", C64_MIKRO_ASSEMBLER)
+ SLOT_INTERFACE_INTERNAL("multiscreen", C64_MULTISCREEN)
+ SLOT_INTERFACE_INTERNAL("ocean", C64_OCEAN)
+ SLOT_INTERFACE_INTERNAL("pagefox", C64_PAGEFOX)
+ SLOT_INTERFACE_INTERNAL("prophet64", C64_PROPHET64)
+ SLOT_INTERFACE_INTERNAL("ps64", C64_PS64)
+ SLOT_INTERFACE_INTERNAL("rex", C64_REX)
+ SLOT_INTERFACE_INTERNAL("rex_ep256", C64_REX_EP256)
+ SLOT_INTERFACE_INTERNAL("ross", C64_ROSS)
+ SLOT_INTERFACE_INTERNAL("silverrock", C64_SILVERROCK)
+ SLOT_INTERFACE_INTERNAL("simons_basic", C64_SIMONS_BASIC)
+ SLOT_INTERFACE_INTERNAL("stardos", C64_STARDOS)
+ SLOT_INTERFACE_INTERNAL("struct_basic", C64_STRUCTURED_BASIC)
+ SLOT_INTERFACE_INTERNAL("super_explode", C64_SUPER_EXPLODE)
+ SLOT_INTERFACE_INTERNAL("super_games", C64_SUPER_GAMES)
+ SLOT_INTERFACE_INTERNAL("sw8k", C64_SW8K)
+ SLOT_INTERFACE_INTERNAL("system3", C64_SYSTEM3)
+ SLOT_INTERFACE_INTERNAL("tdos", C64_TDOS)
+ SLOT_INTERFACE_INTERNAL("vizastar", C64_VIZASTAR)
+ SLOT_INTERFACE_INTERNAL("vizawrite", C64_VW64)
+ SLOT_INTERFACE_INTERNAL("warp_speed", C64_WARP_SPEED)
+ SLOT_INTERFACE_INTERNAL("westermann", C64_WESTERMANN)
+ SLOT_INTERFACE_INTERNAL("zaxxon", C64_ZAXXON)
+ SLOT_INTERFACE_INTERNAL("xl80", C64_XL80)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/c64/exp.h b/src/mess/machine/c64/exp.h
index 1fa57cfd8b0..46f064555b4 100644
--- a/src/mess/machine/c64/exp.h
+++ b/src/mess/machine/c64/exp.h
@@ -198,5 +198,73 @@ protected:
extern const device_type C64_EXPANSION_SLOT;
+// slot devices
+#include "machine/c64/16kb.h"
+#include "machine/c64/comal80.h"
+#include "machine/c64/cpm.h"
+#include "machine/c64/currah_speech.h"
+#include "machine/c64/dela_ep256.h"
+#include "machine/c64/dela_ep64.h"
+#include "machine/c64/dela_ep7x8.h"
+#include "machine/c64/dinamic.h"
+#include "machine/c64/dqbb.h"
+#include "machine/c64/easy_calc_result.h"
+#include "machine/c64/easyflash.h"
+#include "machine/c64/epyx_fast_load.h"
+#include "machine/c64/exos.h"
+#include "machine/c64/fcc.h"
+#include "machine/c64/final.h"
+#include "machine/c64/final3.h"
+#include "machine/c64/fun_play.h"
+#include "machine/c64/georam.h"
+#include "machine/c64/ide64.h"
+#include "machine/c64/ieee488.h"
+#include "machine/c64/kingsoft.h"
+#include "machine/c64/mach5.h"
+#include "machine/c64/magic_desk.h"
+#include "machine/c64/magic_formel.h"
+#include "machine/c64/magic_voice.h"
+#include "machine/c64/midi_maplin.h"
+#include "machine/c64/midi_namesoft.h"
+#include "machine/c64/midi_passport.h"
+#include "machine/c64/midi_sci.h"
+#include "machine/c64/midi_siel.h"
+#include "machine/c64/mikro_assembler.h"
+#include "machine/c64/multiscreen.h"
+#include "machine/c64/music64.h"
+#include "machine/c64/neoram.h"
+#include "machine/c64/ocean.h"
+#include "machine/c64/pagefox.h"
+#include "machine/c64/prophet64.h"
+#include "machine/c64/ps64.h"
+#include "machine/c64/reu.h"
+#include "machine/c64/rex.h"
+#include "machine/c64/rex_ep256.h"
+#include "machine/c64/ross.h"
+#include "machine/c64/sfx_sound_expander.h"
+#include "machine/c64/silverrock.h"
+#include "machine/c64/simons_basic.h"
+#include "machine/c64/stardos.h"
+#include "machine/c64/std.h"
+#include "machine/c64/structured_basic.h"
+#include "machine/c64/super_explode.h"
+#include "machine/c64/super_games.h"
+#include "machine/c64/supercpu.h"
+#include "machine/c64/sw8k.h"
+#include "machine/c64/swiftlink.h"
+#include "machine/c64/system3.h"
+#include "machine/c64/tdos.h"
+#include "machine/c64/turbo232.h"
+#include "machine/c64/vizastar.h"
+#include "machine/c64/vw64.h"
+#include "machine/c64/warp_speed.h"
+#include "machine/c64/westermann.h"
+#include "machine/c64/xl80.h"
+#include "machine/c64/zaxxon.h"
+#include "machine/c128_comal80.h"
+
+SLOT_INTERFACE_EXTERN( c64_expansion_cards );
+
+
#endif
diff --git a/src/mess/machine/c64/ieee488.h b/src/mess/machine/c64/ieee488.h
index 4f87cd48b73..2753e09c79a 100644
--- a/src/mess/machine/c64/ieee488.h
+++ b/src/mess/machine/c64/ieee488.h
@@ -16,7 +16,6 @@
#include "emu.h"
#include "machine/6525tpi.h"
#include "machine/c64/exp.h"
-#include "machine/cbmipt.h"
#include "machine/ieee488.h"
#include "video/mc6845.h"
diff --git a/src/mess/machine/c64/magic_voice.h b/src/mess/machine/c64/magic_voice.h
index a553acad186..73742d4106c 100644
--- a/src/mess/machine/c64/magic_voice.h
+++ b/src/mess/machine/c64/magic_voice.h
@@ -16,7 +16,6 @@
#include "machine/40105.h"
#include "machine/6525tpi.h"
#include "machine/c64/exp.h"
-#include "machine/cbmipt.h"
#include "sound/t6721a.h"
diff --git a/src/mess/machine/c64/music64.h b/src/mess/machine/c64/music64.h
index 3b7c804f6cb..b539eaaa6f1 100644
--- a/src/mess/machine/c64/music64.h
+++ b/src/mess/machine/c64/music64.h
@@ -14,7 +14,6 @@
#include "emu.h"
#include "machine/c64/exp.h"
-#include "machine/cbmipt.h"
diff --git a/src/mess/machine/c64/sfx_sound_expander.h b/src/mess/machine/c64/sfx_sound_expander.h
index 091e26b80f9..b8511cdfb9f 100644
--- a/src/mess/machine/c64/sfx_sound_expander.h
+++ b/src/mess/machine/c64/sfx_sound_expander.h
@@ -14,7 +14,6 @@
#include "emu.h"
#include "machine/c64/exp.h"
-#include "machine/cbmipt.h"
#include "sound/3526intf.h"
diff --git a/src/mess/machine/c64/supercpu.h b/src/mess/machine/c64/supercpu.h
index 537e73e3ab7..78b0fff0896 100644
--- a/src/mess/machine/c64/supercpu.h
+++ b/src/mess/machine/c64/supercpu.h
@@ -14,7 +14,6 @@
#include "emu.h"
#include "machine/c64/exp.h"
-#include "machine/cbmipt.h"
#include "cpu/g65816/g65816.h"
diff --git a/src/mess/machine/c64/tdos.h b/src/mess/machine/c64/tdos.h
index eea6bef25b3..b69b60b663b 100644
--- a/src/mess/machine/c64/tdos.h
+++ b/src/mess/machine/c64/tdos.h
@@ -14,7 +14,6 @@
#include "emu.h"
#include "machine/c64/exp.h"
-#include "machine/cbmipt.h"
#include "machine/mc6852.h"
diff --git a/src/mess/machine/c64/user.c b/src/mess/machine/c64/user.c
index ca09ef1af29..1ec63474ef0 100644
--- a/src/mess/machine/c64/user.c
+++ b/src/mess/machine/c64/user.c
@@ -106,3 +106,18 @@ WRITE_LINE_MEMBER( c64_user_port_device::cnt1_w ) { if (m_card != NULL) m_card->
WRITE_LINE_MEMBER( c64_user_port_device::sp1_w ) { if (m_card != NULL) m_card->c64_sp1_w(state); }
WRITE_LINE_MEMBER( c64_user_port_device::cnt2_w ) { if (m_card != NULL) m_card->c64_cnt2_w(state); }
WRITE_LINE_MEMBER( c64_user_port_device::sp2_w ) { if (m_card != NULL) m_card->c64_sp2_w(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( c64_user_port_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( c64_user_port_cards )
+ SLOT_INTERFACE("4cga", C64_4CGA)
+ SLOT_INTERFACE("4dxh", C64_4DXH)
+ SLOT_INTERFACE("4ksa", C64_4KSA)
+ SLOT_INTERFACE("4tba", C64_4TBA)
+ SLOT_INTERFACE("bn1541", C64_BN1541)
+ SLOT_INTERFACE("geocable", C64_GEOCABLE)
+ SLOT_INTERFACE("rs232", C64_VIC1011)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/c64/user.h b/src/mess/machine/c64/user.h
index 905c97312bf..79b2eec2e42 100644
--- a/src/mess/machine/c64/user.h
+++ b/src/mess/machine/c64/user.h
@@ -152,5 +152,17 @@ protected:
extern const device_type C64_USER_PORT;
+// slot devices
+#include "machine/c64/4cga.h"
+#include "machine/c64/4dxh.h"
+#include "machine/c64/4ksa.h"
+#include "machine/c64/4tba.h"
+#include "machine/c64/bn1541.h"
+#include "machine/c64/geocable.h"
+#include "machine/c64/vic1011.h"
+
+SLOT_INTERFACE_EXTERN( c64_user_port_cards );
+
+
#endif
diff --git a/src/mess/machine/c65.c b/src/mess/machine/c65.c
index 8f2afea32f7..47ae85ed785 100644
--- a/src/mess/machine/c65.c
+++ b/src/mess/machine/c65.c
@@ -7,7 +7,6 @@
#include "emu.h"
-#include "includes/cbm.h"
#include "includes/c65.h"
#include "cpu/m6502/m4510.h"
#include "sound/mos6581.h"
@@ -15,6 +14,9 @@
#include "machine/cbmiec.h"
#include "machine/ram.h"
#include "video/vic4567.h"
+#include "imagedev/cassette.h"
+#include "crsshair.h"
+#include "formats/cbm_tap.h"
#define VERBOSE_LEVEL 0
#define DBG_LOG( MACHINE, N, M, A ) \
@@ -29,6 +31,358 @@
+/***********************************************
+
+ Input Reading - Common Components
+
+***********************************************/
+
+/* These are needed by c64, c65 and c128, each machine has also additional specific
+components in its INTERRUPT_GEN */
+
+/* keyboard lines */
+UINT8 c64_keyline[10];
+
+void cbm_common_init(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_LENGTH(c64_keyline); i++)
+ c64_keyline[i] = 0xff;
+}
+
+static TIMER_CALLBACK( lightpen_tick )
+{
+ if (((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x04) || ((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x06))
+ {
+ /* enable lightpen crosshair */
+ crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_ALL);
+ }
+ else
+ {
+ /* disable lightpen crosshair */
+ crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_NONE);
+ }
+}
+
+void cbm_common_interrupt( device_t *device )
+{
+ int value, i;
+ int controller1 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x07;
+ int controller2 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x70;
+ static const char *const c64ports[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" };
+
+ /* Lines 0-7 : common keyboard */
+ for (i = 0; i < 8; i++)
+ {
+ value = 0xff;
+ value &= ~device->machine().root_device().ioport(c64ports[i])->read();
+
+ /* Shift Lock is mapped on Left Shift */
+ if ((i == 1) && (device->machine().root_device().ioport("SPECIAL")->read() & 0x40))
+ value &= ~0x80;
+
+ c64_keyline[i] = value;
+ }
+
+
+ value = 0xff;
+ switch(controller1)
+ {
+ case 0x00:
+ value &= ~device->machine().root_device().ioport("JOY1_1B")->read(); /* Joy1 Directions + Button 1 */
+ break;
+
+ case 0x01:
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x40) /* Paddle2 Button */
+ value &= ~0x08;
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x80) /* Paddle1 Button */
+ value &= ~0x04;
+ break;
+
+ case 0x02:
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x02) /* Mouse Button Left */
+ value &= ~0x10;
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x01) /* Mouse Button Right */
+ value &= ~0x01;
+ break;
+
+ case 0x03:
+ value &= ~(device->machine().root_device().ioport("JOY1_2B")->read() & 0x1f); /* Joy1 Directions + Button 1 */
+ break;
+
+ case 0x04:
+/* was there any input on the lightpen? where is it mapped? */
+// if (device->machine().root_device().ioport("OTHER")->read() & 0x04) /* Lightpen Signal */
+// value &= ?? ;
+ break;
+
+ case 0x07:
+ break;
+
+ default:
+ logerror("Invalid Controller 1 Setting %d\n", controller1);
+ break;
+ }
+
+ c64_keyline[8] = value;
+
+
+ value = 0xff;
+ switch(controller2)
+ {
+ case 0x00:
+ value &= ~device->machine().root_device().ioport("JOY2_1B")->read(); /* Joy2 Directions + Button 1 */
+ break;
+
+ case 0x10:
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x10) /* Paddle4 Button */
+ value &= ~0x08;
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x20) /* Paddle3 Button */
+ value &= ~0x04;
+ break;
+
+ case 0x20:
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x02) /* Mouse Button Left */
+ value &= ~0x10;
+ if (device->machine().root_device().ioport("OTHER")->read() & 0x01) /* Mouse Button Right */
+ value &= ~0x01;
+ break;
+
+ case 0x30:
+ value &= ~(device->machine().root_device().ioport("JOY2_2B")->read() & 0x1f); /* Joy2 Directions + Button 1 */
+ break;
+
+ case 0x40:
+/* was there any input on the lightpen? where is it mapped? */
+// if (device->machine().root_device().ioport("OTHER")->read() & 0x04) /* Lightpen Signal */
+// value &= ?? ;
+ break;
+
+ case 0x70:
+ break;
+
+ default:
+ logerror("Invalid Controller 2 Setting %d\n", controller2);
+ break;
+ }
+
+ c64_keyline[9] = value;
+
+// vic2_frame_interrupt does nothing so this is not necessary
+// vic2_frame_interrupt (device);
+
+ /* check if lightpen has been chosen as input: if so, enable crosshair */
+ device->machine().scheduler().timer_set(attotime::zero, FUNC(lightpen_tick));
+
+ set_led_status (device->machine(), 1, device->machine().root_device().ioport("SPECIAL")->read() & 0x40 ? 1 : 0); /* Shift Lock */
+ set_led_status (device->machine(), 0, device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 ? 1 : 0); /* Joystick Swap */
+}
+
+
+/***********************************************
+
+ CIA Common Handlers
+
+***********************************************/
+
+/* These are shared by c64, c65 and c128. c65 and c128 also have additional specific
+components (to select/read additional keyboard lines) */
+
+/*
+ * CIA 0 - Port A
+ * bits 7-0 keyboard line select
+ * bits 7,6: paddle select( 01 port a, 10 port b)
+ * bit 4: joystick a fire button
+ * bits 3,2: Paddles port a fire button
+ * bits 3-0: joystick a direction
+ *
+ * CIA 0 - Port B
+ * bits 7-0: keyboard raw values
+ * bit 4: joystick b fire button, lightpen select
+ * bits 3,2: paddle b fire buttons (left,right)
+ * bits 3-0: joystick b direction
+ *
+ * flag cassette read input, serial request in
+ * irq to irq connected
+ */
+
+UINT8 cbm_common_cia0_port_a_r( device_t *device, UINT8 output_b )
+{
+ UINT8 value = 0xff;
+
+ if (!(output_b & 0x80))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x80)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x80)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x80)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x80)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x80)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x80)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x80)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x80)) t &= ~0x01;
+ value &= t;
+ }
+
+ if (!(output_b & 0x40))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x40)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x40)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x40)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x40)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x40)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x40)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x40)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x40)) t &= ~0x01;
+ value &= t;
+ }
+
+ if (!(output_b & 0x20))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x20)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x20)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x20)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x20)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x20)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x20)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x20)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x20)) t &= ~0x01;
+ value &= t;
+ }
+
+ if (!(output_b & 0x10))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x10)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x10)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x10)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x10)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x10)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x10)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x10)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x10)) t &= ~0x01;
+ value &= t;
+ }
+
+ if (!(output_b & 0x08))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x08)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x08)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x08)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x08)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x08)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x08)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x08)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x08)) t &= ~0x01;
+ value &= t;
+ }
+
+ if (!(output_b & 0x04))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x04)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x04)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x04)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x04)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x04)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x04)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x04)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x04)) t &= ~0x01;
+ value &= t;
+ }
+
+ if (!(output_b & 0x02))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x02)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x02)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x02)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x02)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x02)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x02)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x02)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x02)) t &= ~0x01;
+ value &= t;
+ }
+
+ if (!(output_b & 0x01))
+ {
+ UINT8 t = 0xff;
+ if (!(c64_keyline[7] & 0x01)) t &= ~0x80;
+ if (!(c64_keyline[6] & 0x01)) t &= ~0x40;
+ if (!(c64_keyline[5] & 0x01)) t &= ~0x20;
+ if (!(c64_keyline[4] & 0x01)) t &= ~0x10;
+ if (!(c64_keyline[3] & 0x01)) t &= ~0x08;
+ if (!(c64_keyline[2] & 0x01)) t &= ~0x04;
+ if (!(c64_keyline[1] & 0x01)) t &= ~0x02;
+ if (!(c64_keyline[0] & 0x01)) t &= ~0x01;
+ value &= t;
+ }
+
+ if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 )
+ value &= c64_keyline[8];
+ else
+ value &= c64_keyline[9];
+
+ return value;
+}
+
+UINT8 cbm_common_cia0_port_b_r( device_t *device, UINT8 output_a )
+{
+ UINT8 value = 0xff;
+
+ if (!(output_a & 0x80)) value &= c64_keyline[7];
+ if (!(output_a & 0x40)) value &= c64_keyline[6];
+ if (!(output_a & 0x20)) value &= c64_keyline[5];
+ if (!(output_a & 0x10)) value &= c64_keyline[4];
+ if (!(output_a & 0x08)) value &= c64_keyline[3];
+ if (!(output_a & 0x04)) value &= c64_keyline[2];
+ if (!(output_a & 0x02)) value &= c64_keyline[1];
+ if (!(output_a & 0x01)) value &= c64_keyline[0];
+
+ if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 )
+ value &= c64_keyline[9];
+ else
+ value &= c64_keyline[8];
+
+ return value;
+}
+
+
+/***********************************************
+
+ CBM Cartridges
+
+***********************************************/
+
+
+/* All the cartridge specific code has been moved
+ to machine/ drivers. Once more informations
+ surface about the cart expansions for systems
+ in c65.c, c128.c, cbmb.c and pet.c, the shared
+ code could be refactored to have here the
+ common functions */
+
+
+
+/***********************************************
+
+ CBM Datasette Tapes
+
+***********************************************/
+
+const cassette_interface cbm_cassette_interface =
+{
+ cbm_cassette_formats,
+ NULL,
+ (cassette_state) (CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED),
+ NULL,
+ NULL
+};
/*UINT8 *c65_basic; */
diff --git a/src/mess/machine/c8280.h b/src/mess/machine/c8280.h
index ef24faf8842..d2db314d721 100644
--- a/src/mess/machine/c8280.h
+++ b/src/mess/machine/c8280.h
@@ -16,7 +16,6 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/6532riot.h"
-#include "machine/cbmipt.h"
#include "machine/ieee488.h"
#include "machine/wd_fdc.h"
diff --git a/src/mess/machine/cbm.c b/src/mess/machine/cbm.c
deleted file mode 100644
index 054d5e047a3..00000000000
--- a/src/mess/machine/cbm.c
+++ /dev/null
@@ -1,359 +0,0 @@
-#include "emu.h"
-#include "imagedev/cassette.h"
-#include "crsshair.h"
-#include "includes/cbm.h"
-#include "formats/cbm_tap.h"
-
-
-/***********************************************
-
- Input Reading - Common Components
-
-***********************************************/
-
-/* These are needed by c64, c65 and c128, each machine has also additional specific
-components in its INTERRUPT_GEN */
-
-/* keyboard lines */
-UINT8 c64_keyline[10];
-
-void cbm_common_init(void)
-{
- int i;
-
- for (i = 0; i < ARRAY_LENGTH(c64_keyline); i++)
- c64_keyline[i] = 0xff;
-}
-
-static TIMER_CALLBACK( lightpen_tick )
-{
- if (((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x04) || ((machine.root_device().ioport("CTRLSEL")->read() & 0x07) == 0x06))
- {
- /* enable lightpen crosshair */
- crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_ALL);
- }
- else
- {
- /* disable lightpen crosshair */
- crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_NONE);
- }
-}
-
-void cbm_common_interrupt( device_t *device )
-{
- int value, i;
- int controller1 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x07;
- int controller2 = device->machine().root_device().ioport("CTRLSEL")->read() & 0x70;
- static const char *const c64ports[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" };
-
- /* Lines 0-7 : common keyboard */
- for (i = 0; i < 8; i++)
- {
- value = 0xff;
- value &= ~device->machine().root_device().ioport(c64ports[i])->read();
-
- /* Shift Lock is mapped on Left Shift */
- if ((i == 1) && (device->machine().root_device().ioport("SPECIAL")->read() & 0x40))
- value &= ~0x80;
-
- c64_keyline[i] = value;
- }
-
-
- value = 0xff;
- switch(controller1)
- {
- case 0x00:
- value &= ~device->machine().root_device().ioport("JOY1_1B")->read(); /* Joy1 Directions + Button 1 */
- break;
-
- case 0x01:
- if (device->machine().root_device().ioport("OTHER")->read() & 0x40) /* Paddle2 Button */
- value &= ~0x08;
- if (device->machine().root_device().ioport("OTHER")->read() & 0x80) /* Paddle1 Button */
- value &= ~0x04;
- break;
-
- case 0x02:
- if (device->machine().root_device().ioport("OTHER")->read() & 0x02) /* Mouse Button Left */
- value &= ~0x10;
- if (device->machine().root_device().ioport("OTHER")->read() & 0x01) /* Mouse Button Right */
- value &= ~0x01;
- break;
-
- case 0x03:
- value &= ~(device->machine().root_device().ioport("JOY1_2B")->read() & 0x1f); /* Joy1 Directions + Button 1 */
- break;
-
- case 0x04:
-/* was there any input on the lightpen? where is it mapped? */
-// if (device->machine().root_device().ioport("OTHER")->read() & 0x04) /* Lightpen Signal */
-// value &= ?? ;
- break;
-
- case 0x07:
- break;
-
- default:
- logerror("Invalid Controller 1 Setting %d\n", controller1);
- break;
- }
-
- c64_keyline[8] = value;
-
-
- value = 0xff;
- switch(controller2)
- {
- case 0x00:
- value &= ~device->machine().root_device().ioport("JOY2_1B")->read(); /* Joy2 Directions + Button 1 */
- break;
-
- case 0x10:
- if (device->machine().root_device().ioport("OTHER")->read() & 0x10) /* Paddle4 Button */
- value &= ~0x08;
- if (device->machine().root_device().ioport("OTHER")->read() & 0x20) /* Paddle3 Button */
- value &= ~0x04;
- break;
-
- case 0x20:
- if (device->machine().root_device().ioport("OTHER")->read() & 0x02) /* Mouse Button Left */
- value &= ~0x10;
- if (device->machine().root_device().ioport("OTHER")->read() & 0x01) /* Mouse Button Right */
- value &= ~0x01;
- break;
-
- case 0x30:
- value &= ~(device->machine().root_device().ioport("JOY2_2B")->read() & 0x1f); /* Joy2 Directions + Button 1 */
- break;
-
- case 0x40:
-/* was there any input on the lightpen? where is it mapped? */
-// if (device->machine().root_device().ioport("OTHER")->read() & 0x04) /* Lightpen Signal */
-// value &= ?? ;
- break;
-
- case 0x70:
- break;
-
- default:
- logerror("Invalid Controller 2 Setting %d\n", controller2);
- break;
- }
-
- c64_keyline[9] = value;
-
-// vic2_frame_interrupt does nothing so this is not necessary
-// vic2_frame_interrupt (device);
-
- /* check if lightpen has been chosen as input: if so, enable crosshair */
- device->machine().scheduler().timer_set(attotime::zero, FUNC(lightpen_tick));
-
- set_led_status (device->machine(), 1, device->machine().root_device().ioport("SPECIAL")->read() & 0x40 ? 1 : 0); /* Shift Lock */
- set_led_status (device->machine(), 0, device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 ? 1 : 0); /* Joystick Swap */
-}
-
-
-/***********************************************
-
- CIA Common Handlers
-
-***********************************************/
-
-/* These are shared by c64, c65 and c128. c65 and c128 also have additional specific
-components (to select/read additional keyboard lines) */
-
-/*
- * CIA 0 - Port A
- * bits 7-0 keyboard line select
- * bits 7,6: paddle select( 01 port a, 10 port b)
- * bit 4: joystick a fire button
- * bits 3,2: Paddles port a fire button
- * bits 3-0: joystick a direction
- *
- * CIA 0 - Port B
- * bits 7-0: keyboard raw values
- * bit 4: joystick b fire button, lightpen select
- * bits 3,2: paddle b fire buttons (left,right)
- * bits 3-0: joystick b direction
- *
- * flag cassette read input, serial request in
- * irq to irq connected
- */
-
-UINT8 cbm_common_cia0_port_a_r( device_t *device, UINT8 output_b )
-{
- UINT8 value = 0xff;
-
- if (!(output_b & 0x80))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x80)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x80)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x80)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x80)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x80)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x80)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x80)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x80)) t &= ~0x01;
- value &= t;
- }
-
- if (!(output_b & 0x40))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x40)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x40)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x40)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x40)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x40)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x40)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x40)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x40)) t &= ~0x01;
- value &= t;
- }
-
- if (!(output_b & 0x20))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x20)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x20)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x20)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x20)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x20)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x20)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x20)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x20)) t &= ~0x01;
- value &= t;
- }
-
- if (!(output_b & 0x10))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x10)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x10)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x10)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x10)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x10)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x10)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x10)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x10)) t &= ~0x01;
- value &= t;
- }
-
- if (!(output_b & 0x08))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x08)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x08)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x08)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x08)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x08)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x08)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x08)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x08)) t &= ~0x01;
- value &= t;
- }
-
- if (!(output_b & 0x04))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x04)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x04)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x04)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x04)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x04)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x04)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x04)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x04)) t &= ~0x01;
- value &= t;
- }
-
- if (!(output_b & 0x02))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x02)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x02)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x02)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x02)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x02)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x02)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x02)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x02)) t &= ~0x01;
- value &= t;
- }
-
- if (!(output_b & 0x01))
- {
- UINT8 t = 0xff;
- if (!(c64_keyline[7] & 0x01)) t &= ~0x80;
- if (!(c64_keyline[6] & 0x01)) t &= ~0x40;
- if (!(c64_keyline[5] & 0x01)) t &= ~0x20;
- if (!(c64_keyline[4] & 0x01)) t &= ~0x10;
- if (!(c64_keyline[3] & 0x01)) t &= ~0x08;
- if (!(c64_keyline[2] & 0x01)) t &= ~0x04;
- if (!(c64_keyline[1] & 0x01)) t &= ~0x02;
- if (!(c64_keyline[0] & 0x01)) t &= ~0x01;
- value &= t;
- }
-
- if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 )
- value &= c64_keyline[8];
- else
- value &= c64_keyline[9];
-
- return value;
-}
-
-UINT8 cbm_common_cia0_port_b_r( device_t *device, UINT8 output_a )
-{
- UINT8 value = 0xff;
-
- if (!(output_a & 0x80)) value &= c64_keyline[7];
- if (!(output_a & 0x40)) value &= c64_keyline[6];
- if (!(output_a & 0x20)) value &= c64_keyline[5];
- if (!(output_a & 0x10)) value &= c64_keyline[4];
- if (!(output_a & 0x08)) value &= c64_keyline[3];
- if (!(output_a & 0x04)) value &= c64_keyline[2];
- if (!(output_a & 0x02)) value &= c64_keyline[1];
- if (!(output_a & 0x01)) value &= c64_keyline[0];
-
- if ( device->machine().root_device().ioport("CTRLSEL")->read() & 0x80 )
- value &= c64_keyline[9];
- else
- value &= c64_keyline[8];
-
- return value;
-}
-
-
-/***********************************************
-
- CBM Cartridges
-
-***********************************************/
-
-
-/* All the cartridge specific code has been moved
- to machine/ drivers. Once more informations
- surface about the cart expansions for systems
- in c65.c, c128.c, cbmb.c and pet.c, the shared
- code could be refactored to have here the
- common functions */
-
-
-
-/***********************************************
-
- CBM Datasette Tapes
-
-***********************************************/
-
-const cassette_interface cbm_cassette_interface =
-{
- cbm_cassette_formats,
- NULL,
- (cassette_state) (CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED),
- NULL,
- NULL
-};
diff --git a/src/mess/machine/cbm2exp.c b/src/mess/machine/cbm2exp.c
index c30fea140cf..a9098ec7ed5 100644
--- a/src/mess/machine/cbm2exp.c
+++ b/src/mess/machine/cbm2exp.c
@@ -289,3 +289,14 @@ void cbm2_expansion_slot_device::write(address_space &space, offs_t offset, UINT
m_card->cbm2_bd_w(space, offset, data, csbank1, csbank2, csbank3);
}
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( cbm2_expansion_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( cbm2_expansion_cards )
+ SLOT_INTERFACE("24k", CBM2_24K)
+ SLOT_INTERFACE_INTERNAL("standard", CBM2_STD)
+ SLOT_INTERFACE_INTERNAL("graphic", CBM2_GRAPHIC)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/cbm2exp.h b/src/mess/machine/cbm2exp.h
index 1aa6712deea..3e9eb591f01 100644
--- a/src/mess/machine/cbm2exp.h
+++ b/src/mess/machine/cbm2exp.h
@@ -148,5 +148,13 @@ protected:
extern const device_type CBM2_EXPANSION_SLOT;
+// slot devices
+#include "machine/cbm2_std.h"
+#include "machine/cbm2_24k.h"
+#include "machine/cbm2_graphic.h"
+
+SLOT_INTERFACE_EXTERN( cbm2_expansion_cards );
+
+
#endif
diff --git a/src/mess/machine/cbm2user.c b/src/mess/machine/cbm2user.c
index 0130521a71d..1dbfe7745d9 100644
--- a/src/mess/machine/cbm2user.c
+++ b/src/mess/machine/cbm2user.c
@@ -121,3 +121,11 @@ WRITE_LINE_MEMBER( cbm2_user_port_device::pb3_w ) { if (m_card != NULL) m_card->
WRITE_LINE_MEMBER( cbm2_user_port_device::pc_w ) { if (m_card != NULL) m_card->cbm2_pc_w(state); }
WRITE_LINE_MEMBER( cbm2_user_port_device::cnt_w ) { if (m_card != NULL) m_card->cbm2_cnt_w(state); }
WRITE_LINE_MEMBER( cbm2_user_port_device::sp_w ) { if (m_card != NULL) m_card->cbm2_sp_w(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( cbm2_user_port_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( cbm2_user_port_cards )
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/cbm2user.h b/src/mess/machine/cbm2user.h
index e4801672fab..331cca22258 100644
--- a/src/mess/machine/cbm2user.h
+++ b/src/mess/machine/cbm2user.h
@@ -136,5 +136,9 @@ protected:
extern const device_type CBM2_USER_PORT;
+// slot devices
+SLOT_INTERFACE_EXTERN( cbm2_user_port_cards );
+
+
#endif
diff --git a/src/mess/machine/cbmiec.c b/src/mess/machine/cbmiec.c
index f77ba80c11d..f68ceb39954 100644
--- a/src/mess/machine/cbmiec.c
+++ b/src/mess/machine/cbmiec.c
@@ -477,3 +477,31 @@ int cbm_iec_device::get_signal(int signal)
return state;
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( cbm_iec_devices )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( cbm_iec_devices )
+ SLOT_INTERFACE("c1540", C1540)
+ SLOT_INTERFACE("c1541", C1541)
+ SLOT_INTERFACE("c1541c", C1541C)
+ SLOT_INTERFACE("c1541ii", C1541II)
+ SLOT_INTERFACE("fsd2", FSD2)
+ SLOT_INTERFACE("csd1", CSD1)
+ SLOT_INTERFACE("c1541dd", C1541_DOLPHIN_DOS)
+ SLOT_INTERFACE("c1541pd", C1541_PROFESSIONAL_DOS_V1)
+ SLOT_INTERFACE("c1541pdc", C1541_PROLOGIC_DOS_CLASSIC)
+ SLOT_INTERFACE("c1570", C1570)
+ SLOT_INTERFACE("c1571", C1571)
+ SLOT_INTERFACE("c1581", C1581)
+ SLOT_INTERFACE("cmdhd", CMD_HD)
+ SLOT_INTERFACE("fd2000", FD2000)
+ SLOT_INTERFACE("fd4000", FD4000)
+ SLOT_INTERFACE("interpod", INTERPOD)
+ SLOT_INTERFACE("minichief", MINI_CHIEF)
+ SLOT_INTERFACE("serialbox", SERIAL_BOX)
+ SLOT_INTERFACE("diag264", DIAG264_SERIAL_LOOPBACK)
+ SLOT_INTERFACE("nl10", C64_NL10_INTERFACE)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/cbmiec.h b/src/mess/machine/cbmiec.h
index 1465fc01627..4029f70219d 100644
--- a/src/mess/machine/cbmiec.h
+++ b/src/mess/machine/cbmiec.h
@@ -54,6 +54,15 @@
downcast<cbm_iec_slot_device *>(device)->set_address(_address);
+#define MCFG_CBM_IEC_ADD(_default_drive) \
+ MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL) \
+ MCFG_CBM_IEC_SLOT_ADD("iec8", 8, cbm_iec_devices, _default_drive) \
+ MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL) \
+ MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL) \
+ MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL) \
+ MCFG_CBM_IEC_BUS_ADD()
+
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -195,5 +204,19 @@ extern const device_type CBM_IEC;
extern const device_type CBM_IEC_SLOT;
+// slot devices
+#include "machine/c1541.h"
+#include "machine/c1571.h"
+#include "machine/c1581.h"
+#include "machine/c64_nl10.h"
+#include "machine/cmdhd.h"
+#include "machine/diag264_lb_iec.h"
+#include "machine/fd2000.h"
+#include "machine/interpod.h"
+#include "machine/serialbox.h"
+
+SLOT_INTERFACE_EXTERN( cbm_iec_devices );
+
+
#endif
diff --git a/src/mess/machine/cbmipt.c b/src/mess/machine/cbmipt.c
deleted file mode 100644
index 680a403ef03..00000000000
--- a/src/mess/machine/cbmipt.c
+++ /dev/null
@@ -1,1219 +0,0 @@
-/**********************************************************************************
- *
- * machine/cbmipt.c
- *
- * Input port macros shared by various CBM computers
- *
- *
- * TO DO:
- *
- * - investigate C128 input problem with Left Shift / Shift Lock
- * - investigate superpet different reading of Caps Lock (check machine/pet.c)
- * - move here lightpen inputs from vc20.c, eventually
- * - clean up the "SPECIAL" and "CFG" input ports (e.g. there a quite a lot
- * of settings that are not checked anymore! we have either to implement
- * the features properly or, if they're hacks, to remove them)
- *
- *********************************************************************************/
-
-#include "emu.h"
-#include "machine/cbmipt.h"
-
-
-/***************************** Commodore 64 ****************************************
- *
- * - common_cbm_keyboard: C64 keyboard; used by C16, C65 and C128 as well
- * - c64_special: input port for the Restore key and the Shift Lock Switch
- * - c64_controls: joypads, paddles and lightpen; shared with C65, C128
- * and CBMB
- *
- **********************************************************************************/
-
-/*
-
-C64 Keyboard Layout
--------------------
-
- CLR INST
- <- 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 + - ? HOME DEL f 1
-
-
- CTRL Q W E R T Y U I O P @ * UP RESTORE f 3
-
-RUN SHIFT
-STOP LOCK A S D F G H J K L :[ ;] = RETURN f 5
-
- CRSR CRSR
-C= SHIFT Z X C V B N M ,< .> /? SHIFT U/D L/R f 7
-
-
- SPACEBAR
-
-
-Notes: "C=" is a key with the Commodore logo, "UP" is an arrow pointing up, the "CRSR" keys at the
-bottom-right corner are used to move the cursor on screen (Up/Down and Left/Right resp.).
-*/
-
-
-INPUT_PORTS_START( common_cbm_keyboard )
- PORT_START( "ROW0" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Crsr Down Up") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F5))
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F3))
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F7))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Crsr Right Left") PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("INST DEL") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
-
- PORT_START( "ROW1" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift (Left)") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
-
- PORT_START( "ROW2" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
-
- PORT_START( "ROW3" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
-
- PORT_START( "ROW4" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
-
- PORT_START( "ROW5" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('[')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('+')
-
- PORT_START( "ROW6" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x91 Pi") PORT_CODE(KEYCODE_DEL) PORT_CHAR(0x2191) PORT_CHAR(0x03C0)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('=')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift (Right)") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CLR HOME") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(HOME))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') PORT_CHAR(']')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('*')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\xA3')
-
- PORT_START( "ROW7" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("RUN STOP") PORT_CODE(KEYCODE_HOME)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CBM") PORT_CODE(KEYCODE_LALT)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_SHIFT_2)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x90") PORT_CODE(KEYCODE_TILDE) PORT_CHAR(0x2190)
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( c64_special )
- PORT_START( "SPECIAL" ) /* special keys */
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("RESTORE") PORT_CODE(KEYCODE_PRTSCR)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("SHIFT LOCK") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( c64_controls )
- PORT_START("CTRLSEL") /* Controller selection */
- PORT_CONFNAME( 0x07, 0x00, "Gameport A" )
- PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) )
- PORT_CONFSETTING( 0x01, "Paddles 1 & 2" )
- PORT_CONFSETTING( 0x02, "Mouse 1351" )
- PORT_CONFSETTING( 0x03, "Mouse (Non Proportional) 1350" )
- PORT_CONFSETTING( 0x04, "Lightpen" )
-// PORT_CONFSETTING( 0x05, "Koala Pad" )
- PORT_CONFSETTING( 0x06, "Lightgun" )
- PORT_CONFSETTING( 0x07, "No Device Connected" )
- PORT_CONFNAME( 0x70, 0x00, "Gameport B" )
- PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) )
- PORT_CONFSETTING( 0x10, "Paddles 3 & 4" )
-// PORT_CONFSETTING( 0x20, "Mouse 1351" )
-// PORT_CONFSETTING( 0x30, "Mouse (Non Proportional) 1350" )
- PORT_CONFSETTING( 0x70, "No Device Connected" )
- PORT_CONFNAME( 0x80, 0x00, "Swap Gameport A and B") PORT_CODE(KEYCODE_F1) PORT_TOGGLE
- PORT_CONFSETTING( 0x00, DEF_STR( No ) )
- PORT_CONFSETTING( 0x80, DEF_STR( Yes ) )
-
- PORT_START("JOY1_1B")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START("JOY2_1B")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_HOME) PORT_CODE(JOYCODE_Y_UP_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_END) PORT_CODE(JOYCODE_Y_DOWN_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_X_LEFT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_PGDN) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- /* Mouse Commodore 1350 was basically working as a Joystick */
- PORT_START("JOY1_2B")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Up") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Down") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Left") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Mouse 1350 Right") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Mouse 1350 Button 1") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Mouse 1350 Button 2") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x03)
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- /* Still to verify how many mices you were able to plug into a c64 */
- /* Only one, for now */
- PORT_START("JOY2_2B")
- PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
-/* PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_HOME) PORT_CODE(JOYCODE_Y_UP_SWITCH)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_END) PORT_CODE(JOYCODE_Y_DOWN_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_X_LEFT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CODE(KEYCODE_PGDN) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_PGUP) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x30)
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
-*/
- PORT_START("PADDLE1")
- PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT) PORT_CODE_DEC(JOYCODE_X_LEFT_SWITCH) PORT_CODE_INC(JOYCODE_X_RIGHT_SWITCH) PORT_PLAYER(1) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
-
- PORT_START("PADDLE2")
- PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_DOWN) PORT_CODE_INC(KEYCODE_UP) PORT_CODE_DEC(JOYCODE_Y_UP_SWITCH) PORT_CODE_INC(JOYCODE_Y_DOWN_SWITCH) PORT_PLAYER(2) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
-
- PORT_START("PADDLE3")
- PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_HOME) PORT_CODE_INC(KEYCODE_PGUP) PORT_PLAYER(3) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
-
- PORT_START("PADDLE4")
- PORT_BIT( 0xff, 128, IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_MINMAX(0,255) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_END) PORT_CODE_INC(KEYCODE_PGDN) PORT_PLAYER(4) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
-
- PORT_START("TRACKX")
- PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)
-
- PORT_START("TRACKY")
- PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) PORT_REVERSE PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)
-
- PORT_START("LIGHTX")
- PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X) PORT_NAME("Lightpen X Axis") PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04)
-
- PORT_START("LIGHTY")
- PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y) PORT_NAME("Lightpen Y Axis") PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04)
-
- PORT_START("OTHER")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Paddle 1 Button") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Paddle 2 Button") PORT_CODE(KEYCODE_LALT) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Paddle 3 Button") PORT_CODE(KEYCODE_INSERT) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Paddle 4 Button") PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Lightpen Signal") PORT_CODE(KEYCODE_LCONTROL) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x04)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Mouse Button Left") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Mouse Button Right") PORT_CODE(KEYCODE_LALT) PORT_CODE(JOYCODE_BUTTON2) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x02)
-INPUT_PORTS_END
-
-
-/***************************** Commodore 16 ****************************************
- *
- * - C16 shares Keyboard with C64 (only few changes, see c16.c)
- * - c16_special: input port for the Shift Lock Switch
- * - c16_controls: control inputs
- *
- **********************************************************************************/
-
-/*
-
-C16 Keyboard Layout
--------------------
-
- INST
- ESC 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0^ LEFT RIGHT UP DOWN DEL f 1
-
- CLEAR
- CTRL Q W E R T Y U I O P @ + - HOME f 3
-
- RUN SHIFT
- STOP LOCK A S D F G H J K L :[ ;] * RETURN f 5
-
-
- C= SHIFT Z X C V B N M ,< .> /? SHIFT ? = HELP
-
-
- SPACEBAR
-
-
-Notes: "C=" is a key with the Commodore logo, Shift+0 produces an arrow pointing up (''^'' above).
-
-C116 Keyboard Layout
---------------------
-
- F1/F4 F2/F5 F3/F6 HELP/F7 HOME/CLEAR DEL/INST
-
-
- ESC 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0^ + - *
-
-
- CONTROL Q W E R T Y U I O P @ RETURN
-
- RUN
- STOP ?? A S D F G H J K L :[ ;] =
-
-
- C= SHIFT Z X C V B N M ,< .> /? SHIFT
- UP
- LEFT RIGHT
- SPACEBAR DOWN
-
-
-Plus/4 (also 232/264/364 proto)
------------------------------------
-
- F1/F4 F2/F5 F3/F6 HELP/F7
-
- CLEAR INST
- ESC 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0^ + - = HOME DEL || @ + - =
- ||
- ||
- CONTROL Q W E R T Y U I O P @ ? * CONTROL || 7 8 9 *
- ||
- RUN SHIFT ||
- STOP LOCK A S D F G H J K L :[ ;] RETURN || 4 5 6 /
- ||
- || E
- C= SHIFT Z X C V B N M ,< .> /? SHIFT || 1 2 3 n
- UP || t
- LEFT RIGHT || e
- SPACEBAR DOWN || 0 . : r
-
-The 19-keys keypad on the left was present only in the 364 prototype (but probably those
-keys were simply wired to the lines of regular number keys of the keyboard).
-
-*/
-
-INPUT_PORTS_START( c16_special )
- PORT_START("SPECIAL")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift Lock (switch)") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
- PORT_CONFNAME( 0x40, 0x00, "Swap Gameport 1 and 2") PORT_CODE(KEYCODE_F1) PORT_TOGGLE
- PORT_CONFSETTING( 0x00, DEF_STR( No ) )
- PORT_CONFSETTING( 0x40, DEF_STR( Yes ) )
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( c16_controls )
- PORT_START("CTRLSEL") /* Controller selection */
- PORT_CONFNAME( 0x01, 0x00, "Gameport 1" )
- PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) )
- PORT_CONFSETTING( 0x01, "No Device Connected" )
- PORT_CONFNAME( 0x10, 0x00, "Gameport 2" )
- PORT_CONFSETTING( 0x00, DEF_STR( Joystick ) )
- PORT_CONFSETTING( 0x10, "No Device Connected" )
-
- PORT_START("JOY0")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_NAME("P1 Up") PORT_8WAY PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_NAME("P1 Down") PORT_8WAY PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT) PORT_NAME("P1 Left") PORT_8WAY PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_NAME("P1 Right") PORT_8WAY PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("P1 Button") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00)
-
- PORT_START("JOY1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_NAME("P2 Up") PORT_CODE(KEYCODE_HOME) PORT_CODE(JOYCODE_Y_UP_SWITCH) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_NAME("P2 Down") PORT_CODE(KEYCODE_END) PORT_CODE(JOYCODE_Y_DOWN_SWITCH) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT) PORT_NAME("P2 Left") PORT_CODE(KEYCODE_DEL) PORT_CODE(JOYCODE_X_LEFT_SWITCH) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_NAME("P2 Right") PORT_CODE(KEYCODE_PGDN) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("P2 Button") PORT_CODE(KEYCODE_LALT) PORT_CODE(JOYCODE_BUTTON1) PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00)
-INPUT_PORTS_END
-
-
-/***************************** Commodore 128 ***************************************
- *
- * - C128 shares Controls and Keyboard with C64 (+ a keypad, see c128.c)
- * - c128_special: input port for the Restore key and the Shift Lock,
- * TV/RGBI and 40/80 columns switches
- *
- **********************************************************************************/
-
-/*
-
-C128 Keyboard Layout
---------------------
-
-
- CAPS LINE 40/80 NO
- ESC TAB ALT LOCK HELP FEED DISPLAY SCROLL UP DOWN LEFT RIGHT F1 F3 F5 F7
-
- CLR INST
- <- 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 + - ? HOME DEL 7 8 9 +
-
-
- CONTROL Q W E R T Y U I O P @ * UP RESTORE 4 5 6 -
-
- RUN SHIFT E
- STOP LOCK A S D F G H J K L :[ ;] = RETURN 1 2 3 n
- t
- CRSR CRSR e
- C= SHIFT Z X C V B N M ,< .> /? SHIFT U/D L/R 0 . r
-
-
- SPACEBAR
-
-Notes: "C=" is a key with the Commodore logo, "UP" is an arrow pointing up, the "CRSR" keys at the bottom-right
-corner are used to move the cursor on screen (Up/Down and Left/Right resp.).
-
-*/
-
-
-
-/***************************** Commodore 65 ****************************************
- *
- * - C65 shares Keyboard and Inputs with C64 (+ some function keys, see c65.c)
- * - c65_special: input port for the Restore key and the Shift Lock and DIN
- * switches
- *
- **********************************************************************************/
-
-/*
-
-C65 Keyboard Layout
--------------------
-
- RUN CAPS NO
- STOP ESC ALT LOCK SCROLL F1 F3 F5 F7 F9 F11 F13 HELP
-
- CLR INST
- <- 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 + - ?? HOME DEL
-
-
- TAB Q W E R T Y U I O P @ * UP RESTORE
-
- SHIFT
- CTRL LOCK A S D F G H J K L :[ ;] = RETURN
-
-
- C= SHIFT Z X C V B N M ,< .> /? SHIFT UP
-
-
- SPACEBAR LEFT DOWN RIGHT
-
-Notes: "C=" is a key with the Commodore logo, "UP" is an arrow pointing up.
-
-*/
-INPUT_PORTS_START( c65_special )
- PORT_START( "SPECIAL" ) /* special keys */
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Restore") PORT_CODE(KEYCODE_PRTSCR)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift Lock (switch)") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
- PORT_CONFNAME( 0x20, 0x00, "(C65) Caps Lock (switch)") PORT_CODE(KEYCODE_F3)
- PORT_CONFSETTING( 0x00, DEF_STR( Off ) )
- PORT_CONFSETTING( 0x20, DEF_STR( On ) )
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
-INPUT_PORTS_END
-
-
-/***************************** Commodore Pet ***************************************
- *
- * - pet_keyboard: original keyboard used by PET2001
- * - pet_business_keyboard: business keyboard is used by the other computers
- * in pet.c
- * - pet_special: input port for the Shift Lock Switch
- * - pet_config: memory and serial port configurations
- *
- **********************************************************************************/
-
-/*
-
-PET Keyboard Layout
--------------------
-
- CLR CRSR CRSR INST
- @ ! " # $ % ' & \ ( ) <- [ ] HOME U/D L/R DEL
-
- RVS
- OFF Q W E R T Y U I O P UP < > 7 8 9 /
-
- SHIFT STOP
- LOCK A S D F G H J K L : RUN RETURN 4 5 6 *
-
-
- SHIFT Z X C V B N M , ; ? SHIFT 1 2 3 +
-
-
- SPACEBAR 0 . - =
-
-
-The PET Keypad has 16 keys, making impossible to map it in a satisfactory way to a PC keypad.
-Therefore, default settings for these keys in Full Emulation are currently based on the effect
-of the key and not on their real position
-
-
-PET Business Keyboard Layout
-----------------------------
-
- CRSR STOP
- <- 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 :* -= UP L/R RUN 7 8 9
-
- CRSR DEL
- TAB Q W E R T Y U I O P [ \ U/D INST 4 5 6
-
- SHIFT
-ESC LOCK A S D F G H J K L ;+ @ ] RETURN 1 2 3
-
-RVS HOME
-OFF SHIFT Z X C V B N M ,< .> /? SHIFT REPEAT CLR 0 .
-
-
- SPACEBAR
-
-*/
-
-INPUT_PORTS_START( pet_keyboard )
- PORT_START( "ROW0" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Crsr Right Left") PORT_CODE(KEYCODE_PGDN) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Home Clr Screen") PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME))
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x90") PORT_CODE(KEYCODE_MINUS) PORT_CHAR(0x2190)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('(')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('&')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('%')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('#')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('!')
-
- PORT_START( "ROW1" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Del Inst") PORT_CODE(KEYCODE_DEL) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Crsr Down Up") PORT_CODE(KEYCODE_PGUP) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR(')')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('\\')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('\'')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('$')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('"')
-
- PORT_START( "ROW2" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR('9')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR('7')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x91 Pi") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(0x2191) PORT_CHAR(0x03C0)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
-
- PORT_START( "ROW3" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR('/')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR('8')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
-
- PORT_START( "ROW4" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR('6')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR('4')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
-
- PORT_START( "ROW5" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR('*')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR('5')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
-
- PORT_START( "ROW6" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR('3')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR('1')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR(';')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
-
- PORT_START( "ROW7" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR('+')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR('2')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('?')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
-
- PORT_START( "ROW8" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR('-')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR('0')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Shift (Right)") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('>')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(']')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('@')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Shift (Left)") PORT_CODE(KEYCODE_LSHIFT)
-
- PORT_START( "ROW9" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad =") PORT_CODE(KEYCODE_ENTER_PAD) PORT_CHAR('=')
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL_PAD) PORT_CHAR('.')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Stop Run") PORT_CODE(KEYCODE_QUOTE)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('<')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('[')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Rvs Off") PORT_CODE(KEYCODE_TAB)
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( pet_business_keyboard )
- PORT_START( "ROW0" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Crsr Right Left") PORT_CODE(KEYCODE_PGUP) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-') PORT_CHAR('=')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('\\')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
-
- PORT_START( "ROW1" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x91") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(0x2191)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
-
- PORT_START( "ROW2" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
-
- PORT_START( "ROW3" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('@')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
-
- PORT_START( "ROW4" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Del Inst") PORT_CODE(KEYCODE_DEL) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('\\')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
-
- PORT_START( "ROW5" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Crsr Down Up") PORT_CODE(KEYCODE_PGDN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
-
- PORT_START( "ROW6" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Shift (Right)") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL_PAD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Shift (Left)") PORT_CODE(KEYCODE_LSHIFT)
-
- PORT_START( "ROW7" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Repeat") PORT_CODE(KEYCODE_LALT)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
-
- PORT_START( "ROW8" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Home Clr Screen") PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME))
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Rvs Off") PORT_CODE(KEYCODE_INSERT)
-
- PORT_START( "ROW9" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR(':') PORT_CHAR('*')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Stop Run") PORT_CODE(KEYCODE_END)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('\'')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x90") PORT_CODE(KEYCODE_TILDE) PORT_CHAR(0x2190)
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( pet_special )
- PORT_START( "SPECIAL" ) /* Special keys */
- PORT_CONFNAME( 0x80, 0x00, "Shift Lock (switch)") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
- PORT_CONFSETTING(0x00, DEF_STR( Off ) )
- PORT_CONFSETTING(0x80, DEF_STR( On ) )
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( pet_config )
- PORT_START("CFG")
- PORT_CONFNAME( 0x180, 0x180, "Memory")
- PORT_CONFSETTING( 0x000, "4 KByte" )
- PORT_CONFSETTING( 0x080, "8 KByte" )
- PORT_CONFSETTING( 0x100, "16 KByte" )
- PORT_CONFSETTING( 0x180, "32 KByte" )
- PORT_BIT( 0x08, 0x00, IPT_UNUSED ) /* no 8096 hardware */
- PORT_BIT( 0x04, 0x00, IPT_UNUSED ) /* no superpet switch */
- PORT_CONFNAME( 0x02, 0x02, "IEEE488 Bus/Dev 8/Floppy Sim")
- PORT_CONFSETTING( 0x00, DEF_STR( No ) )
- PORT_CONFSETTING( 0x02, DEF_STR( Yes ) )
- PORT_CONFNAME( 0x01, 0x00, "IEEE488 Bus/Dev 9/Floppy Sim")
- PORT_CONFSETTING( 0x00, DEF_STR( No ) )
- PORT_CONFSETTING( 0x01, DEF_STR( Yes ) )
-INPUT_PORTS_END
-
-
-
-/***************************** Commodore CBMB **************************************
- *
- * - CBMB machines share Controls (in particular Lightpen) with C64
- * - cbmb_keyboard: Keyboard used by all the models of this series
- * - cbmb_special: input port for the Shift Lock Switch
- *
- **********************************************************************************/
-
-/*
-
-CBMB Series Keyboard Layout (based on a CBM 610 keyboard)
----------------------------------------------------------
-
- F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 DOWN UP LEFT RIGHT HOME/CLEAR DEL/INST
-
- INS
- ESC 1! 2" 3# 4$ 5% 6^ 7& 8* 9( 0) - =+ <-? DEL ? CE . /
-
- ________
- TAB Q W E R T Y U I O P [ ] | RETURN | 7 8 9 -
- |__ |
- SHIFT | |
- LOCK A S D F G H J K L ;: '" Pi | | 4 5 6 +
- |_____|
- E
- SHIFT Z X C V B N M ,< .> /? SHIFT C= 1 2 3 n
- t
- e
- CTRL SPACEBAR 0 . 00 r
-
-
-Notes: "C=" is a key with the Commodore logo, Shift+6 produces an arrow pointing up ("^" above).
-
-
-*/
-
-INPUT_PORTS_START( cbmb_keyboard )
- PORT_START("ROW0")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Stop Run") PORT_CODE(KEYCODE_DEL)
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("RVS Off") PORT_CODE(KEYCODE_HOME)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Graph Norm") PORT_CODE(KEYCODE_PGUP)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Home Clr") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(HOME))
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10))
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9))
-
- PORT_START("ROW1")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8))
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6))
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5))
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
-
- PORT_START("ROW2")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad CE") PORT_CODE(KEYCODE_NUMLOCK)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad ?") PORT_CODE(KEYCODE_END)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
-
- PORT_START("ROW3")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
-
- PORT_START("ROW4")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD))
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x90 \xC2\xA3") PORT_CODE(KEYCODE_TILDE) PORT_CHAR(0x2190) PORT_CHAR('\xA3')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
-
- PORT_START("ROW5")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("6 \xE2\x86\x91") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR(0x2191)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
-
- PORT_START("ROW6")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD))
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD))
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Del Ins") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
-
- PORT_START("ROW7")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START("ROW8")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER_PAD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD))
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD))
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD))
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD))
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CBM") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(RALT))
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':')
-
- PORT_START("ROW9")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
-
- PORT_START("ROW10")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 00") PORT_CODE(KEYCODE_PGDN)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL_PAD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Pi") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(0x03C0)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('"')
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
-
- PORT_START("ROW11")
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( cbmb_special )
- PORT_START("SPECIAL")
- PORT_BIT( 0x200, 0x200, IPT_UNUSED ) /* ntsc */
- PORT_BIT( 0x100, 0x000, IPT_UNUSED ) /* cbm600 */
- PORT_CONFNAME( 0x04, 0x00, "Shift Lock (switch)") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
- PORT_CONFSETTING( 0x00, DEF_STR( Off ) )
- PORT_CONFSETTING( 0x04, DEF_STR( On ) )
-INPUT_PORTS_END
-
-
- /***************************** Commodore Vic 20 ***********************************
- *
- * - vic_keyboard: basic Vic 20 keyboard
- * - vic_special: input port for the Shift Lock Switch
- * - vic_controls: joypads and paddles
- * - VIC20 also has 2 lightpen ports, vic_lightpen_6560 & vic_lightpen_6561
- * currently in vic20.c (they need visible area parameters for centering)
- *
- **********************************************************************************/
-
-/*
-
-VIC20 Keyboard Layout
----------------------
-
- CLR INST
- <- 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 + - ? HOME DEL f 1
-
-
- CTRL Q W E R T Y U I O P @ * UP RESTORE f 3
-
-RUN SHIFT
-STOP LOCK A S D F G H J K L :[ ;] = RETURN f 5
-
- CRSR CRSR
-C= SHIFT Z X C V B N M ,< .> /? SHIFT U/D L/R f 7
-
-
- SPACEBAR
-
-
-Notes: "C=" is a key with the Commodore logo, "UP" is an arrow pointing up, the "CRSR" keys at the
-bottom-right corner are used to move the cursor on screen (Up/Down and Left/Right respectively).
-Notice that this is exactly the same layout of C64 keyboard.
-
-*/
-
-INPUT_PORTS_START( vic_keyboard )
- PORT_START( "ROW0" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Del Inst") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\xA3')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('+')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
-
- PORT_START( "ROW1" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('*')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x90") PORT_CODE(KEYCODE_TILDE) PORT_CHAR(0x2190)
-
- PORT_START( "ROW2" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Crsr Right Left") PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') PORT_CHAR(']')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_SHIFT_2)
-
- PORT_START( "ROW3" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Crsr Down Up") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Shift (Left)") PORT_CODE(KEYCODE_LSHIFT)
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Stop Run") PORT_CODE(KEYCODE_HOME)
-
- PORT_START( "ROW4" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CHAR(UCHAR_MAMEKEY(F2))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Shift (Right)") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
-
- PORT_START( "ROW5" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CHAR(UCHAR_MAMEKEY(F4))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('=')
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('[')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CBM") PORT_CODE(KEYCODE_LCONTROL)
-
- PORT_START( "ROW6" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_CHAR(UCHAR_MAMEKEY(F6))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x86\x91 Pi") PORT_CODE(KEYCODE_DEL) PORT_CHAR(0x2191) PORT_CHAR(0x03C0)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
-
- PORT_START( "ROW7" )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F7)) PORT_CHAR(UCHAR_MAMEKEY(F8))
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Home Clr") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(HOME))
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-')
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
-INPUT_PORTS_END
-
-
-INPUT_PORTS_START( vic_special )
- PORT_START( "SPECIAL" ) /* special keys */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Restore") PORT_CODE(KEYCODE_PRTSCR)
- PORT_CONFNAME( 0x01, 0x00, "Shift Lock (switch)") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
- PORT_CONFSETTING( 0x00, DEF_STR( Off ) )
- PORT_CONFSETTING( 0x01, DEF_STR( On ) )
-INPUT_PORTS_END
-
-SLOT_INTERFACE_START( pet_expansion_cards )
- SLOT_INTERFACE("64k", PET_64K)
- SLOT_INTERFACE("superpet", SUPERPET)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( pet_user_port_cards )
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( cbm2_expansion_cards )
- SLOT_INTERFACE("24k", CBM2_24K)
- SLOT_INTERFACE_INTERNAL("standard", CBM2_STD)
- SLOT_INTERFACE_INTERNAL("graphic", CBM2_GRAPHIC)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( cbm2_user_port_cards )
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( cbm_datassette_devices )
- SLOT_INTERFACE("c2n", C2N)
- SLOT_INTERFACE("c1530", C1530)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( cbm_iec_devices )
- SLOT_INTERFACE("c1540", C1540)
- SLOT_INTERFACE("c1541", C1541)
- SLOT_INTERFACE("c1541c", C1541C)
- SLOT_INTERFACE("c1541ii", C1541II)
- SLOT_INTERFACE("fsd2", FSD2)
- SLOT_INTERFACE("csd1", CSD1)
- SLOT_INTERFACE("c1541dd", C1541_DOLPHIN_DOS)
- SLOT_INTERFACE("c1541pd", C1541_PROFESSIONAL_DOS_V1)
- SLOT_INTERFACE("c1541pdc", C1541_PROLOGIC_DOS_CLASSIC)
- SLOT_INTERFACE("c1570", C1570)
- SLOT_INTERFACE("c1571", C1571)
- SLOT_INTERFACE("c1581", C1581)
- SLOT_INTERFACE("cmdhd", CMD_HD)
- SLOT_INTERFACE("fd2000", FD2000)
- SLOT_INTERFACE("fd4000", FD4000)
- SLOT_INTERFACE("interpod", INTERPOD)
- SLOT_INTERFACE("minichief", MINI_CHIEF)
- SLOT_INTERFACE("serialbox", SERIAL_BOX)
- SLOT_INTERFACE("diag264", DIAG264_SERIAL_LOOPBACK)
- SLOT_INTERFACE("nl10", C64_NL10_INTERFACE)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( sx1541_iec_devices )
- SLOT_INTERFACE("sx1541", SX1541)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( c128dcr_iec_devices )
- SLOT_INTERFACE("c1571", C1571)
- SLOT_INTERFACE("c1571cr", C1571CR)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( c128d81_iec_devices )
- SLOT_INTERFACE("c1563", C1563)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( cbm_ieee488_devices )
- SLOT_INTERFACE("c2040", C2040)
- SLOT_INTERFACE("c3040", C3040)
- SLOT_INTERFACE("c4040", C4040)
- SLOT_INTERFACE("c8050", C8050)
- SLOT_INTERFACE("c8250", C8250)
- SLOT_INTERFACE("sfd1001", SFD1001)
- SLOT_INTERFACE("c2031", C2031)
- SLOT_INTERFACE("c8280", C8280)
- SLOT_INTERFACE("d9060", D9060)
- SLOT_INTERFACE("d9090", D9090)
- SLOT_INTERFACE("softbox", SOFTBOX)
- SLOT_INTERFACE("hardbox", HARDBOX)
- SLOT_INTERFACE("shark", SHARK)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( cbm8296d_ieee488_devices )
- SLOT_INTERFACE("c8250lp", C8250LP)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( vic20_expansion_cards )
- SLOT_INTERFACE("exp", VIC1010)
- SLOT_INTERFACE("3k", VIC1210)
- SLOT_INTERFACE("8k", VIC1110)
- SLOT_INTERFACE("16k", VIC1111)
-
- // the following need ROMs from the software list
- SLOT_INTERFACE_INTERNAL("standard", VIC20_STD)
- SLOT_INTERFACE_INTERNAL("ieee488", VIC1112)
- SLOT_INTERFACE_INTERNAL("megacart", VIC20_MEGACART)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( vic20_user_port_cards )
- SLOT_INTERFACE("rs232", VIC1011)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( vic10_expansion_cards )
- // the following need ROMs from the software list
- SLOT_INTERFACE_INTERNAL("standard", VIC10_STD)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( c64_expansion_cards )
- SLOT_INTERFACE("16k", C64_16KB)
- SLOT_INTERFACE("cpm", C64_CPM)
- SLOT_INTERFACE("dqbb", C64_DQBB)
- SLOT_INTERFACE("easyflash", C64_EASYFLASH)
- SLOT_INTERFACE("georam", C64_GEORAM)
- SLOT_INTERFACE("ide64", C64_IDE64)
- SLOT_INTERFACE("midimap", C64_MIDI_MAPLIN)
- SLOT_INTERFACE("midins", C64_MIDI_NAMESOFT)
- SLOT_INTERFACE("midipp", C64_MIDI_PASSPORT)
- SLOT_INTERFACE("midisci", C64_MIDI_SCI)
- SLOT_INTERFACE("midisiel", C64_MIDI_SIEL)
- SLOT_INTERFACE("music64", C64_MUSIC64)
- SLOT_INTERFACE("neoram", C64_NEORAM)
- SLOT_INTERFACE("reu1700", C64_REU1700)
- SLOT_INTERFACE("reu1750", C64_REU1750)
- SLOT_INTERFACE("reu1764", C64_REU1764)
- SLOT_INTERFACE("sfxse", C64_SFX_SOUND_EXPANDER)
- SLOT_INTERFACE("supercpu", C64_SUPERCPU)
- SLOT_INTERFACE("swiftlink", C64_SWIFTLINK)
- SLOT_INTERFACE("turbo232", C64_TURBO232)
-
- // the following need ROMs from the software list
- SLOT_INTERFACE_INTERNAL("standard", C64_STD)
- SLOT_INTERFACE_INTERNAL("comal80", C64_COMAL80)
- SLOT_INTERFACE_INTERNAL("c128_comal80", C128_COMAL80)
- SLOT_INTERFACE_INTERNAL("cs64", C64_CURRAH_SPEECH)
- SLOT_INTERFACE_INTERNAL("dela_ep256", C64_DELA_EP256)
- SLOT_INTERFACE_INTERNAL("ep64", C64_DELA_EP64)
- SLOT_INTERFACE_INTERNAL("ep7x8", C64_DELA_EP7X8)
- SLOT_INTERFACE_INTERNAL("dinamic", C64_DINAMIC)
- SLOT_INTERFACE_INTERNAL("easycalcres", C64_EASY_CALC_RESULT)
- SLOT_INTERFACE_INTERNAL("epyxfastload", C64_EPYX_FAST_LOAD)
- SLOT_INTERFACE_INTERNAL("exos", C64_EXOS)
- SLOT_INTERFACE_INTERNAL("fcc", C64_FCC)
- SLOT_INTERFACE_INTERNAL("final", C64_FINAL)
- SLOT_INTERFACE_INTERNAL("final3", C64_FINAL3)
- SLOT_INTERFACE_INTERNAL("fun_play", C64_FUN_PLAY)
- SLOT_INTERFACE_INTERNAL("ieee488", C64_IEEE488)
- SLOT_INTERFACE_INTERNAL("kingsoft", C64_KINGSOFT)
- SLOT_INTERFACE_INTERNAL("mach5", C64_MACH5)
- SLOT_INTERFACE_INTERNAL("magic_desk", C64_MAGIC_DESK)
- SLOT_INTERFACE_INTERNAL("magic_formel", C64_MAGIC_FORMEL)
- SLOT_INTERFACE_INTERNAL("magic_voice", C64_MAGIC_VOICE)
- SLOT_INTERFACE_INTERNAL("mikroasm", C64_MIKRO_ASSEMBLER)
- SLOT_INTERFACE_INTERNAL("multiscreen", C64_MULTISCREEN)
- SLOT_INTERFACE_INTERNAL("ocean", C64_OCEAN)
- SLOT_INTERFACE_INTERNAL("pagefox", C64_PAGEFOX)
- SLOT_INTERFACE_INTERNAL("prophet64", C64_PROPHET64)
- SLOT_INTERFACE_INTERNAL("ps64", C64_PS64)
- SLOT_INTERFACE_INTERNAL("rex", C64_REX)
- SLOT_INTERFACE_INTERNAL("rex_ep256", C64_REX_EP256)
- SLOT_INTERFACE_INTERNAL("ross", C64_ROSS)
- SLOT_INTERFACE_INTERNAL("silverrock", C64_SILVERROCK)
- SLOT_INTERFACE_INTERNAL("simons_basic", C64_SIMONS_BASIC)
- SLOT_INTERFACE_INTERNAL("stardos", C64_STARDOS)
- SLOT_INTERFACE_INTERNAL("struct_basic", C64_STRUCTURED_BASIC)
- SLOT_INTERFACE_INTERNAL("super_explode", C64_SUPER_EXPLODE)
- SLOT_INTERFACE_INTERNAL("super_games", C64_SUPER_GAMES)
- SLOT_INTERFACE_INTERNAL("sw8k", C64_SW8K)
- SLOT_INTERFACE_INTERNAL("system3", C64_SYSTEM3)
- SLOT_INTERFACE_INTERNAL("tdos", C64_TDOS)
- SLOT_INTERFACE_INTERNAL("vizastar", C64_VIZASTAR)
- SLOT_INTERFACE_INTERNAL("vizawrite", C64_VW64)
- SLOT_INTERFACE_INTERNAL("warp_speed", C64_WARP_SPEED)
- SLOT_INTERFACE_INTERNAL("westermann", C64_WESTERMANN)
- SLOT_INTERFACE_INTERNAL("zaxxon", C64_ZAXXON)
- SLOT_INTERFACE_INTERNAL("xl80", C64_XL80)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( c64_user_port_cards )
- SLOT_INTERFACE("4cga", C64_4CGA)
- SLOT_INTERFACE("4dxh", C64_4DXH)
- SLOT_INTERFACE("4ksa", C64_4KSA)
- SLOT_INTERFACE("4tba", C64_4TBA)
- SLOT_INTERFACE("bn1541", C64_BN1541)
- SLOT_INTERFACE("geocable", C64_GEOCABLE)
- SLOT_INTERFACE("rs232", C64_VIC1011)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( plus4_datassette_devices )
- SLOT_INTERFACE("c1531", C1531)
- SLOT_INTERFACE("diag264", DIAG264_CASSETTE_LOOPBACK)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( plus4_expansion_cards )
- SLOT_INTERFACE("c1551", C1551)
- SLOT_INTERFACE("sid", PLUS4_SID)
-
- // the following need ROMs from the software list
- SLOT_INTERFACE_INTERNAL("standard", PLUS4_STD)
-SLOT_INTERFACE_END
-
-SLOT_INTERFACE_START( plus4_user_port_cards )
- SLOT_INTERFACE("diag264", DIAG264_USER_PORT_LOOPBACK)
-SLOT_INTERFACE_END
diff --git a/src/mess/machine/cbmipt.h b/src/mess/machine/cbmipt.h
deleted file mode 100644
index 890816577e7..00000000000
--- a/src/mess/machine/cbmipt.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#pragma once
-
-#ifndef CBMIPT_H_
-#define CBMIPT_H_
-
-#include "machine/c2n.h"
-#include "machine/c64/4cga.h"
-#include "machine/c64/4dxh.h"
-#include "machine/c64/4ksa.h"
-#include "machine/c64/4tba.h"
-#include "machine/c64/16kb.h"
-#include "machine/c64/bn1541.h"
-#include "machine/c64/comal80.h"
-#include "machine/c64/cpm.h"
-#include "machine/c64/currah_speech.h"
-#include "machine/c64/dela_ep256.h"
-#include "machine/c64/dela_ep64.h"
-#include "machine/c64/dela_ep7x8.h"
-#include "machine/c64/dinamic.h"
-#include "machine/c64/dqbb.h"
-#include "machine/c64/easy_calc_result.h"
-#include "machine/c64/easyflash.h"
-#include "machine/c64/epyx_fast_load.h"
-#include "machine/c64/exos.h"
-#include "machine/c64/fcc.h"
-#include "machine/c64/final.h"
-#include "machine/c64/final3.h"
-#include "machine/c64/fun_play.h"
-#include "machine/c64/geocable.h"
-#include "machine/c64/georam.h"
-#include "machine/c64/ide64.h"
-#include "machine/c64/ieee488.h"
-#include "machine/c64/kingsoft.h"
-#include "machine/c64/mach5.h"
-#include "machine/c64/magic_desk.h"
-#include "machine/c64/magic_formel.h"
-#include "machine/c64/magic_voice.h"
-#include "machine/c64/midi_maplin.h"
-#include "machine/c64/midi_namesoft.h"
-#include "machine/c64/midi_passport.h"
-#include "machine/c64/midi_sci.h"
-#include "machine/c64/midi_siel.h"
-#include "machine/c64/mikro_assembler.h"
-#include "machine/c64/multiscreen.h"
-#include "machine/c64/music64.h"
-#include "machine/c64/neoram.h"
-#include "machine/c64/ocean.h"
-#include "machine/c64/pagefox.h"
-#include "machine/c64/prophet64.h"
-#include "machine/c64/ps64.h"
-#include "machine/c64/reu.h"
-#include "machine/c64/rex.h"
-#include "machine/c64/rex_ep256.h"
-#include "machine/c64/ross.h"
-#include "machine/c64/sfx_sound_expander.h"
-#include "machine/c64/silverrock.h"
-#include "machine/c64/simons_basic.h"
-#include "machine/c64/stardos.h"
-#include "machine/c64/std.h"
-#include "machine/c64/structured_basic.h"
-#include "machine/c64/super_explode.h"
-#include "machine/c64/super_games.h"
-#include "machine/c64/supercpu.h"
-#include "machine/c64/sw8k.h"
-#include "machine/c64/swiftlink.h"
-#include "machine/c64/system3.h"
-#include "machine/c64/tdos.h"
-#include "machine/c64/turbo232.h"
-#include "machine/c64/vizastar.h"
-#include "machine/c64/vic1011.h"
-#include "machine/c64/vw64.h"
-#include "machine/c64/warp_speed.h"
-#include "machine/c64/westermann.h"
-#include "machine/c64/xl80.h"
-#include "machine/c64/zaxxon.h"
-#include "machine/c128_comal80.h"
-#include "machine/c64_nl10.h"
-#include "machine/cbm2_std.h"
-#include "machine/cbm2_24k.h"
-#include "machine/cbm2_graphic.h"
-#include "machine/c1541.h"
-#include "machine/c1551.h"
-#include "machine/c1571.h"
-#include "machine/c1581.h"
-#include "machine/c2031.h"
-#include "machine/c2040.h"
-#include "machine/c8280.h"
-#include "machine/d9060.h"
-#include "machine/cmdhd.h"
-#include "machine/diag264_lb_iec.h"
-#include "machine/diag264_lb_tape.h"
-#include "machine/diag264_lb_user.h"
-#include "machine/fd2000.h"
-#include "machine/hardbox.h"
-#include "machine/interpod.h"
-#include "machine/pet_64k.h"
-#include "machine/plus4_sid.h"
-#include "machine/plus4_std.h"
-#include "machine/serialbox.h"
-#include "machine/shark.h"
-#include "machine/softbox.h"
-#include "machine/superpet.h"
-#include "machine/vic1010.h"
-#include "machine/vic1011.h"
-#include "machine/vic1110.h"
-#include "machine/vic1111.h"
-#include "machine/vic1112.h"
-#include "machine/vic1210.h"
-#include "machine/vic10std.h"
-#include "machine/vic20std.h"
-#include "machine/vic20_megacart.h"
-
-
-#define MCFG_CBM_IEC_ADD(_default_drive) \
- MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL) \
- MCFG_CBM_IEC_SLOT_ADD("iec8", 8, cbm_iec_devices, _default_drive) \
- MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL) \
- MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL) \
- MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL) \
- MCFG_CBM_IEC_BUS_ADD()
-
-
-#define MCFG_CBM_IEEE488_ADD(_default_drive) \
- MCFG_IEEE488_SLOT_ADD("ieee4", 4, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm_ieee488_devices, _default_drive) \
- MCFG_IEEE488_SLOT_ADD("ieee9", 9, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_SLOT_ADD("ieee10", 10, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_SLOT_ADD("ieee11", 11, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_SLOT_ADD("ieee12", 12, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_SLOT_ADD("ieee13", 13, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_SLOT_ADD("ieee14", 14, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_SLOT_ADD("ieee15", 15, cbm_ieee488_devices, NULL) \
- MCFG_IEEE488_BUS_ADD()
-
-
-/* Commodore 64 */
-
-INPUT_PORTS_EXTERN( common_cbm_keyboard ); /* shared with c16, c65, c128 */
-INPUT_PORTS_EXTERN( c64_special );
-INPUT_PORTS_EXTERN( c64_controls ); /* shared with c65, c128, cbmb */
-
-
-/* Commodore 16 */
-
-INPUT_PORTS_EXTERN( c16_special );
-INPUT_PORTS_EXTERN( c16_controls );
-
-
-/* Commodore 65 */
-
-INPUT_PORTS_EXTERN( c65_special );
-
-
-/* PET2001 */
-
-INPUT_PORTS_EXTERN( pet_keyboard );
-INPUT_PORTS_EXTERN( pet_business_keyboard );
-INPUT_PORTS_EXTERN( pet_special );
-INPUT_PORTS_EXTERN( pet_config );
-
-
-/* CBMB 500 / 600/ 700 */
-
-INPUT_PORTS_EXTERN( cbmb_keyboard );
-INPUT_PORTS_EXTERN( cbmb_special );
-
-
-/* Vic 20 */
-
-INPUT_PORTS_EXTERN( vic_keyboard );
-INPUT_PORTS_EXTERN( vic_special );
-
-
-
-SLOT_INTERFACE_EXTERN( pet_expansion_cards );
-SLOT_INTERFACE_EXTERN( pet_user_port_cards );
-SLOT_INTERFACE_EXTERN( cbm2_expansion_cards );
-SLOT_INTERFACE_EXTERN( cbm2_user_port_cards );
-SLOT_INTERFACE_EXTERN( cbm_datassette_devices );
-SLOT_INTERFACE_EXTERN( cbm_iec_devices );
-SLOT_INTERFACE_EXTERN( sx1541_iec_devices );
-SLOT_INTERFACE_EXTERN( c128dcr_iec_devices );
-SLOT_INTERFACE_EXTERN( c128d81_iec_devices );
-SLOT_INTERFACE_EXTERN( cbm_ieee488_devices );
-SLOT_INTERFACE_EXTERN( cbm8296d_ieee488_devices );
-SLOT_INTERFACE_EXTERN( vic20_control_port_devices );
-SLOT_INTERFACE_EXTERN( vic20_expansion_cards );
-SLOT_INTERFACE_EXTERN( vic20_user_port_cards );
-SLOT_INTERFACE_EXTERN( vic10_expansion_cards );
-SLOT_INTERFACE_EXTERN( c64_expansion_cards );
-SLOT_INTERFACE_EXTERN( c64_user_port_cards );
-SLOT_INTERFACE_EXTERN( plus4_datassette_devices );
-SLOT_INTERFACE_EXTERN( plus4_expansion_cards );
-SLOT_INTERFACE_EXTERN( plus4_user_port_cards );
-
-
-
-#endif /* CBMIPT_H_ */
diff --git a/src/mess/machine/cmdhd.h b/src/mess/machine/cmdhd.h
index 7778ee5d848..e13bfc3b0ae 100644
--- a/src/mess/machine/cmdhd.h
+++ b/src/mess/machine/cmdhd.h
@@ -17,7 +17,6 @@
#include "imagedev/harddriv.h"
#include "machine/6522via.h"
#include "machine/cbmiec.h"
-#include "machine/cbmipt.h"
#include "machine/i8255.h"
#include "machine/scsibus.h"
#include "machine/scsicb.h"
diff --git a/src/mess/machine/d9060.h b/src/mess/machine/d9060.h
index a6c98a585ee..da3dfff44e5 100644
--- a/src/mess/machine/d9060.h
+++ b/src/mess/machine/d9060.h
@@ -28,7 +28,6 @@
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
#include "machine/6532riot.h"
-#include "machine/cbmipt.h"
#include "machine/ieee488.h"
#include "machine/scsicb.h"
diff --git a/src/mess/machine/fd2000.h b/src/mess/machine/fd2000.h
index 6b6a54ab568..0e7e59332a5 100644
--- a/src/mess/machine/fd2000.h
+++ b/src/mess/machine/fd2000.h
@@ -17,7 +17,6 @@
#include "formats/d81_dsk.h"
#include "machine/6522via.h"
#include "machine/cbmiec.h"
-#include "machine/cbmipt.h"
#include "machine/upd765.h"
diff --git a/src/mess/machine/hardbox.h b/src/mess/machine/hardbox.h
index a727f7cfaa7..37e72be3efb 100644
--- a/src/mess/machine/hardbox.h
+++ b/src/mess/machine/hardbox.h
@@ -16,7 +16,6 @@
#include "cpu/z80/z80.h"
#include "imagedev/harddriv.h"
#include "includes/corvushd.h"
-#include "machine/cbmipt.h"
#include "machine/i8255.h"
#include "machine/ieee488.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/ieee488.c b/src/mess/machine/ieee488.c
index 67ce1ef3023..fb90fa542a9 100644
--- a/src/mess/machine/ieee488.c
+++ b/src/mess/machine/ieee488.c
@@ -362,3 +362,24 @@ UINT8 ieee488_device::get_data()
return data;
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( cbm_ieee488_devices )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( cbm_ieee488_devices )
+ SLOT_INTERFACE("c2040", C2040)
+ SLOT_INTERFACE("c3040", C3040)
+ SLOT_INTERFACE("c4040", C4040)
+ SLOT_INTERFACE("c8050", C8050)
+ SLOT_INTERFACE("c8250", C8250)
+ SLOT_INTERFACE("sfd1001", SFD1001)
+ SLOT_INTERFACE("c2031", C2031)
+ SLOT_INTERFACE("c8280", C8280)
+ SLOT_INTERFACE("d9060", D9060)
+ SLOT_INTERFACE("d9090", D9090)
+ SLOT_INTERFACE("softbox", SOFTBOX)
+ SLOT_INTERFACE("hardbox", HARDBOX)
+ SLOT_INTERFACE("shark", SHARK)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/ieee488.h b/src/mess/machine/ieee488.h
index afee1f45929..911b1616467 100644
--- a/src/mess/machine/ieee488.h
+++ b/src/mess/machine/ieee488.h
@@ -64,6 +64,19 @@
downcast<ieee488_slot_device *>(device)->set_address(_address);
+#define MCFG_CBM_IEEE488_ADD(_default_drive) \
+ MCFG_IEEE488_SLOT_ADD("ieee4", 4, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm_ieee488_devices, _default_drive) \
+ MCFG_IEEE488_SLOT_ADD("ieee9", 9, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_SLOT_ADD("ieee10", 10, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_SLOT_ADD("ieee11", 11, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_SLOT_ADD("ieee12", 12, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_SLOT_ADD("ieee13", 13, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_SLOT_ADD("ieee14", 14, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_SLOT_ADD("ieee15", 15, cbm_ieee488_devices, NULL) \
+ MCFG_IEEE488_BUS_ADD()
+
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -234,5 +247,17 @@ extern const device_type IEEE488;
extern const device_type IEEE488_SLOT;
+// slot devices
+#include "machine/c2031.h"
+#include "machine/c2040.h"
+#include "machine/c8280.h"
+#include "machine/d9060.h"
+#include "machine/hardbox.h"
+#include "machine/shark.h"
+#include "machine/softbox.h"
+
+SLOT_INTERFACE_EXTERN( cbm_ieee488_devices );
+
+
#endif
diff --git a/src/mess/machine/interpod.h b/src/mess/machine/interpod.h
index 9246ea67d4f..1ff4582ed0f 100644
--- a/src/mess/machine/interpod.h
+++ b/src/mess/machine/interpod.h
@@ -17,12 +17,7 @@
#include "machine/6522via.h"
#include "machine/6532riot.h"
#include "machine/6850acia.h"
-#include "machine/c2031.h"
-#include "machine/c2040.h"
-#include "machine/c8280.h"
-#include "machine/d9060.h"
#include "machine/cbmiec.h"
-#include "machine/cbmipt.h"
#include "machine/ieee488.h"
diff --git a/src/mess/machine/petcass.c b/src/mess/machine/petcass.c
index 2157277afca..bb22f4b4aa4 100644
--- a/src/mess/machine/petcass.c
+++ b/src/mess/machine/petcass.c
@@ -88,3 +88,13 @@ READ_LINE_MEMBER( pet_datassette_port_device::sense_r ) { int state = 1; if (m_c
WRITE_LINE_MEMBER( pet_datassette_port_device::motor_w ) { if (m_cart != NULL) m_cart->datassette_motor(state); }
WRITE_LINE_MEMBER( pet_datassette_port_device::read_w ) { m_read_handler(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( cbm_datassette_devices )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( cbm_datassette_devices )
+ SLOT_INTERFACE("c2n", C2N)
+ SLOT_INTERFACE("c1530", C1530)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/petcass.h b/src/mess/machine/petcass.h
index da2e45e0151..58dccb2b890 100644
--- a/src/mess/machine/petcass.h
+++ b/src/mess/machine/petcass.h
@@ -107,5 +107,12 @@ protected:
extern const device_type PET_DATASSETTE_PORT;
+// slot devices
+#include "machine/c2n.h"
+#include "machine/diag264_lb_tape.h"
+
+SLOT_INTERFACE_EXTERN( cbm_datassette_devices );
+
+
#endif
diff --git a/src/mess/machine/petexp.c b/src/mess/machine/petexp.c
index 78cf58a6db0..96e92897d0b 100644
--- a/src/mess/machine/petexp.c
+++ b/src/mess/machine/petexp.c
@@ -186,3 +186,13 @@ int pet_expansion_slot_device::phi2()
{
return clock();
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( pet_expansion_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( pet_expansion_cards )
+ SLOT_INTERFACE("64k", PET_64K)
+ SLOT_INTERFACE("superpet", SUPERPET)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/petexp.h b/src/mess/machine/petexp.h
index 2dfa45f66bd..c16c76b145f 100644
--- a/src/mess/machine/petexp.h
+++ b/src/mess/machine/petexp.h
@@ -133,5 +133,12 @@ protected:
extern const device_type PET_EXPANSION_SLOT;
+// slot devices
+#include "machine/pet_64k.h"
+#include "machine/superpet.h"
+
+SLOT_INTERFACE_EXTERN( pet_expansion_cards );
+
+
#endif
diff --git a/src/mess/machine/petuser.c b/src/mess/machine/petuser.c
index 963262cdffb..639d5f68e8a 100644
--- a/src/mess/machine/petuser.c
+++ b/src/mess/machine/petuser.c
@@ -112,3 +112,11 @@ READ_LINE_MEMBER( pet_user_port_device::ca1_r ) { int state = 1; if (m_card != N
WRITE_LINE_MEMBER( pet_user_port_device::ca1_w ) { if (m_card != NULL) m_card->pet_ca1_w(state); }
READ_LINE_MEMBER( pet_user_port_device::cb2_r ) { int state = 1; if (m_card != NULL) state = m_card->pet_cb2_r(); return state; }
WRITE_LINE_MEMBER( pet_user_port_device::cb2_w ) { if (m_card != NULL) m_card->pet_cb2_w(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( pet_user_port_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( pet_user_port_cards )
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/petuser.h b/src/mess/machine/petuser.h
index 1bd673c8bf6..4dbd9282bea 100644
--- a/src/mess/machine/petuser.h
+++ b/src/mess/machine/petuser.h
@@ -131,5 +131,9 @@ protected:
extern const device_type PET_USER_PORT;
+// slot devices
+SLOT_INTERFACE_EXTERN( pet_user_port_cards );
+
+
#endif
diff --git a/src/mess/machine/plus4_sid.h b/src/mess/machine/plus4_sid.h
index 226a8f1a4e5..ef5b77e8070 100644
--- a/src/mess/machine/plus4_sid.h
+++ b/src/mess/machine/plus4_sid.h
@@ -17,7 +17,6 @@
#include "machine/plus4exp.h"
#include "sound/dac.h"
#include "sound/mos6581.h"
-#include "machine/cbmipt.h"
#include "machine/vcsctrl.h"
diff --git a/src/mess/machine/plus4exp.c b/src/mess/machine/plus4exp.c
index 077cd92fea6..407320c70de 100644
--- a/src/mess/machine/plus4exp.c
+++ b/src/mess/machine/plus4exp.c
@@ -312,3 +312,16 @@ void plus4_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT
m_card->plus4_cd_w(space, offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
}
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( plus4_expansion_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( plus4_expansion_cards )
+ SLOT_INTERFACE("c1551", C1551)
+ SLOT_INTERFACE("sid", PLUS4_SID)
+
+ // the following need ROMs from the software list
+ SLOT_INTERFACE_INTERNAL("standard", PLUS4_STD)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/plus4exp.h b/src/mess/machine/plus4exp.h
index a688d25a342..e7204b68421 100644
--- a/src/mess/machine/plus4exp.h
+++ b/src/mess/machine/plus4exp.h
@@ -187,5 +187,13 @@ protected:
extern const device_type PLUS4_EXPANSION_SLOT;
+// slot devices
+#include "machine/c1551.h"
+#include "machine/plus4_sid.h"
+#include "machine/plus4_std.h"
+
+SLOT_INTERFACE_EXTERN( plus4_expansion_cards );
+
+
#endif
diff --git a/src/mess/machine/plus4user.c b/src/mess/machine/plus4user.c
index 76dfbb061fb..12dd6aa0548 100644
--- a/src/mess/machine/plus4user.c
+++ b/src/mess/machine/plus4user.c
@@ -94,3 +94,12 @@ WRITE_LINE_MEMBER( plus4_user_port_device::dtr_w ) { if (m_cart != NULL) m_cart-
WRITE_LINE_MEMBER( plus4_user_port_device::rts_w ) { if (m_cart != NULL) m_cart->plus4_rts_w(state); }
WRITE_LINE_MEMBER( plus4_user_port_device::rxc_w ) { if (m_cart != NULL) m_cart->plus4_rxc_w(state); }
WRITE_LINE_MEMBER( plus4_user_port_device::atn_w ) { if (m_cart != NULL) m_cart->plus4_atn_w(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( plus4_user_port_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( plus4_user_port_cards )
+ SLOT_INTERFACE("diag264", DIAG264_USER_PORT_LOOPBACK)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/plus4user.h b/src/mess/machine/plus4user.h
index b1039756d0b..a5179df33e1 100644
--- a/src/mess/machine/plus4user.h
+++ b/src/mess/machine/plus4user.h
@@ -117,5 +117,11 @@ protected:
extern const device_type PLUS4_USER_PORT;
+// slot devices
+#include "machine/diag264_lb_user.h"
+
+SLOT_INTERFACE_EXTERN( plus4_user_port_cards );
+
+
#endif
diff --git a/src/mess/machine/serialbox.h b/src/mess/machine/serialbox.h
index 6591ff85160..1bc0a913a54 100644
--- a/src/mess/machine/serialbox.h
+++ b/src/mess/machine/serialbox.h
@@ -15,7 +15,6 @@
#include "emu.h"
#include "cpu/m6502/m65c02.h"
#include "machine/cbmiec.h"
-#include "machine/cbmipt.h"
diff --git a/src/mess/machine/shark.h b/src/mess/machine/shark.h
index e26e887a679..7e84ebfcc85 100644
--- a/src/mess/machine/shark.h
+++ b/src/mess/machine/shark.h
@@ -17,7 +17,6 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "imagedev/harddriv.h"
-#include "machine/cbmipt.h"
#include "machine/ieee488.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/softbox.h b/src/mess/machine/softbox.h
index 985bf80fe73..5b213ef5637 100644
--- a/src/mess/machine/softbox.h
+++ b/src/mess/machine/softbox.h
@@ -16,7 +16,6 @@
#include "cpu/z80/z80.h"
#include "imagedev/harddriv.h"
#include "includes/corvushd.h"
-#include "machine/cbmipt.h"
#include "machine/com8116.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
diff --git a/src/mess/machine/vic1010.h b/src/mess/machine/vic1010.h
index d3b58168b3e..d58854a12ab 100644
--- a/src/mess/machine/vic1010.h
+++ b/src/mess/machine/vic1010.h
@@ -14,7 +14,6 @@
#include "emu.h"
-#include "machine/cbmipt.h"
#include "machine/vic20exp.h"
diff --git a/src/mess/machine/vic10exp.c b/src/mess/machine/vic10exp.c
index 6e1369266dc..1742d915597 100644
--- a/src/mess/machine/vic10exp.c
+++ b/src/mess/machine/vic10exp.c
@@ -275,3 +275,13 @@ void vic10_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT
READ_LINE_MEMBER( vic10_expansion_slot_device::p0_r ) { int state = 0; if (m_card != NULL) state = m_card->vic10_p0_r(); return state; }
WRITE_LINE_MEMBER( vic10_expansion_slot_device::p0_w ) { if (m_card != NULL) m_card->vic10_p0_w(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( vic10_expansion_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( vic10_expansion_cards )
+ // the following need ROMs from the software list
+ SLOT_INTERFACE_INTERNAL("standard", VIC10_STD)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/vic10exp.h b/src/mess/machine/vic10exp.h
index 4eb9e7b5c00..72f1171e133 100644
--- a/src/mess/machine/vic10exp.h
+++ b/src/mess/machine/vic10exp.h
@@ -176,5 +176,11 @@ protected:
extern const device_type VIC10_EXPANSION_SLOT;
+// slot devices
+#include "machine/vic10std.h"
+
+SLOT_INTERFACE_EXTERN( vic10_expansion_cards );
+
+
#endif
diff --git a/src/mess/machine/vic1112.h b/src/mess/machine/vic1112.h
index 4feea9df8e9..a1a1d17eaad 100644
--- a/src/mess/machine/vic1112.h
+++ b/src/mess/machine/vic1112.h
@@ -18,7 +18,6 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
-#include "machine/cbmipt.h"
#include "machine/ieee488.h"
#include "machine/vic20exp.h"
diff --git a/src/mess/machine/vic20exp.c b/src/mess/machine/vic20exp.c
index e9a52a37345..b0d53ddf6b1 100644
--- a/src/mess/machine/vic20exp.c
+++ b/src/mess/machine/vic20exp.c
@@ -315,3 +315,20 @@ void vic20_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT
m_card->vic20_cd_w(space, offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3);
}
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( vic20_expansion_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( vic20_expansion_cards )
+ SLOT_INTERFACE("exp", VIC1010)
+ SLOT_INTERFACE("3k", VIC1210)
+ SLOT_INTERFACE("8k", VIC1110)
+ SLOT_INTERFACE("16k", VIC1111)
+
+ // the following need ROMs from the software list
+ SLOT_INTERFACE_INTERNAL("standard", VIC20_STD)
+ SLOT_INTERFACE_INTERNAL("ieee488", VIC1112)
+ SLOT_INTERFACE_INTERNAL("megacart", VIC20_MEGACART)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/vic20exp.h b/src/mess/machine/vic20exp.h
index 1a897419b14..9cd408dfc0a 100644
--- a/src/mess/machine/vic20exp.h
+++ b/src/mess/machine/vic20exp.h
@@ -174,5 +174,17 @@ protected:
extern const device_type VIC20_EXPANSION_SLOT;
+// slot devices
+#include "machine/vic1010.h"
+#include "machine/vic1110.h"
+#include "machine/vic1111.h"
+#include "machine/vic1112.h"
+#include "machine/vic1210.h"
+#include "machine/vic20std.h"
+#include "machine/vic20_megacart.h"
+
+SLOT_INTERFACE_EXTERN( vic20_expansion_cards );
+
+
#endif
diff --git a/src/mess/machine/vic20user.c b/src/mess/machine/vic20user.c
index 0752c4b7024..ea5076ce9eb 100644
--- a/src/mess/machine/vic20user.c
+++ b/src/mess/machine/vic20user.c
@@ -123,3 +123,12 @@ READ_LINE_MEMBER( vic20_user_port_device::cassette_switch_r ) { int state = 1; i
WRITE_LINE_MEMBER( vic20_user_port_device::cb1_w ) { if (m_card != NULL) m_card->vic20_cb1_w(state); }
WRITE_LINE_MEMBER( vic20_user_port_device::cb2_w ) { if (m_card != NULL) m_card->vic20_cb2_w(state); }
WRITE_LINE_MEMBER( vic20_user_port_device::atn_w ) { if (m_card != NULL) m_card->vic20_atn_w(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( vic20_user_port_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( vic20_user_port_cards )
+ SLOT_INTERFACE("rs232", VIC1011)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/vic20user.h b/src/mess/machine/vic20user.h
index 8a99aeb0e3a..af9664278ad 100644
--- a/src/mess/machine/vic20user.h
+++ b/src/mess/machine/vic20user.h
@@ -146,5 +146,11 @@ protected:
extern const device_type VIC20_USER_PORT;
+// slot devices
+#include "machine/vic1011.h"
+
+SLOT_INTERFACE_EXTERN( vic20_user_port_cards );
+
+
#endif