--cWoXeonUoKmBZSoM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,
I suspect the attached diff is needed for alpha booting from pciide devices
to find the root device.
Can someone check and confirm ?

--
Manuel Bouyer, LIP6, Universite Paris VI.           Manuel.Bouyer@lip6.fr
     NetBSD: 24 ans d'experience feront toujours la difference
--

--cWoXeonUoKmBZSoM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="alpha.diff"

Index: alpha/api_up1000.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/api_up1000.c,v
retrieving revision 1.14
diff -u -r1.14 api_up1000.c
--- alpha/api_up1000.c	2003/06/14 17:01:07	1.14
+++ alpha/api_up1000.c	2003/10/08 20:42:42
@@ -275,7 +275,7 @@
 	 */
 	if ((ideboot || scsiboot) && !strcmp(name, "wd")) {
 		struct ata_device *adev = aux;
-		if ((strncmp("pciide", parent->dv_xname, 6) != 0)) {
+		if ((strncmp("atabus", parent->dv_xname, 6) != 0)) {
 			return;
 		} else {
 			if (parent != scsipidev)
Index: alpha/dec_550.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_550.c,v
retrieving revision 1.21
diff -u -r1.21 dec_550.c
--- alpha/dec_550.c	2003/06/14 17:01:07	1.21
+++ alpha/dec_550.c	2003/10/08 20:42:42
@@ -289,7 +289,7 @@
 	 */
 	if ((ideboot || scsiboot) && !strcmp(name, "wd")) {
 		struct ata_device *adev = aux;
-		if ((strncmp("pciide", parent->dv_xname, 6) != 0)) {
+		if ((strncmp("atabus", parent->dv_xname, 6) != 0)) {
 			return;
 		} else {
 			if (parent != scsipidev)
Index: alpha/dec_6600.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_6600.c,v
retrieving revision 1.18
diff -u -r1.18 dec_6600.c
--- alpha/dec_6600.c	2003/06/14 17:01:08	1.18
+++ alpha/dec_6600.c	2003/10/08 20:42:42
@@ -299,7 +299,7 @@
 	 */
 	if ((ideboot || scsiboot) && !strcmp(name, "wd")) {
 		struct ata_device *adev = aux;
-		if ((strncmp("pciide", parent->dv_xname, 6) != 0)) {
+		if ((strncmp("atabus", parent->dv_xname, 6) != 0)) {
 			return;
 		} else {
 			if (parent != scsipidev)
Index: alpha/dec_eb164.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_eb164.c,v
retrieving revision 1.47
diff -u -r1.47 dec_eb164.c
--- alpha/dec_eb164.c	2003/06/14 17:01:08	1.47
+++ alpha/dec_eb164.c	2003/10/08 20:42:42
@@ -284,7 +284,7 @@
 	 */
 	if ((ideboot || scsiboot) && !strcmp(name, "wd")) {
 		struct ata_device *adev = aux;
-		if ((strncmp("pciide", parent->dv_xname, 6) != 0)) {
+		if ((strncmp("atabus", parent->dv_xname, 6) != 0)) {
 			return;
 		} else {
 			if (parent != scsipidev)

--cWoXeonUoKmBZSoM--