summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgallatin <gallatin@FreeBSD.org>1999-05-29 19:23:20 +0000
committergallatin <gallatin@FreeBSD.org>1999-05-29 19:23:20 +0000
commitec6b8177b18fd5d7854aaf64177285851cdf52cd (patch)
treee0811ab99cb8a2fb1ab51befde763bac1e10e957
parentd34376d0e4f7cc56dccfb9c564a1f34198a9d273 (diff)
downloadFreeBSD-src-ec6b8177b18fd5d7854aaf64177285851cdf52cd.zip
FreeBSD-src-ec6b8177b18fd5d7854aaf64177285851cdf52cd.tar.gz
A small change to allow automatic detection of the boot
disk on Compaq XP1000's where Disk zero is dka0.0.0.6.1, eg bus #1, slot #6. Reviewed by: Doug Rabson <dfr@nlsystems.com>
-rw-r--r--sys/alpha/alpha/autoconf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index a8f6806..fd60d3b 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: autoconf.c,v 1.25 1999/05/15 17:56:34 dfr Exp $
+ * $Id: autoconf.c,v 1.26 1999/05/24 00:54:17 jb Exp $
*/
#include "opt_bootp.h"
@@ -171,7 +171,8 @@ alpha_register_pci_scsi(int bus, int slot, struct cam_sim *sim)
{
if (!strcmp(bootdev_protocol(), "SCSI")) {
int boot_slot = bootdev_slot();
- if (bus == boot_slot / 1000
+ if (((bus == boot_slot / 1000 )
+ || (bus == 1 && (boot_slot < 1000)))
&& slot == boot_slot % 1000)
boot_sim = sim;
}
OpenPOWER on IntegriCloud