--- BasiliskII/src/prefs.cpp	2000/07/22 16:07:17	1.7
+++ BasiliskII/src/prefs.cpp	2000/07/25 15:19:40	1.8
@@ -28,43 +28,7 @@
 #include "prefs.h"
 
 
-// Common preferences items (those which exist on all platforms)
-// Except for "disk", "floppy", "cdrom", "scsiX", "screen", "rom" and "ether",
-// these are guaranteed to be in the prefs; "disk", "floppy" and "cdrom" can
-// occur multiple times
-prefs_desc common_prefs_items[] = {
-	{"disk", TYPE_STRING, true},		// Device/file names of Mac volumes (disk.cpp)
-	{"floppy", TYPE_STRING, true},		// Device/file names of Mac floppy drives (sony.cpp)
-	{"cdrom", TYPE_STRING, true},		// Device/file names of Mac CD-ROM drives (cdrom.cpp)
-	{"extfs", TYPE_STRING, false},		// Root path of ExtFS (extfs.cpp)
-	{"scsi0", TYPE_STRING, false},		// SCSI targets for Mac SCSI ID 0..6 (scsi_*.cpp)
-	{"scsi1", TYPE_STRING, false},
-	{"scsi2", TYPE_STRING, false},
-	{"scsi3", TYPE_STRING, false},
-	{"scsi4", TYPE_STRING, false},
-	{"scsi5", TYPE_STRING, false},
-	{"scsi6", TYPE_STRING, false},
-	{"screen", TYPE_STRING, false},		// Video mode (video.cpp)
-	{"seriala", TYPE_STRING, false},	// Device name of Mac serial port A (serial_*.cpp)
-	{"serialb", TYPE_STRING, false},	// Device name of Mac serial port B (serial_*.cpp)
-	{"ether", TYPE_STRING, false},		// Device name of Mac ethernet adapter (ether_*.cpp)
-	{"rom", TYPE_STRING, false},		// Path of ROM file (main_*.cpp)
-	{"bootdrive", TYPE_INT16, false},	// Boot drive number (main.cpp)
-	{"bootdriver", TYPE_INT16, false},	// Boot driver number (main.cpp)
-	{"ramsize", TYPE_INT32, false},		// Size of Mac RAM in bytes (main_*.cpp)
-	{"frameskip", TYPE_INT32, false},	// Number of frames to skip in refreshed video modes (video_*.cpp)
-	{"modelid", TYPE_INT32, false},		// Mac Model ID (Gestalt Model ID minus 6) (rom_patches.cpp)
-	{"cpu", TYPE_INT32, false},			// CPU type (0 = 68000, 1 = 68010 etc.) (main.cpp)
-	{"fpu", TYPE_BOOLEAN, false},		// Enable FPU emulation (main.cpp)
-	{"nocdrom", TYPE_BOOLEAN, false},	// Don't install CD-ROM driver (cdrom.cpp/rom_patches.cpp)
-	{"nosound", TYPE_BOOLEAN, false},	// Don't enable sound output (audio_*.cpp)
-	{"noclipconversion", TYPE_BOOLEAN, false}, // Don't convert clipboard contents (clip_*.cpp)
-	{"nogui", TYPE_BOOLEAN, false},		// Disable GUI (main_*.cpp)
-	{NULL, TYPE_END, false}	// End of list
-};
-
-
-// Prefs item are stored in a linked list of these nodes
+// Prefs items are stored in a linked list of these nodes
 struct prefs_node {
 	prefs_node *next;
 	const char *name;
@@ -86,18 +50,7 @@ void PrefsInit(void)
 	the_prefs = NULL;
 
 	// Set defaults
-	SysAddSerialPrefs();
-	PrefsAddInt16("bootdriver", 0);
-	PrefsAddInt16("bootdrive", 0);
-	PrefsAddInt32("ramsize", 8 * 1024 * 1024);
-	PrefsAddInt32("frameskip", 6);
-	PrefsAddInt32("modelid", 5);	// Mac IIci
-	PrefsAddInt32("cpu", 3);		// 68030
-	PrefsAddBool("fpu", false);
-	PrefsAddBool("nocdrom", false);
-	PrefsAddBool("nosound", false);
-	PrefsAddBool("noclipconversion", false);
-	PrefsAddBool("nogui", false);
+	AddPrefsDefaults();
 	AddPlatformPrefsDefaults();
 
 	// Load preferences from settings file