From 68c4c457464278b6b43716251793f70c25cdd8a5 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Thu, 22 Jan 2015 23:45:53 +0100 Subject: New personal branch, for WIP rewrites and other goodies. --- src/mess/drivers/c65.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index 08d1d123054..c8ab81fea51 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -76,16 +76,19 @@ QUICKLOAD_LOAD_MEMBER( c65_state, cbm_c65 ) *************************************/ static ADDRESS_MAP_START( c65_mem , AS_PROGRAM, 8, c65_state ) - AM_RANGE(0x00000, 0x07fff) AM_RAMBANK("bank11") - AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE_BANK("bank12") - AM_RANGE(0x0a000, 0x0bfff) AM_READ_BANK("bank2") AM_WRITE_BANK("bank13") - AM_RANGE(0x0c000, 0x0cfff) AM_READ_BANK("bank3") AM_WRITE_BANK("bank14") - AM_RANGE(0x0d000, 0x0d7ff) AM_READ_BANK("bank4") AM_WRITE_BANK("bank5") - AM_RANGE(0x0d800, 0x0dbff) AM_READ_BANK("bank6") AM_WRITE_BANK("bank7") - AM_RANGE(0x0dc00, 0x0dfff) AM_READ_BANK("bank8") AM_WRITE_BANK("bank9") - AM_RANGE(0x0e000, 0x0ffff) AM_READ_BANK("bank10") AM_WRITE_BANK("bank15") - AM_RANGE(0x10000, 0x1f7ff) AM_RAM - AM_RANGE(0x1f800, 0x1ffff) AM_RAM AM_SHARE("colorram") + AM_RANGE(0xf0000, 0xf7fff) AM_RAMBANK("bank11") + AM_RANGE(0xf8000, 0xf9fff) AM_READ_BANK("bank1") AM_WRITE_BANK("bank12") + AM_RANGE(0xfa000, 0xfbfff) AM_READ_BANK("bank2") AM_WRITE_BANK("bank13") + AM_RANGE(0xfc000, 0xfcfff) AM_READ_BANK("bank3") AM_WRITE_BANK("bank14") + AM_RANGE(0xfd000, 0xfd7ff) AM_READ_BANK("bank4") AM_WRITE_BANK("bank5") + AM_RANGE(0xfd800, 0xfdbff) AM_READ_BANK("bank6") AM_WRITE_BANK("bank7") + AM_RANGE(0xfdc00, 0xfdfff) AM_READ_BANK("bank8") AM_WRITE_BANK("bank9") + AM_RANGE(0xfe000, 0xfffff) AM_READ_BANK("bank10") AM_WRITE_BANK("bank15") +// AM_RANGE(0x10000, 0x1f7ff) AM_RAM +// AM_RANGE(0x1f800, 0x1ffff) AM_RAM AM_SHARE("colorram") + AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_REGION("maincpu",0x20000) + + AM_RANGE(0x20000, 0x207ff) AM_RAM AM_SHARE("colorram") AM_RANGE(0x20000, 0x23fff) AM_ROM /* &c65_dos, maps to 0x8000 */ AM_RANGE(0x24000, 0x28fff) AM_ROM /* reserved */ -- cgit v1.2.3 From 03e3e644613c8b61cfd565d14065caa085f8e83d Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Fri, 23 Jan 2015 20:35:04 +0100 Subject: Prepare for rewrite. --- src/mess/drivers/c65.c | 737 ++++++-------------------- src/mess/includes/c65.h | 194 ------- src/mess/machine/c65.c | 1336 ----------------------------------------------- 3 files changed, 148 insertions(+), 2119 deletions(-) diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index c8ab81fea51..18b05b39346 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -1,649 +1,208 @@ +// license: MAME +// copyright-holders: Angelo Salese /*************************************************************************** - commodore c65 home computer - PeT mess@utanet.at +C=65 / C=64DX (c) 1991 Commodore - documention - www.funet.fi +Attempt at rewriting the driver ... ***************************************************************************/ -/* - -2008 - Driver Updates ---------------------- - -(most of the informations are taken from http://www.zimmers.net/cbmpics/ ) - - -[CBM systems which belong to this driver] - -* Commodore 65 (1989) - -Also known as C64 DX at early stages of the project. It was cancelled -around 1990-1991. Only few units survive (they were sold after Commodore -liquidation in 1994). - -CPU: CSG 4510 (3.54 MHz) -RAM: 128 kilobytes, expandable to 8 megabytes -ROM: 128 kilobytes -Video: CSG 4569 "VIC-III" (6 Video modes; Resolutions from 320x200 to - 1280x400; 80 columns text; Palette of 4096 colors) -Sound: CSG 8580 "SID" x2 (6 voice stereo synthesizer/digital sound - capabilities) -Ports: CSG 4510 (2 Joystick/Mouse ports; CBM Serial port; CBM 'USER' - port; CBM Monitor port; Power and reset switches; C65 bus drive - port; RGBI video port; 2 RCA audio ports; RAM expansion port; C65 - expansion port) -Keyboard: Full-sized 77 key QWERTY (12 programmable function keys; - 4 direction cursor-pad) -Additional Hardware: Built in 3.5" DD disk drive (1581 compatible) -Miscellaneous: Partially implemented Commodore 64 emulation - -[Notes] - -The datasette port was removed here. C65 supports an additional "dumb" -drive externally. It also features, in addition to the standard CBM -bus serial (available in all modes), a Fast and a Burst serial bus -(both available in C65 mode only) - -*/ - #include "emu.h" #include "cpu/m6502/m4510.h" -#include "machine/mos6526.h" -#include "machine/cbm_snqk.h" -#include "includes/c65.h" -#include "bus/cbmiec/cbmiec.h" -#include "machine/ram.h" -static void cbm_c65_quick_sethiaddress( address_space &space, UINT16 hiaddress ) +#define MAIN_CLOCK XTAL_8MHz + +class c65_state : public driver_device +{ +public: + c65_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") + { } + + // devices + required_device m_maincpu; + + // screen updates + UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_PALETTE_INIT(c65); + DECLARE_DRIVER_INIT(c65); + DECLARE_DRIVER_INIT(c65pal); +protected: + // driver_device overrides + virtual void machine_start(); + virtual void machine_reset(); + + virtual void video_start(); +}; + +void c65_state::video_start() { - space.write_byte(0x82, hiaddress & 0xff); - space.write_byte(0x83, hiaddress >> 8); } -QUICKLOAD_LOAD_MEMBER( c65_state, cbm_c65 ) +UINT32 c65_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) { - return general_cbm_loadsnap(image, file_type, quickload_size, m_maincpu->space(AS_PROGRAM), 0, cbm_c65_quick_sethiaddress); + return 0; } -/************************************* - * - * Main CPU memory handlers - * - *************************************/ - -static ADDRESS_MAP_START( c65_mem , AS_PROGRAM, 8, c65_state ) - AM_RANGE(0xf0000, 0xf7fff) AM_RAMBANK("bank11") - AM_RANGE(0xf8000, 0xf9fff) AM_READ_BANK("bank1") AM_WRITE_BANK("bank12") - AM_RANGE(0xfa000, 0xfbfff) AM_READ_BANK("bank2") AM_WRITE_BANK("bank13") - AM_RANGE(0xfc000, 0xfcfff) AM_READ_BANK("bank3") AM_WRITE_BANK("bank14") - AM_RANGE(0xfd000, 0xfd7ff) AM_READ_BANK("bank4") AM_WRITE_BANK("bank5") - AM_RANGE(0xfd800, 0xfdbff) AM_READ_BANK("bank6") AM_WRITE_BANK("bank7") - AM_RANGE(0xfdc00, 0xfdfff) AM_READ_BANK("bank8") AM_WRITE_BANK("bank9") - AM_RANGE(0xfe000, 0xfffff) AM_READ_BANK("bank10") AM_WRITE_BANK("bank15") -// AM_RANGE(0x10000, 0x1f7ff) AM_RAM -// AM_RANGE(0x1f800, 0x1ffff) AM_RAM AM_SHARE("colorram") - AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_REGION("maincpu",0x20000) - - AM_RANGE(0x20000, 0x207ff) AM_RAM AM_SHARE("colorram") - - AM_RANGE(0x20000, 0x23fff) AM_ROM /* &c65_dos, maps to 0x8000 */ - AM_RANGE(0x24000, 0x28fff) AM_ROM /* reserved */ - AM_RANGE(0x29000, 0x29fff) AM_ROM AM_SHARE("c65_chargen") - AM_RANGE(0x2a000, 0x2bfff) AM_ROM AM_SHARE("basic") - AM_RANGE(0x2c000, 0x2cfff) AM_ROM AM_SHARE("interface") - AM_RANGE(0x2d000, 0x2dfff) AM_ROM AM_SHARE("chargen") - AM_RANGE(0x2e000, 0x2ffff) AM_ROM AM_SHARE("kernal") - - AM_RANGE(0x30000, 0x31fff) AM_ROM /*&c65_monitor, monitor maps to 0x6000 */ - AM_RANGE(0x32000, 0x37fff) AM_ROM /*&c65_basic, */ - AM_RANGE(0x38000, 0x3bfff) AM_ROM /*&c65_graphics, */ - AM_RANGE(0x3c000, 0x3dfff) AM_ROM /* reserved */ - AM_RANGE(0x3e000, 0x3ffff) AM_ROM /* &c65_kernal, */ - - AM_RANGE(0x40000, 0x7ffff) AM_NOP - /* 8 megabyte full address space! */ +static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) + AM_RANGE(0x00000, 0x01fff) AM_RAM // TODO: bank + AM_RANGE(0x0c800, 0x0cfff) AM_ROM AM_REGION("maincpu", 0xc800) + // 0x0d000, 0x0d07f VIC-4567 + // 0x0d080, 0x0d09f FDC + // 0x0d0a0, 0x0d0ff Ram Expansion Control (REC) + // 0x0d100, 0x0d1ff Red Palette + // 0x0d200, 0x0d2ff Green Palette + // 0x0d300, 0x0d3ff Blue Palette + // 0x0d400, 0x0d4*f Right SID + // 0x0d440, 0x0d4*f Left SID + // 0x0d600, 0x0d6** UART + // 0x0d700, 0x0d7** DMAgic + // 0x0d800, 0x0d8** Color matrix + // 0x0dc00, 0x0dc** CIA-1 + // 0x0dd00, 0x0dd** CIA-2 + // 0x0de00, 0x0de** Ext I/O Select 1 + // 0x0df00, 0x0df** Ext I/O Select 2 + AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("maincpu",0) ADDRESS_MAP_END -/************************************* - * - * Input Ports - * - *************************************/ static INPUT_PORTS_START( c65 ) - 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('!') - PORT_START("FUNCT") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("ESC") PORT_CODE(KEYCODE_F1) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F13 F14") PORT_CODE(KEYCODE_F11) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F11 F12") PORT_CODE(KEYCODE_F10) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F9 F10") PORT_CODE(KEYCODE_F9) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("HELP") PORT_CODE(KEYCODE_F12) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("ALT") PORT_CODE(KEYCODE_F2) /* non blocking */ - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("NO SCRL") PORT_CODE(KEYCODE_F4) - - 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 ) - - 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 - - -static INPUT_PORTS_START( c65ger ) - PORT_INCLUDE( c65 ) - - PORT_MODIFY( "ROW1" ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Z { Y }") PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("3 # { 3 Paragraph }") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') - - PORT_MODIFY( "ROW3" ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Y { Z }") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("7 ' { 7 / }") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') - - PORT_MODIFY( "ROW4" ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("0 { = }") PORT_CODE(KEYCODE_0) PORT_CHAR('0') - - PORT_MODIFY( "ROW5" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(", < { ; }") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Paragraph \xE2\x86\x91 { \xc3\xbc }") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(0x00A7) PORT_CHAR(0x2191) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(": [ { \xc3\xa4 }") PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('[') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(". > { : }") PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("- { ' ` }") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("+ { \xc3\x9f ? }") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('+') - - PORT_MODIFY( "ROW6" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("/ ? { - _ }") PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Sum Pi { ] \\ }") PORT_CODE(KEYCODE_DEL) PORT_CHAR(0x03A3) PORT_CHAR(0x03C0) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("= { # ' }") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('=') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("; ] { \xc3\xb6 }") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') PORT_CHAR(']') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("* ` { + * }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('*') PORT_CHAR('`') - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\\ { [ \xE2\x86\x91 }") PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\xa3') - - PORT_MODIFY( "ROW7" ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("_ { < > }") PORT_CODE(KEYCODE_TILDE) PORT_CHAR('_') - - PORT_MODIFY("SPECIAL") /* special keys */ - PORT_DIPNAME( 0x20, 0x00, "(C65) DIN ASC (switch)") PORT_CODE(KEYCODE_F3) - PORT_DIPSETTING( 0x00, "ASC" ) - PORT_DIPSETTING( 0x20, "DIN" ) + /* dummy active high structure */ + PORT_START("SYSA") + PORT_DIPNAME( 0x01, 0x00, "SYSA" ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x01, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x02, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x04, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x10, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x20, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x40, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x80, DEF_STR( On ) ) + + /* dummy active low structure */ + PORT_START("DSWA") + PORT_DIPNAME( 0x01, 0x01, "DSWA" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END - -/************************************* - * - * Sound definitions - * - *************************************/ - -int c65_state::c64_paddle_read( device_t *device, address_space &space, int which ) -{ - int pot1 = 0xff, pot2 = 0xff, pot3 = 0xff, pot4 = 0xff, temp; - UINT8 cia0porta = machine().device("cia_0")->pa_r(space, 0); - int controller1 = ioport("CTRLSEL")->read() & 0x07; - int controller2 = ioport("CTRLSEL")->read() & 0x70; - /* Notice that only a single input is defined for Mouse & Lightpen in both ports */ - switch (controller1) - { - case 0x01: - if (which) - pot2 = ioport("PADDLE2")->read(); - else - pot1 = ioport("PADDLE1")->read(); - break; - - case 0x02: - if (which) - pot2 = ioport("TRACKY")->read(); - else - pot1 = ioport("TRACKX")->read(); - break; - - case 0x03: - if (which && (ioport("JOY1_2B")->read() & 0x20)) /* Joy1 Button 2 */ - pot1 = 0x00; - break; - - case 0x04: - if (which) - pot2 = ioport("LIGHTY")->read(); - else - pot1 = ioport("LIGHTX")->read(); - break; - - case 0x06: - if (which && (ioport("OTHER")->read() & 0x04)) /* Lightpen Signal */ - pot2 = 0x00; - break; - - case 0x00: - case 0x07: - break; - - default: - logerror("Invalid Controller Setting %d\n", controller1); - break; - } - - switch (controller2) - { - case 0x10: - if (which) - pot4 = ioport("PADDLE4")->read(); - else - pot3 = ioport("PADDLE3")->read(); - break; - - case 0x20: - if (which) - pot4 = ioport("TRACKY")->read(); - else - pot3 = ioport("TRACKX")->read(); - break; - - case 0x30: - if (which && (ioport("JOY2_2B")->read() & 0x20)) /* Joy2 Button 2 */ - pot4 = 0x00; - break; - - case 0x40: - if (which) - pot4 = ioport("LIGHTY")->read(); - else - pot3 = ioport("LIGHTX")->read(); - break; - - case 0x60: - if (which && (ioport("OTHER")->read() & 0x04)) /* Lightpen Signal */ - pot4 = 0x00; - break; - - case 0x00: - case 0x70: - break; - - default: - logerror("Invalid Controller Setting %d\n", controller1); - break; - } - - if (ioport("CTRLSEL")->read() & 0x80) /* Swap */ - { - temp = pot1; pot1 = pot3; pot3 = temp; - temp = pot2; pot2 = pot4; pot4 = temp; - } - - switch (cia0porta & 0xc0) - { - case 0x40: - return which ? pot2 : pot1; - - case 0x80: - return which ? pot4 : pot3; - - case 0xc0: - return which ? pot2 : pot1; - - default: - return 0; - } -} - -READ8_MEMBER( c65_state::sid_potx_r ) -{ - return c64_paddle_read(m_sid_r, space, 0); -} - -READ8_MEMBER( c65_state::sid_poty_r ) -{ - return c64_paddle_read(m_sid_r, space, 1); -} - - -/************************************* - * - * VIC III interfaces - * - *************************************/ - -UINT32 c65_state::screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - m_vic->video_update(bitmap, cliprect); - return 0; -} - -READ8_MEMBER(c65_state::c65_lightpen_x_cb) +void c65_state::machine_start() { - return ioport("LIGHTX")->read() & ~0x01; } -READ8_MEMBER(c65_state::c65_lightpen_y_cb) +void c65_state::machine_reset() { - return ioport("LIGHTY")->read() & ~0x01; } -READ8_MEMBER(c65_state::c65_lightpen_button_cb) -{ - return ioport("OTHER")->read() & 0x04; -} - -READ8_MEMBER(c65_state::c65_c64_mem_r) -{ - return m_memory[offset]; -} -INTERRUPT_GEN_MEMBER(c65_state::vic3_raster_irq) +PALETTE_INIT_MEMBER(c65_state, c65) { - m_vic->raster_interrupt_gen(); } -/************************************* - * - * Machine driver - * - *************************************/ - static MACHINE_CONFIG_START( c65, c65_state ) - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M4510, 3500000) /* or VIC6567_CLOCK, */ - MCFG_CPU_PROGRAM_MAP(c65_mem) - MCFG_CPU_VBLANK_INT_DRIVER("screen", c65_state, c65_frame_interrupt) - MCFG_CPU_PERIODIC_INT_DRIVER(c65_state, vic3_raster_irq, VIC6567_HRETRACERATE) - MCFG_MACHINE_START_OVERRIDE(c65_state, c65 ) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu",M4510,MAIN_CLOCK/2) + MCFG_CPU_PROGRAM_MAP(c65_map) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ - MCFG_SCREEN_SIZE(525 * 2, 520 * 2) - MCFG_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,(VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1) * 2, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1) - MCFG_SCREEN_UPDATE_DRIVER(c65_state, screen_update_c65) - MCFG_SCREEN_PALETTE("vic3:palette") - - MCFG_DEVICE_ADD("vic3", VIC3, 0) - MCFG_VIC3_CPU("maincpu") - MCFG_VIC3_TYPE(VIC4567_NTSC) - MCFG_VIC3_LIGHTPEN_X_CB(READ8(c65_state, c65_lightpen_x_cb)) - MCFG_VIC3_LIGHTPEN_Y_CB(READ8(c65_state, c65_lightpen_y_cb)) - MCFG_VIC3_LIGHTPEN_BUTTON_CB(READ8(c65_state, c65_lightpen_button_cb)) - MCFG_VIC3_DMA_READ_CB(READ8(c65_state, c65_dma_read)) - MCFG_VIC3_DMA_READ_COLOR_CB(READ8(c65_state, c65_dma_read_color)) - MCFG_VIC3_INTERRUPT_CB(WRITELINE(c65_state, c65_vic_interrupt)) - MCFG_VIC3_PORT_CHANGED_CB(WRITE8(c65_state, c65_bankswitch_interface)) - MCFG_VIC3_C64_MEM_R_CB(READ8(c65_state, c65_c64_mem_r)) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("sid_r", MOS8580, 985248) - MCFG_MOS6581_POTX_CALLBACK(READ8(c65_state, sid_potx_r)) - MCFG_MOS6581_POTY_CALLBACK(READ8(c65_state, sid_poty_r)) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MCFG_SOUND_ADD("sid_l", MOS8580, 985248) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) - - /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", c65_state, cbm_c65, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) - - /* cia */ - MCFG_DEVICE_ADD("cia_0", MOS6526, 3500000) - MCFG_MOS6526_TOD(60) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia0_interrupt)) - MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia0_port_a_r)) - MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c65_state, c65_cia0_port_b_r)) - MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia0_port_b_w)) - - MCFG_DEVICE_ADD("cia_1", MOS6526, 3500000) - MCFG_MOS6526_TOD(60) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia1_interrupt)) - MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia1_port_a_r)) - MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia1_port_a_w)) - - /* floppy from serial bus */ - MCFG_CBM_IEC_ADD(NULL) - - /* internal ram */ - MCFG_RAM_ADD(RAM_TAG) - MCFG_RAM_DEFAULT_SIZE("128K") - MCFG_RAM_EXTRA_OPTIONS("640K,4224K") -MACHINE_CONFIG_END +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_UPDATE_DRIVER(c65_state, screen_update) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) + MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 442, 0, 320, 264, 0, 240) /* generic NTSC video timing, change accordingly */ + MCFG_SCREEN_PALETTE("palette") -static MACHINE_CONFIG_DERIVED( c65pal, c65 ) - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE) - MCFG_SCREEN_SIZE(625 * 2, 520 * 2) - MCFG_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, (VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1) * 2, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1) - MCFG_SCREEN_PALETTE("vic3:palette") - - MCFG_DEVICE_MODIFY("vic3") - MCFG_VIC3_TYPE(VIC4567_PAL) + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_PALETTE_INIT_OWNER(c65_state, c65) /* sound hardware */ - MCFG_SOUND_REPLACE("sid_r", MOS8580, 1022727) - MCFG_MOS6581_POTX_CALLBACK(READ8(c65_state, sid_potx_r)) - MCFG_MOS6581_POTY_CALLBACK(READ8(c65_state, sid_poty_r)) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MCFG_SOUND_REPLACE("sid_l", MOS8580, 1022727) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) - - /* cia */ - MCFG_DEVICE_MODIFY("cia_0") - MCFG_MOS6526_TOD(50) - - MCFG_DEVICE_MODIFY("cia_1") - MCFG_MOS6526_TOD(50) + MCFG_SPEAKER_STANDARD_MONO("mono") +// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4) +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -/************************************* - * - * ROM definition(s) - * - *************************************/ +/*************************************************************************** + Game driver(s) + +***************************************************************************/ ROM_START( c65 ) - ROM_REGION( 0x400000, "maincpu", 0 ) + ROM_REGION( 0x20000, "maincpu", 0 ) ROM_SYSTEM_BIOS( 0, "910111", "V0.9.910111" ) - ROMX_LOAD( "910111.bin", 0x20000, 0x20000, CRC(c5d8d32e) SHA1(71c05f098eff29d306b0170e2c1cdeadb1a5f206), ROM_BIOS(1) ) + ROMX_LOAD( "910111.bin", 0x0000, 0x20000, CRC(c5d8d32e) SHA1(71c05f098eff29d306b0170e2c1cdeadb1a5f206), ROM_BIOS(1) ) ROM_SYSTEM_BIOS( 1, "910523", "V0.9.910523" ) - ROMX_LOAD( "910523.bin", 0x20000, 0x20000, CRC(e8235dd4) SHA1(e453a8e7e5b95de65a70952e9d48012191e1b3e7), ROM_BIOS(2) ) + ROMX_LOAD( "910523.bin", 0x0000, 0x20000, CRC(e8235dd4) SHA1(e453a8e7e5b95de65a70952e9d48012191e1b3e7), ROM_BIOS(2) ) ROM_SYSTEM_BIOS( 2, "910626", "V0.9.910626" ) - ROMX_LOAD( "910626.bin", 0x20000, 0x20000, CRC(12527742) SHA1(07c185b3bc58410183422f7ac13a37ddd330881b), ROM_BIOS(3) ) + ROMX_LOAD( "910626.bin", 0x0000, 0x20000, CRC(12527742) SHA1(07c185b3bc58410183422f7ac13a37ddd330881b), ROM_BIOS(3) ) ROM_SYSTEM_BIOS( 3, "910828", "V0.9.910828" ) - ROMX_LOAD( "910828.bin", 0x20000, 0x20000, CRC(3ee40b06) SHA1(b63d970727a2b8da72a0a8e234f3c30a20cbcb26), ROM_BIOS(4) ) + ROMX_LOAD( "910828.bin", 0x0000, 0x20000, CRC(3ee40b06) SHA1(b63d970727a2b8da72a0a8e234f3c30a20cbcb26), ROM_BIOS(4) ) ROM_SYSTEM_BIOS( 4, "911001", "V0.9.911001" ) - ROMX_LOAD( "911001.bin", 0x20000, 0x20000, CRC(0888b50f) SHA1(129b9a2611edaebaa028ac3e3f444927c8b1fc5d), ROM_BIOS(5) ) + ROMX_LOAD( "911001.bin", 0x0000, 0x20000, CRC(0888b50f) SHA1(129b9a2611edaebaa028ac3e3f444927c8b1fc5d), ROM_BIOS(5) ) ROM_END ROM_START( c64dx ) - ROM_REGION( 0x400000, "maincpu", 0 ) - ROM_LOAD( "910429.bin", 0x20000, 0x20000, CRC(b025805c) SHA1(c3b05665684f74adbe33052a2d10170a1063ee7d) ) + ROM_REGION( 0x20000, "maincpu", 0 ) + ROM_LOAD( "910429.bin", 0x0000, 0x20000, CRC(b025805c) SHA1(c3b05665684f74adbe33052a2d10170a1063ee7d) ) ROM_END -/*************************************************************************** - - Game driver(s) - -***************************************************************************/ +DRIVER_INIT_MEMBER(c65_state,c65) +{ +// m_dma.version = 2; +// c65_common_driver_init(); +} -/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ +DRIVER_INIT_MEMBER(c65_state,c65pal) +{ +// m_dma.version = 1; +// c65_common_driver_init(); +// m_pal = 1; +} -COMP( 1991, c65, 0, 0, c65, c65, c65_state, c65, "Commodore Business Machines", "Commodore 65 Development System (Prototype, NTSC)", GAME_NOT_WORKING ) -COMP( 1991, c64dx, c65, 0, c65pal, c65ger, c65_state, c65pal, "Commodore Business Machines", "Commodore 64DX Development System (Prototype, PAL, German)", GAME_NOT_WORKING ) +COMP( 1991, c65, 0, 0, c65, c65, c65_state, c65, "Commodore Business Machines", "Commodore 65 Development System (Prototype, NTSC)", GAME_NOT_WORKING ) +COMP( 1991, c64dx, c65, 0, c65, c65, c65_state, c65pal, "Commodore Business Machines", "Commodore 64DX Development System (Prototype, PAL, German)", GAME_NOT_WORKING ) diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h index 0cb898178e0..8b137891791 100644 --- a/src/mess/includes/c65.h +++ b/src/mess/includes/c65.h @@ -1,195 +1 @@ -/***************************************************************************** - * - * includes/c65.h - * - ****************************************************************************/ -#ifndef C65_H_ -#define C65_H_ - -#include "machine/mos6526.h" -#include "bus/cbmiec/cbmiec.h" -#include "imagedev/snapquik.h" -#include "machine/ram.h" -#include "sound/mos6581.h" -#include "video/vic4567.h" - -#define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'. - -struct C64_ROM { - int addr, size, index, start; -}; - -struct c64_cart_t { - C64_ROM bank[C64_MAX_ROMBANK]; - INT8 game; - INT8 exrom; - UINT8 mapper; - UINT8 n_banks; -}; - -struct dma_t -{ - int version; - UINT8 data[4]; -}; - -struct fdc_t -{ - int state; - - UINT8 reg[0x0f]; - - UINT8 buffer[0x200]; - int cpu_pos; - int fdc_pos; - - UINT16 status; - - attotime time; - int head,track,sector; -}; - -struct expansion_ram_t -{ - UINT8 reg; -}; - -class c65_state : public driver_device -{ -public: - c65_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_cia0(*this, "cia_0"), - m_cia1(*this, "cia_1"), - m_sid_r(*this, "sid_r"), - m_vic(*this, "vic3"), - m_iec(*this, CBM_IEC_TAG), - m_colorram(*this, "colorram"), - m_basic(*this, "basic"), - m_chargen(*this, "chargen"), - m_kernal(*this, "kernal"), - m_c65_chargen(*this, "c65_chargen"), - m_interface(*this, "interface"), - m_roml_writable(0), - m_maincpu(*this, "maincpu"), - m_ram(*this, RAM_TAG) { } - - required_device m_cia0; - required_device m_cia1; - required_device m_sid_r; - required_device m_vic; - optional_device m_iec; - - required_shared_ptr m_colorram; - required_shared_ptr m_basic; - required_shared_ptr m_chargen; - required_shared_ptr m_kernal; - required_shared_ptr m_c65_chargen; - required_shared_ptr m_interface; - int m_old_level; - int m_old_data; - int m_old_exrom; - int m_old_game; - UINT8 m_vicirq; - emu_timer *m_datasette_timer; - emu_timer *m_cartridge_timer; - UINT8 *m_memory; - int m_pal; - int m_tape_on; - UINT8 *m_c64_roml; - UINT8 *m_c64_romh; - UINT8 *m_vicaddr; - UINT8 *m_c128_vicaddr; - UINT8 m_game; - UINT8 m_exrom; - UINT8 *m_io_mirror; - UINT8 m_port_data; - UINT8 *m_roml; - UINT8 *m_romh; - int m_roml_writable; - int m_ultimax; - int m_cia1_on; - int m_io_enabled; - int m_is_sx64; - UINT8 *m_io_ram_w_ptr; - UINT8 *m_io_ram_r_ptr; - c64_cart_t m_cart; - int m_nmilevel; int m_charset_select; - int m_c64mode; - UINT8 m_6511_port; - UINT8 m_keyline; - int m_old_value; - dma_t m_dma; - int m_dump_dma; - fdc_t m_fdc; - expansion_ram_t m_expansion_ram; - int m_io_on; - int m_io_dc00_on; - int m_cia0_irq, m_cia1_irq; - DECLARE_DRIVER_INIT(c65); - DECLARE_DRIVER_INIT(c65pal); - - DECLARE_READ8_MEMBER( c64_lightpen_x_cb ); - DECLARE_READ8_MEMBER( c64_lightpen_y_cb ); - DECLARE_READ8_MEMBER( c64_lightpen_button_cb ); - DECLARE_READ8_MEMBER( c64_dma_read ); - DECLARE_READ8_MEMBER( c64_dma_read_ultimax ); - DECLARE_READ8_MEMBER( c64_dma_read_color ); - DECLARE_WRITE_LINE_MEMBER( c64_vic_interrupt ); - DECLARE_READ8_MEMBER( c64_rdy_cb ); - DECLARE_READ8_MEMBER( sid_potx_r ); - DECLARE_READ8_MEMBER( sid_poty_r ); - DECLARE_MACHINE_START(c65); - UINT32 screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(vic3_raster_irq); - INTERRUPT_GEN_MEMBER(c65_frame_interrupt); - DECLARE_READ8_MEMBER(c65_cia0_port_a_r); - DECLARE_READ8_MEMBER(c65_cia0_port_b_r); - DECLARE_WRITE8_MEMBER(c65_cia0_port_b_w); - DECLARE_READ8_MEMBER(c65_cia1_port_a_r); - DECLARE_WRITE8_MEMBER(c65_cia1_port_a_w); - DECLARE_WRITE_LINE_MEMBER(c65_cia1_interrupt); - void c64_legacy_driver_init(); - DECLARE_DEVICE_IMAGE_LOAD_MEMBER( c64_cart ); - DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( c64_cart ); - DECLARE_WRITE_LINE_MEMBER(c65_cia0_interrupt); - DECLARE_READ8_MEMBER(c65_lightpen_x_cb); - DECLARE_READ8_MEMBER(c65_lightpen_y_cb); - DECLARE_READ8_MEMBER(c65_lightpen_button_cb); - DECLARE_READ8_MEMBER(c65_c64_mem_r); - DECLARE_READ8_MEMBER(c65_dma_read); - DECLARE_READ8_MEMBER(c65_dma_read_color); - DECLARE_WRITE_LINE_MEMBER(c65_vic_interrupt); - DECLARE_WRITE8_MEMBER(c65_bankswitch_interface); - DECLARE_READ8_MEMBER( c65_read_mem ); - DECLARE_WRITE8_MEMBER( c65_write_mem ); - DECLARE_READ8_MEMBER( c65_ram_expansion_r ); - DECLARE_WRITE8_MEMBER( c65_ram_expansion_w ); - DECLARE_WRITE8_MEMBER( c65_write_io ); - DECLARE_WRITE8_MEMBER( c65_write_io_dc00 ); - DECLARE_READ8_MEMBER( c65_read_io ); - DECLARE_READ8_MEMBER( c65_read_io_dc00 ); - DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_c65 ); - - int c64_paddle_read( device_t *device, address_space &space, int which ); - void c65_nmi( ); - void c65_irq( int level ); - void c65_dma_port_w( int offset, int value ); - int c65_dma_port_r( int offset ); - void c65_6511_port_w( int offset, int value ); - int c65_6511_port_r( int offset ); - void c65_fdc_state(void); - void c65_fdc_w( int offset, int data ); - int c65_fdc_r( int offset ); - void c65_bankswitch( ); - void c65_colorram_write( int offset, int value ); - void c65_common_driver_init( ); - - required_device m_maincpu; - required_device m_ram; -}; - -MACHINE_CONFIG_EXTERN( c64_cartslot ); - -#endif /* C65_H_ */ diff --git a/src/mess/machine/c65.c b/src/mess/machine/c65.c index 8060f05c54c..8b137891791 100644 --- a/src/mess/machine/c65.c +++ b/src/mess/machine/c65.c @@ -1,1337 +1 @@ -/*************************************************************************** - commodore c65 home computer - peter.trauner@jk.uni-linz.ac.at - documention - www.funet.fi - ***************************************************************************/ -#include "emu.h" - -#include "includes/c65.h" -#include "cpu/m6502/m4510.h" -#include "sound/mos6581.h" -#include "machine/mos6526.h" -#include "bus/cbmiec/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 ) \ - do { \ - if(VERBOSE_LEVEL >= N) \ - { \ - if( M ) \ - logerror("%11.6f: %-24s", MACHINE.time().as_double(), (char*) M ); \ - logerror A; \ - } \ - } while (0) - - - -/*********************************************** - - 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 - -***********************************************/ - -#if 0 -const cassette_interface cbm_cassette_interface = -{ - cbm_cassette_formats, - NULL, - (cassette_state) (CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED), - NULL -}; -#endif - - -/*UINT8 *c65_basic; */ -/*UINT8 *c65_kernal; */ -/*UINT8 *c65_dos; */ -/*UINT8 *c65_monitor; */ -/*UINT8 *c65_graphics; */ - - -void c65_state::c65_nmi( ) -{ - if (m_nmilevel != (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq) /* KEY_RESTORE */ - { - m_maincpu->set_input_line(INPUT_LINE_NMI, (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq); - - m_nmilevel = (ioport("SPECIAL")->read() & 0x80) || m_cia1_irq; - } -} - - -/*********************************************** - - CIA Interfaces - -***********************************************/ - -/* - * CIA 0 - Port A keyboard line select - * CIA 0 - Port B keyboard line read - * - * flag cassette read input, serial request in - * irq to irq connected - * - * see machine/cbm.c - */ - -READ8_MEMBER(c65_state::c65_cia0_port_a_r) -{ - UINT8 cia0portb = m_cia0->pb_r(space, 0); - - return cbm_common_cia0_port_a_r(m_cia0, cia0portb); -} - -READ8_MEMBER(c65_state::c65_cia0_port_b_r) -{ - UINT8 value = 0xff; - UINT8 cia0porta = m_cia0->pa_r(space, 0); - - value &= cbm_common_cia0_port_b_r(m_cia0, cia0porta); - - if (!(m_6511_port & 0x02)) - value &= m_keyline; - - return value; -} - -WRITE8_MEMBER(c65_state::c65_cia0_port_b_w) -{ -// was there lightpen support in c65 video chip? -// vic3_device *vic3 = machine().device("vic3"); -// vic3->lightpen_write(data & 0x10); -} - -void c65_state::c65_irq( int level ) -{ - if (level != m_old_level) - { - DBG_LOG(machine(), 3, "mos4510", ("irq %s\n", level ? "start" : "end")); - m_maincpu->set_input_line(M4510_IRQ_LINE, level); - m_old_level = level; - } -} - -/* is this correct for c65 as well as c64? */ -WRITE_LINE_MEMBER(c65_state::c65_cia0_interrupt) -{ - m_cia0_irq = state; - c65_irq(state || m_vicirq); -} - -/* is this correct for c65 as well as c64? */ -WRITE_LINE_MEMBER(c65_state::c65_vic_interrupt) -{ -#if 1 - if (state != m_vicirq) - { - c65_irq (state || m_cia0_irq); - m_vicirq = state; - } -#endif -} - -/* - * CIA 1 - Port A - * bit 7 serial bus data input - * bit 6 serial bus clock input - * bit 5 serial bus data output - * bit 4 serial bus clock output - * bit 3 serial bus atn output - * bit 2 rs232 data output - * bits 1-0 vic-chip system memory bank select - * - * CIA 1 - Port B - * bit 7 user rs232 data set ready - * bit 6 user rs232 clear to send - * bit 5 user - * bit 4 user rs232 carrier detect - * bit 3 user rs232 ring indicator - * bit 2 user rs232 data terminal ready - * bit 1 user rs232 request to send - * bit 0 user rs232 received data - * - * flag restore key or rs232 received data input - * irq to nmi connected ? - */ -READ8_MEMBER(c65_state::c65_cia1_port_a_r) -{ - UINT8 value = 0xff; - - if (!m_iec->clk_r()) - value &= ~0x40; - - if (!m_iec->data_r()) - value &= ~0x80; - - return value; -} - -WRITE8_MEMBER(c65_state::c65_cia1_port_a_w) -{ - static const int helper[4] = {0xc000, 0x8000, 0x4000, 0x0000}; - - m_iec->atn_w(!BIT(data, 3)); - m_iec->clk_w(!BIT(data, 4)); - m_iec->data_w(!BIT(data, 5)); - - m_vicaddr = m_memory + helper[data & 0x03]; -} - -WRITE_LINE_MEMBER(c65_state::c65_cia1_interrupt) -{ - m_cia1_irq = state; - c65_nmi(); -} - -/*********************************************** - - Memory Handlers - -***********************************************/ - -/* processor has only 1 mega address space !? */ -/* and system 8 megabyte */ -/* dma controller and bankswitch hardware ?*/ -READ8_MEMBER( c65_state::c65_read_mem ) -{ - UINT8 result; - if (offset <= 0x0ffff) - result = m_memory[offset]; - else - result = space.read_byte(offset); - return result; -} - -WRITE8_MEMBER( c65_state::c65_write_mem ) -{ - if (offset <= 0x0ffff) - m_memory[offset] = data; - else - space.write_byte(offset, data); -} - -/* dma chip at 0xd700 - used: - writing banknumber to offset 2 - writing hibyte to offset 1 - writing lobyte to offset 0 - cpu holded, dma transfer(data at address) executed, cpu activated - - command data: - 0 command (0 copy, 3 fill) - 1,2 length - 3,4,5 source - 6,7,8 dest - 9 subcommand - 10 mod - - version 1: - seldom copy (overlapping) from 0x402002 to 0x402008 - (making place for new line in basic area) - for whats this bit 0x400000, or is this really the address? - maybe means add counter to address for access, - so allowing up or down copies, and reordering copies - - version 2: - cmd 0x30 used for this -*/ -void c65_state::c65_dma_port_w( int offset, int value ) -{ - PAIR pair, src, dst, len; - UINT8 cmd, fill; - int i; - address_space &space = m_maincpu->space(AS_PROGRAM); - - switch (offset & 3) - { - case 2: - case 1: - m_dma.data[offset & 3] = value; - break; - case 0: - pair.b.h3 = 0; - pair.b.h2 = m_dma.data[2]; - pair.b.h = m_dma.data[1]; - pair.b.l = m_dma.data[0]=value; - cmd = c65_read_mem(space, pair.d++); - len.w.h = 0; - len.b.l = c65_read_mem(space, pair.d++); - len.b.h = c65_read_mem(space, pair.d++); - src.b.h3 = 0; - fill = src.b.l = c65_read_mem(space, pair.d++); - src.b.h = c65_read_mem(space, pair.d++); - src.b.h2 = c65_read_mem(space, pair.d++); - dst.b.h3 = 0; - dst.b.l = c65_read_mem(space, pair.d++); - dst.b.h = c65_read_mem(space, pair.d++); - dst.b.h2 = c65_read_mem(space, pair.d++); - - switch (cmd) - { - case 0: - if (src.d == 0x3ffff) m_dump_dma = 1; - if (m_dump_dma) - DBG_LOG(space.machine(), 1,"dma copy job", - ("len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n", - len.w.l, src.d, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1) ) ); - if ((m_dma.version == 1) - && ( (src.d&0x400000) || (dst.d & 0x400000))) - { - if (!(src.d & 0x400000)) - { - dst.d &= ~0x400000; - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d--, c65_read_mem(space, src.d++)); - } - else if (!(dst.d & 0x400000)) - { - src.d &= ~0x400000; - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d++, c65_read_mem(space, src.d--)); - } - else - { - src.d &= ~0x400000; - dst.d &= ~0x400000; - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, --dst.d, c65_read_mem(space, --src.d)); - } - } - else - { - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d++, c65_read_mem(space, src.d++)); - } - break; - case 3: - DBG_LOG(space.machine(), 3,"dma fill job", - ("len:%.4x value:%.2x dst:%.6x sub:%.2x modrm:%.2x\n", - len.w.l, fill, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1))); - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d++, fill); - break; - case 0x30: - DBG_LOG(space.machine(), 1,"dma copy down", - ("len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n", - len.w.l, src.d, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1) ) ); - for (i = 0; i < len.w.l; i++) - c65_write_mem(space, dst.d--,c65_read_mem(space, src.d--)); - break; - default: - DBG_LOG(space.machine(), 1,"dma job", - ("cmd:%.2x len:%.4x src:%.6x dst:%.6x sub:%.2x modrm:%.2x\n", - cmd,len.w.l, src.d, dst.d, c65_read_mem(space, pair.d), - c65_read_mem(space, pair.d + 1))); - } - break; - default: - DBG_LOG(space.machine(), 1, "dma chip write", ("%.3x %.2x\n", offset, value)); - break; - } -} - -int c65_state::c65_dma_port_r( int offset ) -{ - /* offset 3 bit 7 in progress ? */ - DBG_LOG(machine(), 2, "dma chip read", ("%.3x\n", offset)); - return 0x7f; -} - -void c65_state::c65_6511_port_w( int offset, int value ) -{ - if (offset == 7) - { - m_6511_port = value; - } - DBG_LOG(machine(), 2, "r6511 write", ("%.2x %.2x\n", offset, value)); -} - -int c65_state::c65_6511_port_r( int offset ) -{ - int data = 0xff; - - if (offset == 7) - { - if (ioport("SPECIAL")->read() & 0x20) - data &= ~1; - } - DBG_LOG(machine(), 2, "r6511 read", ("%.2x\n", offset)); - - return data; -} - -/* one docu states custom 4191 disk controller - (for 2 1MB MFM disk drives, 1 internal, the other extern (optional) 1565 - with integrated 512 byte buffer - - 0->0 reset ? - - 0->1, 0->0, wait until 2 positiv, 1->0 ??? - - 0->0, 0 not 0 means no drive ???, other system entries - - - reg 0 write/read - 0,1 written - bit 1 set - bit 2 set - bit 3 set - bit 4 set - - - reg 0 read - bit 0 - bit 1 - bit 2 - 0..2 ->$1d4 - - reg 1 write - $01 written - $18 written - $46 written - $80 written - $a1 written - $01 written, dec - $10 written - - reg 2 read/write?(lsr) - bit 2 - bit 4 - bit 5 busy waiting until zero, then reading reg 7 - bit 6 operation not activ flag!? or set overflow pin used - bit 7 busy flag? - - reg 3 read/write?(rcr) - bit 1 - bit 3 - bit 7 busy flag? - - reg 4 - track?? - 0 written - read -> $1d2 - cmp #$50 - bcs - - - reg 5 - sector ?? - 1 written - read -> $1d3 - cmp #$b bcc - - - reg 6 - head ?? - 0 written - read -> $1d1 - cmp #2 bcc - - reg 7 read - #4e written - 12 times 0, a1 a1 a1 fe written - - reg 8 read - #ff written - 16 times #ff written - - reg 9 - #60 written - -might use the set overflow input - -$21a6c 9a6c format -$21c97 9c97 write operation -$21ca0 9ca0 get byte? -$21cab 9cab read reg 7 -$21caf 9caf write reg 7 -$21cb3 -*/ - -#define FDC_LOST 4 -#define FDC_CRC 8 -#define FDC_RNF 0x10 -#define FDC_BUSY 0x80 -#define FDC_IRQ 0x200 - -#define FDC_CMD_MOTOR_SPIN_UP 0x10 - -#if 0 -void c65_state::c65_fdc_state(void) -{ - switch (m_fdc.state) - { - case FDC_CMD_MOTOR_SPIN_UP: - if (machine().time() - m_fdc.time) - { - m_fdc.state = 0; - m_fdc.status &= ~FDC_BUSY; - } - break; - } -} -#endif - -void c65_state::c65_fdc_w( int offset, int data ) -{ - DBG_LOG(machine(), 1, "fdc write", ("%.5x %.2x %.2x\n", machine().device("maincpu")->safe_pc(), offset, data)); - switch (offset & 0xf) - { - case 0: - m_fdc.reg[0] = data; - break; - case 1: - m_fdc.reg[1] = data; - switch (data & 0xf9) - { - case 0x20: // wait for motor spin up - m_fdc.status &= ~(FDC_IRQ|FDC_LOST|FDC_CRC|FDC_RNF); - m_fdc.status |= FDC_BUSY; - m_fdc.time = machine().time(); - m_fdc.state = FDC_CMD_MOTOR_SPIN_UP; - break; - case 0: // cancel - m_fdc.status &= ~(FDC_BUSY); - m_fdc.state = 0; - break; - case 0x80: // buffered write - case 0x40: // buffered read - case 0x81: // unbuffered write - case 0x41: // unbuffered read - case 0x30:case 0x31: // step - break; - } - break; - case 2: case 3: // read only - break; - case 4: - m_fdc.reg[offset & 0xf] = data; - m_fdc.track = data; - break; - case 5: - m_fdc.reg[offset & 0xf] = data; - m_fdc.sector = data; - break; - case 6: - m_fdc.reg[offset & 0xf] = data; - m_fdc.head = data; - break; - case 7: - m_fdc.buffer[m_fdc.cpu_pos++] = data; - break; - default: - m_fdc.reg[offset & 0xf] = data; - break; - } -} - -int c65_state::c65_fdc_r( int offset ) -{ - UINT8 data = 0; - switch (offset & 0xf) - { - case 0: - data = m_fdc.reg[0]; - break; - case 1: - data = m_fdc.reg[1]; - break; - case 2: - data = m_fdc.status; - break; - case 3: - data = m_fdc.status >> 8; - break; - case 4: - data = m_fdc.track; - break; - case 5: - data = m_fdc.sector; - break; - case 6: - data = m_fdc.head; - break; - case 7: - data = m_fdc.buffer[m_fdc.cpu_pos++]; - break; - default: - data = m_fdc.reg[offset & 0xf]; - break; - } - DBG_LOG(machine(), 1, "fdc read", ("%.5x %.2x %.2x\n", machine().device("maincpu")->safe_pc(), offset, data)); - return data; -} - -/* version 1 ramcheck - write 0:0 - read write read write 80000,90000,f0000 - write 0:8 - read write read write 80000,90000,f0000 - - version 2 ramcheck??? - read 0: - write 0:0 - read 0: - first read and second read bit 0x80 set --> nothing - write 0:0 - read 0 - write 0:ff -*/ - -READ8_MEMBER( c65_state::c65_ram_expansion_r ) -{ - UINT8 data = 0xff; - if (m_ram->size() > (128 * 1024)) - data = m_expansion_ram.reg; - return data; -} - -WRITE8_MEMBER( c65_state::c65_ram_expansion_w ) -{ - offs_t expansion_ram_begin; - offs_t expansion_ram_end; - - if (m_ram->size() > (128 * 1024)) - { - m_expansion_ram.reg = data; - - expansion_ram_begin = 0x80000; - expansion_ram_end = 0x80000 + (m_ram->size() - 128*1024) - 1; - - if (data == 0x00) { - space.install_readwrite_bank(expansion_ram_begin, expansion_ram_end,"bank16"); - membank("bank16")->set_base(m_ram->pointer() + 128*1024); - } else { - space.nop_readwrite(expansion_ram_begin, expansion_ram_end); - } - } -} - -WRITE8_MEMBER( c65_state::c65_write_io ) -{ - mos6581_device *sid_0 = machine().device("sid_r"); - mos6581_device *sid_1 = machine().device("sid_l"); - vic3_device *vic3 = machine().device("vic3"); - - switch (offset & 0xf00) - { - case 0x000: - if (offset < 0x80) - vic3->port_w(space, offset & 0x7f, data); - else if (offset < 0xa0) - c65_fdc_w(offset & 0x1f, data); - else - { - c65_ram_expansion_w(space, offset & 0x1f, data, mem_mask); - /*ram expansion crtl optional */ - } - break; - case 0x100: - case 0x200: - case 0x300: - vic3->palette_w(space, offset - 0x100, data); - break; - case 0x400: - if (offset<0x420) /* maybe 0x20 */ - sid_0->write(space, offset & 0x3f, data); - else if (offset<0x440) - sid_1->write(space, offset & 0x3f, data); - else - DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset, data)); - break; - case 0x500: - DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset, data)); - break; - case 0x600: - c65_6511_port_w(offset & 0xff,data); - break; - case 0x700: - c65_dma_port_w(offset & 0xff, data); - break; - } -} - -WRITE8_MEMBER( c65_state::c65_write_io_dc00 ) -{ - switch (offset & 0xf00) - { - case 0x000: - m_cia0->write(space, offset, data); - break; - case 0x100: - m_cia1->write(space, offset, data); - break; - case 0x200: - case 0x300: - DBG_LOG(machine(), 1, "io write", ("%.3x %.2x\n", offset+0xc00, data)); - break; - } -} - -READ8_MEMBER( c65_state::c65_read_io ) -{ - mos6581_device *sid_0 = machine().device("sid_r"); - mos6581_device *sid_1 = machine().device("sid_l"); - vic3_device *vic3 = machine().device("vic3"); - - switch (offset & 0xf00) - { - case 0x000: - if (offset < 0x80) - return vic3->port_r(space, offset & 0x7f); - if (offset < 0xa0) - return c65_fdc_r(offset & 0x1f); - else - { - return c65_ram_expansion_r(space, offset & 0x1f, mem_mask); - /*return; ram expansion crtl optional */ - } - case 0x100: - case 0x200: - case 0x300: - /* read only !? */ - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset)); - break; - case 0x400: - if (offset < 0x420) - return sid_0->read(space, offset & 0x3f); - if (offset < 0x440) - return sid_1->read(space, offset & 0x3f); - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset)); - break; - case 0x500: - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset)); - break; - case 0x600: - return c65_6511_port_r(offset&0xff); - case 0x700: - return c65_dma_port_r(offset&0xff); - } - return 0xff; -} - -READ8_MEMBER( c65_state::c65_read_io_dc00 ) -{ - switch (offset & 0x300) - { - case 0x000: - return m_cia0->read(space, offset); - case 0x100: - return m_cia1->read(space, offset); - case 0x200: - case 0x300: - DBG_LOG(machine(), 1, "io read", ("%.3x\n", offset+0xc00)); - break; - } - return 0xff; -} - - -/* -d02f: - init a5 96 written (seems to be switch to c65 or vic3 mode) - go64 0 written -*/ - -/* bit 1 external sync enable (genlock) - bit 2 palette enable - bit 6 vic3 c65 character set */ -WRITE8_MEMBER(c65_state::c65_bankswitch_interface) -{ - DBG_LOG(machine(), 2, "c65 bankswitch", ("%.2x\n",data)); - - if (m_io_on) - { - if (data & 1) - { - membank("bank8")->set_base(m_colorram + 0x400); - membank("bank9")->set_base(m_colorram + 0x400); - m_maincpu->space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8"); - m_maincpu->space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9"); - } - else - { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0dc00, 0x0dfff, read8_delegate(FUNC(c65_state::c65_read_io_dc00),this)); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x0dc00, 0x0dfff, write8_delegate(FUNC(c65_state::c65_write_io_dc00),this)); - } - } - - m_io_dc00_on = !(data & 1); -#if 0 - /* cartridge roms !?*/ - if (data & 0x08) - membank("bank1")->set_base(m_roml); - else - membank("bank1")->set_base(m_memory + 0x8000); - - if (data & 0x10) - membank("bank2")->set_base(m_basic); - else - membank("bank2")->set_base(m_memory + 0xa000); -#endif - if ((m_old_value^data) & 0x20) - { - /* bankswitching faulty when doing actual page */ - if (data & 0x20) - membank("bank3")->set_base(m_basic); - else - membank("bank3")->set_base(m_memory + 0xc000); - } - m_charset_select = data & 0x40; -#if 0 - /* cartridge roms !?*/ - if (data & 0x80) - membank("bank8")->set_base(m_kernal); - else - membank("bank6")->set_base(m_memory + 0xe000); -#endif - m_old_value = data; -} - -void c65_state::c65_bankswitch( ) -{ - int data, loram, hiram, charen; - - data = 0x00; // machine().device("maincpu")->get_port(); - if (data == m_old_data) - return; - - DBG_LOG(machine(), 1, "bankswitch", ("%d\n", data & 7)); - loram = (data & 1) ? 1 : 0; - hiram = (data & 2) ? 1 : 0; - charen = (data & 4) ? 1 : 0; - - if ((!m_game && m_exrom) || (loram && hiram && !m_exrom)) - membank("bank1")->set_base(m_roml); - else - membank("bank1")->set_base(m_memory + 0x8000); - - if ((!m_game && m_exrom && hiram) || (!m_exrom)) - membank("bank2")->set_base(m_romh); - else if (loram && hiram) - membank("bank2")->set_base(m_basic); - else - membank("bank2")->set_base(m_memory + 0xa000); - - if ((!m_game && m_exrom) || (charen && (loram || hiram))) - { - m_io_on = 1; - membank("bank6")->set_base(m_colorram); - membank("bank7")->set_base(m_colorram); - - if (m_io_dc00_on) - { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0dc00, 0x0dfff, read8_delegate(FUNC(c65_state::c65_read_io_dc00),this)); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x0dc00, 0x0dfff, write8_delegate(FUNC(c65_state::c65_write_io_dc00),this)); - } - else - { - m_maincpu->space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8"); - m_maincpu->space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9"); - membank("bank8")->set_base(m_colorram + 0x400); - membank("bank9")->set_base(m_colorram + 0x400); - } - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0d000, 0x0d7ff, read8_delegate(FUNC(c65_state::c65_read_io),this)); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x0d000, 0x0d7ff, write8_delegate(FUNC(c65_state::c65_write_io),this)); - } - else - { - m_io_on = 0; - membank("bank5")->set_base(m_memory + 0xd000); - membank("bank7")->set_base(m_memory + 0xd800); - membank("bank9")->set_base(m_memory + 0xdc00); - if (!charen && (loram || hiram)) - { - membank("bank4")->set_base(m_chargen); - membank("bank6")->set_base(m_chargen + 0x800); - membank("bank8")->set_base(m_chargen + 0xc00); - } - else - { - membank("bank4")->set_base(m_memory + 0xd000); - membank("bank6")->set_base(m_memory + 0xd800); - membank("bank8")->set_base(m_memory + 0xdc00); - } - m_maincpu->space(AS_PROGRAM).install_read_bank(0x0d000, 0x0d7ff, "bank4"); - m_maincpu->space(AS_PROGRAM).install_write_bank(0x0d000, 0x0d7ff, "bank5"); - } - - if (!m_game && m_exrom) - { - membank("bank10")->set_base(m_romh); - } - else - { - if (hiram) - { - membank("bank10")->set_base(m_kernal); - } - else - { - membank("bank10")->set_base(m_memory + 0xe000); - } - } - m_old_data = data; -} - -#ifdef UNUSED_FUNCTION -void c65_state::c65_colorram_write( int offset, int value ) -{ - m_colorram[offset & 0x7ff] = value | 0xf0; -} -#endif - -/* - * only 14 address lines - * a15 and a14 portlines - * 0x1000-0x1fff, 0x9000-0x9fff char rom - */ -READ8_MEMBER(c65_state::c65_dma_read) -{ - if (!m_game && m_exrom) - { - if (offset < 0x3000) - return m_memory[offset]; - return m_romh[offset & 0x1fff]; - } - if ((m_vicaddr == m_memory) || (m_vicaddr == m_memory + 0x8000)) - { - if (offset < 0x1000) - return m_vicaddr[offset & 0x3fff]; - if (offset < 0x2000) { - if (m_charset_select) - return m_chargen[offset & 0xfff]; - else - return m_chargen[offset & 0xfff]; - } - return m_vicaddr[offset & 0x3fff]; - } - return m_vicaddr[offset & 0x3fff]; -} - -READ8_MEMBER(c65_state::c65_dma_read_color) -{ - if (m_c64mode) - return m_colorram[offset & 0x3ff] & 0xf; - return m_colorram[offset & 0x7ff]; -} - -void c65_state::c65_common_driver_init( ) -{ - m_memory = auto_alloc_array_clear(machine(), UINT8, 0x10000); - membank("bank11")->set_base(m_memory + 0x00000); - membank("bank12")->set_base(m_memory + 0x08000); - membank("bank13")->set_base(m_memory + 0x0a000); - membank("bank14")->set_base(m_memory + 0x0c000); - membank("bank15")->set_base(m_memory + 0x0e000); - - cbm_common_init(); - m_keyline = 0xff; - - m_pal = 0; - m_charset_select = 0; - m_6511_port = 0xff; - m_vicirq = 0; - m_old_data = -1; - - /* C65 had no datasette port */ - m_tape_on = 0; - m_game = 1; - m_exrom = 1; - - /*memset(m_memory + 0x40000, 0, 0x800000 - 0x40000); */ -} - -DRIVER_INIT_MEMBER(c65_state,c65) -{ - m_dma.version = 2; - c65_common_driver_init(); -} - -DRIVER_INIT_MEMBER(c65_state,c65pal) -{ - m_dma.version = 1; - c65_common_driver_init(); - m_pal = 1; -} - -MACHINE_START_MEMBER(c65_state,c65) -{ - /* clear upper memory */ - memset(m_ram->pointer() + 128*1024, 0xff, m_ram->size() - 128*1024); - -//removed cbm_drive_0_config (SERIAL, 10); -//removed cbm_drive_1_config (SERIAL, 11); - m_vicaddr = m_memory; - - m_c64mode = 0; - - c65_bankswitch_interface(m_maincpu->space(AS_PROGRAM),0,0xff); - c65_bankswitch(); -} - - -INTERRUPT_GEN_MEMBER(c65_state::c65_frame_interrupt) -{ - int value; - - c65_nmi(); - - /* common keys input ports */ - cbm_common_interrupt(&device); - - /* c65 specific: function keys input ports */ - value = 0xff; - - value &= ~ioport("FUNCT")->read(); - m_keyline = value; -} -- cgit v1.2.3 From d3f4613afcfa687067a42d479ba1bb9069eb227e Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Fri, 23 Jan 2015 21:23:52 +0100 Subject: Planning. --- src/emu/drivers/xtal.h | 1 + src/mess/drivers/c65.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index d391a2a71d5..f146cfe2f54 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -57,6 +57,7 @@ enum XTAL_2_5MHz = 2500000, /* Janken Man units */ XTAL_3MHz = 3000000, /* Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */ XTAL_3_12MHz = 3120000, /* SP0250 clock on Gottlieb games */ + XTAL_3_5MHz = 3500000, /* Reported by Commodore 65 document, true xtal unchecked on PCB */ XTAL_3_52128MHz = 3521280, /* RCA COSMAC VIP */ XTAL_3_579545MHz = 3579545, /* NTSC color subcarrier, extremely common, used on 100's of PCBs (Keytronic custom part #48-300-010 is equivalent) */ XTAL_3_6864MHz = 3686400, /* CPS3 */ diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index 18b05b39346..6679d4c12a0 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -6,24 +6,33 @@ C=65 / C=64DX (c) 1991 Commodore Attempt at rewriting the driver ... +Note: +- VIC-4567 will be eventually be added via compile switch, once that I + get the hang of the system (and checking where the old code fails + eventually) + ***************************************************************************/ #include "emu.h" #include "cpu/m6502/m4510.h" -#define MAIN_CLOCK XTAL_8MHz +#define MAIN_CLOCK XTAL_3_5MHz class c65_state : public driver_device { public: c65_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + m_maincpu(*this, "maincpu"), + m_screen(*this, "screen") { } // devices required_device m_maincpu; + required_device m_screen; + DECLARE_READ8_MEMBER(vic4567_dummy_r); + DECLARE_WRITE8_MEMBER(vic4567_dummy_w); // screen updates UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -47,9 +56,43 @@ UINT32 c65_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, co return 0; } +READ8_MEMBER(c65_state::vic4567_dummy_r) +{ + UINT8 res; + + res=0xff; + switch(offset) + { + case 0x11: + res = (m_screen->vpos() & 0x100) >> 1; + return res; + case 0x12: + res = (m_screen->vpos() & 0xff); + return res; + } + + printf("%02x\n",offset); // TODO: PC + return res; +} + +WRITE8_MEMBER(c65_state::vic4567_dummy_w) +{ + switch(offset) + { + /* KEY register, handles vic-iii and vic-ii modes via two consecutive writes + 0xa5 -> 0x96 vic-iii mode + any other write vic-ii mode + */ + //case 0x2f: break; + default: printf("%02x %02x\n",offset,data); break; + } + +} + static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) AM_RANGE(0x00000, 0x01fff) AM_RAM // TODO: bank AM_RANGE(0x0c800, 0x0cfff) AM_ROM AM_REGION("maincpu", 0xc800) + AM_RANGE(0x0d000, 0x0d07f) AM_READWRITE(vic4567_dummy_r,vic4567_dummy_w) // 0x0d000, 0x0d07f VIC-4567 // 0x0d080, 0x0d09f FDC // 0x0d0a0, 0x0d0ff Ram Expansion Control (REC) @@ -143,7 +186,7 @@ PALETTE_INIT_MEMBER(c65_state, c65) static MACHINE_CONFIG_START( c65, c65_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu",M4510,MAIN_CLOCK/2) + MCFG_CPU_ADD("maincpu",M4510,MAIN_CLOCK) MCFG_CPU_PROGRAM_MAP(c65_map) /* video hardware */ @@ -153,7 +196,7 @@ static MACHINE_CONFIG_START( c65, c65_state ) MCFG_SCREEN_UPDATE_DRIVER(c65_state, screen_update) // MCFG_SCREEN_SIZE(32*8, 32*8) // MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) - MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 442, 0, 320, 264, 0, 240) /* generic NTSC video timing, change accordingly */ + MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, 525, 0, 320, 525, 0, 240) // mods needed MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 0x100) -- cgit v1.2.3 From 11534b7c9ed62afd8719e14d42df76edfdebee52 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Fri, 23 Jan 2015 21:42:45 +0100 Subject: Getting palette is always a good start. --- src/mess/drivers/c65.c | 55 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index 6679d4c12a0..1f2d3aee4fe 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -25,15 +25,28 @@ public: c65_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_screen(*this, "screen") + m_screen(*this, "screen"), + m_palette(*this, "palette"), + m_palred(*this, "redpal"), + m_palgreen(*this, "greenpal"), + m_palblue(*this, "bluepal") + { } // devices required_device m_maincpu; required_device m_screen; + required_device m_palette; + required_shared_ptr m_palred; + required_shared_ptr m_palgreen; + required_shared_ptr m_palblue; + DECLARE_READ8_MEMBER(vic4567_dummy_r); DECLARE_WRITE8_MEMBER(vic4567_dummy_w); - + DECLARE_WRITE8_MEMBER(PalRed_w); + DECLARE_WRITE8_MEMBER(PalGreen_w); + DECLARE_WRITE8_MEMBER(PalBlue_w); + // screen updates UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(c65); @@ -45,6 +58,8 @@ protected: virtual void machine_reset(); virtual void video_start(); +private: + void PalEntryFlush(UINT8 offset); }; void c65_state::video_start() @@ -89,16 +104,39 @@ WRITE8_MEMBER(c65_state::vic4567_dummy_w) } +void c65_state::PalEntryFlush(UINT8 offset) +{ + m_palette->set_pen_color(offset, pal4bit(m_palred[offset]), pal4bit(m_palgreen[offset]), pal4bit(m_palblue[offset])); +} + +WRITE8_MEMBER(c65_state::PalRed_w) +{ + m_palred[offset] = data; + PalEntryFlush(offset); +} + +WRITE8_MEMBER(c65_state::PalGreen_w) +{ + m_palblue[offset] = data; + PalEntryFlush(offset); +} + +WRITE8_MEMBER(c65_state::PalBlue_w) +{ + m_palgreen[offset] = data; + PalEntryFlush(offset); +} + + static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) AM_RANGE(0x00000, 0x01fff) AM_RAM // TODO: bank AM_RANGE(0x0c800, 0x0cfff) AM_ROM AM_REGION("maincpu", 0xc800) - AM_RANGE(0x0d000, 0x0d07f) AM_READWRITE(vic4567_dummy_r,vic4567_dummy_w) - // 0x0d000, 0x0d07f VIC-4567 + AM_RANGE(0x0d000, 0x0d07f) AM_READWRITE(vic4567_dummy_r,vic4567_dummy_w) // 0x0d000, 0x0d07f VIC-4567 // 0x0d080, 0x0d09f FDC // 0x0d0a0, 0x0d0ff Ram Expansion Control (REC) - // 0x0d100, 0x0d1ff Red Palette - // 0x0d200, 0x0d2ff Green Palette - // 0x0d300, 0x0d3ff Blue Palette + AM_RANGE(0x0d100, 0x0d1ff) AM_RAM_WRITE(PalRed_w) AM_SHARE("redpal")// 0x0d100, 0x0d1ff Red Palette + AM_RANGE(0x0d200, 0x0d2ff) AM_RAM_WRITE(PalGreen_w) AM_SHARE("greenpal") // 0x0d200, 0x0d2ff Green Palette + AM_RANGE(0x0d300, 0x0d3ff) AM_RAM_WRITE(PalBlue_w) AM_SHARE("bluepal") // 0x0d300, 0x0d3ff Blue Palette // 0x0d400, 0x0d4*f Right SID // 0x0d440, 0x0d4*f Left SID // 0x0d600, 0x0d6** UART @@ -107,7 +145,7 @@ static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) // 0x0dc00, 0x0dc** CIA-1 // 0x0dd00, 0x0dd** CIA-2 // 0x0de00, 0x0de** Ext I/O Select 1 - // 0x0df00, 0x0df** Ext I/O Select 2 + AM_RANGE(0x0df00, 0x0dfff) AM_RAM // 0x0df00, 0x0df** Ext I/O Select 2 (RAM window?) AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("maincpu",0) ADDRESS_MAP_END @@ -181,6 +219,7 @@ void c65_state::machine_reset() PALETTE_INIT_MEMBER(c65_state, c65) { + // TODO: initial state? } static MACHINE_CONFIG_START( c65, c65_state ) -- cgit v1.2.3 From b05c21dd698982d7c9ba9fb37cad7dca2e7ff114 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Fri, 23 Jan 2015 23:39:33 +0100 Subject: It's a kind of (D)MAgic (sets up basic VRAM) --- src/mess/drivers/c65.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index 1f2d3aee4fe..8ce1117cf57 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -29,23 +29,25 @@ public: m_palette(*this, "palette"), m_palred(*this, "redpal"), m_palgreen(*this, "greenpal"), - m_palblue(*this, "bluepal") - + m_palblue(*this, "bluepal"), + m_dmalist(*this, "dmalist") { } // devices - required_device m_maincpu; + required_device m_maincpu; required_device m_screen; required_device m_palette; required_shared_ptr m_palred; required_shared_ptr m_palgreen; required_shared_ptr m_palblue; + required_shared_ptr m_dmalist; DECLARE_READ8_MEMBER(vic4567_dummy_r); DECLARE_WRITE8_MEMBER(vic4567_dummy_w); DECLARE_WRITE8_MEMBER(PalRed_w); DECLARE_WRITE8_MEMBER(PalGreen_w); DECLARE_WRITE8_MEMBER(PalBlue_w); + DECLARE_WRITE8_MEMBER(DMAgic_w); // screen updates UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -60,6 +62,7 @@ protected: virtual void video_start(); private: void PalEntryFlush(UINT8 offset); + void DMAgicExecute(address_space &space,UINT32 address); }; void c65_state::video_start() @@ -86,7 +89,8 @@ READ8_MEMBER(c65_state::vic4567_dummy_r) return res; } - printf("%02x\n",offset); // TODO: PC + if(!space.debugger_access()) + printf("%02x\n",offset); // TODO: PC return res; } @@ -99,7 +103,10 @@ WRITE8_MEMBER(c65_state::vic4567_dummy_w) any other write vic-ii mode */ //case 0x2f: break; - default: printf("%02x %02x\n",offset,data); break; + default: + if(!space.debugger_access()) + printf("%02x %02x\n",offset,data); + break; } } @@ -127,6 +134,60 @@ WRITE8_MEMBER(c65_state::PalBlue_w) PalEntryFlush(offset); } +void c65_state::DMAgicExecute(address_space &space,UINT32 address) +{ + UINT8 cmd;// = space.read_byte(address++); + UINT16 length; //= space.read_byte(address++); + UINT32 src, dst; + static const char *const dma_cmd_string[] = + { + "COPY", // 0 + "MIX", + "SWAP", + "FILL" + }; + cmd = space.read_byte(address++); + length = space.read_byte(address++); + length|=(space.read_byte(address++)<<8); + src = space.read_byte(address++); + src|=(space.read_byte(address++)<<8); + src|=(space.read_byte(address++)<<16); + dst = space.read_byte(address++); + dst|=(space.read_byte(address++)<<8); + dst|=(space.read_byte(address++)<<16); + + switch(cmd & 3) + { + case 3: // fill + { + /* TODO: upper bits of source */ + printf("DMAgic %s %02x -> %08x %04x (CHAIN=%s)\n",dma_cmd_string[cmd & 3],src & 0xff,dst,length,cmd & 4 ? "yes" : "no"); + UINT8 FillValue; + UINT32 DestIndex; + UINT16 SizeIndex; + FillValue = src & 0xff; + DestIndex = dst & 0xfffff; + SizeIndex = length; + do + { + space.write_byte(DestIndex++,FillValue); + SizeIndex--; + }while(SizeIndex != 0); + } + return; + } + printf("DMAgic %s %08x %08x %04x (CHAIN=%s)\n",dma_cmd_string[cmd & 3],src,dst,length,cmd & 4 ? "yes" : "no"); +} + + +WRITE8_MEMBER(c65_state::DMAgic_w) +{ + m_dmalist[offset] = data; + if(offset == 0) + DMAgicExecute(space,(m_dmalist[0])|(m_dmalist[1]<<8)|(m_dmalist[2]<<16)); +} + + static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) AM_RANGE(0x00000, 0x01fff) AM_RAM // TODO: bank @@ -140,12 +201,15 @@ static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) // 0x0d400, 0x0d4*f Right SID // 0x0d440, 0x0d4*f Left SID // 0x0d600, 0x0d6** UART - // 0x0d700, 0x0d7** DMAgic + AM_RANGE(0x0d700, 0x0d702) AM_WRITE(DMAgic_w) AM_SHARE("dmalist") // 0x0d700, 0x0d7** DMAgic + //AM_RANGE(0x0d703, 0x0d703) AM_READ(DMAgic_r) // 0x0d800, 0x0d8** Color matrix // 0x0dc00, 0x0dc** CIA-1 // 0x0dd00, 0x0dd** CIA-2 // 0x0de00, 0x0de** Ext I/O Select 1 AM_RANGE(0x0df00, 0x0dfff) AM_RAM // 0x0df00, 0x0df** Ext I/O Select 2 (RAM window?) + AM_RANGE(0x10000, 0x1f7ff) AM_RAM + AM_RANGE(0x1f800, 0x1ffff) AM_RAM // VRAM AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("maincpu",0) ADDRESS_MAP_END -- cgit v1.2.3 From 6e0a315ce0e77292e1d678d6adb312bb9be322ba Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Sat, 24 Jan 2015 01:58:59 +0100 Subject: Bad stack pointer read is bad. --- src/emu/cpu/m6502/om4510.lst | 9 +++++ src/emu/cpu/m6502/om65ce02.lst | 1 + src/mess/drivers/c65.c | 84 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 89 insertions(+), 5 deletions(-) diff --git a/src/emu/cpu/m6502/om4510.lst b/src/emu/cpu/m6502/om4510.lst index 4728dd68786..fbe49491fac 100644 --- a/src/emu/cpu/m6502/om4510.lst +++ b/src/emu/cpu/m6502/om4510.lst @@ -9,4 +9,13 @@ map_imp map_offset[0] = (A<<8) | ((X & 0xf) << 16); map_offset[1] = (Y<<8) | ((Z & 0xf) << 16); map_enable = ((X & 0xf0) >> 4) | (Z & 0xf0); + logerror("MAP execute\n"); + logerror("0x0000 - 0x1fff = %08x\n",map_enable & 1 ? map_offset[0]+0x0000 : 0x0000); + logerror("0x2000 - 0x3fff = %08x\n",map_enable & 2 ? map_offset[0]+0x2000 : 0x2000); + logerror("0x4000 - 0x5fff = %08x\n",map_enable & 4 ? map_offset[0]+0x4000 : 0x4000); + logerror("0x6000 - 0x7fff = %08x\n",map_enable & 8 ? map_offset[0]+0x6000 : 0x6000); + logerror("0x8000 - 0x9fff = %08x\n",map_enable & 16 ? map_offset[1]+0x8000 : 0x8000); + logerror("0xa000 - 0xbfff = %08x\n",map_enable & 32 ? map_offset[1]+0xa000 : 0xa000); + logerror("0xc000 - 0xdfff = %08x\n",map_enable & 64 ? map_offset[1]+0xc000 : 0xc000); + logerror("0xe000 - 0xffff = %08x\n",map_enable & 128 ? map_offset[1]+0xe000 : 0xe000); prefetch(); diff --git a/src/emu/cpu/m6502/om65ce02.lst b/src/emu/cpu/m6502/om65ce02.lst index a10f64fa1ef..acdf8a65d96 100644 --- a/src/emu/cpu/m6502/om65ce02.lst +++ b/src/emu/cpu/m6502/om65ce02.lst @@ -419,6 +419,7 @@ cld_ce_imp cle_imp read_pc_noinc(); P &= ~F_E; + logerror("CLE\n"); prefetch(); cli_ce_imp diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index 8ce1117cf57..83f447d01de 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -6,6 +6,9 @@ C=65 / C=64DX (c) 1991 Commodore Attempt at rewriting the driver ... +TODO: +- Dies as soon as it enters into DOS ROM (bp 0x9d1a, it never returns due of a bad stack pointer read); + Note: - VIC-4567 will be eventually be added via compile switch, once that I get the hang of the system (and checking where the old code fails @@ -30,7 +33,8 @@ public: m_palred(*this, "redpal"), m_palgreen(*this, "greenpal"), m_palblue(*this, "bluepal"), - m_dmalist(*this, "dmalist") + m_dmalist(*this, "dmalist"), + m_cram(*this, "cram") { } // devices @@ -41,19 +45,26 @@ public: required_shared_ptr m_palgreen; required_shared_ptr m_palblue; required_shared_ptr m_dmalist; - + required_shared_ptr m_cram; + DECLARE_READ8_MEMBER(vic4567_dummy_r); DECLARE_WRITE8_MEMBER(vic4567_dummy_w); DECLARE_WRITE8_MEMBER(PalRed_w); DECLARE_WRITE8_MEMBER(PalGreen_w); DECLARE_WRITE8_MEMBER(PalBlue_w); DECLARE_WRITE8_MEMBER(DMAgic_w); + DECLARE_READ8_MEMBER(CIASelect_r); + DECLARE_WRITE8_MEMBER(CIASelect_w); + + DECLARE_READ8_MEMBER(dummy_r); // screen updates UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(c65); DECLARE_DRIVER_INIT(c65); DECLARE_DRIVER_INIT(c65pal); + + INTERRUPT_GEN_MEMBER(vic3_vblank_irq); protected: // driver_device overrides virtual void machine_start(); @@ -61,6 +72,8 @@ protected: virtual void video_start(); private: + UINT8 m_VIC2_IRQMask; + UINT8 m_VIC3_ControlA; void PalEntryFlush(UINT8 offset); void DMAgicExecute(address_space &space,UINT32 address); }; @@ -87,6 +100,8 @@ READ8_MEMBER(c65_state::vic4567_dummy_r) case 0x12: res = (m_screen->vpos() & 0xff); return res; + case 0x30: + return m_VIC3_ControlA; } if(!space.debugger_access()) @@ -98,11 +113,18 @@ WRITE8_MEMBER(c65_state::vic4567_dummy_w) { switch(offset) { + case 0x1a: + m_VIC2_IRQMask = data & 0xf; + break; /* KEY register, handles vic-iii and vic-ii modes via two consecutive writes 0xa5 -> 0x96 vic-iii mode any other write vic-ii mode */ //case 0x2f: break; + case 0x30: + printf("CONTROL A %02x\n",data); + m_VIC3_ControlA = data; + break; default: if(!space.debugger_access()) printf("%02x %02x\n",offset,data); @@ -187,13 +209,39 @@ WRITE8_MEMBER(c65_state::DMAgic_w) DMAgicExecute(space,(m_dmalist[0])|(m_dmalist[1]<<8)|(m_dmalist[2]<<16)); } +READ8_MEMBER(c65_state::CIASelect_r) +{ + if(m_VIC3_ControlA & 1) + return m_cram[offset]; + else + { + // CIA + } + return 0xff; +} + +WRITE8_MEMBER(c65_state::CIASelect_w) +{ + if(m_VIC3_ControlA & 1) + m_cram[offset] = data; + else + { + // CIA + } + +} + +READ8_MEMBER(c65_state::dummy_r) +{ + return 0xff; +} static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) AM_RANGE(0x00000, 0x01fff) AM_RAM // TODO: bank AM_RANGE(0x0c800, 0x0cfff) AM_ROM AM_REGION("maincpu", 0xc800) AM_RANGE(0x0d000, 0x0d07f) AM_READWRITE(vic4567_dummy_r,vic4567_dummy_w) // 0x0d000, 0x0d07f VIC-4567 - // 0x0d080, 0x0d09f FDC + AM_RANGE(0x0d080, 0x0d081) AM_READ(dummy_r) // 0x0d080, 0x0d09f FDC // 0x0d0a0, 0x0d0ff Ram Expansion Control (REC) AM_RANGE(0x0d100, 0x0d1ff) AM_RAM_WRITE(PalRed_w) AM_SHARE("redpal")// 0x0d100, 0x0d1ff Red Palette AM_RANGE(0x0d200, 0x0d2ff) AM_RAM_WRITE(PalGreen_w) AM_SHARE("greenpal") // 0x0d200, 0x0d2ff Green Palette @@ -204,10 +252,12 @@ static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) AM_RANGE(0x0d700, 0x0d702) AM_WRITE(DMAgic_w) AM_SHARE("dmalist") // 0x0d700, 0x0d7** DMAgic //AM_RANGE(0x0d703, 0x0d703) AM_READ(DMAgic_r) // 0x0d800, 0x0d8** Color matrix + AM_RANGE(0x0dc00, 0x0dfff) AM_READWRITE(CIASelect_r,CIASelect_w) AM_SHARE("cram") // 0x0dc00, 0x0dc** CIA-1 // 0x0dd00, 0x0dd** CIA-2 // 0x0de00, 0x0de** Ext I/O Select 1 - AM_RANGE(0x0df00, 0x0dfff) AM_RAM // 0x0df00, 0x0df** Ext I/O Select 2 (RAM window?) + // 0x0df00, 0x0df** Ext I/O Select 2 (RAM window?) + AM_RANGE(0x0e000, 0x0ffff) AM_ROM AM_REGION("maincpu",0x0e000) AM_RANGE(0x10000, 0x1f7ff) AM_RAM AM_RANGE(0x1f800, 0x1ffff) AM_RAM // VRAM AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("maincpu",0) @@ -286,11 +336,33 @@ PALETTE_INIT_MEMBER(c65_state, c65) // TODO: initial state? } +static const gfx_layout charlayout = +{ + 8,8, + 0x1000/8, + 1, + { RGN_FRAC(0,1) }, + { 0, 1, 2, 3, 4, 5, 6, 7 }, + { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, + 8*8 +}; + +static GFXDECODE_START( c65 ) + GFXDECODE_ENTRY( "maincpu", 0xd000, charlayout, 0, 1 ) // another identical copy is at 0x9000 +GFXDECODE_END + +INTERRUPT_GEN_MEMBER(c65_state::vic3_vblank_irq) +{ + if(m_VIC2_IRQMask & 1) + m_maincpu->set_input_line(M4510_IRQ_LINE,HOLD_LINE); +} + static MACHINE_CONFIG_START( c65, c65_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M4510,MAIN_CLOCK) MCFG_CPU_PROGRAM_MAP(c65_map) + MCFG_CPU_VBLANK_INT_DRIVER("screen",c65_state,vic3_vblank_irq) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -299,9 +371,11 @@ static MACHINE_CONFIG_START( c65, c65_state ) MCFG_SCREEN_UPDATE_DRIVER(c65_state, screen_update) // MCFG_SCREEN_SIZE(32*8, 32*8) // MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) - MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, 525, 0, 320, 525, 0, 240) // mods needed + MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, 910, 0, 320, 525, 0, 240) // mods needed MCFG_SCREEN_PALETTE("palette") + MCFG_GFXDECODE_ADD("gfxdecode", "palette", c65) + MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(c65_state, c65) -- cgit v1.2.3 From c652a6efe20a1b1570233bd46514cd0f18ac03f8 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Wed, 28 Jan 2015 00:20:38 +0100 Subject: One bug nailed (boot vectors are *whatever exists in regular 0-0xffff range"). --- src/emu/cpu/m6502/m4510.c | 6 +++--- src/emu/cpu/m6502/m6502.h | 4 ++-- src/emu/cpu/m6502/om65ce02.lst | 6 +++++- src/mess/drivers/c65.c | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index ce210b98ad6..a435ae7aa4e 100644 --- a/src/emu/cpu/m6502/m4510.c +++ b/src/emu/cpu/m6502/m4510.c @@ -75,8 +75,8 @@ void m4510_device::device_reset() nomap = true; // Wild guess, this setting makes the cpu start executing some code in the c65 driver - map_offset[1] = 0x30000; - map_enable = 0x80; + //map_offset[1] = 0x2e000; + //map_enable = 0x80; m65ce02_device::device_reset(); } @@ -86,7 +86,7 @@ bool m4510_device::memory_translate(address_spacenum spacenum, int intention, of { address = map(address); } - + return true; } diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index f77a33f6ae8..9ca5e08fdda 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -220,8 +220,8 @@ protected: // inline helpers static inline bool page_changing(UINT16 base, int delta) { return ((base + delta) ^ base) & 0xff00; } - static inline UINT16 set_l(UINT16 base, UINT8 val) { return (base & 0xff00) | val; } - static inline UINT16 set_h(UINT16 base, UINT8 val) { return (base & 0x00ff) | (val << 8); } + static inline UINT16 set_l(UINT16 base, UINT16 val) { return (base & 0xff00) | val; } + static inline UINT16 set_h(UINT16 base, UINT16 val) { return (base & 0x00ff) | (val << 8); } inline void dec_SP() { SP = set_l(SP, SP-1); } inline void inc_SP() { SP = set_l(SP, SP+1); } diff --git a/src/emu/cpu/m6502/om65ce02.lst b/src/emu/cpu/m6502/om65ce02.lst index acdf8a65d96..998d6ac3697 100644 --- a/src/emu/cpu/m6502/om65ce02.lst +++ b/src/emu/cpu/m6502/om65ce02.lst @@ -342,9 +342,10 @@ bra_ce_rel prefetch(); bra_rw2 + printf("PC=%04x\n",PC); TMP = read_pc(); TMP = set_h(TMP, read_pc()); - PC += TMP; + PC += TMP - 1; prefetch(); brk_ce_imp @@ -734,11 +735,14 @@ jmp_ce_ind jsr_ce_adr TMP = read_pc(); write(SP, PC>>8); + printf("a %04x\n",SP); dec_SP_ce(); write(SP, PC); + printf("b %04x\n",SP); dec_SP_ce(); TMP = set_h(TMP, read_pc()); PC = TMP; + printf("%04x\n",TMP); prefetch(); jsr_iax diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index 83f447d01de..00b4e00cd45 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -125,7 +125,7 @@ WRITE8_MEMBER(c65_state::vic4567_dummy_w) printf("CONTROL A %02x\n",data); m_VIC3_ControlA = data; break; - default: + default: if(!space.debugger_access()) printf("%02x %02x\n",offset,data); break; -- cgit v1.2.3 From e539999dfaa3922320c147be44694865800d0367 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Wed, 28 Jan 2015 00:24:59 +0100 Subject: bra_rw2 requires a displacement of -1, fixes pha/pla bug, needs fixing in DASM. --- src/emu/cpu/m6502/om65ce02.lst | 1 - 1 file changed, 1 deletion(-) diff --git a/src/emu/cpu/m6502/om65ce02.lst b/src/emu/cpu/m6502/om65ce02.lst index 998d6ac3697..8a9e296dd87 100644 --- a/src/emu/cpu/m6502/om65ce02.lst +++ b/src/emu/cpu/m6502/om65ce02.lst @@ -342,7 +342,6 @@ bra_ce_rel prefetch(); bra_rw2 - printf("PC=%04x\n",PC); TMP = read_pc(); TMP = set_h(TMP, read_pc()); PC += TMP - 1; -- cgit v1.2.3 From 51e9ad2ee0530e030f7e104d7ba5e2ed45c47072 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Wed, 28 Jan 2015 00:26:33 +0100 Subject: Don't need this logging --- src/emu/cpu/m6502/om65ce02.lst | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/emu/cpu/m6502/om65ce02.lst b/src/emu/cpu/m6502/om65ce02.lst index 8a9e296dd87..d5c2e543e46 100644 --- a/src/emu/cpu/m6502/om65ce02.lst +++ b/src/emu/cpu/m6502/om65ce02.lst @@ -734,14 +734,11 @@ jmp_ce_ind jsr_ce_adr TMP = read_pc(); write(SP, PC>>8); - printf("a %04x\n",SP); dec_SP_ce(); write(SP, PC); - printf("b %04x\n",SP); dec_SP_ce(); TMP = set_h(TMP, read_pc()); PC = TMP; - printf("%04x\n",TMP); prefetch(); jsr_iax -- cgit v1.2.3 From 08aaa1ec91905cb3272b6d4c36edc1cb14918941 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Wed, 28 Jan 2015 01:07:22 +0100 Subject: Various fixes, VRAM is now filled up. --- src/mess/drivers/c65.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index 00b4e00cd45..ac8d9646a3e 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -72,8 +72,8 @@ protected: virtual void video_start(); private: - UINT8 m_VIC2_IRQMask; - UINT8 m_VIC3_ControlA; + UINT8 m_VIC2_IRQPend, m_VIC2_IRQMask; + UINT8 m_VIC3_ControlA,m_VIC3_ControlB; void PalEntryFlush(UINT8 offset); void DMAgicExecute(address_space &space,UINT32 address); }; @@ -100,8 +100,12 @@ READ8_MEMBER(c65_state::vic4567_dummy_r) case 0x12: res = (m_screen->vpos() & 0xff); return res; + case 0x19: + return m_VIC2_IRQPend; case 0x30: return m_VIC3_ControlA; + case 0x31: + return m_VIC3_ControlB; } if(!space.debugger_access()) @@ -113,6 +117,9 @@ WRITE8_MEMBER(c65_state::vic4567_dummy_w) { switch(offset) { + case 0x19: + m_VIC2_IRQPend = data & 0x8f; + break; case 0x1a: m_VIC2_IRQMask = data & 0xf; break; @@ -122,9 +129,14 @@ WRITE8_MEMBER(c65_state::vic4567_dummy_w) */ //case 0x2f: break; case 0x30: - printf("CONTROL A %02x\n",data); + if((data & 0xfe) != 0x64) + printf("CONTROL A %02x\n",data); m_VIC3_ControlA = data; break; + case 0x31: + printf("CONTROL B %02x\n",data); + m_VIC3_ControlB = data; + break; default: if(!space.debugger_access()) printf("%02x %02x\n",offset,data); @@ -180,6 +192,24 @@ void c65_state::DMAgicExecute(address_space &space,UINT32 address) switch(cmd & 3) { + case 0: // copy - TODO: untested + { + if(length != 1) + printf("DMAgic %s %02x -> %08x %04x (CHAIN=%s)\n",dma_cmd_string[cmd & 3],src,dst,length,cmd & 4 ? "yes" : "no"); + UINT32 SourceIndex; + UINT32 DestIndex; + UINT16 SizeIndex; + SourceIndex = src & 0xfffff; + DestIndex = dst & 0xfffff; + SizeIndex = length; + do + { + space.write_byte(DestIndex++,space.read_byte(SourceIndex++)); + SizeIndex--; + }while(SizeIndex != 0); + + return; + } case 3: // fill { /* TODO: upper bits of source */ @@ -218,7 +248,7 @@ READ8_MEMBER(c65_state::CIASelect_r) // CIA } - return 0xff; + return 0; } WRITE8_MEMBER(c65_state::CIASelect_w) @@ -238,7 +268,7 @@ READ8_MEMBER(c65_state::dummy_r) } static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) - AM_RANGE(0x00000, 0x01fff) AM_RAM // TODO: bank + AM_RANGE(0x00000, 0x07fff) AM_RAM // TODO: bank AM_RANGE(0x0c800, 0x0cfff) AM_ROM AM_REGION("maincpu", 0xc800) AM_RANGE(0x0d000, 0x0d07f) AM_READWRITE(vic4567_dummy_r,vic4567_dummy_w) // 0x0d000, 0x0d07f VIC-4567 AM_RANGE(0x0d080, 0x0d081) AM_READ(dummy_r) // 0x0d080, 0x0d09f FDC @@ -353,8 +383,8 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(c65_state::vic3_vblank_irq) { - if(m_VIC2_IRQMask & 1) - m_maincpu->set_input_line(M4510_IRQ_LINE,HOLD_LINE); + //if(m_VIC2_IRQMask & 1) + // m_maincpu->set_input_line(M4510_IRQ_LINE,HOLD_LINE); } static MACHINE_CONFIG_START( c65, c65_state ) -- cgit v1.2.3 From afeb6ccf0ba3bae31c6222e23627c68645e434a9 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Wed, 28 Jan 2015 01:39:32 +0100 Subject: BREAKs now, added drawgfx VRAM dumper. --- src/mess/drivers/c65.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c index ac8d9646a3e..2c30446ba37 100644 --- a/src/mess/drivers/c65.c +++ b/src/mess/drivers/c65.c @@ -30,23 +30,27 @@ public: m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), m_palette(*this, "palette"), + m_workram(*this, "wram"), m_palred(*this, "redpal"), m_palgreen(*this, "greenpal"), m_palblue(*this, "bluepal"), m_dmalist(*this, "dmalist"), - m_cram(*this, "cram") + m_cram(*this, "cram"), + m_gfxdecode(*this, "gfxdecode") { } // devices required_device m_maincpu; required_device m_screen; required_device m_palette; + required_shared_ptr m_workram; required_shared_ptr m_palred; required_shared_ptr m_palgreen; required_shared_ptr m_palblue; required_shared_ptr m_dmalist; required_shared_ptr m_cram; - + required_device m_gfxdecode; + DECLARE_READ8_MEMBER(vic4567_dummy_r); DECLARE_WRITE8_MEMBER(vic4567_dummy_w); DECLARE_WRITE8_MEMBER(PalRed_w); @@ -84,6 +88,18 @@ void c65_state::video_start() UINT32 c65_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) { + int y,x; + gfx_element *gfx = m_gfxdecode->gfx(0); + + for(y=0;y<30;y++) + { + for(x=0;x<40;x++) + { + UINT8 tile = m_workram[x+y*40+0x800]; + gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8); + } + } + return 0; } @@ -264,11 +280,11 @@ WRITE8_MEMBER(c65_state::CIASelect_w) READ8_MEMBER(c65_state::dummy_r) { - return 0xff; + return 0; } static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) - AM_RANGE(0x00000, 0x07fff) AM_RAM // TODO: bank + AM_RANGE(0x00000, 0x07fff) AM_RAM AM_SHARE("wram") // TODO: bank AM_RANGE(0x0c800, 0x0cfff) AM_ROM AM_REGION("maincpu", 0xc800) AM_RANGE(0x0d000, 0x0d07f) AM_READWRITE(vic4567_dummy_r,vic4567_dummy_w) // 0x0d000, 0x0d07f VIC-4567 AM_RANGE(0x0d080, 0x0d081) AM_READ(dummy_r) // 0x0d080, 0x0d09f FDC @@ -289,7 +305,7 @@ static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state ) // 0x0df00, 0x0df** Ext I/O Select 2 (RAM window?) AM_RANGE(0x0e000, 0x0ffff) AM_ROM AM_REGION("maincpu",0x0e000) AM_RANGE(0x10000, 0x1f7ff) AM_RAM - AM_RANGE(0x1f800, 0x1ffff) AM_RAM // VRAM + AM_RANGE(0x1f800, 0x1ffff) AM_RAM // VRAM attributes AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("maincpu",0) ADDRESS_MAP_END -- cgit v1.2.3