--- np2/embed/menu/filesel.c	2004/01/10 20:15:43	1.2
+++ np2/embed/menu/filesel.c	2004/01/27 10:55:47	1.5
@@ -208,14 +208,7 @@ static void dlgsetlist(void) {
 		do {
 			append = FALSE;
 			if (fli.attr & 0x10) {
-#if defined(WIN32) && !defined(_WIN32_WCE)
-				if ((file_cmpname(fli.path, ".")) &&
-					(file_cmpname(fli.path, ".."))) {
-					append = TRUE;
-				}
-#else
 				append = TRUE;
-#endif
 			}
 			else if (!(fli.attr & 0x08)) {
 				append = checkext(fli.path, filesel.ext);
@@ -386,16 +379,19 @@ const char	*title;
 
 // ----
 
-static const char diskfilter[] = "All supported Files";
+static const char diskfilter[] = "All supported files";
 static const char fddtitle[] = "Select floppy image";
-static const char fddext[] = "d88\088d\0d98\098d\0xdf\0hdm\0dup\02hd\0tfd\0";
+static const char fddext[] = "d88\088d\0d98\098d\0fdi\0" \
+								"xdf\0hdm\0dup\02hd\0tfd\0";
 static const char hddtitle[] = "Select HDD image";
-static const char hddext[] = "thd\0hdi\0";
+static const char sasiext[] = "thd\0nhd\0hdi\0";
+static const char scsiext[] = "hdd\0";
 
 static const FSELPRM fddprm = {fddtitle, diskfilter, fddext};
-static const FSELPRM hddprm = {hddtitle, diskfilter, hddext};
+static const FSELPRM sasiprm = {hddtitle, diskfilter, sasiext};
+static const FSELPRM scsiprm = {hddtitle, diskfilter, scsiext};
 
-void filesel_fdd(BYTE drv) {
+void filesel_fdd(REG8 drv) {
 
 	char	path[MAX_PATH];
 
@@ -406,14 +402,30 @@ void filesel_fdd(BYTE drv) {
 	}
 }
 
-void filesel_sasi(BYTE drv) {
-
-	char	path[MAX_PATH];
+void filesel_hdd(REG8 drv) {
 
-	if (drv < 2) {
-		if (selectfile(&hddprm, path, sizeof(path), np2cfg.hddfile[drv])) {
-			diskdrv_sethdd(drv, path);
+	UINT		num;
+	char		path[MAX_PATH];
+	char		*p;
+const FSELPRM	*prm;
+
+	num = drv & 0x0f;
+	if (!(drv & 0x20)) {		// SASI/IDE
+		if (num >= 2) {
+			return;
+		}
+		p = np2cfg.sasihdd[num];
+		prm = &sasiprm;
+	}
+	else {						// SCSI
+		if (num >= 4) {
+			return;
 		}
+		p = np2cfg.scsihdd[num];
+		prm = &scsiprm;
+	}
+	if (selectfile(prm, path, sizeof(path), p)) {
+		diskdrv_sethdd(drv, path);
 	}
 }