diff options
| -rw-r--r-- | sys/dev/si/si.h | 5 | ||||
| -rw-r--r-- | sys/i386/include/ipl.h | 8 | ||||
| -rw-r--r-- | sys/i386/include/si.h | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h index 8e6f0ab..97284d8 100644 --- a/sys/dev/si/si.h +++ b/sys/dev/si/si.h @@ -30,9 +30,11 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id$ + * $Id: si.h,v 1.8 1997/02/22 09:35:10 peter Exp $ */ +#include <sys/callout.h> + /* * Macro to turn a device number into various parameters, and test for * CONTROL device. @@ -358,6 +360,7 @@ struct si_port { /* Lock state. */ struct termios sp_lin; struct termios sp_lout; + struct callout_handle lstart_ch;/* For canceling our timeout */ #ifdef SI_DEBUG int sp_debug; /* debug mask */ #endif diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h index 9ec4046..d49ea6b 100644 --- a/sys/i386/include/ipl.h +++ b/sys/i386/include/ipl.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ipl.h,v 1.1 1997/08/20 19:47:48 smp Exp $ + * $Id: ipl.h,v 1.11 1997/08/21 05:15:08 fsmp Exp $ */ #ifndef _MACHINE_IPL_H_ @@ -51,6 +51,8 @@ */ #define SWI_TTY (NHWI + 0) #define SWI_NET (NHWI + 1) +#define SWI_CAMNET (NHWI + 2) +#define SWI_CAMBIO (NHWI + 3) #define SWI_CLOCK 30 #define SWI_AST 31 @@ -59,6 +61,8 @@ */ #define SWI_TTY_PENDING (1 << SWI_TTY) #define SWI_NET_PENDING (1 << SWI_NET) +#define SWI_CAMNET_PENDING (1 << SWI_CAMNET) +#define SWI_CAMBIO_PENDING (1 << SWI_CAMBIO) #define SWI_CLOCK_PENDING (1 << SWI_CLOCK) #define SWI_AST_PENDING (1 << SWI_AST) @@ -75,6 +79,8 @@ * spltty() apparently only needs to mask soft net interrupts). */ #define SWI_TTY_MASK (SWI_TTY_PENDING | SWI_CLOCK_MASK | SWI_NET_MASK) +#define SWI_CAMNET_MASK (SWI_CAMNET_PENDING | SWI_CLOCK_MASK) +#define SWI_CAMBIO_MASK (SWI_CAMBIO_PENDING | SWI_CLOCK_MASK) #define SWI_NET_MASK (SWI_NET_PENDING | SWI_CLOCK_MASK) #define SWI_CLOCK_MASK (SWI_CLOCK_PENDING | SWI_AST_MASK) #define SWI_AST_MASK SWI_AST_PENDING diff --git a/sys/i386/include/si.h b/sys/i386/include/si.h index 8e6f0ab..97284d8 100644 --- a/sys/i386/include/si.h +++ b/sys/i386/include/si.h @@ -30,9 +30,11 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id$ + * $Id: si.h,v 1.8 1997/02/22 09:35:10 peter Exp $ */ +#include <sys/callout.h> + /* * Macro to turn a device number into various parameters, and test for * CONTROL device. @@ -358,6 +360,7 @@ struct si_port { /* Lock state. */ struct termios sp_lin; struct termios sp_lout; + struct callout_handle lstart_ch;/* For canceling our timeout */ #ifdef SI_DEBUG int sp_debug; /* debug mask */ #endif |
