CDROMs can exist on ide buses

This commit is contained in:
matt 2000-06-20 03:48:53 +00:00
parent d78ff1cd5b
commit 5c13e34063
4 changed files with 12 additions and 12 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: api_up1000.c,v 1.3 2000/06/11 01:59:26 sommerfeld Exp $ */
/* $NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.3 2000/06/11 01:59:26 sommerfeld Exp $");
__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -215,7 +215,7 @@ api_up1000_device_register(dev, aux)
}
}
if (scsiboot &&
if ((ideboot || scsiboot) &&
(!strcmp(cd->cd_name, "sd") ||
!strcmp(cd->cd_name, "st") ||
!strcmp(cd->cd_name, "cd"))) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_550.c,v 1.9 2000/06/09 04:58:32 soda Exp $ */
/* $NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.9 2000/06/09 04:58:32 soda Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -221,7 +221,7 @@ dec_550_device_register(dev, aux)
}
}
if (scsiboot &&
if ((ideboot || scsiboot) &&
(!strcmp(cd->cd_name, "sd") ||
!strcmp(cd->cd_name, "st") ||
!strcmp(cd->cd_name, "cd"))) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_6600.c,v 1.6 2000/06/09 04:58:32 soda Exp $ */
/* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.6 2000/06/09 04:58:32 soda Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -234,7 +234,7 @@ dec_6600_device_register(dev, aux)
return;
}
}
if (scsiboot &&
if ((ideboot || scsiboot) &&
(!strcmp(cd->cd_name, "sd") ||
!strcmp(cd->cd_name, "st") ||
!strcmp(cd->cd_name, "cd"))) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb164.c,v 1.35 2000/06/09 04:58:32 soda Exp $ */
/* $NetBSD: dec_eb164.c,v 1.36 2000/06/20 03:48:54 matt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.35 2000/06/09 04:58:32 soda Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.36 2000/06/20 03:48:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -216,7 +216,7 @@ dec_eb164_device_register(dev, aux)
}
}
if (scsiboot &&
if ((ideboot || scsiboot) &&
(!strcmp(cd->cd_name, "sd") ||
!strcmp(cd->cd_name, "st") ||
!strcmp(cd->cd_name, "cd"))) {