Temporarily reverted r64524 until I (or someone else) find the time to sort out the stuff.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64536 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 99 insertions, 101 deletions

diff --git a/plugins/dfcdrom/cfg.c b/plugins/dfcdrom/cfg.c
index 6985eda6..1ded04c8 100644
--- a/plugins/dfcdrom/cfg.c
+++ b/plugins/dfcdrom/cfg.c
@@ -1,101 +1,99 @@
-/*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
- * All Rights Reserved.
- *
- * Based on: Cdrom for Psemu Pro like Emulators
- * By: linuzappz <linuzappz@hotmail.com>
- *
- * 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, see <http://www.gnu.org/licenses>.
- */
-
-#include "cdr.h"
-
-char CdromDev[256];
-long ReadMode;
-long UseSubQ;
-long CacheSize;
-long CdrSpeed;
-long SpinDown;
-
-void LoadConf() {
-	FILE *f;
-
-#if defined (__sun)
-	char buf[256], *devname, *nick;
-
-	CdromDev[0] = '\0';
-	f = popen("eject -l", "r");
-
-	if (f != NULL) {
-		while (!feof(f)) {
-			fgets(buf, 256, f);
-
-			devname = strtok(buf, " ");
-			nick = strtok(NULL, " ");
-
-			if (devname == NULL || nick == NULL) continue;
-
-			if (strstr(nick, "cdrom") != NULL) {
-				strcpy(CdromDev, devname);
-				break;
-			}
-		}
-
-		pclose(f);
-	}
-#else
-	strcpy(CdromDev, DEV_DEF);
-#endif
-
-	ReadMode = THREADED;
-	UseSubQ = 0;
-	CacheSize = 64;
-	CdrSpeed = 0;
-	SpinDown = SPINDOWN_VENDOR_SPECIFIC;
-
-	f = fopen("dfcdrom.cfg", "r");
-	if (f == NULL) return;
-
-	if(fscanf(f, "CdromDev = %s\n", CdromDev) != 1 ||
-	   fscanf(f, "ReadMode = %ld\n", &ReadMode) != 1 ||
-	   fscanf(f, "UseSubQ = %ld\n", &UseSubQ) != 1 ||
-	   fscanf(f, "CacheSize = %ld\n", &CacheSize) != 1 ||
-	   fscanf(f, "CdrSpeed = %ld\n", &CdrSpeed) != 1 ||
-	   fscanf(f, "SpinDown = %ld\n", &SpinDown) != 1) {
-	  perror("syntax error in dfcdrom.cfg");
-	}
-	fclose(f);
-
-	if (ReadMode >= READ_MODES) ReadMode = THREADED;
-	if (CacheSize <= 0) CacheSize = 32;
-	if (CacheSize > 2048) CacheSize = 2048;
-	if (SpinDown <= 0) SpinDown = SPINDOWN_VENDOR_SPECIFIC;
-	if (SpinDown > SPINDOWN_32MIN) SpinDown = SPINDOWN_32MIN;
-}
-
-void SaveConf() {
-	FILE *f;
-
-	f = fopen("dfcdrom.cfg", "w");
-	if (f == NULL)
-		return;
-
-	fprintf(f, "CdromDev = %s\n", CdromDev);
-	fprintf(f, "ReadMode = %ld\n", ReadMode);
-	fprintf(f, "UseSubQ = %ld\n", UseSubQ);
-	fprintf(f, "CacheSize = %ld\n", CacheSize);
-	fprintf(f, "CdrSpeed = %ld\n", CdrSpeed);
-	fprintf(f, "SpinDown = %ld\n", SpinDown);
-	fclose(f);
-}
+/*

+ * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.

+ * All Rights Reserved.

+ *

+ * Based on: Cdrom for Psemu Pro like Emulators

+ * By: linuzappz <linuzappz@hotmail.com>

+ *

+ * 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, see <http://www.gnu.org/licenses>.

+ */

+

+#include "cdr.h"

+

+char CdromDev[256];

+long ReadMode;

+long UseSubQ;

+long CacheSize;

+long CdrSpeed;

+long SpinDown;

+

+void LoadConf() {

+	FILE *f;

+

+#if defined (__sun)

+	char buf[256], *devname, *nick;

+

+	CdromDev[0] = '\0';

+	f = popen("eject -l", "r");

+

+	if (f != NULL) {

+		while (!feof(f)) {

+			fgets(buf, 256, f);

+

+			devname = strtok(buf, " ");

+			nick = strtok(NULL, " ");

+

+			if (devname == NULL || nick == NULL) continue;

+

+			if (strstr(nick, "cdrom") != NULL) {

+				strcpy(CdromDev, devname);

+				break;

+			}

+		}

+

+		pclose(f);

+	}

+#else

+	strcpy(CdromDev, DEV_DEF);

+#endif

+

+	ReadMode = THREADED;

+	UseSubQ = 0;

+	CacheSize = 64;

+	CdrSpeed = 0;

+	SpinDown = SPINDOWN_VENDOR_SPECIFIC;

+

+	f = fopen("dfcdrom.cfg", "r");

+	if (f == NULL) return;

+

+	fscanf(f, "CdromDev = %s\n", CdromDev);

+	fscanf(f, "ReadMode = %ld\n", &ReadMode);

+	fscanf(f, "UseSubQ = %ld\n", &UseSubQ);

+	fscanf(f, "CacheSize = %ld\n", &CacheSize);

+	fscanf(f, "CdrSpeed = %ld\n", &CdrSpeed);

+	fscanf(f, "SpinDown = %ld\n", &SpinDown);

+	fclose(f);

+

+	if (ReadMode >= READ_MODES) ReadMode = THREADED;

+	if (CacheSize <= 0) CacheSize = 32;

+	if (CacheSize > 2048) CacheSize = 2048;

+	if (SpinDown <= 0) SpinDown = SPINDOWN_VENDOR_SPECIFIC;

+	if (SpinDown > SPINDOWN_32MIN) SpinDown = SPINDOWN_32MIN;

+}

+

+void SaveConf() {

+	FILE *f;

+

+	f = fopen("dfcdrom.cfg", "w");

+	if (f == NULL)

+		return;

+

+	fprintf(f, "CdromDev = %s\n", CdromDev);

+	fprintf(f, "ReadMode = %ld\n", ReadMode);

+	fprintf(f, "UseSubQ = %ld\n", UseSubQ);

+	fprintf(f, "CacheSize = %ld\n", CacheSize);

+	fprintf(f, "CdrSpeed = %ld\n", CdrSpeed);

+	fprintf(f, "SpinDown = %ld\n", SpinDown);

+	fclose(f);

+}