From 5f2d466997e2ba161de47c7484ceaabccb15f473 Mon Sep 17 00:00:00 2001 From: pk Date: Wed, 10 Apr 1996 20:33:38 +0000 Subject: [PATCH] Make room for another `value' in struct bootpath. Drop the global `bootdv' in favour of storing the device pointer in the bootpath[] element corresponding to the boot device. This also allows the opportunity to get to "intermediate" devices (e.g. busses) should the need for this ever arise. --- sys/arch/sparc/include/autoconf.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h index c7bca84932e8..1caa73db7abb 100644 --- a/sys/arch/sparc/include/autoconf.h +++ b/sys/arch/sparc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.h,v 1.15 1996/03/31 22:12:34 pk Exp $ */ +/* $NetBSD: autoconf.h,v 1.16 1996/04/10 20:33:38 pk Exp $ */ /* * Copyright (c) 1992, 1993 @@ -189,12 +189,11 @@ void rominterpret __P((char *)); /* Openprom V2 style boot path */ struct bootpath { - char name[16]; /* name of this node */ - int val[2]; /* up to two optional values */ + char name[16]; /* name of this node */ + int val[3]; /* up to three optional values */ + struct device *dev; /* device that recognised this component */ }; -struct device *bootdv; /* found during autoconfiguration */ - struct bootpath *bootpath_store __P((int, struct bootpath *)); int sd_crazymap __P((int)); @@ -202,8 +201,8 @@ int sd_crazymap __P((int)); struct device *parsedisk __P((char *, int, int, dev_t *)); /* Establish a mountroot_hook, for benefit of floppy drive, mostly. */ -void mountroot_hook_establish __P((void (*func) __P((struct device *)), - struct device *)); +void mountroot_hook_establish __P((void (*) __P((struct device *)), + struct device *)); void configure __P((void)); void bootstrap __P((void)); @@ -211,7 +210,7 @@ int firstchild __P((int)); int nextsibling __P((int)); void callrom __P((void)); struct device *getdevunit __P((char *, int)); -void *findzs __P((int)); +void *findzs __P((int)); int romgetcursoraddr __P((int **, int **)); int findroot __P((void)); int findnode __P((int, const char *));