diff options
author | peter <peter@FreeBSD.org> | 1998-03-21 06:17:14 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1998-03-21 06:17:14 +0000 |
commit | 30c12fe99aa398f9cfc125463f406a940d5e7db2 (patch) | |
tree | 747538745508128af19746efb3d027f68883e51a /sys/i386/include/si.h | |
parent | 313d920e802e39135e82b2750669430d6432eb64 (diff) | |
download | FreeBSD-src-30c12fe99aa398f9cfc125463f406a940d5e7db2.zip FreeBSD-src-30c12fe99aa398f9cfc125463f406a940d5e7db2.tar.gz |
merge from 2.2
Diffstat (limited to 'sys/i386/include/si.h')
-rw-r--r-- | sys/i386/include/si.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/i386/include/si.h b/sys/i386/include/si.h index ebc51ef..56aae66 100644 --- a/sys/i386/include/si.h +++ b/sys/i386/include/si.h @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.h,v 1.9 1997/09/21 21:38:54 gibbs Exp $ + * $Id: si.h,v 1.10 1998/02/15 14:42:32 peter Exp $ */ #include <sys/callout.h> @@ -70,8 +70,9 @@ #define SI_CONTROLDEV_MASK 0x40000 #define SI_SPECIAL_MASK 0x70000 +#define SI_CARDSHIFT 5 #define SI_PORT(m) (m & SI_PORT_MASK) -#define SI_CARD(m) ((m & SI_CARD_MASK) >> 5) +#define SI_CARD(m) ((m & SI_CARD_MASK) >> SI_CARDSHIFT) #define SI_TTY(m) (m & SI_TTY_MASK) #define IS_CALLOUT(m) (m & SI_CALLOUT_MASK) |