[src/netbsd-1-5]: src/sys/arch/sparc/sparc Pull up revision 1.162 (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/5ac6c6c00dff
branches:  netbsd-1-5
changeset: 492744:5ac6c6c00dff
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 09 20:13:18 2002 +0000

description:
Pull up revision 1.162 (requested by pk):
  Parse boot path correctly if boot device arguments consists of
  more than one character (we still only pay attention to the first
  argument character).  Fixes PR#15495.

diffstat:

 sys/arch/sparc/sparc/autoconf.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 950f44e83e91 -r 5ac6c6c00dff sys/arch/sparc/sparc/autoconf.c
--- a/sys/arch/sparc/sparc/autoconf.c   Sat Feb 09 19:56:24 2002 +0000
+++ b/sys/arch/sparc/sparc/autoconf.c   Sat Feb 09 20:13:18 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.139.2.1 2000/08/13 09:09:29 jdolecek Exp $ */
+/*     $NetBSD: autoconf.c,v 1.139.2.2 2002/02/09 20:13:18 he Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -379,9 +379,14 @@
                                cp = str2hex(++cp, &bp->val[0]);
                                if (*cp == ',')
                                        cp = str2hex(++cp, &bp->val[1]);
-                               if (*cp == ':')
+                               if (*cp == ':') {
                                        /* XXX - we handle just one char */
-                                       bp->val[2] = *++cp - 'a', ++cp;
+                                       /*       skip remainder of paths */
+                                       /*       like "ledma@f,400010:tpe" */
+                                       bp->val[2] = *++cp - 'a';
+                                       while (*++cp != '/' && *cp != '\0')
+                                               /*void*/;
+                               }
                        } else {
                                bp->val[0] = -1; /* no #'s: assume unit 0, no
                                                        sbus offset/adddress */