| main.c (163897) | main.c (172924) |
|---|---|
| 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 --- 11 unchanged lines hidden (view full) --- 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 27#include <sys/cdefs.h> | 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 --- 11 unchanged lines hidden (view full) --- 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 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/boot/pc98/loader/main.c 163897 2006-11-02 01:23:18Z marcel $"); | 28__FBSDID("$FreeBSD: head/sys/boot/pc98/loader/main.c 172924 2007-10-24 11:54:04Z nyan $"); |
| 29 30/* 31 * MD bootstrap main() and assorted miscellaneous 32 * commands. 33 */ 34 35#include <stand.h> 36#include <string.h> --- 168 unchanged lines hidden (view full) --- 205 biosdev = -1; 206 } 207 } else if ((initial_bootdev & B_MAGICMASK) != B_DEVMAGIC) { 208 /* The passed-in boot device is bad */ 209 new_currdev.d_kind.biosdisk.slice = -1; 210 new_currdev.d_kind.biosdisk.partition = 0; 211 biosdev = -1; 212 } else { | 29 30/* 31 * MD bootstrap main() and assorted miscellaneous 32 * commands. 33 */ 34 35#include <stand.h> 36#include <string.h> --- 168 unchanged lines hidden (view full) --- 205 biosdev = -1; 206 } 207 } else if ((initial_bootdev & B_MAGICMASK) != B_DEVMAGIC) { 208 /* The passed-in boot device is bad */ 209 new_currdev.d_kind.biosdisk.slice = -1; 210 new_currdev.d_kind.biosdisk.partition = 0; 211 biosdev = -1; 212 } else { |
| 213 new_currdev.d_kind.biosdisk.slice = (B_ADAPTOR(initial_bootdev) << 4) + 214 B_CONTROLLER(initial_bootdev) - 1; | 213 new_currdev.d_kind.biosdisk.slice = B_SLICE(initial_bootdev) - 1; |
| 215 new_currdev.d_kind.biosdisk.partition = B_PARTITION(initial_bootdev); 216 biosdev = initial_bootinfo->bi_bios_dev; 217 major = B_TYPE(initial_bootdev); 218 219 /* 220 * If we are booted by an old bootstrap, we have to guess at the BIOS 221 * unit number. We will lose if there is more than one disk type 222 * and we are not booting from the lowest-numbered disk type --- 91 unchanged lines hidden --- | 214 new_currdev.d_kind.biosdisk.partition = B_PARTITION(initial_bootdev); 215 biosdev = initial_bootinfo->bi_bios_dev; 216 major = B_TYPE(initial_bootdev); 217 218 /* 219 * If we are booted by an old bootstrap, we have to guess at the BIOS 220 * unit number. We will lose if there is more than one disk type 221 * and we are not booting from the lowest-numbered disk type --- 91 unchanged lines hidden --- |