projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
how did these ever work before?
[unix-history]
/
usr
/
src
/
sys
/
kern
/
tty_tty.c
diff --git
a/usr/src/sys/kern/tty_tty.c
b/usr/src/sys/kern/tty_tty.c
index
574b65d
..
4a4b415
100644
(file)
--- a/
usr/src/sys/kern/tty_tty.c
+++ b/
usr/src/sys/kern/tty_tty.c
@@
-1,4
+1,4
@@
-/* tty_tty.c 4.
6 82/01/19
*/
+/* tty_tty.c 4.
14 82/12/05
*/
/*
* Indirect driver for controlling tty.
/*
* Indirect driver for controlling tty.
@@
-10,66
+10,72
@@
#include "../h/conf.h"
#include "../h/dir.h"
#include "../h/user.h"
#include "../h/conf.h"
#include "../h/dir.h"
#include "../h/user.h"
+#include "../h/ioctl.h"
#include "../h/tty.h"
#include "../h/proc.h"
#include "../h/tty.h"
#include "../h/proc.h"
+#include "../h/uio.h"
/*ARGSUSED*/
syopen(dev, flag)
/*ARGSUSED*/
syopen(dev, flag)
+ dev_t dev;
+ int flag;
{
{
- if (u.u_ttyp == NULL) {
- u.u_error = ENXIO;
- return;
- }
- (*cdevsw[major(u.u_ttyd)].d_open)(u.u_ttyd, flag);
+ if (u.u_ttyp == NULL)
+ return (ENXIO);
+ return ((*cdevsw[major(u.u_ttyd)].d_open)(u.u_ttyd, flag));
}
/*ARGSUSED*/
}
/*ARGSUSED*/
-syread(dev)
+syread(dev, uio)
+ dev_t dev;
+ struct uio *uio;
{
{
- if (u.u_ttyp == NULL) {
- u.u_error = ENXIO;
- return;
- }
- (*cdevsw[major(u.u_ttyd)].d_read)(u.u_ttyd);
+ if (u.u_ttyp == NULL)
+ return (ENXIO);
+ return ((*cdevsw[major(u.u_ttyd)].d_read)(u.u_ttyd, uio));
}
/*ARGSUSED*/
}
/*ARGSUSED*/
-sywrite(dev)
+sywrite(dev, uio)
+ dev_t dev;
+ struct uio *uio;
{
{
- if (u.u_ttyp == NULL) {
- u.u_error = ENXIO;
- return;
- }
- (*cdevsw[major(u.u_ttyd)].d_write)(u.u_ttyd);
+ if (u.u_ttyp == NULL)
+ return (ENXIO);
+ return ((*cdevsw[major(u.u_ttyd)].d_write)(u.u_ttyd, uio));
}
/*ARGSUSED*/
syioctl(dev, cmd, addr, flag)
}
/*ARGSUSED*/
syioctl(dev, cmd, addr, flag)
-caddr_t addr;
+ dev_t dev;
+ int cmd;
+ caddr_t addr;
+ int flag;
{
if (cmd == TIOCNOTTY) {
u.u_ttyp = 0;
u.u_ttyd = 0;
u.u_procp->p_pgrp = 0;
{
if (cmd == TIOCNOTTY) {
u.u_ttyp = 0;
u.u_ttyd = 0;
u.u_procp->p_pgrp = 0;
- return;
- }
- if (u.u_ttyp == NULL) {
- u.u_error = ENXIO;
- return;
+ return (0);
}
}
- (*cdevsw[major(u.u_ttyd)].d_ioctl)(u.u_ttyd, cmd, addr, flag);
+ if (u.u_ttyp == NULL)
+ return (ENXIO);
+ return ((*cdevsw[major(u.u_ttyd)].d_ioctl)(u.u_ttyd, cmd, addr, flag));
}
}
+/*ARGSUSED*/
syselect(dev, flag)
syselect(dev, flag)
+ dev_t dev;
+ int flag;
{
if (u.u_ttyp == NULL) {
u.u_error = ENXIO;
return (0);
}
{
if (u.u_ttyp == NULL) {
u.u_error = ENXIO;
return (0);
}
- return ((*cdevsw[major(u.u_ttyd)].d_select)(
dev
, flag));
+ return ((*cdevsw[major(u.u_ttyd)].d_select)(
u.u_ttyd
, flag));
}
}