diff options
Diffstat (limited to 'drivers/char/rio/riotty.c')
-rw-r--r-- | drivers/char/rio/riotty.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c index c99354843be1..2fb49e89b324 100644 --- a/drivers/char/rio/riotty.c +++ b/drivers/char/rio/riotty.c | |||
@@ -29,10 +29,6 @@ | |||
29 | ** | 29 | ** |
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | #ifdef SCCS_LABELS | ||
33 | static char *_riotty_c_sccs_ = "@(#)riotty.c 1.3"; | ||
34 | #endif | ||
35 | |||
36 | 32 | ||
37 | #define __EXPLICIT_DEF_H__ | 33 | #define __EXPLICIT_DEF_H__ |
38 | 34 | ||
@@ -144,14 +140,14 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
144 | 140 | ||
145 | tty->driver_data = PortP; | 141 | tty->driver_data = PortP; |
146 | 142 | ||
147 | PortP->gs.tty = tty; | 143 | PortP->gs.port.tty = tty; |
148 | PortP->gs.count++; | 144 | PortP->gs.port.count++; |
149 | 145 | ||
150 | rio_dprintk(RIO_DEBUG_TTY, "%d bytes in tx buffer\n", PortP->gs.xmit_cnt); | 146 | rio_dprintk(RIO_DEBUG_TTY, "%d bytes in tx buffer\n", PortP->gs.xmit_cnt); |
151 | 147 | ||
152 | retval = gs_init_port(&PortP->gs); | 148 | retval = gs_init_port(&PortP->gs); |
153 | if (retval) { | 149 | if (retval) { |
154 | PortP->gs.count--; | 150 | PortP->gs.port.count--; |
155 | return -ENXIO; | 151 | return -ENXIO; |
156 | } | 152 | } |
157 | /* | 153 | /* |
@@ -297,7 +293,7 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
297 | ** insert test for carrier here. -- ??? | 293 | ** insert test for carrier here. -- ??? |
298 | ** I already see that test here. What's the deal? -- REW | 294 | ** I already see that test here. What's the deal? -- REW |
299 | */ | 295 | */ |
300 | if ((PortP->gs.tty->termios->c_cflag & CLOCAL) || | 296 | if ((PortP->gs.port.tty->termios->c_cflag & CLOCAL) || |
301 | (PortP->ModemState & RIOC_MSVR1_CD)) { | 297 | (PortP->ModemState & RIOC_MSVR1_CD)) { |
302 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) Modem carr on\n", SysPort); | 298 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) Modem carr on\n", SysPort); |
303 | /* | 299 | /* |
@@ -305,16 +301,16 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
305 | wakeup((caddr_t) &tp->tm.c_canq); | 301 | wakeup((caddr_t) &tp->tm.c_canq); |
306 | */ | 302 | */ |
307 | PortP->State |= RIO_CARR_ON; | 303 | PortP->State |= RIO_CARR_ON; |
308 | wake_up_interruptible(&PortP->gs.open_wait); | 304 | wake_up_interruptible(&PortP->gs.port.open_wait); |
309 | } else { /* no carrier - wait for DCD */ | 305 | } else { /* no carrier - wait for DCD */ |
310 | /* | 306 | /* |
311 | while (!(PortP->gs.tty->termios->c_state & CARR_ON) && | 307 | while (!(PortP->gs.port.tty->termios->c_state & CARR_ON) && |
312 | !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted ) | 308 | !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted ) |
313 | */ | 309 | */ |
314 | while (!(PortP->State & RIO_CARR_ON) && !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted) { | 310 | while (!(PortP->State & RIO_CARR_ON) && !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted) { |
315 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) sleeping for carr on\n", SysPort); | 311 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) sleeping for carr on\n", SysPort); |
316 | /* | 312 | /* |
317 | PortP->gs.tty->termios->c_state |= WOPEN; | 313 | PortP->gs.port.tty->termios->c_state |= WOPEN; |
318 | */ | 314 | */ |
319 | PortP->State |= RIO_WOPEN; | 315 | PortP->State |= RIO_WOPEN; |
320 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 316 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); |
@@ -384,7 +380,7 @@ int riotclose(void *ptr) | |||
384 | /* PortP = p->RIOPortp[SysPort]; */ | 380 | /* PortP = p->RIOPortp[SysPort]; */ |
385 | rio_dprintk(RIO_DEBUG_TTY, "Port is at address %p\n", PortP); | 381 | rio_dprintk(RIO_DEBUG_TTY, "Port is at address %p\n", PortP); |
386 | /* tp = PortP->TtyP; *//* Get tty */ | 382 | /* tp = PortP->TtyP; *//* Get tty */ |
387 | tty = PortP->gs.tty; | 383 | tty = PortP->gs.port.tty; |
388 | rio_dprintk(RIO_DEBUG_TTY, "TTY is at address %p\n", tty); | 384 | rio_dprintk(RIO_DEBUG_TTY, "TTY is at address %p\n", tty); |
389 | 385 | ||
390 | if (PortP->gs.closing_wait) | 386 | if (PortP->gs.closing_wait) |