Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If booted device starts with pci(N), strip it off; also, compare strncmp()

Browse Source 
result to 0, not NULL.  This gets the O2 figure out what device it's been
booted off correctly mow.
This commit is contained in:
rafal 2003-04-04 04:27:29 +00:00
parent eb8a295e82
commit 42dea81851
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/sgimips/sgimips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.14 2003/01/19 22:33:20 rafal Exp $ */
/* $NetBSD: autoconf.c,v 1.15 2003/04/04 04:27:29 rafal Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -116,17 +116,29 @@ makebootdev(cp)
booted_slot = booted_unit = booted_partition = 0;
if (strncmp(cp, "scsi(", 5) == NULL) {
if (strncmp(cp, "pci(", 4) == 0) {
cp += 4;
while (*cp && *cp != ')')
cp++;
if (*cp != ')')
return;
cp++;
}
if (strncmp(cp, "scsi(", 5) == 0) {
cp += 5;
if (*cp >= '0' && *cp <= '9')
booted_slot = *cp++ - '0';
if (strncmp(cp, ")disk(", 6) == NULL) {
if (strncmp(cp, ")disk(", 6) == 0) {
cp += 6;
if (*cp >= '0' && *cp <= '9')
booted_unit = *cp++ - '0';
}
/* XXX can rdisk() ever be other than 0? */
if (strncmp(cp, ")rdisk(0)partition(", 19) == NULL) {
if (strncmp(cp, ")rdisk(0)partition(", 19) == 0) {
cp += 19;
while (*cp >= '0' && *cp <= '9')
booted_partition =
@ -137,7 +149,7 @@ makebootdev(cp)
booted_protocol = "SCSI";
return;
}
if (strncmp(cp, "dksc(", 5) == NULL) {
if (strncmp(cp, "dksc(", 5) == 0) {
cp += 5;
if (*cp >= '0' && *cp <= '9')
booted_slot = *cp++ - '0';