adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

epca: use tty_port

Browse source 
Switch the EPCA driver to include and begin using a tty_port structure

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2008-07-16 21:55:02 +01:00 committed by Linus Torvalds
parent 7a4d29f426
commit 52d417388d
2 changed files with 54 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
drivers/char/epca.c
View file

@ -432,7 +432,7 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
return; return;
} }
if (ch->count-- > 1) { if (ch->port.count-- > 1) {
/* Begin channel is open more than once */ /* Begin channel is open more than once */
/* /*
* Return without doing anything. Someone might still * Return without doing anything. Someone might still
@ -442,19 +442,19 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
return; return;
} }
/* Port open only once go ahead with shutdown & reset */ /* Port open only once go ahead with shutdown & reset */
BUG_ON(ch->count < 0); BUG_ON(ch->port.count < 0);
/* /*
* Let the rest of the driver know the channel is being closed. * Let the rest of the driver know the channel is being closed.
* This becomes important if an open is attempted before close * This becomes important if an open is attempted before close
* is finished. * is finished.
*/ */
ch->asyncflags |= ASYNC_CLOSING; ch->port.flags |= ASYNC_CLOSING;
tty->closing = 1; tty->closing = 1;
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
if (ch->asyncflags & ASYNC_INITIALIZED) { if (ch->port.flags & ASYNC_INITIALIZED) {
/* Setup an event to indicate when the /* Setup an event to indicate when the
transmit buffer empties */ transmit buffer empties */
setup_empty_event(tty, ch); setup_empty_event(tty, ch);
@ -469,17 +469,17 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
spin_lock_irqsave(&epca_lock, flags); spin_lock_irqsave(&epca_lock, flags);
tty->closing = 0; tty->closing = 0;
ch->event = 0; ch->event = 0;
ch->tty = NULL; ch->port.tty = NULL;
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
if (ch->blocked_open) { if (ch->port.blocked_open) {
if (ch->close_delay) if (ch->close_delay)
msleep_interruptible(jiffies_to_msecs(ch->close_delay)); msleep_interruptible(jiffies_to_msecs(ch->close_delay));
wake_up_interruptible(&ch->open_wait); wake_up_interruptible(&ch->port.open_wait);
} }
ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED | ch->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED |
ASYNC_CLOSING); ASYNC_CLOSING);
wake_up_interruptible(&ch->close_wait); wake_up_interruptible(&ch->port.close_wait);
} }
} }
@ -489,7 +489,7 @@ static void shutdown(struct channel *ch)
struct tty_struct *tty; struct tty_struct *tty;
struct board_chan __iomem *bc; struct board_chan __iomem *bc;
if (!(ch->asyncflags & ASYNC_INITIALIZED)) if (!(ch->port.flags & ASYNC_INITIALIZED))
return; return;
spin_lock_irqsave(&epca_lock, flags); spin_lock_irqsave(&epca_lock, flags);
@ -504,7 +504,7 @@ static void shutdown(struct channel *ch)
*/ */
if (bc) if (bc)
writeb(0, &bc->idata); writeb(0, &bc->idata);
tty = ch->tty; tty = ch->port.tty;
/* If we're a modem control device and HUPCL is on, drop RTS & DTR. */ /* If we're a modem control device and HUPCL is on, drop RTS & DTR. */
if (tty->termios->c_cflag & HUPCL) { if (tty->termios->c_cflag & HUPCL) {
@ -518,7 +518,7 @@ static void shutdown(struct channel *ch)
* will have to reinitialized. Set a flag to indicate this. * will have to reinitialized. Set a flag to indicate this.
*/ */
/* Prevent future Digi programmed interrupts from coming active */ /* Prevent future Digi programmed interrupts from coming active */
ch->asyncflags &= ~ASYNC_INITIALIZED; ch->port.flags &= ~ASYNC_INITIALIZED;
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
} }
@ -538,12 +538,12 @@ static void pc_hangup(struct tty_struct *tty)
shutdown(ch); shutdown(ch);
spin_lock_irqsave(&epca_lock, flags); spin_lock_irqsave(&epca_lock, flags);
ch->tty = NULL; ch->port.tty = NULL;
ch->event = 0; ch->event = 0;
ch->count = 0; ch->port.count = 0;
ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED); ch->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED);
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
wake_up_interruptible(&ch->open_wait); wake_up_interruptible(&ch->port.open_wait);
} }
} }
@ -795,7 +795,7 @@ static int block_til_ready(struct tty_struct *tty,
unsigned long flags; unsigned long flags;
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
if (ch->asyncflags & ASYNC_HUP_NOTIFY) if (ch->port.flags & ASYNC_HUP_NOTIFY)
retval = -EAGAIN; retval = -EAGAIN;
else else
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
@ -806,10 +806,10 @@ static int block_til_ready(struct tty_struct *tty,
* If the device is in the middle of being closed, then block until * If the device is in the middle of being closed, then block until
* it's done, and then try again. * it's done, and then try again.
*/ */
if (ch->asyncflags & ASYNC_CLOSING) { if (ch->port.flags & ASYNC_CLOSING) {
interruptible_sleep_on(&ch->close_wait); interruptible_sleep_on(&ch->port.close_wait);
if (ch->asyncflags & ASYNC_HUP_NOTIFY) if (ch->port.flags & ASYNC_HUP_NOTIFY)
return -EAGAIN; return -EAGAIN;
else else
return -ERESTARTSYS; return -ERESTARTSYS;
@ -820,7 +820,7 @@ static int block_til_ready(struct tty_struct *tty,
* If non-blocking mode is set, then make the check up front * If non-blocking mode is set, then make the check up front
* and then exit. * and then exit.
*/ */
ch->asyncflags |= ASYNC_NORMAL_ACTIVE; ch->port.flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
if (tty->termios->c_cflag & CLOCAL) if (tty->termios->c_cflag & CLOCAL)
@ -828,24 +828,24 @@ static int block_til_ready(struct tty_struct *tty,
/* Block waiting for the carrier detect and the line to become free */ /* Block waiting for the carrier detect and the line to become free */
retval = 0; retval = 0;
add_wait_queue(&ch->open_wait, &wait); add_wait_queue(&ch->port.open_wait, &wait);
spin_lock_irqsave(&epca_lock, flags); spin_lock_irqsave(&epca_lock, flags);
/* We dec count so that pc_close will know when to free things */ /* We dec count so that pc_close will know when to free things */
if (!tty_hung_up_p(filp)) if (!tty_hung_up_p(filp))
ch->count--; ch->port.count--;
ch->blocked_open++; ch->port.blocked_open++;
while (1) { while (1) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (tty_hung_up_p(filp) || if (tty_hung_up_p(filp) ||
!(ch->asyncflags & ASYNC_INITIALIZED)) { !(ch->port.flags & ASYNC_INITIALIZED)) {
if (ch->asyncflags & ASYNC_HUP_NOTIFY) if (ch->port.flags & ASYNC_HUP_NOTIFY)
retval = -EAGAIN; retval = -EAGAIN;
else else
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
break; break;
} }
if (!(ch->asyncflags & ASYNC_CLOSING) && if (!(ch->port.flags & ASYNC_CLOSING) &&
(do_clocal || (ch->imodem & ch->dcd))) (do_clocal || (ch->imodem & ch->dcd)))
break; break;
if (signal_pending(current)) { if (signal_pending(current)) {
@ -864,17 +864,17 @@ static int block_til_ready(struct tty_struct *tty,
} }
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
remove_wait_queue(&ch->open_wait, &wait); remove_wait_queue(&ch->port.open_wait, &wait);
if (!tty_hung_up_p(filp)) if (!tty_hung_up_p(filp))
ch->count++; ch->port.count++;
ch->blocked_open--; ch->port.blocked_open--;
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
if (retval) if (retval)
return retval; return retval;
ch->asyncflags |= ASYNC_NORMAL_ACTIVE; ch->port.flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
@ -933,7 +933,7 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
* necessary because we do not wish to flush and shutdown the channel * necessary because we do not wish to flush and shutdown the channel
* until the last app holding the channel open, closes it. * until the last app holding the channel open, closes it.
*/ */
ch->count++; ch->port.count++;
/* /*
* Set a kernel structures pointer to our local channel structure. This * Set a kernel structures pointer to our local channel structure. This
* way we can get to it when passed only a tty struct. * way we can get to it when passed only a tty struct.
@ -957,14 +957,14 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
writew(head, &bc->rout); writew(head, &bc->rout);
/* Set the channels associated tty structure */ /* Set the channels associated tty structure */
ch->tty = tty; ch->port.tty = tty;
/* /*
* The below routine generally sets up parity, baud, flow control * The below routine generally sets up parity, baud, flow control
* issues, etc.... It effect both control flags and input flags. * issues, etc.... It effect both control flags and input flags.
*/ */
epcaparam(tty, ch); epcaparam(tty, ch);
ch->asyncflags |= ASYNC_INITIALIZED; ch->port.flags |= ASYNC_INITIALIZED;
memoff(ch); memoff(ch);
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
@ -976,7 +976,7 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
* waiting for the line... * waiting for the line...
*/ */
spin_lock_irqsave(&epca_lock, flags); spin_lock_irqsave(&epca_lock, flags);
ch->tty = tty; ch->port.tty = tty;
globalwinon(ch); globalwinon(ch);
/* Enable Digi Data events */ /* Enable Digi Data events */
writeb(1, &bc->idata); writeb(1, &bc->idata);
@ -1017,8 +1017,8 @@ static void __exit epca_module_exit(void)
} }
ch = card_ptr[crd]; ch = card_ptr[crd];
for (count = 0; count < bd->numports; count++, ch++) { for (count = 0; count < bd->numports; count++, ch++) {
if (ch && ch->tty) if (ch && ch->port.tty)
tty_hangup(ch->tty); tty_hangup(ch->port.tty);
} }
} }
pci_unregister_driver(&epca_driver); pci_unregister_driver(&epca_driver);
@ -1427,7 +1427,7 @@ static void post_fep_init(unsigned int crd)
ch->boardnum = crd; ch->boardnum = crd;
ch->channelnum = i; ch->channelnum = i;
ch->magic = EPCA_MAGIC; ch->magic = EPCA_MAGIC;
ch->tty = NULL; ch->port.tty = NULL;
if (shrinkmem) { if (shrinkmem) {
fepcmd(ch, SETBUFFER, 32, 0, 0, 0); fepcmd(ch, SETBUFFER, 32, 0, 0, 0);
@ -1510,10 +1510,10 @@ static void post_fep_init(unsigned int crd)
ch->fepstopca = 0; ch->fepstopca = 0;
ch->close_delay = 50; ch->close_delay = 50;
ch->count = 0; ch->port.count = 0;
ch->blocked_open = 0; ch->port.blocked_open = 0;
init_waitqueue_head(&ch->open_wait); init_waitqueue_head(&ch->port.open_wait);
init_waitqueue_head(&ch->close_wait); init_waitqueue_head(&ch->port.close_wait);
spin_unlock_irqrestore(&epca_lock, flags); spin_unlock_irqrestore(&epca_lock, flags);
} }
@ -1633,15 +1633,15 @@ static void doevent(int crd)
if (event & MODEMCHG_IND) { if (event & MODEMCHG_IND) {
/* A modem signal change has been indicated */ /* A modem signal change has been indicated */
ch->imodem = mstat; ch->imodem = mstat;
if (ch->asyncflags & ASYNC_CHECK_CD) { if (ch->port.flags & ASYNC_CHECK_CD) {
/* We are now receiving dcd */ /* We are now receiving dcd */
if (mstat & ch->dcd) if (mstat & ch->dcd)
wake_up_interruptible(&ch->open_wait); wake_up_interruptible(&ch->port.open_wait);
else /* No dcd; hangup */ else /* No dcd; hangup */
pc_sched_event(ch, EPCA_EVENT_HANGUP); pc_sched_event(ch, EPCA_EVENT_HANGUP);
} }
} }
tty = ch->tty; tty = ch->port.tty;
if (tty) { if (tty) {
if (event & BREAK_IND) { if (event & BREAK_IND) {
/* A break has been indicated */ /* A break has been indicated */
@ -1880,9 +1880,9 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch)
* that the driver will wait on carrier detect. * that the driver will wait on carrier detect.
*/ */
if (ts->c_cflag & CLOCAL) if (ts->c_cflag & CLOCAL)
ch->asyncflags &= ~ASYNC_CHECK_CD; ch->port.flags &= ~ASYNC_CHECK_CD;
else else
ch->asyncflags |= ASYNC_CHECK_CD; ch->port.flags |= ASYNC_CHECK_CD;
mval = ch->m_dtr | ch->m_rts; mval = ch->m_dtr | ch->m_rts;
} /* End CBAUD not detected */ } /* End CBAUD not detected */
iflag = termios2digi_i(ch, ts->c_iflag); iflag = termios2digi_i(ch, ts->c_iflag);
@ -1972,7 +1972,7 @@ static void receive_data(struct channel *ch)
globalwinon(ch); globalwinon(ch);
if (ch->statusflags & RXSTOPPED) if (ch->statusflags & RXSTOPPED)
return; return;
tty = ch->tty; tty = ch->port.tty;
if (tty) if (tty)
ts = tty->termios; ts = tty->termios;
bc = ch->brdchan; bc = ch->brdchan;
@ -2032,7 +2032,7 @@ static void receive_data(struct channel *ch)
globalwinon(ch); globalwinon(ch);
writew(tail, &bc->rout); writew(tail, &bc->rout);
/* Must be called with global data */ /* Must be called with global data */
tty_schedule_flip(ch->tty); tty_schedule_flip(ch->port.tty);
} }
static int info_ioctl(struct tty_struct *tty, struct file *file, static int info_ioctl(struct tty_struct *tty, struct file *file,
@ -2376,7 +2376,7 @@ static void pc_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
if (!(old_termios->c_cflag & CLOCAL) && if (!(old_termios->c_cflag & CLOCAL) &&
(tty->termios->c_cflag & CLOCAL)) (tty->termios->c_cflag & CLOCAL))
wake_up_interruptible(&ch->open_wait); wake_up_interruptible(&ch->port.open_wait);
} /* End if channel valid */ } /* End if channel valid */
} }
@ -2386,13 +2386,13 @@ static void do_softint(struct work_struct *work)
struct channel *ch = container_of(work, struct channel, tqueue); struct channel *ch = container_of(work, struct channel, tqueue);
/* Called in response to a modem change event */ /* Called in response to a modem change event */
if (ch && ch->magic == EPCA_MAGIC) { if (ch && ch->magic == EPCA_MAGIC) {
struct tty_struct *tty = ch->tty; struct tty_struct *tty = ch->port.tty;
if (tty && tty->driver_data) { if (tty && tty->driver_data) {
if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) { if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {
tty_hangup(tty); tty_hangup(tty);
wake_up_interruptible(&ch->open_wait); wake_up_interruptible(&ch->port.open_wait);
ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE; ch->port.flags &= ~ASYNC_NORMAL_ACTIVE;
} }
} }
} }

7
drivers/char/epca.h
View file

@ -84,6 +84,7 @@ static char *board_desc[] =
struct channel struct channel
{ {
long magic; long magic;
struct tty_port port;
unsigned char boardnum; unsigned char boardnum;
unsigned char channelnum; unsigned char channelnum;
unsigned char omodem; /* FEP output modem status */ unsigned char omodem; /* FEP output modem status */
@ -117,10 +118,7 @@ struct channel
unsigned short rxbufhead; unsigned short rxbufhead;
unsigned short rxbufsize; unsigned short rxbufsize;
int close_delay; int close_delay;
int count;
int blocked_open;
unsigned long event; unsigned long event;
int asyncflags;
uint dev; uint dev;
unsigned long statusflags; unsigned long statusflags;
unsigned long c_iflag; unsigned long c_iflag;
@ -132,9 +130,6 @@ struct channel
struct board_info *board; struct board_info *board;
struct board_chan __iomem *brdchan; struct board_chan __iomem *brdchan;
struct digi_struct digiext; struct digi_struct digiext;
struct tty_struct *tty;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
struct work_struct tqueue; struct work_struct tqueue;
struct global_data __iomem *mailbox; struct global_data __iomem *mailbox;
}; };