emulators: Remove arnold.

Failing to build, non-redistributable, and no updates since 2004.

Try caprice32 instead.

12 files changed, 1 insertions, 495 deletions

diff --git a/emulators/Makefile b/emulators/Makefile
index e8c958e659c..5a9bcb6de2e 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.313 2020/03/06 12:23:01 nia Exp $
+# $NetBSD: Makefile,v 1.314 2020/03/06 12:24:26 nia Exp $
 #
 
 COMMENT=	Emulators for other operating systems
@@ -17,7 +17,6 @@ SUBDIR+=	aliados
 SUBDIR+=	applyppf
 SUBDIR+=	aranym
 SUBDIR+=	arcem
-SUBDIR+=	arnold
 SUBDIR+=	atari800
 SUBDIR+=	b-em
 SUBDIR+=	blastem
diff --git a/emulators/arnold/DESCR b/emulators/arnold/DESCR
deleted file mode 100644
index 69e5c27d493..00000000000
--- a/emulators/arnold/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Arnold is an Amstrad CPC, Amstrad CPC+ and KC Compact emulator.
-Arnold is accurate and emulates the Amstrad systems to the cycle
-level. It also emulates 99% of all demo effects.
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
deleted file mode 100644
index c138a8f667f..00000000000
--- a/emulators/arnold/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2019/07/06 09:48:43 nia Exp $
-#
-
-DISTNAME=		arnsrc04012004
-PKGNAME=		arnold-20040111
-CATEGORIES=		emulators
-MASTER_SITES=		http://arnold.emuunlim.com/download/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://arnold.emuunlim.com/
-COMMENT=		Amstrad CPC, Amstrad CPC+ and KC Compact emulator
-
-RESTRICTED=		ROM image copyright is questionable.
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-WRKSRC=			${WRKDIR}/arnold
-GNU_CONFIGURE=		yes
-CONFIGURE_DIRS=		src
-BUILD_DIRS=		${CONFIGURE_DIRS}
-BUILD_TARGET=		arnold
-MAKE_FLAGS+=		LFLAGS2=#none, especially not -s
-
-SHAREDIR=		${PREFIX}/share/arnold
-MAKE_ENV+=		SHAREDIR=${SHAREDIR}
-AUTO_MKDIRS=		yes
-
-USE_TOOLS+=		gmake pax
-
-post-extract:
-	cd ${WRKSRC} && ${FIND} . -type d -name CVS -print | ${XARGS} ${RM} -rf
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/arnold ${DESTDIR}${PREFIX}/bin
-	cd ${WRKSRC}/src/roms && pax -wr * ${DESTDIR}${SHAREDIR}/roms/
-	cd ${DESTDIR}${SHAREDIR}/roms && \
-		${FIND} . -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} && \
-		${FIND} . -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	cd ${WRKSRC} && ${INSTALL_DATA} readme.* \
-		${DESTDIR}${PREFIX}/share/doc/arnold
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+=	--x-includes=${PREFIX}/include
-CONFIGURE_ARGS+=	--x-libraries=${PREFIX}/lib
-.endif
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/arnold/PLIST b/emulators/arnold/PLIST
deleted file mode 100644
index cd69be98bb5..00000000000
--- a/emulators/arnold/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2018/04/09 15:03:22 ryoon Exp $
-bin/arnold
-share/arnold/roms/ARNOR/PROTEXT.ROM
-share/arnold/roms/ARNOR/UTOPIA.ROM
-share/arnold/roms/amsdose/amsdos.rom
-share/arnold/roms/cpc464e/basic.rom
-share/arnold/roms/cpc464e/os.rom
-share/arnold/roms/cpc6128e/basic.rom
-share/arnold/roms/cpc6128e/os.rom
-share/arnold/roms/cpc664e/basic.rom
-share/arnold/roms/cpc664e/os.rom
-share/arnold/roms/cpcplus/system.cpr
-share/arnold/roms/kcc/kccbas.rom
-share/arnold/roms/kcc/kccos.rom
-share/arnold/roms/parados.rom
-share/doc/arnold/readme.linux
-share/doc/arnold/readme.txt
diff --git a/emulators/arnold/distinfo b/emulators/arnold/distinfo
deleted file mode 100644
index daf3b61b654..00000000000
--- a/emulators/arnold/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.6 2018/04/09 15:03:22 ryoon Exp $
-
-SHA1 (arnsrc04012004.zip) = 7020aa50d80f55cd10bf280fc3a8fdc0ef44e7c3
-RMD160 (arnsrc04012004.zip) = 9e9cce2b1a869769af10f951b1bdc0ca5d3b6461
-SHA512 (arnsrc04012004.zip) = a9503325cd7972294b80e715c3ff270544b210403acb5b9d69e56eec7aa4a4d10a54bfe0ad353bd5715c7213cd68212636d06520147b25abc9e38cce50ead02b
-Size (arnsrc04012004.zip) = 1082107 bytes
-SHA1 (patch-aa) = 7e576715cd16cbeaed1b87d51b2bc04d291716e2
-SHA1 (patch-ab) = 89d03d691f93aa5e48072c2d93579a1ddbe148ec
-SHA1 (patch-src_cpc_amsdos.c) = 9edeca19e486c24826222e5bb0950ba8a90d10d8
-SHA1 (patch-src_cpc_debugger_gdebug.c) = 3303e9779b9a7dc95fc02d07e339ecacaef476d7
-SHA1 (patch-src_cpc_render5.c) = 8c9150e424caed46079869576adbbc5645f1c855
-SHA1 (patch-src_unix_display__sdl.c) = b43d5f61cffee6f16d61d65b7a56f68390f612b9
-SHA1 (patch-src_unix_gtkui.c) = 847c4809707873a7b7769891866ae332e121f071
diff --git a/emulators/arnold/patches/patch-aa b/emulators/arnold/patches/patch-aa
deleted file mode 100644
index 341900f919c..00000000000
--- a/emulators/arnold/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2018/04/09 15:03:22 ryoon Exp $
-
---- src/Makefile.in.orig	2004-01-04 05:18:40.000000000 +0000
-+++ src/Makefile.in
-@@ -25,7 +25,7 @@ SDLINC = @SDL_CFLAGS@
- SDLLIB = @SDL_LIBS@
- 
- #-Wall for max warnings!
--CFLAGS = @CPPFLAGS@ @CFLAGS@ $(GTKINC) $(SDLINC) @DEFS@ $(X11INC) -I. -DUNIX -Wall -Wno-unused
-+CFLAGS = @CPPFLAGS@ @CFLAGS@ $(GTKINC) $(SDLINC) @DEFS@ $(X11INC) -I. -DUNIX -DCPC_LSB_FIRST -Wall -Wno-unused
- #-g3 -pg -dm -dp -a
- LFLAGS1 = @LDFLAGS@ @LIBS@ $(GTKLIB) $(SDLLIB) $(X11LIBS)
- #debug
-@@ -39,17 +39,17 @@ TARGET_CPU = @target_cpu@
- CPC_O=	cpc/arnold.o cpc/asic.o cpc/audioevent.o cpc/bmp.o cpc/cpc.o \
- 	cpc/crtc.o cpc/dumpym.o cpc/fdc.o cpc/fdd.o cpc/fdi.o \
- 	cpc/garray.o cpc/multface.o cpc/printer.o cpc/psgplay.o \
--	cpc/psg.o cpc/render.o cpc/render5.o cpc/scrsnap.o \
-+	cpc/psg.o cpc/render.o cpc/render5.o \
- 	cpc/snapshot.o cpc/sampload.o cpc/spo256.o cpc/pal.o \
- 	cpc/voc.o cpc/tzxold.o cpc/wav.o cpc/westpha.o cpc/yiq.o \
- 	cpc/z8536.o cpc/csw.o cpc/cassette.o cpc/amsdos.o \
- 	cpc/debugger/gdebug.o cpc/debugger/breakpt.o \
- 	cpc/diskimage/diskimg.o cpc/ramrom.o \
- 	cpc/diskimage/dsk.o cpc/diskimage/extdsk.o \
--	cpc/diskimage/iextdsk.o cpc/diskimage/maketrk.o \
-+	cpc/diskimage/iextdsk.o \
- 	cpc/z80/z80.o cpc/debugger/memdump.o \
- 	cpc/riff.o cpc/snapv3.o \
--	cpc/cheatsys.o cpc/cpcdbg.o cpc/messages.o
-+	cpc/messages.o
- 
- UNIX_O= unix/main.o unix/host.o unix/global.o \
- 	unix/display.o unix/display_sdl.o unix/gtkui.o unix/sdlsound.o \
diff --git a/emulators/arnold/patches/patch-ab b/emulators/arnold/patches/patch-ab
deleted file mode 100644
index 58e585e6963..00000000000
--- a/emulators/arnold/patches/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2018/04/09 15:03:22 ryoon Exp $
-
---- src/unix/main.c.orig	2004-01-04 05:10:54.000000000 +0000
-+++ src/unix/main.c
-@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
- 
- 	init_main(argc, argv);
- 	
--	GenericInterface_Finish();
-+//	GenericInterface_Finish();
- 
- //	DirStuff_Finish();
- 
-@@ -207,7 +207,7 @@ void init_main(int argc, char *argv[]) {
- 	do {
- 		int this_option_optind = optind ? optind : 1;
- 		int option_index = 0;
--		c = getopt_long_only (argc, argv, "",
-+		c = getopt_long (argc, argv, "",
- 			long_options, &option_index);
- 		printf("c: %i %c\n", c, c);
- 		switch(c) {
-@@ -281,7 +281,7 @@ void init_main(int argc, char *argv[]) {
- 	/* fprintf(stderr,"%s\n",LocalDirectory); */
- 
- 
--	GenericInterface_Initialise();
-+	//GenericInterface_Initialise();
- 
-   /* initialise cpc hardware */
- 	CPC_Initialise();
-@@ -297,7 +297,7 @@ void init_main(int argc, char *argv[]) {
- 		ConfigCPC6128();
- 
- 		if (tape) {
--			if (!TapeImage_InsertFromFile(tape)) {
-+			if (!GenericInterface_InsertTape(tape)) {
- 				printf(Messages[73], tape);
- 			}
- 		}
-@@ -381,7 +381,7 @@ void init_main(int argc, char *argv[]) {
- 		}
- 
- 		if (snapshot) {
--			if (!Snapshot_Load(snapshot)) {
-+			if (!GenericInterface_LoadSnapshot(snapshot)) {
- 				printf(Messages[78],
- 					snapshot);
- 			}
diff --git a/emulators/arnold/patches/patch-src_cpc_amsdos.c b/emulators/arnold/patches/patch-src_cpc_amsdos.c
deleted file mode 100644
index 597a842167f..00000000000
--- a/emulators/arnold/patches/patch-src_cpc_amsdos.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_cpc_amsdos.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
---- src/cpc/amsdos.c.orig	2004-01-03 23:22:58.000000000 +0000
-+++ src/cpc/amsdos.c
-@@ -559,11 +559,11 @@ int AMSDOS_GetPrefixPriority(const char 
- 
- 		/* default prefixes in order searched for by AMSDOS */
- 		/* assign higher priority to order prefixes are used */
--		if (stricmp(pExtension,"   ")==0)
-+		if (strcmp(pExtension,"   ")==0)
- 			return 3;
--		if (stricmp(pExtension,"BAS")==0)
-+		if (strcmp(pExtension,"BAS")==0)
- 			return 2;
--		if (stricmp(pExtension,"BIN")==0)
-+		if (strcmp(pExtension,"BIN")==0)
- 			return 1;
- 	}
- 
diff --git a/emulators/arnold/patches/patch-src_cpc_debugger_gdebug.c b/emulators/arnold/patches/patch-src_cpc_debugger_gdebug.c
deleted file mode 100644
index e795238c843..00000000000
--- a/emulators/arnold/patches/patch-src_cpc_debugger_gdebug.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_cpc_debugger_gdebug.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
-Fix segfault on quit
-https://github.com/rofl0r/arnold/commit/08915c467477ad2316cd5a8997a3538738be8945
-
---- src/cpc/debugger/gdebug.c.orig	2004-01-03 01:02:20.000000000 +0000
-+++ src/cpc/debugger/gdebug.c
-@@ -2757,7 +2757,7 @@ void    Debug_DeleteComparisonList(DEBUG
-                 pNode = pList->Dummy.pNext;
- 
-                 /* traverse as long as node isn't the dummy node */
--                while (pNode!=&pList->Dummy)
-+                while (pNode && pNode!=&pList->Dummy)
-                 {
-                         DEBUG_CMP_LIST_NODE *pNext;
- 
diff --git a/emulators/arnold/patches/patch-src_cpc_render5.c b/emulators/arnold/patches/patch-src_cpc_render5.c
deleted file mode 100644
index 326c162d845..00000000000
--- a/emulators/arnold/patches/patch-src_cpc_render5.c
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-src_cpc_render5.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
-Fix segfault on quit
-https://github.com/rofl0r/arnold/commit/08915c467477ad2316cd5a8997a3538738be8945
-
---- src/cpc/render5.c.orig	2004-01-02 06:00:40.000000000 +0000
-+++ src/cpc/render5.c
-@@ -57,14 +57,16 @@ static int Render_CPCRenderHeight, Rende
- static int Render_CPCXOffset, Render_CPCYOffset;
- 
- 
--static void	Render_SetColourNULL(RGBCOLOUR *pColour,/*int Red, int Green, int Blue,*/ int Index);
-+static void	Render_SetColourNULL(const RGBCOLOUR *pColour,/*int Red, 
-+int Green, int Blue,*/ int Index);
- static void Render_PutDataWordNULL(int, unsigned long, int);
- static void Render_PutSyncNULL(int, int);
- static void Render_PutBorderNULL(int, int);
- static void Render_PutDataWordPLUSNULL(int HorizontalCount,unsigned long GraphicsData, int Line, unsigned long Mask, int *pPixels);
- 
- static void (*pRender_DumpScreen)(void) = NULL;
--static void (*pRender_SetColour)(RGBCOLOUR *pColour,/*int, int, int,*/ int)=Render_SetColourNULL;
-+static void (*pRender_SetColour)(const RGBCOLOUR *pColour,/*int, int, 
-+int,*/ int)=Render_SetColourNULL;
- static void (*pRender_PutDataWord)(int, unsigned long, int)=Render_PutDataWordNULL;
- static void (*pRender_PutSync)(int, int)=Render_PutSyncNULL;
- static void (*pRender_PutBorder)(int, int)=Render_PutBorderNULL;
-@@ -95,7 +97,8 @@ static PALETTE_ENTRY_RGB888    UnConvert
- static unsigned long    ConvertedColourTable[32];
- 
- /* TrueColour RGB version of set colour */
--static void Render_TrueColourRGB_SetColour(RGBCOLOUR *pColour, /*int, int, int,*/int);
-+static void Render_TrueColourRGB_SetColour(const RGBCOLOUR *pColour, 
-+/*int, int, int,*/int);
- static void Render_TrueColourRGB_Setup(void);
- 
- /* **** PALETTE stuff **** */
-@@ -115,7 +118,8 @@ static PALETTE_ENTRY    CPCPalette[256];
- /* palette we build up */
- 
- /* Paletted version of set colour */
--static void Render_Paletted_SetColour(RGBCOLOUR *pColour, /*int,int,int,*/int);
-+static void Render_Paletted_SetColour(const RGBCOLOUR *pColour, 
-+/*int,int,int,*/int);
- static void Render_Paletted_Setup(void);
- 
- 
-@@ -211,7 +215,8 @@ static void Render_TrueColourRGB_Setup(v
- 
- }
- 
--void	Render_TrueColourRGB_SetColour(RGBCOLOUR *pColour,/*int Red, int Green, int Blue,*/ int
-+void	Render_TrueColourRGB_SetColour(const RGBCOLOUR *pColour,/*int Red, 
-+int Green, int Blue,*/ int
- Index)
- {
- 	/* convert R,G,B into format of screen pixel */
-@@ -343,7 +348,8 @@ int     GetIndexInPalette(int PenIndex, 
- }
- 
- 
--static void	Render_Paletted_SetColour(RGBCOLOUR *pColour,/*int Red, int Green, int Blue,*/
-+static void	Render_Paletted_SetColour(const RGBCOLOUR *pColour,/*int 
-+Red, int Green, int Blue,*/
- int Index)
- {
- 	int PaletteIndex;
-@@ -473,10 +479,12 @@ void    Render_Finish(void)
-         if (pScreenBase!=NULL)
-         {
-                 free(pScreenBase);
-+                pScreenBase = 0;
-         }
- }
- 
--void	Render_SetColourNULL(RGBCOLOUR *pColour,/*int Red, int Green, int Blue,*/ int Index)
-+void	Render_SetColourNULL(const RGBCOLOUR *pColour,/*int Red, int 
-+Green, int Blue,*/ int Index)
- {
- }
- 
-@@ -499,7 +507,8 @@ static void Render_PutDataWordPLUSNULL(i
- 
- 
- /* set pen index specified by Index to Red, Green and Blue specified */
--void    Render_SetColour(RGBCOLOUR *pColour,/*int Red,int Green,int Blue,*/ int Index)
-+void    Render_SetColour(const RGBCOLOUR *pColour,/*int Red,int Green,int 
-+Blue,*/ int Index)
- {
- 	/* store chosen colour - in conversion table */
- 	UnConvertedColourTable[Index].RGB.SeperateElements.u.element.Red = pColour->u.element.Red;
diff --git a/emulators/arnold/patches/patch-src_unix_display__sdl.c b/emulators/arnold/patches/patch-src_unix_display__sdl.c
deleted file mode 100644
index 34a3e3d57db..00000000000
--- a/emulators/arnold/patches/patch-src_unix_display__sdl.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_unix_display__sdl.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
---- src/unix/display_sdl.c.orig	2003-12-20 09:47:50.000000000 +0000
-+++ src/unix/display_sdl.c
-@@ -34,7 +34,7 @@ static INLINE void debug(char *s) {
- 	fprintf(stderr,"%s\n",s);
- }
- 
--void sdl_InitialiseKeyboardMapping(void);
-+void sdl_InitialiseKeyboardMapping(int);
- void sdl_InitialiseJoysticks(void);
- 
- void sdl_SetDisplay(int Width, int Height, int Depth, BOOL fullscreen) {
diff --git a/emulators/arnold/patches/patch-src_unix_gtkui.c b/emulators/arnold/patches/patch-src_unix_gtkui.c
deleted file mode 100644
index 95869adb9d9..00000000000
--- a/emulators/arnold/patches/patch-src_unix_gtkui.c
+++ /dev/null
@@ -1,184 +0,0 @@
-$NetBSD: patch-src_unix_gtkui.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
---- src/unix/gtkui.c.orig	2004-01-04 05:09:30.000000000 +0000
-+++ src/unix/gtkui.c
-@@ -20,6 +20,17 @@
- #include <gtk/gtk.h>
- #include "../cpc/messages.h"
- 
-+void ConfigCPC464();
-+void ConfigCPC6128();
-+void ConfigCPC664();
-+void Config464Plus();
-+void Config6128Plus();
-+void ConfigKCCompact();
-+
-+void SaveFile(const char *,const unsigned char *pPtr, unsigned long 
-+Length);
-+
-+
- GtkWidget *btn_diska, *btn_diskb, *btn_cartridge, *btn_tape, *btn_loadsnap,
- 	*btn_savesnap, *btn_reset, *btn_quit, *btn_lock, *btn_double,
- 	*btn_audio, *btn_joysticks;
-@@ -33,7 +44,8 @@ static char *CPCTYPESTRINGS[7] = { "CPC 
- 	"CPC 6128+", "KC Compact", NULL };
- static char *CRTCTYPESTRINGS[6] = { "CRTC 0", "CRTC 1", "CRTC 2", "CRTC 3",
- 	"CRTC 4", NULL };
--static char *KEYBOARDTYPESTRINGS[3] = { "QWERTY", "QWERTZ", "AZERTY", NULL };
-+static char *KEYBOARDTYPESTRINGS[4] = { "QWERTY", "QWERTZ", "AZERTY", NULL 
-+};
- 
- static BOOL cpcPaused = FALSE;
- 
-@@ -92,12 +104,29 @@ void get_filename_and_destroy( char *fil
- 
- }
- 
-+void write_disk(int drive)
-+{
-+	unsigned char *pBuffer;
-+	unsigned long Length;
-+
-+	Length = DiskImage_CalculateOutputSize(drive);
-+		
-+	pBuffer = malloc(Length);
-+	if (pBuffer)
-+	{
-+		DiskImage_GenerateOutputData(pBuffer, drive);
-+		SaveFile("test.dsk",pBuffer,Length);
-+
-+		free(pBuffer);	
-+	}	
-+}
-+
- 
- void save_disk_and_insert( GtkWidget *w, GtkWindow *dialog, int drive,
- 	char *filename){
- 	gtk_widget_destroy(GTK_WIDGET(dialog));
- 
--	DiskImage_WriteImage(drive);
-+	write_disk(drive);
- 	DiskImage_RemoveDisk(drive);
- 	
- 	if (!GenericInterface_InsertDiskImage( drive, filename )) {
-@@ -109,7 +138,7 @@ void dont_save_disk_and_insert( GtkWidge
- 	char *filename) {
- 	gtk_widget_destroy(GTK_WIDGET(dialog));
- 
--	DiskImage_RemoveDisk(drive);
-+	write_disk(drive);
- 
- 	if (!GenericInterface_InsertDiskImage( drive, filename )) {
- 		printf("Failed to open disk image %s.\r\n", filename);
-@@ -135,7 +164,7 @@ void dont_save_diskB_and_insert( GtkWidg
- void save_disk_and_quit( GtkWidget *w, GtkWindow *dialog, int drive) {
- 	gtk_widget_destroy(GTK_WIDGET(dialog));
- 
--	DiskImage_WriteImage(drive);
-+	write_disk(drive);
- 	DiskImage_RemoveDisk(drive);
- 
- 	if (!FDD_IsDiskPresent(0) && !FDD_IsDiskPresent(1)) {
-@@ -146,7 +175,7 @@ void save_disk_and_quit( GtkWidget *w, G
- void dont_save_disk_and_quit( GtkWidget *w, GtkWindow *dialog, int drive){
- 	gtk_widget_destroy(GTK_WIDGET(dialog));
- 
--	DiskImage_RemoveDisk(drive);
-+	write_disk(drive);
- 
- 	if (!FDD_IsDiskPresent(0) && !FDD_IsDiskPresent(1)) {
- 		gtk_main_quit();
-@@ -237,7 +266,7 @@ void choosen_tape( GtkWidget *w, GtkFile
- 	char filename[ PATH_MAX ];
- 	get_filename_and_destroy( filename, fs );
- 
--	if (!GenericInterface_InsertTapeImage( filename )) {
-+	if (!GenericInterface_InsertTape( filename )) {
- 		printf(Messages[73], filename);
- 	} 
- 
-@@ -258,15 +287,19 @@ void choosen_savesnap( GtkWidget *w, Gtk
- 
- 	char filename[ PATH_MAX ];
- 	int cpcType;
-+	int nSize = 64;
- 	get_filename_and_destroy( filename, fs );
- 
--	cpcType = CPC_GetCPCType();
--	if (cpcType == CPC_TYPE_CPC6128 || cpcType == CPC_TYPE_6128PLUS) {
--		GenericInterface_SetSnapshotSize(128);
--	} else {
--		GenericInterface_SetSnapshotSize(64);
--	}
--	if (!GenericInterface_SnapshotSave( filename )) {
-+//	cpcType = CPC_GetHardware();
-+//
-+//	if (cpcType == CPC_TYPE_CPC6128 || cpcType == CPC_TYPE_6128PLUS) {
-+//		nSize = 128;
-+//	} else {
-+//		nSize = 64;
-+//	}
-+
-+	nSize = 128;
-+	if (!GenericInterface_SnapshotSave( filename,3,nSize )) {
- 		printf(Messages[90], filename);
- 	} 
- 	cpcPaused = FALSE;
-@@ -318,7 +351,7 @@ void choose_media( GtkWidget *widget, gp
- }
- 
- void reset( GtkWidget *widget, gpointer data ) {
--	GenericInterface_DoReset();
-+	CPC_Reset();
- }
- 
- static void quit( GtkWidget *widget, gpointer data ) {
-@@ -393,7 +426,47 @@ int indexInArray( char *s, char **p ) {
- void choose_cpctype( GtkWidget *widget, gpointer data ) {
- 	fprintf(stderr, Messages[96], (char *) data,
- 		indexInArray((char *) data, CPCTYPESTRINGS));
--	CPC_SetCPCType( indexInArray((char *) data, CPCTYPESTRINGS ));
-+
-+	switch (indexInArray((char *)data, CPCTYPESTRINGS))
-+	{
-+		case 0:
-+		{
-+			ConfigCPC464();
-+		}
-+		break;
-+
-+		case 1:
-+		{
-+			ConfigCPC664();
-+		}
-+		break;
-+
-+		case 2:
-+		{
-+			ConfigCPC6128();
-+		}
-+		break;
-+
-+		case 3:
-+		{
-+			Config464Plus();
-+		}
-+		break;
-+
-+		case 4:
-+		{
-+			Config6128Plus();
-+		}
-+		break;
-+
-+		case 5:
-+		{
-+			ConfigKCCompact();
-+		}
-+		break;
-+	}
-+
-+//	CPC_SetCPCType( indexInArray((char *) data, CPCTYPESTRINGS ));
- }
- 
- void choose_crtctype( GtkWidget *widget, gpointer data ) {