From 18a60bb546fcc414a53c69e7d44e0d6a8dd92958 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Wed, 24 Oct 2007 11:54:04 +0000 Subject: [PATCH] MFi386: revision 1.41 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. --- sys/boot/pc98/loader/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c index d56e352c718b..eee463807b24 100644 --- a/sys/boot/pc98/loader/main.c +++ b/sys/boot/pc98/loader/main.c @@ -210,8 +210,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; major = B_TYPE(initial_bootdev);