diff options
| author | nyan <nyan@FreeBSD.org> | 2007-10-24 11:54:04 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2007-10-24 11:54:04 +0000 |
| commit | 805e024dbda2f7e47c06bf4427724995be4e5a4b (patch) | |
| tree | 81bf991ea2f6adb480b8c129b2a02e393a802dd0 /sys | |
| parent | e64b2194638eabcc812d11973098029df5dafb4f (diff) | |
| download | FreeBSD-src-805e024dbda2f7e47c06bf4427724995be4e5a4b.zip FreeBSD-src-805e024dbda2f7e47c06bf4427724995be4e5a4b.tar.gz | |
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.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/pc98/loader/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c index d56e352..eee4638 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); |
