diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
| commit | a2952398e5de8746a761a59686619d08d376bce3 (patch) | |
| tree | df2373bb1119468873c667624769455c36dc3786 /device/tty.h | |
| parent | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (diff) | |
| parent | 92e98a7f4d4fa75b286a067e1d1caef514fccb0d (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'device/tty.h')
| -rw-r--r-- | device/tty.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/device/tty.h b/device/tty.h index be287083..d7aa2add 100644 --- a/device/tty.h +++ b/device/tty.h @@ -42,10 +42,6 @@ #include <device/cirbuf.h> #include <device/io_req.h> -#ifdef luna88k -#include <luna88k/jtermio.h> -#endif - struct tty { decl_simple_lock_data(,t_lock) struct cirbuf t_inq; /* input buffer */ @@ -76,8 +72,8 @@ struct tty { * Items beyond this point should be removed to device-specific * extension structures. */ - int (*t_getstat)(); /* routine to get status */ - int (*t_setstat)(); /* routine to set status */ + io_return_t (*t_getstat)(dev_t, int, int *, natural_t *); /* routine to get status */ + io_return_t (*t_setstat)(dev_t, int, int *, natural_t); /* routine to set status */ dev_ops_t t_tops; /* another device to possibly push through */ }; @@ -188,7 +184,7 @@ extern boolean_t tty_portdeath( #define TS_TRANSLATE 0x00100000 /* translation device enabled */ #define TS_KDB 0x00200000 /* should enter kdb on ALT */ -#define TS_MIN_TO_RCV 0x00400000 /* character recived during +#define TS_MIN_TO_RCV 0x00400000 /* character received during receive timeout interval */ /* flags - old names defined in terms of new ones */ @@ -238,6 +234,4 @@ struct ldisc_switch { extern struct ldisc_switch linesw[]; -extern void chario_init(void); - #endif /* _DEVICE_TTY_H_ */ |