diff options
| author |   miod <miod@openbsd.org> | 2015-04-25 21:15:08 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2015-04-25 21:15:08 +0000 |
| commit | c95072df669886e326f4159a79d4e5b4c33144ec (patch) | |
| tree | 395db48041b44ef442d8d0f894afe4f337853410 | |
| parent | Disable kq-tun test, as it's been broken for a while and not because of kq (diff) | |
| download | wireguard-openbsd-c95072df669886e326f4159a79d4e5b4c33144ec.tar.xz wireguard-openbsd-c95072df669886e326f4159a79d4e5b4c33144ec.zip | |
Repair boot device detection when booting off the second SCSI controller on
AV530.
| -rw-r--r-- | sys/arch/aviion/aviion/autoconf.c | 3 | ||||
| -rw-r--r-- | sys/arch/aviion/aviion/av530_machdep.c | 4 |
2 files changed, 4 insertions, 3 deletions
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; } |