ioctl now takes struct proc *.
This commit is contained in:
parent
011f63af43
commit
ecfa08e11e
@ -33,7 +33,7 @@
|
||||
*/
|
||||
/*
|
||||
* The console device driver for Alice.
|
||||
* $Id: console.c,v 1.8 1994/01/30 01:07:01 briggs Exp $
|
||||
* $Id: console.c,v 1.9 1994/02/10 04:30:30 briggs Exp $
|
||||
*
|
||||
* April 11th, 1992 LK
|
||||
* Original
|
||||
@ -1532,7 +1532,7 @@ conwrite(dev_t dev, struct uio *uio, int flag)
|
||||
return ((*linesw[maccon_tty[unit]->t_line].l_write)(maccon_tty[unit], uio, flag));
|
||||
}
|
||||
|
||||
conioctl(dev_t dev, int cmd, caddr_t data, int flag)
|
||||
conioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
{
|
||||
register struct tty *tp;
|
||||
register int unit = minor(dev);
|
||||
@ -1543,10 +1543,10 @@ conioctl(dev_t dev, int cmd, caddr_t data, int flag)
|
||||
if (unit >= NCON)
|
||||
return (ENODEV);
|
||||
tp = maccon_tty[unit];
|
||||
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag);
|
||||
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
|
||||
if (error >= 0)
|
||||
return (error);
|
||||
error = ttioctl(tp, cmd, data, flag);
|
||||
error = ttioctl(tp, cmd, data, flag, p);
|
||||
if (error >= 0)
|
||||
return (error);
|
||||
|
||||
|
@ -69,7 +69,7 @@
|
||||
* added DCD event detection
|
||||
* added software fifo's
|
||||
*
|
||||
* $Id: ser.c,v 1.4 1994/01/30 01:10:33 briggs Exp $
|
||||
* $Id: ser.c,v 1.5 1994/02/10 04:30:27 briggs Exp $
|
||||
*
|
||||
* Mac II serial device interface
|
||||
*
|
||||
@ -553,7 +553,7 @@ sersir(void)
|
||||
}
|
||||
|
||||
extern int
|
||||
serioctl(dev_t dev, int cmd, caddr_t data, int flag)
|
||||
serioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
{
|
||||
register struct tty *tp;
|
||||
register int unit = UNIT(dev);
|
||||
@ -563,10 +563,10 @@ serioctl(dev_t dev, int cmd, caddr_t data, int flag)
|
||||
printf("ser: entering ioctl()\n");
|
||||
#endif
|
||||
tp = ser_tty[unit];
|
||||
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag);
|
||||
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
|
||||
if (error >= 0)
|
||||
return (error);
|
||||
error = ttioctl(tp, cmd, data, flag);
|
||||
error = ttioctl(tp, cmd, data, flag, p);
|
||||
if (error >= 0)
|
||||
return (error);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user