[src/netbsd-6]: src/sys/arch/hp700/dev Pull up the following revisions(s) (re...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a20cf59b7aa1
branches:  netbsd-6
changeset: 776566:a20cf59b7aa1
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Fri Feb 07 12:32:55 2014 +0000

description:
Pull up the following revisions(s) (requested by skrll in ticket #1018):
        sys/arch/hp700/dev/lasi.c:      revision 1.25

Fix HP715/100 cpu and device detection.

diffstat:

 sys/arch/hp700/dev/lasi.c |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 9130f1cb312f -r a20cf59b7aa1 sys/arch/hp700/dev/lasi.c
--- a/sys/arch/hp700/dev/lasi.c Fri Feb 07 12:30:11 2014 +0000
+++ b/sys/arch/hp700/dev/lasi.c Fri Feb 07 12:32:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $ */
+/*     $NetBSD: lasi.c,v 1.21.8.1 2014/02/07 12:32:55 sborrill Exp $   */
 
 /*     $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.21.8.1 2014/02/07 12:32:55 sborrill Exp $");
 
 #undef LASIDEBUG
 
@@ -197,6 +197,15 @@
 
        /* Attach the GSC bus. */
        ga.ga_ca = *ca; /* clone from us */
+       if (strcmp(device_xname(parent), "mainbus0") == 0) {
+               ga.ga_dp.dp_bc[0] = ga.ga_dp.dp_bc[1];
+               ga.ga_dp.dp_bc[1] = ga.ga_dp.dp_bc[2];
+               ga.ga_dp.dp_bc[2] = ga.ga_dp.dp_bc[3];
+               ga.ga_dp.dp_bc[3] = ga.ga_dp.dp_bc[4];
+               ga.ga_dp.dp_bc[4] = ga.ga_dp.dp_bc[5];
+               ga.ga_dp.dp_bc[5] = ga.ga_dp.dp_mod;
+               ga.ga_dp.dp_mod = 0;
+       }
 
        ga.ga_name = "gsc";
        ga.ga_ir = &sc->sc_ir;