diff options
| author | jhb <jhb@FreeBSD.org> | 2011-10-25 19:45:12 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2011-10-25 19:45:12 +0000 |
| commit | 465469fc74999a15659ae97644b7fcd86a664cd5 (patch) | |
| tree | 9833dc925193f64e764ad4b4a8923355e787b17b /sys/boot/i386/common | |
| parent | 332e83efa6d41a05f6d3c987ba946b36dce78ab0 (diff) | |
| download | FreeBSD-src-465469fc74999a15659ae97644b7fcd86a664cd5.zip FreeBSD-src-465469fc74999a15659ae97644b7fcd86a664cd5.tar.gz | |
Consolidate duplicate definitions of V86_CY() and V86_ZR() which check for
the carry and zero flags being set, respectively, in <btxv86.h> and use
them throughout the x86 boot code.
Diffstat (limited to 'sys/boot/i386/common')
| -rw-r--r-- | sys/boot/i386/common/cons.c | 2 | ||||
| -rw-r--r-- | sys/boot/i386/common/drv.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/sys/boot/i386/common/cons.c b/sys/boot/i386/common/cons.c index 9384f43..97019c6 100644 --- a/sys/boot/i386/common/cons.c +++ b/sys/boot/i386/common/cons.c @@ -27,8 +27,6 @@ __FBSDID("$FreeBSD$"); #include "util.h" #include "cons.h" -#define V86_ZR(x) ((x) & PSL_Z) - #define SECOND 18 /* Circa that many ticks in a second. */ uint8_t ioctrl = IO_KEYBOARD; diff --git a/sys/boot/i386/common/drv.c b/sys/boot/i386/common/drv.c index 11f6628..661047c 100644 --- a/sys/boot/i386/common/drv.c +++ b/sys/boot/i386/common/drv.c @@ -19,8 +19,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <machine/psl.h> - #include <btxv86.h> #include "rbx.h" @@ -30,9 +28,6 @@ __FBSDID("$FreeBSD$"); #include "xreadorg.h" #endif -#define V86_CY(x) ((x) & PSL_C) -#define V86_ZR(x) ((x) & PSL_Z) - #ifdef GPT uint64_t drvsize(struct dsk *dskp) |
