diff options
| author | jhb <jhb@FreeBSD.org> | 2007-10-24 04:03:25 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2007-10-24 04:03:25 +0000 |
| commit | 67997e41d53c8ad1c2b5042fbb90c1324c017ac4 (patch) | |
| tree | fdf38b4daaca0d3bae26f2cebbfb7bbbf5eb115e /sys/boot/i386/loader | |
| parent | 9bc0f4c6a443721979818bca4ed522cc2dcb24f3 (diff) | |
| download | FreeBSD-src-67997e41d53c8ad1c2b5042fbb90c1324c017ac4.zip FreeBSD-src-67997e41d53c8ad1c2b5042fbb90c1324c017ac4.tar.gz | |
Slightly cleanup the 'bootdev' concept on x86 by changing the various
macros to treat the 'slice' field as a real part of the bootdev instead
of as hack that spans two other fields (adaptor (sic) and controller)
that are not used in any modern FreeBSD boot code.
MFC after: 1 week
Diffstat (limited to 'sys/boot/i386/loader')
| -rw-r--r-- | sys/boot/i386/loader/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c index 0c0046f..2083456 100644 --- a/sys/boot/i386/loader/main.c +++ b/sys/boot/i386/loader/main.c @@ -218,8 +218,7 @@ extract_currdev(void) new_currdev.d_kind.biosdisk.partition = 0; biosdev = -1; } else { - new_currdev.d_kind.biosdisk.slice = (B_ADAPTOR(initial_bootdev) << 4) + - B_CONTROLLER(initial_bootdev) - 1; + new_currdev.d_kind.biosdisk.slice = B_SLICE(initial_bootdev) - 1; new_currdev.d_kind.biosdisk.partition = B_PARTITION(initial_bootdev); biosdev = initial_bootinfo->bi_bios_dev; |
