Deleted Added
full compact
bootinfo32.c (55211) bootinfo32.c (59087)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/boot/i386/libi386/bootinfo32.c 55211 1999-12-29 09:54:46Z msmith $
26 * $FreeBSD: head/sys/boot/i386/libi386/bootinfo32.c 59087 2000-04-08 01:22:14Z ps $
27 */
28
29#include <stand.h>
30#include <sys/param.h>
31#include <sys/reboot.h>
32#include <sys/linker.h>
33#include <machine/bootinfo.h>
34#include "bootstrap.h"

--- 231 unchanged lines hidden (view full) ---

266 case DEVT_DISK:
267 /* pass in the BIOS device number of the current disk */
268 bi.bi_bios_dev = bd_unit2bios(rootdev->d_kind.biosdisk.unit);
269 bootdevnr = bd_getdev(rootdev);
270 if (bootdevnr != -1)
271 break;
272 printf("root device %s invalid\n", i386_fmtdev(rootdev));
273 return(EINVAL);
27 */
28
29#include <stand.h>
30#include <sys/param.h>
31#include <sys/reboot.h>
32#include <sys/linker.h>
33#include <machine/bootinfo.h>
34#include "bootstrap.h"

--- 231 unchanged lines hidden (view full) ---

266 case DEVT_DISK:
267 /* pass in the BIOS device number of the current disk */
268 bi.bi_bios_dev = bd_unit2bios(rootdev->d_kind.biosdisk.unit);
269 bootdevnr = bd_getdev(rootdev);
270 if (bootdevnr != -1)
271 break;
272 printf("root device %s invalid\n", i386_fmtdev(rootdev));
273 return(EINVAL);
274
274
275 case DEVT_NET:
276 break;
277
275 default:
276 printf("WARNING - don't know how to boot from device type %d\n", rootdev->d_type);
277 }
278 free(rootdev);
279 *bootdevp = bootdevnr;
280
281 /* legacy bootinfo structure */
282 bi.bi_version = BOOTINFO_VERSION;

--- 52 unchanged lines hidden ---
278 default:
279 printf("WARNING - don't know how to boot from device type %d\n", rootdev->d_type);
280 }
281 free(rootdev);
282 *bootdevp = bootdevnr;
283
284 /* legacy bootinfo structure */
285 bi.bi_version = BOOTINFO_VERSION;

--- 52 unchanged lines hidden ---