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

convert from "bbinfo.h" to <dev/sun/sun_boot.h>

Browse Source
This commit is contained in:
lukem 2002-04-24 01:40:25 +00:00
parent 4ca5cf63d9
commit 86caccc77b
2 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/sun68k/stand/bootxx/bootxx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootxx.c,v 1.2 2001/12/15 23:09:50 fredette Exp $ */
/* $NetBSD: bootxx.c,v 1.3 2002/04/24 01:40:25 lukem Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -49,9 +49,10 @@
#include <sys/param.h>
#include <machine/mon.h>
#include <dev/sun/sun_boot.h>
#include <stand.h>
#include "libsa.h"
#include "bbinfo.h"
/*
* This is the address where we load the second-stage boot loader.
@ -59,13 +60,13 @@
#define LOADADDR 0x4000
/*
* The contents of the bbinfo below are set by installboot(8)
* The contents of the sun68k_bbinfo below are set by installboot(8)
* to hold the filesystem data of the second-stage boot program
* (typically `/ufsboot'): filesystem block size, # of filesystem
* blocks and the block numbers themselves.
*/
struct bbinfo bbinfo = {
{ BBINFO_MAGIC },
struct sun68k_bbinfo bbinfo = {
{ SUN68K_BBINFO_MAGIC },
0,
MAXBLOCKNUM,
{ 0 }

41
sys/arch/sun68k/stand/libsa/bbinfo.h
View File

@ -1,41 +0,0 @@
/* $NetBSD: bbinfo.h,v 1.1 2001/12/15 23:09:51 fredette Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
* Author: Chris G. Demetriou
*
* Permission to use, copy, modify and distribute this software and
* its documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
*
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*
* Carnegie Mellon requests users of this software to return to
*
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
*
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
#define MAXBLOCKNUM 64 /* enough for a 32K boot program (bs 512) */
/* Magic string -- 32 bytes long (including the NUL) */
#define BBINFO_MAGIC "NetBSD/sun68k bootxx "
#define BBINFO_MAGICSIZE sizeof(BBINFO_MAGIC)
struct bbinfo {
uint8_t bbi_magic[BBINFO_MAGICSIZE];
int32_t bbi_block_size;
int32_t bbi_block_count;
int32_t bbi_block_table[MAXBLOCKNUM];
};