From 36cafd61ddc4f7ed976159324f7f730880f5e311 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Fri, 28 Sep 2001 20:49:18 +0000 Subject: Variable declarations in .h files without extern keywords suck. Especially when not all of these variables are used. --- sys/arch/mvme88k/include/autoconf.h | 8 +++----- sys/arch/mvme88k/mvme88k/autoconf.c | 7 +++++-- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'sys') diff --git a/sys/arch/mvme88k/include/autoconf.h b/sys/arch/mvme88k/include/autoconf.h index 4f32c7f44ad..21db4c63254 100644 --- a/sys/arch/mvme88k/include/autoconf.h +++ b/sys/arch/mvme88k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.7 2001/03/16 00:03:52 miod Exp $ */ +/* $OpenBSD: autoconf.h,v 1.8 2001/09/28 20:49:13 miod Exp $ */ /* * Copyright (c) 1999, Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -64,10 +64,8 @@ int always_match __P((struct device *, struct cfdata *, void *)); #define CFDATA_LOC(cfdata) (cfdata->cf_loc) /* the following are from the prom/bootblocks */ -void *bootaddr; /* PA of boot device */ -int bootctrllun; /* ctrl_lun of boot device */ -int bootdevlun; /* dev_lun of boot device */ -int bootpart; /* boot partition (disk) */ +extern void *bootaddr; /* PA of boot device */ +extern int bootpart; /* boot partition (disk) */ struct device *bootdv; /* boot device */ diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c index 18fd4ee13c5..eed07e5a4bf 100644 --- a/sys/arch/mvme88k/mvme88k/autoconf.c +++ b/sys/arch/mvme88k/mvme88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.13 2001/09/19 21:32:19 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.14 2001/09/28 20:49:17 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -65,7 +65,10 @@ void dumpconf __P((void)); int findblkmajor __P((struct device *)); struct device *getdisk __P((char *, int, int, dev_t *)); -int cold; /* 1 if still booting */ +int cold = 1; /* 1 if still booting */ + +void *bootaddr; +int bootpart; /* * called at boot time, configure all devices on the system. -- cgit v1.2.3