diff options
| author | jhb <jhb@FreeBSD.org> | 2015-12-24 06:22:41 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-12-24 06:22:41 +0000 |
| commit | dea196cd0987efddd0de054962cd6f8b403787d4 (patch) | |
| tree | 0771dc0af112a1f6922d82ea8b5a3cb3b862fea7 /sys/boot/pc98 | |
| parent | 7f1fba1154060b21f6c2b13be3a730d04951ff16 (diff) | |
| download | FreeBSD-src-dea196cd0987efddd0de054962cd6f8b403787d4.zip FreeBSD-src-dea196cd0987efddd0de054962cd6f8b403787d4.tar.gz | |
Fix remaining direct tests of the carry flag in the v86 %eflags via a
magic number to use V86_CY() instead. These should have been fixed as
part of the cleanup in r226746 but were missed.
The md5 sums of the object files were unchanged, so there should be no
functional change.
PR: 205424
Submitted by: Alexander Kuleshov <kuleshovmail@gmail.com>
MFC after: 1 week
Diffstat (limited to 'sys/boot/pc98')
| -rw-r--r-- | sys/boot/pc98/boot2/boot2.c | 2 | ||||
| -rw-r--r-- | sys/boot/pc98/libpc98/biosdisk.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/pc98/boot2/boot2.c b/sys/boot/pc98/boot2/boot2.c index 83af085..991cc53 100644 --- a/sys/boot/pc98/boot2/boot2.c +++ b/sys/boot/pc98/boot2/boot2.c @@ -327,7 +327,7 @@ bd_getbigeom(int bunit) v86.addr = 0x1b; v86.eax = 0x8400 | unit; v86int(); - if (v86.efl & 0x1) + if (V86_CY(v86.efl)) return 0x4F020F; /* 1200KB FD C:80 H:2 S:15 */ return ((v86.ecx & 0xffff) << 16) | (v86.edx & 0xffff); } diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c index 96dbd1f..b777d25 100644 --- a/sys/boot/pc98/libpc98/biosdisk.c +++ b/sys/boot/pc98/libpc98/biosdisk.c @@ -824,7 +824,7 @@ bd_chs_io(struct open_disk *od, daddr_t dblk, int blks, caddr_t dest, int write) v86.es = VTOPSEG(dest); v86.ebp = VTOPOFF(dest); v86int(); - return (v86.efl & 0x1); + return (V86_CY(v86.efl)); } static int @@ -959,7 +959,7 @@ bd_getgeom(struct open_disk *od) od->od_cyl = v86.ecx; od->od_hds = (v86.edx >> 8) & 0xff; od->od_sec = v86.edx & 0xff; - if (v86.efl & 0x1) + if (V86_CY(v86.efl)) return(1); } @@ -1010,7 +1010,7 @@ bd_getbigeom(int bunit) v86.addr = 0x1b; v86.eax = 0x8400 | unit; v86int(); - if (v86.efl & 0x1) + if (V86_CY(v86.efl)) return 0x4F020F; /* 1200KB FD C:80 H:2 S:15 */ return ((v86.ecx & 0xffff) << 16) | (v86.edx & 0xffff); } |
