mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
Move the mfs_getimage() prototype to mfs_extern.h duplicating it
everywhere.
This commit is contained in:
parent
8b2970bbe6
commit
7f2d5fc4f2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=46915
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: autoconf.c,v 1.21 1999/05/10 16:04:52 peter Exp $
|
||||
* $Id: autoconf.c,v 1.22 1999/05/10 16:36:38 peter Exp $
|
||||
*/
|
||||
|
||||
#include "opt_bootp.h"
|
||||
@ -58,6 +58,10 @@
|
||||
#include <cam/cam_xpt_sim.h>
|
||||
#include <cam/cam_debug.h>
|
||||
|
||||
#ifdef MFS_ROOT
|
||||
#include <ufs/mfs/mfs_extern.h>
|
||||
#endif
|
||||
|
||||
static void configure __P((void *));
|
||||
SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL)
|
||||
|
||||
@ -65,10 +69,6 @@ static void configure_finish __P((void));
|
||||
static void configure_start __P((void));
|
||||
static int setdumpdev __P((dev_t dev));
|
||||
|
||||
#ifdef MFS_ROOT
|
||||
extern u_char *mfs_getimage __P((void));
|
||||
#endif
|
||||
|
||||
device_t isa_bus_device = 0;
|
||||
struct cam_sim *boot_sim = 0;
|
||||
extern int nfs_diskless_valid;
|
||||
@ -86,8 +86,6 @@ configure_finish()
|
||||
{
|
||||
}
|
||||
|
||||
extern void pci_configure(void);
|
||||
|
||||
static int
|
||||
atoi(const char *s)
|
||||
{
|
||||
@ -198,8 +196,6 @@ configure(void *dummy)
|
||||
|
||||
if((hwrpb->rpb_type != ST_DEC_3000_300) &&
|
||||
(hwrpb->rpb_type != ST_DEC_3000_500)){
|
||||
/* pci_configure(); */
|
||||
|
||||
/*
|
||||
* Probe ISA devices after everything.
|
||||
*/
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
|
||||
* $Id: autoconf.c,v 1.119 1999/05/09 16:45:49 phk Exp $
|
||||
* $Id: autoconf.c,v 1.120 1999/05/09 16:56:09 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -75,9 +75,8 @@
|
||||
|
||||
#include <i386/isa/icu.h>
|
||||
|
||||
#include "isa.h"
|
||||
#if NISA > 0
|
||||
device_t isa_bus_device = 0;
|
||||
#ifdef MFS_ROOT
|
||||
#include <ufs/mfs/mfs_extern.h>
|
||||
#endif
|
||||
|
||||
#include "pnp.h"
|
||||
@ -96,6 +95,11 @@ device_t isa_bus_device = 0;
|
||||
#include <pci/pcivar.h>
|
||||
#endif
|
||||
|
||||
#include "isa.h"
|
||||
#if NISA > 0
|
||||
device_t isa_bus_device = 0;
|
||||
#endif
|
||||
|
||||
static void configure_first __P((void *));
|
||||
static void configure __P((void *));
|
||||
static void configure_final __P((void *));
|
||||
@ -178,10 +182,6 @@ find_cdrom_root()
|
||||
}
|
||||
#endif /* CD9660 || CD9660_ROOT */
|
||||
|
||||
#ifdef MFS_ROOT
|
||||
extern u_char *mfs_getimage __P((void));
|
||||
#endif
|
||||
|
||||
static void
|
||||
configure_start()
|
||||
{
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
|
||||
* $Id: autoconf.c,v 1.119 1999/05/09 16:45:49 phk Exp $
|
||||
* $Id: autoconf.c,v 1.120 1999/05/09 16:56:09 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -75,9 +75,8 @@
|
||||
|
||||
#include <i386/isa/icu.h>
|
||||
|
||||
#include "isa.h"
|
||||
#if NISA > 0
|
||||
device_t isa_bus_device = 0;
|
||||
#ifdef MFS_ROOT
|
||||
#include <ufs/mfs/mfs_extern.h>
|
||||
#endif
|
||||
|
||||
#include "pnp.h"
|
||||
@ -96,6 +95,11 @@ device_t isa_bus_device = 0;
|
||||
#include <pci/pcivar.h>
|
||||
#endif
|
||||
|
||||
#include "isa.h"
|
||||
#if NISA > 0
|
||||
device_t isa_bus_device = 0;
|
||||
#endif
|
||||
|
||||
static void configure_first __P((void *));
|
||||
static void configure __P((void *));
|
||||
static void configure_final __P((void *));
|
||||
@ -178,10 +182,6 @@ find_cdrom_root()
|
||||
}
|
||||
#endif /* CD9660 || CD9660_ROOT */
|
||||
|
||||
#ifdef MFS_ROOT
|
||||
extern u_char *mfs_getimage __P((void));
|
||||
#endif
|
||||
|
||||
static void
|
||||
configure_start()
|
||||
{
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)mfs_extern.h 8.4 (Berkeley) 3/30/95
|
||||
* $Id: mfs_extern.h,v 1.11 1998/02/03 21:52:02 bde Exp $
|
||||
* $Id: mfs_extern.h,v 1.12 1999/01/21 08:29:08 dillon Exp $
|
||||
*/
|
||||
|
||||
#ifndef _UFS_MFS_MFS_EXTERN_H_
|
||||
@ -46,5 +46,6 @@ struct mfsnode;
|
||||
void mfs_doio __P((struct buf *bp, struct mfsnode *mfsnode));
|
||||
int mfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
|
||||
int mfs_mountroot __P((void));
|
||||
u_char *mfs_getimage __P((void));
|
||||
|
||||
#endif /* !_UFS_MFS_MFS_EXTERN_H_ */
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95
|
||||
* $Id: mfs_vfsops.c,v 1.59 1999/04/06 03:08:43 peter Exp $
|
||||
* $Id: mfs_vfsops.c,v 1.60 1999/04/21 09:41:07 dt Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -62,8 +62,6 @@
|
||||
|
||||
MALLOC_DEFINE(M_MFSNODE, "MFS node", "MFS vnode private part");
|
||||
|
||||
u_char * mfs_getimage __P((void));
|
||||
|
||||
#ifdef MFS_ROOT
|
||||
static caddr_t mfs_rootbase; /* address of mini-root in kernel virtual memory */
|
||||
static u_long mfs_rootsize; /* size of mini-root in bytes */
|
||||
|
Loading…
Reference in New Issue
Block a user