xnu-344.26.tar.gz

[apple/xnu.git] / bsd / sys / tty.h

diff --git a/bsd/sys/tty.h b/bsd/sys/tty.h
index 277f50849fe5732c6aae345b5487f9123690ed0c..c24e3083ba0fe6416b001561571c0a4e59b40a87 100644 (file)
--- a/bsd/sys/tty.h
+++ b/bsd/sys/tty.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -63,11 +63,13 @@
 #ifndef _SYS_TTY_H_
 #define        _SYS_TTY_H_
 
 #ifndef _SYS_TTY_H_
 #define        _SYS_TTY_H_
 

+#include <sys/appleapiopts.h>

 #include <sys/cdefs.h>
 #include <sys/cdefs.h>

-

 #include <sys/termios.h>
 #include <sys/select.h>                /* For struct selinfo. */
 
 #include <sys/termios.h>
 #include <sys/select.h>                /* For struct selinfo. */
 

+#ifdef __APPLE_API_UNSTABLE
+

 #ifndef __APPLE__
 /*
  * Clists are character lists, which is a variable length linked list
 #ifndef __APPLE__
 /*
  * Clists are character lists, which is a variable length linked list


@@ -155,6 +157,7 @@ struct tty {
 #define        t_ospeed        t_termios.c_ospeed
 #define        t_time          t_termios.c_time
 
 #define        t_ospeed        t_termios.c_ospeed
 #define        t_time          t_termios.c_time
 

+

 #define        TTIPRI  25                      /* Sleep priority for tty reads. */
 #define        TTOPRI  26                      /* Sleep priority for tty writes. */
 
 #define        TTIPRI  25                      /* Sleep priority for tty reads. */
 #define        TTOPRI  26                      /* Sleep priority for tty writes. */
 


@@ -214,6 +217,7 @@ struct tty {
 #define        TS_DSR_OFLOW    0x800000        /* For CDSR_OFLOW. */
 #endif
 
 #define        TS_DSR_OFLOW    0x800000        /* For CDSR_OFLOW. */
 #endif
 

+

 /* Character type information. */
 #define        ORDINARY        0
 #define        CONTROL         1
 /* Character type information. */
 #define        ORDINARY        0
 #define        CONTROL         1


@@ -260,6 +264,7 @@ struct speedtab {
 #define        TSA_PTC_WRITE(tp)       ((void *)&(tp)->t_rawq.c_cl)
 #define        TSA_PTS_READ(tp)        ((void *)&(tp)->t_canq)
 
 #define        TSA_PTC_WRITE(tp)       ((void *)&(tp)->t_rawq.c_cl)
 #define        TSA_PTS_READ(tp)        ((void *)&(tp)->t_canq)
 

+

 #ifdef KERNEL
 __BEGIN_DECLS
 
 #ifdef KERNEL
 __BEGIN_DECLS
 


@@ -313,8 +318,8 @@ int  ttioctl __P((struct tty *tp, u_long com, caddr_t data, int flag,
 #endif
 int     ttread __P((struct tty *tp, struct uio *uio, int flag));
 void    ttrstrt __P((void *tp));
 #endif
 int     ttread __P((struct tty *tp, struct uio *uio, int flag));
 void    ttrstrt __P((void *tp));

-int     ttyselect __P((struct tty *tp, int rw, struct proc *p));
-int     ttselect __P((dev_t dev, int rw, struct proc *p));
+int     ttyselect __P((struct tty *tp, int rw, void * wql, struct proc *p));
+int     ttselect __P((dev_t dev, int rw, void * wql, struct proc *p));

 void    ttsetwater __P((struct tty *tp));
 int     ttspeedtab __P((int speed, struct speedtab *table));
 int     ttstart __P((struct tty *tp));
 void    ttsetwater __P((struct tty *tp));
 int     ttspeedtab __P((int speed, struct speedtab *table));
 int     ttstart __P((struct tty *tp));


@@ -341,4 +346,6 @@ __END_DECLS
 
 #endif /* KERNEL */
 
 
 #endif /* KERNEL */
 

+#endif /* __APPLE_API_UNSTABLE */
+

 #endif /* !_SYS_TTY_H_ */
 #endif /* !_SYS_TTY_H_ */