|
From: <bla...@us...> - 2008-07-30 08:58:08
|
Revision: 19085
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19085&view=rev
Author: blackystardust
Date: 2008-07-30 08:58:13 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Updated the OS/2 UI and watcom project files for x64dtv.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128c64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/config.h
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/monitor.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vice.wpj
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/vicii.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x128.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/xcbm2.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/Makefile.am
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c
Added Paths:
-----------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64common.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c64dtvc64.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciicommon.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/viciidtv.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-dlg-fileio.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-dragndrrop.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-main.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-menubar.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-specific.tgt
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-video.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv-vsyncarch.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/x64dtv.tgt
Removed Paths:
-------------
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-mmc64.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-patchrom.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-ramcart.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-reu.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-tfe.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/Makefile.am 2008-07-30 08:58:13 UTC (rev 19085)
@@ -104,34 +104,13 @@
fonts/vice2.def \
fonts/vice2.rc \
watcom/archdep.tgt \
- watcom/c128-c64-snapshot.c \
- watcom/c128-c64acia1.c \
- watcom/c128-c64bus.c \
- watcom/c128-c64cia2.c \
- watcom/c128-c64datasette.c \
- watcom/c128-c64export.c \
- watcom/c128-c64iec.c \
- watcom/c128-c64io.c \
- watcom/c128-c64keyboard.c \
- watcom/c128-c64meminit.c \
- watcom/c128-c64memrom.c \
- watcom/c128-c64parallel.c \
- watcom/c128-c64pla.c \
- watcom/c128-c64printer.c \
- watcom/c128-c64rsuser.c \
- watcom/c128-c64sound.c \
- watcom/c128-c64tpi.c \
- watcom/c128-digimax.c \
- watcom/c128-georam.c \
- watcom/c128-mmc64.c \
- watcom/c128-patchrom.c \
- watcom/c128-ramcart.c \
- watcom/c128-reu.c \
- watcom/c128-tfe.c \
watcom/c128.tgt \
watcom/c128c64.tgt \
watcom/c64.tgt \
watcom/c64cart.tgt \
+ watcom/c64common.tgt \
+ watcom/c64dtv.tgt \
+ watcom/c64dtvc64.tgt \
watcom/cartconv.tgt \
watcom/cbm2.tgt \
watcom/config.h \
@@ -190,6 +169,8 @@
watcom/vic20.tgt \
watcom/vice.wpj \
watcom/vicii.tgt \
+ watcom/viciicommon.tgt \
+ watcom/viciidtv.tgt \
watcom/video.tgt \
watcom/vsid.tgt \
watcom/x128-dlg-fileio.c \
@@ -204,6 +185,14 @@
watcom/x1541.tgt \
watcom/x64-specific.tgt \
watcom/x64.tgt \
+ watcom/x64dtv-dlg-fileio.c \
+ watcom/x64dtv-dragndrrop.c \
+ watcom/x64dtv-main.c \
+ watcom/x64dtv-menubar.c \
+ watcom/x64dtv-specific.tgt \
+ watcom/x64dtv-video.c \
+ watcom/x64dtv-vsyncarch.c \
+ watcom/x64dtv.tgt \
watcom/x64x128-sid.c \
watcom/x64x128-specific.tgt \
watcom/xall-specific.tgt \
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dialogs.rc 2008-07-30 08:58:13 UTC (rev 19085)
@@ -44,7 +44,7 @@
ICON PTR_NOTE "..\\..\\icons\\note.ico"
#endif
-#ifdef __X64__
+#if defined __X64__ || defined __X64DTV__
#ifdef WATCOM_COMPILE
ICON IDM_VICE2 "..\\icons\\x64.ico"
ICON DLG_VSID "..\\icons\\vsid.ico"
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1241,3 +1241,38 @@
strcpy(path, dat);
}
+char *ViceFileSelect(HWND hwnd, int save)
+{
+ FILEDLG filedlg;
+ ULONG rc;
+
+ //
+ // Setup 'MUST' values
+ //
+ memset(&filedlg, 0, sizeof(FILEDLG)); // Initially set all fields to 0
+ filedlg.cbSize = sizeof(FILEDLG);
+
+ filedlg.fl = FDS_CENTER | FDS_CUSTOM | (save == 1) ? FDS_SAVEAS_DIALOG : FDS_OPEN_DIALOG;
+ filedlg.usDlgId = 0;
+ filedlg.pfnDlgProc = (PFNWP)NULL;
+ filedlg.pszTitle = (save == 1) ? "Save as" : "Open File";
+ filedlg.pszOKButton = (save == 1) ? "Save" : "Apply";
+ filedlg.pszIDrive = "c:";
+ filedlg.ulUser = 0L;
+
+ //
+ // let the file dialog do it's work
+ //
+ rc=WinFileDlg(HWND_DESKTOP, hwnd, &filedlg);
+
+ //
+ // if error or not 'Attach' button
+ //
+ if (!rc || filedlg.lReturn!=DID_OK)
+ return NULL;
+
+ //
+ // if the result was ok return the path
+ //
+ return lib_stralloc(filedlg.szFullFile[0]);
+}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/dragndrop.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -35,7 +35,7 @@
#include "machine.h" // vsid_mode
#include "resources.h"
#include "autostart.h" // autostart_autodetect
-#ifdef __X64__
+#if defined __X64__
#include "psid.h" // psid_init_driver
#endif
@@ -94,13 +94,13 @@
strcat(dir, nam);
-#ifdef __X64__
+#if defined __X64__
if (!vsid_mode)
{
#endif
if (autostart_autodetect(dir, NULL, 0, AUTOSTART_MODE_RUN) >= 0)
return NULL;
-#ifdef __X64__
+#if defined __X64__
}
else
{
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -119,7 +119,7 @@
#endif
#endif
/*
-#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __XPLUS4__
+#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __XPLUS4__ || defined __X64DTV__
static const char *VIDEO_CACHE="ViciiVideoCache";
#else // __XPET__ || __XCBM__
static const char *VIDEO_CACHE="CrtcVideoCache";
@@ -490,7 +490,7 @@
return;
#endif
-#if defined __X64__ || defined __X128__ || defined __XVIC__
+#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __X64DTV__
case IDM_PAL:
resources_set_int("MachineVideoStandard",
MACHINE_SYNC_PAL);
@@ -507,7 +507,7 @@
#endif // __X64__
#endif // __X64__ || __X128__ || __XVIC__
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X128__ || defined __X64DTV__
/*
case IDM_KERNALREV0:
resources_set_string("KernalRev", "0");
@@ -568,6 +568,10 @@
resources_set_int("REUSize", (idm&0xff)<<7);
return;
+ case IDM_REUFILE:
+ resources_set_string("REUfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_GEORAM64:
case IDM_GEORAM128:
case IDM_GEORAM256:
@@ -578,11 +582,19 @@
resources_set_int("GEORAMSize", (idm&0xff)<<6);
return;
+ case IDM_GEORAMFILE:
+ resources_set_string("GEORAMfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_RAMCART64:
case IDM_RAMCART128:
resources_set_int("RAMCARTSize", (idm&0xf)<<6);
return;
+ case IDM_RAMCARTFILE:
+ resources_set_string("RAMCARTfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_DIGIMAXDD00:
resources_set_int("DIGIMAXbase", 0xdd00);
return;
@@ -613,15 +625,54 @@
case IDM_PLUS60KD100:
resources_set_int("PLUS60Kbase", 0xd100);
return;
+
+ case IDM_PLUS60KFILE:
+ resources_set_string("PLUS60Kfilename", ViceFileSelect(hwnd, 1));
+ return;
+
+ case IDM_PLUS256KFILE:
+ resources_set_string("PLUS256Kfilename", ViceFileSelect(hwnd, 1));
+ return;
+
case IDM_C64_256K_BASEDE00:
case IDM_C64_256K_BASEDE80:
case IDM_C64_256K_BASEDF00:
case IDM_C64_256K_BASEDF80:
resources_set_int("C64_256Kbase", ((idm&3)*80)+0xde00);
return;
+
+ case IDM_C64_256KFILE:
+ resources_set_string("C64_256Kfilename", ViceFileSelect(hwnd, 1));
+ return;
#endif
#endif // __X64__ || __X128__
+#ifdef __X64DTV__
+ case IDM_C64DTV_FLASHROM_ATTACH:
+ resources_set_string("c64dtvromfilename", ViceFileSelect(hwnd, 0));
+ return;
+ case IDM_C64DTV_FLASHROM_DETACH:
+ resources_set_string("c64dtvromfilename", "");
+ return;
+ case IDM_C64DTV_FLASHROM_RW:
+ toggle("c64dtvromrw");
+ return;
+ case IDM_DTV2:
+ resources_set_int("DtvRevision", 2);
+ return;
+ case IDM_DTV3:
+ resources_set_int("DtvRevision", 3);
+ return;
+ case IDM_C64DTV_HUMMER_JOY:
+ toggle("HummerUserportJoy");
+ return;
+ case IDM_HUMMER_JOY1:
+ resources_set_int("HummerUserportJoyPort", 1);
+ return;
+ case IDM_HUMMER_JOY2:
+ resources_set_int("HummerUserportJoyPort", 2);
+ return;
+#endif
#ifdef __XPET__
case IDM_PETREU:
toggle("PETREU");
@@ -639,6 +690,10 @@
case IDM_PETREU2048:
resources_set_int("PETREUSize", 2048);
return;
+
+ case IDM_PETREUFILE:
+ resources_set_string("PETREUfilename", ViceFileSelect(hwnd, 1));
+ return;
#endif
#ifdef HAVE_MOUSE
case IDM_MOUSE:
@@ -1169,7 +1224,7 @@
case IDM_VIEW:
WinEnableMenuItem(hwnd, IDM_LOGWIN, hwndLog !=NULLHANDLE);
WinEnableMenuItem(hwnd, IDM_MONITOR, hwndMonitor!=NULLHANDLE);
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X128__ || defined __X64DTV__
resources_get_int(EXTERNAL_PALETTE, &val);
WinEnableMenuItem(hwnd, IDM_COLOR, !val);
#endif
@@ -1183,7 +1238,7 @@
#endif
return;
-#if defined __X64__ || defined __X128__ || defined __XVIC__
+#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __X64DTV__
/*
//
// A change online is not possible yet.
@@ -1272,12 +1327,15 @@
resources_get_int("REU", &val);
WinCheckMenuItem(hwnd, IDM_REU, val);
WinEnableMenuItem(hwnd, IDM_REUSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_REUFILE, val);
resources_get_int("GEORAM", &val);
WinCheckMenuItem(hwnd, IDM_GEORAM, val);
WinEnableMenuItem(hwnd, IDM_GEORAMSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_GEORAMFILE, val);
resources_get_int("RAMCART", &val);
WinCheckMenuItem(hwnd, IDM_RAMCART, val);
WinEnableMenuItem(hwnd, IDM_RAMCARTSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_RAMCARTFILE, val);
resources_get_int("DIGIMAX", &val);
WinCheckMenuItem(hwnd, IDM_DIGIMAX, val);
WinEnableMenuItem(hwnd, IDM_DIGIMAXBASE, val);
@@ -1286,16 +1344,26 @@
resources_get_int("PLUS60K", &val);
WinCheckMenuItem(hwnd, IDM_PLUS60K, val);
WinEnableMenuItem(hwnd, IDM_PLUS60KBASE, val);
+ WinEnableMenuItem(hwnd, IDM_PLUS60KFILE, val);
resources_get_int("PLUS256K", &val);
WinCheckMenuItem(hwnd, IDM_PLUS256K, val);
+ WinEnableMenuItem(hwnd, IDM_PLUS256KFILE, val);
resources_get_int("C64_256K", &val);
WinCheckMenuItem(hwnd, IDM_C64_256K, val);
WinEnableMenuItem(hwnd, IDM_C64_256K_BASE, val);
+ WinEnableMenuItem(hwnd, IDM_C64_256KFILE, val);
#endif
+#ifdef __X64DTV__
+ resources_get_int("c64dtvromrw", &val);
+ WinCheckMenuItem(hwnd, IDM_C64DTV_FLASHROM_RW, val);
+ resources_get_int("HummerUserportJoy", &val);
+ WinCheckMenuItem(hwnd, IDM_C64DTV_HUMMER_JOY, val);
+#endif
#ifdef __XPET__
resources_get_int("REU", &val);
- WinCheckMenuItem(hwnd, IDM_REU, val);
- WinEnableMenuItem(hwnd, IDM_REUSIZE, val);
+ WinCheckMenuItem(hwnd, IDM_PETREU, val);
+ WinEnableMenuItem(hwnd, IDM_PETREUSIZE, val);
+ WinEnableMenuItem(hwnd, IDM_PETREUFILE, val);
WinCheckRes(hwnd, IDM_CHARSET, "Basic1Chars");
WinCheckRes(hwnd, IDM_EOI, "EoiBlank");
WinCheckRes(hwnd, IDM_ROMPATCH, "Basic1");
@@ -1359,6 +1427,19 @@
return;
#endif
+#ifdef __X64DTV__
+ case IDM_C64DTV_REVISION:
+ resources_get_int("DtvRevision", &val);
+ WinCheckMenuItem(hwnd, IDM_DTV2, val==2);
+ WinCheckMenuItem(hwnd, IDM_DTV3, val==3);
+ return;
+ case IDM_C64DTV_HUMMER_MAPPED_JOY:
+ resources_get_int("HummerUserportJoyPort", &val);
+ WinCheckMenuItem(hwnd, IDM_HUMMER_JOY1, val==1);
+ WinCheckMenuItem(hwnd, IDM_HUMMER_JOY2, val==2);
+ return;
+#endif
+
#if defined __X64__ || defined __X128__
case IDM_REUSIZE:
resources_get_int("REUSize", &val);
@@ -1497,7 +1578,7 @@
}
return;
#endif // HAVE_RESID
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
case IDM_SIDCHIP:
resources_get_int("SidModel", &val);
WinCheckMenuItem(hwnd, IDM_SC6581, val==0);
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.h 2008-07-30 08:58:13 UTC (rev 19085)
@@ -110,6 +110,17 @@
#define IDM_NTSC 0x147
#define IDM_NTSCOLD 0x148
+#define IDM_C64DTV_FLASHROM_ATTACH 0x1a4
+#define IDM_C64DTV_FLASHROM_DETACH 0x1a5
+#define IDM_C64DTV_FLASHROM_RW 0x1a6
+#define IDM_C64DTV_REVISION 0x1a7
+#define IDM_DTV2 0x1a8
+#define IDM_DTV3 0x1a9
+#define IDM_C64DTV_HUMMER_JOY 0x1aa
+#define IDM_C64DTV_HUMMER_MAPPED_JOY 0x1ab
+#define IDM_HUMMER_JOY1 0x1ac
+#define IDM_HUMMER_JOY2 0x1ad
+
#define IDM_REU 0x149
#define IDM_REUSIZE 0x150
#define IDM_REU128 0x601
@@ -120,6 +131,7 @@
#define IDM_REU4096 0x620
#define IDM_REU8192 0x640
#define IDM_REU16384 0x680
+#define IDM_REUFILE 0x14a
#define IDM_GEORAM 0x16b
#define IDM_GEORAMSIZE 0x16c
@@ -130,11 +142,13 @@
#define IDM_GEORAM1024 0x910
#define IDM_GEORAM2048 0x920
#define IDM_GEORAM4096 0x940
+#define IDM_GEORAMFILE 0x14b
#define IDM_RAMCART 0x16e
#define IDM_RAMCARTSIZE 0x16f
#define IDM_RAMCART64 0x941
#define IDM_RAMCART128 0x942
+#define IDM_RAMCARTFILE 0x14c
#define IDM_DIGIMAX 0x1a1
#define IDM_DIGIMAXBASE 0x1a2
@@ -160,8 +174,10 @@
#define IDM_PLUS60KBASE 0x17d
#define IDM_PLUS60KD040 0x17e
#define IDM_PLUS60KD100 0x17f
+#define IDM_PLUS60KFILE 0x14d
#define IDM_PLUS256K 0x18b
+#define IDM_PLUS256KFILE 0x14e
#define IDM_C64_256K 0x16d
#define IDM_C64_256K_BASE 0x16e
@@ -169,6 +185,7 @@
#define IDM_C64_256K_BASEDE80 0x18d
#define IDM_C64_256K_BASEDF00 0x18e
#define IDM_C64_256K_BASEDF80 0x18f
+#define IDM_C64_256KFILE 0x14f
#define IDM_PETREU 0x19b
#define IDM_PETREUSIZE 0x19c
@@ -176,6 +193,7 @@
#define IDM_PETREU512 0x19e
#define IDM_PETREU1024 0x19f
#define IDM_PETREU2048 0x1a0
+#define IDM_PETREUFILE 0x159
#define IDM_TFE 0x158
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/dialogs/menubar.rc 2008-07-30 08:58:13 UTC (rev 19085)
@@ -76,8 +76,10 @@
MENUITEM "~Cartridge", IDM_CARTRIDGEDET, MIS_TEXT
MENUITEM SEPARATOR
#endif
+#if !defined __X64DTV__
MENUITEM "~Tape", IDM_DETACHTAPE, MIS_TEXT
MENUITEM SEPARATOR
+#endif
MENUITEM "Disk ~8", IDM_DETACH8, MIS_TEXT
MENUITEM "Disk ~9", IDM_DETACH9, MIS_TEXT
MENUITEM "Disk 1~0", IDM_DETACH10, MIS_TEXT
@@ -85,6 +87,22 @@
MENUITEM SEPARATOR
MENUITEM "~All Disks", IDM_DETACHALL, MIS_TEXT
END
+#if defined __X64DTV__
+ MENUITEM "~Attach DTV flash ROM image", IDM_C64DTV_FLASHROM_ATTACH, MIS_TEXT
+ MENUITEM "~Detach DTV flash ROM image", IDM_C64DTV_FLASHROM_DETACH, MIS_TEXT
+ MENUITEM "DTV flash ROM image write enabled", IDM_C64DTV_FLASHROM_RW, MIS_TEXT
+ SUBMENU "DTV revision", IDM_C64DTV_REVISION, MIS_TEXT
+ BEGIN
+ MENUITEM "DTV~2", IDM_DTV2, MIS_TEXT
+ MENUITEM "DTV~3", IDM_DTV3, MIS_TEXT
+ END
+ MENUITEM "Enable Hummer userport joystick", IDM_C64DTV_HUMMER_JOY, MIS_TEXT
+ SUBMENU "Joyport mapped to userport", IDM_C64DTV_HUMMER_MAPPED_JOY, MIS_TEXT
+ BEGIN
+ MENUITEM "Joy~1", IDM_HUMMER_JOY1, MIS_TEXT
+ MENUITEM "Joy~2", IDM_HUMMER_JOY2, MIS_TEXT
+ END
+#endif
SUBMENU "~Fliplist", IDM_FLIPLIST, MIS_TEXT
BEGIN
MENUITEM "Drive #8 ~Next\tAlt-F", IDM_FLIPNEXT8, MIS_TEXT
@@ -129,7 +147,9 @@
MENUITEM "~Video Color Settings\tAlt-I", IDM_COLOR, MIS_TEXT
#endif
MENUITEM "~Joystick Setup\tAlt-J", IDM_JOYSTICK, MIS_TEXT
+#if !defined __X64DTV__
MENUITEM "Datasette ~Control\tAlt-C", IDM_DATASETTE, MIS_TEXT
+#endif
MENUITEM "~Logging Window\tAlt-L", IDM_LOGWIN, MIS_TEXT
MENUITEM "Buildin ~Monitor\tAlt-M", IDM_MONITOR, MIS_TEXT
END
@@ -196,7 +216,7 @@
MENUITEM "~64kB", IDM_VDC64K, MIS_TEXT
END
#endif
-#if defined __X64__ || defined __X128__ || defined __XVIC__
+#if defined __X64__ || defined __X64DTV__ || defined __X128__ || defined __XVIC__
SUBMENU "~Video Frequency Standard", IDM_VIDEOSTD, MIS_TEXT
BEGIN
MENUITEM "~PAL-G", IDM_PAL, MIS_TEXT
@@ -206,7 +226,7 @@
#endif // __X64__
END
#endif
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X64DTV__ || defined __X128__
SUBMENU "Sprite Collision ~Detection", IDM_COLLISION, MIS_TEXT
BEGIN
MENUITEM "Sprite-~Sprite", IDM_SSCOLL, MIS_TEXT
@@ -392,6 +412,7 @@
MENUITEM "1~024kB", IDM_PETREU1024, MIS_TEXT
MENUITEM "~2048kB", IDM_PETREU2048, MIS_TEXT
END
+ MENUITEM "PET REU Filename", IDM_PETREUFILE, MIS_TEXT
#endif
#if defined __X64__ || defined __X128__
#ifdef HAVE_TFE
@@ -409,6 +430,7 @@
MENUITEM "81~92kB", IDM_REU8192, MIS_TEXT
MENUITEM "16~384kB", IDM_REU16384, MIS_TEXT
END
+ MENUITEM "REU Filename", IDM_REUFILE, MIS_TEXT
MENUITEM "G~EORAM - Memory Extension", IDM_GEORAM, MIS_TEXT
SUBMENU "GEORAM Memory ~Size", IDM_GEORAMSIZE, MIS_TEXT
BEGIN
@@ -420,12 +442,14 @@
MENUITEM "204~8kB", IDM_GEORAM2048, MIS_TEXT
MENUITEM "409~6kB", IDM_GEORAM4096, MIS_TEXT
END
+ MENUITEM "GEORAM Filename", IDM_GEORAMFILE, MIS_TEXT
MENUITEM "R~AMCART - Memory Expansion", IDM_RAMCART, MIS_TEXT
SUBMENU "RAMCART Memory ~Size", IDM_RAMCARTSIZE, MIS_TEXT
BEGIN
MENUITEM "~64kB", IDM_RAMCART64, MIS_TEXT
MENUITEM "~128kB", IDM_RAMCART128, MIS_TEXT
END
+ MENUITEM "RAMCART Filename", IDM_RAMCARTFILE, MIS_TEXT
MENUITEM "~DIGIMAX - Cartridge", IDM_DIGIMAX, MIS_TEXT
SUBMENU "DIGIMAX ~Base", IDM_DIGIMAXBASE, MIS_TEXT
BEGIN
@@ -455,7 +479,9 @@
MENUITEM "$~D040", IDM_PLUS60KD040, MIS_TEXT
MENUITEM "$D~100", IDM_PLUS60KD100, MIS_TEXT
END
+ MENUITEM "PLUS60K Filename", IDM_PLUS60KFILE, MIS_TEXT
MENUITEM "PLUS2~56K - Memory Expansion", IDM_PLUS60K, MIS_TEXT
+ MENUITEM "PLUS256K Filename", IDM_PLUS256KFILE, MIS_TEXT
MENUITEM "~256K - Memory Expansion", IDM_C64_256K, MIS_TEXT
SUBMENU "256K ~Base", IDM_C64_256K_BASE, MIS_TEXT
BEGIN
@@ -464,6 +490,7 @@
MENUITEM "$DF~00-$DF7F", IDM_C64_256K_BASEDF00, MIS_TEXT
MENUITEM "$D~F80-$DFFF", IDM_C64_256K_BASEDF80, MIS_TEXT
END
+ MENUITEM "256K Filename", IDM_C64_256KFILE, MIS_TEXT
#endif
#ifdef __X128__
SUBMENU "Machine Type", IDM_C128TYPE, MIS_TEXT
@@ -503,7 +530,7 @@
MENUITEM "~10%", IDM_VOL10, MIS_TEXT
END
MENUITEM SEPARATOR
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
SUBMENU "SID ~Chip", IDM_SIDCHIP, MIS_TEXT
BEGIN
MENUITEM "~6581", IDM_SC6581, MIS_TEXT
@@ -619,7 +646,7 @@
"C", IDM_DATASETTE, ALT, SHIFT
"d", IDM_DRIVE, ALT
"D", IDM_DRIVE, ALT, SHIFT
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
"i", IDM_COLOR, ALT
"I", IDM_COLOR, ALT, SHIFT
#endif
Added: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c (rev 0)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/kbd/kbd-c64dtv.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -0,0 +1,192 @@
+/*
+ * c64dtvkbd.c -- C64DTV keyboard for MS-DOS.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include "kbd.h"
+
+int c64_kbd_init(void)
+{
+// kbd_set_freeze_function(cartridge_trigger_freeze);
+ return kbd_init();
+}
+
+// ------------------ for further use ---------------------
+
+/*
+char *arr2sym(int col, int row, int vshift)
+{
+ keymap_t *k = keymap;
+
+ while (((k->key.col != col) || (k->key.row != row) ||
+ (k->key.vshift != vshift)) && k)
+ k++;
+
+ return k->sym;
+}
+
+keyconv *sym2arr(const char *c)
+{
+ keymap_t *k = keymap;
+
+ while (strcmp(c, k->sym) && k)
+ k++;
+
+ return &k->key;
+}
+
+
+struct _keymap
+{
+ char sym[10];
+ keyconv key;
+} keymap_t;
+
+// unshifted
+const char kbdlayout1[8][8][8] = {
+// col 0 1 2 3 4 5 6 7 // row
+ {"Del", "3", "5", "7", "9", "+", "Pound", "1"}, // 0
+ {"Return", "w", "r", "y", "i", "p", "*", "ArrowLt"}, // 1
+ {"CrsrRt", "a" "d", "g", "j", "l", ";", "Ctrl"}, // 2
+ {"F7", "4", "6", "8", "0", "-", "Home", "2"}, // 3
+ {"F1", "z", "c", "b", "m", ".", "RtShift", "Space"}, // 4
+ {"F3", "s", "f", "h", "k", ":", "=", "CBM"}, // 5
+ {"F5", "e", "t", "u", "o", "@", "ArrowUp", "q"}, // 6
+ {"CrsrDn", "", "x", "v", "n", ",", "/", "Stop"} // 7
+}
+
+// shifted
+const char kbdlayout2[8][8][8] = {
+// col 0 1 2 3 4 5 6 7 // row
+ {"Ins", "#", "%%", "'", ")", "+", "Pound", "!"}, // 0
+ {"Return", "W", "R", "Y", "I", "P", "*", "ArrowLt"}, // 1
+ {"CrsrLt", "A" "D", "G", "J", "L", ";", "Ctrl"}, // 2
+ {"F8", "$", "&", "(", "0", "-", "Home", "\""}, // 3
+ {"F2", "Z", "C", "B", "M", ".", "RtShift", "Space"}, // 4
+ {"F4", "S", "F", "H", "K", ":", "=", "CBM"}, // 5
+ {"F6", "E", "T", "U", "O", "@", "ArrowUp", "Q"}, // 6
+ {"CrsrUp", "", "X", "V", "N", ",", "/", "Stop"} // 7
+}
+
+const keymap_t keymap[] = {
+
+ // --- Unshifted ---
+
+ {"NoKey", {-1, -1, 0}},
+ {"Stop", {7, 7, 0}},
+ {"1", {7, 0, 0}},
+ {"2", {7, 3, 0}},
+ {"3", {1, 0, 0}},
+ {"4", {1, 3, 0}},
+ {"5", {2, 0, 0}},
+ {"6", {2, 3, 0}},
+ {"7", {3, 0, 0}},
+ {"8", {3, 3, 0}},
+ {"9", {4, 0, 0}},
+ {"0", {4, 3, 0}},
+ {"+", {5, 0, 0}},
+ {"-", {5, 3, 0}},
+ {"Del", {0, 0, 0}},
+ {"Ctrl", {7, 2, 0}},
+ {"Q", {7, 6, 0}},
+ {"W", {1, 1, 0}},
+ {"E", {1, 6, 0}},
+ {"R", {2, 1, 0}},
+ {"T", {2, 6, 0}},
+ {"Y", {3, 1, 0}},
+ {"U", {3, 6, 0}},
+ {"I", {4, 1, 0}},
+ {"O", {4, 6, 0}},
+ {"P", {5, 1, 0}},
+ {"@", {5, 6, 0}},
+ {"*", {6, 1, 0}},
+ {"Return", {0, 1, 0}},
+ {"CBM", {7, 5, 0}},
+ {"A", {1, 2, 0}},
+ {"S", {1, 5, 0}},
+ {"D", {2, 2, 0}},
+ {"F", {2, 5, 0}},
+ {"G", {3, 2, 0}},
+ {"H", {3, 5, 0}},
+ {"J", {4, 2, 0}},
+ {"K", {4, 5, 0}},
+ {"L", {5, 2, 0}},
+ {":", {5, 5, 0}},
+ {";", {6, 2, 0}},
+ {"ArrowLt", {7, 1, 0}},
+ {"=", {6, 5, 0}},
+ {"Z", {1, 4, 0}},
+ {"X", {2, 7, 0}},
+ {"C", {2, 4, 0}},
+ {"V", {3, 7, 0}},
+ {"B", {3, 4, 0}},
+ {"N", {4, 7, 0}},
+ {"M", {4, 4, 0}},
+ {",", {5, 7, 0}},
+ {".", {5, 4, 0}},
+ {"/", {6, 7, 0}},
+ {"RtShift", {6, 4, 0}},
+ {"Space", {7, 4, 0}},
+ {"F1", {0, 4, 0}},
+ {"F3", {0, 5, 0}},
+ {"F5", {0, 6, 0}},
+ {"F7", {0, 3, 0}},
+ {"Home", {6, 3, 0}},
+ {"CrsrRt", {0, 2, 0}},
+ {"CrsrDn", {0, 7, 0}},
+ {"Pound", {6, 0, 0}},
+ {"ArrowUp", {6, 6, 0}},
+
+ // --- Shifted ---
+
+ {"Run", {7, 7, 1}},
+ {"!", {7, 0, 1}},
+ {"\"", {7, 3, 1}},
+ {"#", {1, 0, 1}},
+ {"$", {1, 3, 1}},
+ {"%%", {2, 0, 1}},
+ {"&", {2, 3, 1}},
+ {"'", {3, 0, 1}},
+ {"(", {3, 3, 1}},
+ {")", {4, 0, 1}},
+ {"[", {5, 5, 1}},
+ {"]", {6, 2, 1}},
+ {"<", {5, 7, 1}},
+ {">", {5, 4, 1}},
+ {"?", {6, 7, 1}},
+ {"F2", {0, 4, 1}},
+ {"F4", {0, 5, 1}},
+ {"F6", {0, 6, 1}},
+ {"F8", {0, 3, 1}},
+ {"Pi", {6, 6, 1}},
+ {"Clr", {6, 3, 1}},
+ {"CrsrUp", {0, 7, 1}},
+ {"CrsrLt", {0, 2, 1}},
+ {"LtShift", {1, 7, 1}},
+ {"Ins", {0, 0, 1}},
+ {NULL, {-1, -1, 0}}
+}
+*/
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/ui.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -116,6 +116,11 @@
return 0;
}
+int c64dtvui_init(void)
+{
+ return 0;
+}
+
int c128ui_init(void)
{
return 0;
@@ -155,6 +160,10 @@
{
}
+void c64dtvui_shutdown(void)
+{
+}
+
void c128ui_shutdown(void)
{
}
@@ -335,6 +344,21 @@
lib_free(txt);
}
+void ui_message(const char *format,...)
+{
+ char *txt, *tmp;
+
+ va_list ap;
+ va_start(ap, format);
+ tmp = lib_mvsprintf(format, ap);
+ txt = util_concat(" Message from emulation thread:\n ", tmp, NULL);
+ lib_free(tmp);
+
+ ViceErrorDlg(HWND_DESKTOP, PTR_SKULL, txt);
+
+ lib_free(txt);
+}
+
ui_jam_action_t ui_jam_dialog(const char *format,...)
{
ULONG rc;
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vac++/config.h 2008-07-30 08:58:13 UTC (rev 19085)
@@ -71,12 +71,12 @@
//#define HAVE_RS232 1
/* Do we want to enable the ReSID code support? */
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
#define HAVE_RESID 1
#endif
/* Do we support a 1351 mouse? */
-#if defined __X64__ || defined __X128__
+#if defined __X64__ || defined __X128__ || defined __X64DTV__
#define HAVE_MOUSE 1
#endif
@@ -84,7 +84,7 @@
#define HAS_JOYSTICK 1
/* VIC II Doublesize/-scan */
-#if defined __X64__ || defined __X128__ || defined __XCBM__
+#if defined __X64__ || defined __X128__ || defined __XCBM__ || defined __X64DTV__
#define HAVE_VIC_II 1
#endif
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/vsyncarch.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -155,11 +155,11 @@
//
// FIXME !!!
//
-#ifdef __X64__
+#if defined __X64__
if (!vsid_mode)
#endif
CanvasDisplaySpeed(speed+0.5, frame_rate+1, warp_enabled);
-#ifdef __X64__
+#if defined __X64__
else
WinSendMsg(hwndVsid, WM_DISPLAY,
(void*)(int)(speed+0.5), (void*)(int)(frame_rate+0.5));
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64-snapshot.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64-snapshot.c - Watcom c64-snapshot.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64-snapshot.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64acia1.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64acia1.c - Watcom c64acia1.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64acia1.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64bus.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64bus.c - Watcom c64bus.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64bus.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64cia2.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64cia2.c - Watcom c64cia2.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64cia2.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64datasette.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64datasette.c - Watcom c64datasette.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64datasette.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64export.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64export.c - Watcom c64export.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64export.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64iec.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64iec.c - Watcom c64iec.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64iec.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64io.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64io.c - Watcom c64io.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64io.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64keyboard.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64keyboard.c - Watcom c64keyboard.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64keyboard.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64meminit.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64meminit.c - Watcom c64meminit.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64meminit.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64memrom.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64memrom.c - Watcom c64memrom.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64memrom.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64parallel.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64parallel.c - Watcom c64parallel.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64parallel.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64pla.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64pla.c - Watcom c64pla.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64pla.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64printer.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64printer.c - Watcom c64printer.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64printer.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64rsuser.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64rsuser.c - Watcom c64rsuser.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64rsuser.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64sound.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64sound.c - Watcom c64sound.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64sound.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-c64tpi.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-c64tpi.c - Watcom c64tpi.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "c64tpi.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-digimax.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-digimax.c - Watcom digimax.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "digimax.c"
Deleted: branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c 2008-07-27 16:42:35 UTC (rev 19084)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/os2/watcom/c128-georam.c 2008-07-30 08:58:13 UTC (rev 19085)
@@ -1,27 +0,0 @@
-/*
- * c128-georam.c - Watcom georam.c for c128c64lib wrapper.
- *
- * Written by
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part ...
[truncated message content] |