ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Windows/prefs_windows.cpp

Comparing BasiliskII/src/Windows/prefs_windows.cpp (file contents):
Revision 1.9 by gbeauche, 2005-11-20T17:26:16Z vs.
Revision 1.13 by asvitkine, 2009-07-23T19:19:13Z

#	Line 1 | Line 1
1		/*
2		*  prefs_windows.cpp - Preferences handling, Windows specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2005 Christian Bauer
4	>	*  Basilisk II (C) 1997-2008 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 41 | Line 41 | prefs_desc platform_prefs_items[] = {
41		#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
42		{"ignoresegv", TYPE_BOOLEAN, false,    "ignore illegal memory accesses"},
43		#endif
44	+	{"idlewait", TYPE_BOOLEAN, false,      "sleep when idle"},
45		{"enableextfs", TYPE_BOOLEAN, false,   "enable extfs system"},
46		{"debugextfs", TYPE_BOOLEAN, false,    "debug extfs system"},
47		{"extdrives", TYPE_STRING, false,      "define allowed extfs drives"},
48		{"pollmedia", TYPE_BOOLEAN, false,     "poll for new media (e.g. cd, floppy)"},
49	+	{"etherguid", TYPE_STRING, false,      "GUID of the ethernet device to use"},
50		{"etherpermanentaddress", TYPE_BOOLEAN, false,  "use permanent NIC address to identify itself"},
51		{"ethermulticastmode", TYPE_INT32, false,       "how to multicast packets"},
52		{"etherfakeaddress", TYPE_STRING, false,        "optional fake hardware address"},
#	Line 68 | Line 70 | static string prefs_path;
70		*  Load preferences from settings file
71		*/
72
73	<	void LoadPrefs(void)
73	>	void LoadPrefs(const char *vmdir)
74		{
75		// Construct prefs path
76		if (UserPrefsPath.empty()) {
#	Line 128 | Line 130 | void AddPlatformPrefsDefaults(void)
130		#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
131		PrefsAddBool("ignoresegv", false);
132		#endif
133	+	PrefsAddBool("idlewait", true);
134		PrefsReplaceBool("etherpermanentaddress", true);
135		PrefsReplaceInt32("ethermulticastmode", 0);
133	–	PrefsReplaceBool("routerenabled", false);
136		PrefsReplaceString("ftp_port_list", "21");
137		PrefsReplaceString("seriala", "COM1");
138		PrefsReplaceString("serialb", "COM2");

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines