"SCSI (Auto)" priority change.

diff --git a/filesys.cpp b/filesys.cpp
index 3927aa8d9fae7c440e2a563701031cb6b0cfbab2..2e977ba0475eac0d4d96a8b748d42a15827259c9 100644 (file)
--- a/filesys.cpp
+++ b/filesys.cpp
@@ -813,24 +813,40 @@ static bool add_cpuboard_scsi_unit(int unit, struct uaedev_config_info *uci)
 static bool add_scsi_unit(int type, int unit, struct uaedev_config_info *uci)
 {
        bool added = false;
-       if (type == HD_CONTROLLER_TYPE_SCSI_A2091) {
+       if (type == HD_CONTROLLER_TYPE_SCSI_A3000) {
 #ifdef A2091
-               if (cfgfile_board_enabled(&currprefs.a2091rom)) {
-                       a2091_add_scsi_unit (unit, uci, 0);
+               if (currprefs.cs_mbdmac == 1) {
+                       a3000_add_scsi_unit (unit, uci);
                        added = true;
                }
 #endif
-       } else if (type == HD_CONTROLLER_TYPE_SCSI_A2091_2) {
+       } else if (type == HD_CONTROLLER_TYPE_SCSI_A4000T) {
+#ifdef NCR
+               if (currprefs.cs_mbdmac == 2) {
+                       a4000t_add_scsi_unit (unit, uci);
+                       added = true;
+               }
+#endif
+       } else if (type == HD_CONTROLLER_TYPE_SCSI_CPUBOARD) {
+               added = add_cpuboard_scsi_unit(unit, uci);
+       } else if (type == HD_CONTROLLER_TYPE_SCSI_CDTV) {
+#ifdef CDTV
+               if (currprefs.cs_cdtvscsi) {
+                       cdtv_add_scsi_hd_unit (unit, uci);
+                       added = true;
+               }
+#endif
+       } else if (type == HD_CONTROLLER_TYPE_SCSI_A2091) {
 #ifdef A2091
                if (cfgfile_board_enabled(&currprefs.a2091rom)) {
-                       a2091_add_scsi_unit (unit, uci, 1);
+                       a2091_add_scsi_unit (unit, uci, 0);
                        added = true;
                }
 #endif
-       } else if (type == HD_CONTROLLER_TYPE_SCSI_A3000) {
+       } else if (type == HD_CONTROLLER_TYPE_SCSI_A2091_2) {
 #ifdef A2091
-               if (currprefs.cs_mbdmac == 1) {
-                       a3000_add_scsi_unit (unit, uci);
+               if (cfgfile_board_enabled(&currprefs.a2091rom)) {
+                       a2091_add_scsi_unit (unit, uci, 1);
                        added = true;
                }
 #endif
@@ -875,22 +891,6 @@ static bool add_scsi_unit(int type, int unit, struct uaedev_config_info *uci)
                        oktagon_add_scsi_unit (unit, uci, 1);
                        added = true;
                }
-#endif
-       } else if (type == HD_CONTROLLER_TYPE_SCSI_CPUBOARD) {
-               added = add_cpuboard_scsi_unit(unit, uci);
-       } else if (type == HD_CONTROLLER_TYPE_SCSI_A4000T) {
-#ifdef NCR
-               if (currprefs.cs_mbdmac == 2) {
-                       a4000t_add_scsi_unit (unit, uci);
-                       added = true;
-               }
-#endif
-       } else if (type == HD_CONTROLLER_TYPE_SCSI_CDTV) {
-#ifdef CDTV
-               if (currprefs.cs_cdtvscsi) {
-                       cdtv_add_scsi_hd_unit (unit, uci);
-                       added = true;
-               }
 #endif
        }
        return added;