From: miod <miod@openbsd.org>
Date: Sat, 25 Apr 2015 21:15:08 +0000 (+0000)
Subject: Repair boot device detection when booting off the second SCSI controller on
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c95072df669886e326f4159a79d4e5b4c33144ec;p=openbsd

Repair boot device detection when booting off the second SCSI controller on
AV530.
---

diff --git a/sys/arch/aviion/aviion/autoconf.c b/sys/arch/aviion/aviion/autoconf.c
index fbbebfef585..ca33d594c12 100644
--- a/sys/arch/aviion/aviion/autoconf.c
+++ b/sys/arch/aviion/aviion/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.16 2013/10/10 21:24:58 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.17 2015/04/25 21:15:08 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -156,6 +156,7 @@ strtoi(const char *s)
 			break;
 		val *= 10;
 		val += c - '0';
+		c = *s++;
 	}
 
 	return val;
diff --git a/sys/arch/aviion/aviion/av530_machdep.c b/sys/arch/aviion/aviion/av530_machdep.c
index 8e7e1433a33..a8e7b780b72 100644
--- a/sys/arch/aviion/aviion/av530_machdep.c
+++ b/sys/arch/aviion/aviion/av530_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av530_machdep.c,v 1.14 2014/12/16 21:29:05 miod Exp $	*/
+/*	$OpenBSD: av530_machdep.c,v 1.15 2015/04/25 21:15:08 miod Exp $	*/
 /*
  * Copyright (c) 2006, 2007, 2010 Miodrag Vallat.
  *
@@ -221,7 +221,7 @@ av530_get_boot_device(uint32_t *name, u_int unit)
 		case 0:
 			return AV530_SCSI1;
 		case 1:
-			return AV530_SCSI1;
+			return AV530_SCSI2;
 		}
 		break;
 	}