staging:dgnc:dgnc_tty.c Modify block comments
PATCH 3/4 staging:dgnc:dgnc_tty.c Modify block comments
Make block comment format changes to comply with
style guides
Signed-off-by Walt Feasel <[email protected]>
--- drivers/staging/dgnc/dgnc_tty.c | 166 ++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 100 deletions(-)
drivers/staging/dgnc/dgnc_tty.c +66 -100
@@ -42,9 +42,8 @@#include "dgnc_sysfs.h" #include "dgnc_utils.h" -/* -* Default transparent print information. -*/ +/* Default transparent print information. */ +static const struct digi_t dgnc_digi_init = { .digi_flags =DIGI_COOK ,/* Flags */ .digi_maxcps =100 ,/* Max CPS */
@@ -396,9 +395,8 @@ static void dgnc_wmove(struct channel_t *ch, char *buf, uint n) }if (n >0 ) { -/* -* Move rest of data. -*/ +/* Move rest of data. */ + remain = n;memcpy (ch->ch_wqueue + head, buf, remain); head += remain;
@@ -468,9 +466,8 @@ void dgnc_input(struct channel_t *ch) goto exit_unlock; } -/* -* If we are throttled, simply don't read any data. -*/ +/* If we are throttled, simply don't read any data. */ +if (ch->ch_flags &CH_FORCED_STOPI ) goto exit_unlock;
@@ -604,9 +601,8 @@ void dgnc_carrier(struct channel_t *ch)if (ch->ch_c_cflag &CLOCAL ) virt_carrier =1 ; -/* -* Test for a VIRTUAL carrier transition to HIGH. -*/ +/* Test for a VIRTUAL carrier transition to HIGH. */ +if (((ch->ch_flags &CH_FCAR ) ==0 ) && (virt_carrier ==1 )) {/* * When carrier rises, wake any threads waiting
@@ -617,9 +613,8 @@ void dgnc_carrier(struct channel_t *ch)wake_up_interruptible (&ch->ch_flags_wait); } -/* -* Test for a PHYSICAL carrier transition to HIGH. -*/ +/* Test for a PHYSICAL carrier transition to HIGH. */ +if (((ch->ch_flags &CH_CD ) ==0 ) && (phys_carrier ==1 )) {/* * When carrier rises, wake any threads waiting
@@ -663,9 +658,8 @@ void dgnc_carrier(struct channel_t *ch)tty_hangup (ch->ch_pun.un_tty); } -/* -* Make sure that our cached values reflect the current reality. -*/ +/* Make sure that our cached values reflect the current reality. */ +if (virt_carrier ==1 ) ch->ch_flags |=CH_FCAR ;else
@@ -677,9 +671,8 @@ void dgnc_carrier(struct channel_t *ch) ch->ch_flags &= ~CH_CD ; } -/* -* Assign the custom baud rate to the channel structure -*/ +/* Assign the custom baud rate to the channel structure */ +static void dgnc_set_custom_speed (struct channel_t *ch,uint newrate) {int testdiv;
@@ -823,9 +816,8 @@ void dgnc_wakeup_writes(struct channel_t *ch)spin_lock_irqsave (&ch->ch_lock, flags); -/* -* If channel now has space, wake up anyone waiting on the condition. -*/ +/* If channel now has space, wake up anyone waiting on the condition. */ + qlen = ch->ch_w_head - ch->ch_w_tail;if (qlen <0 ) qlen +=WQUEUESIZE ;
@@ -913,10 +905,8 @@ static struct dgnc_board *find_board_by_major(unsigned int major)* ************************************************************************/ -/* -* dgnc_tty_open() -* -*/ +/* dgnc_tty_open() */ +static int dgnc_tty_open (struct tty_struct *tty,struct file *file) {struct dgnc_board *brd;
@@ -1016,9 +1006,8 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)/* Store our unit into driver_data, so we always have it available. */ tty->driver_data = un; -/* -* Initialize tty's -*/ +/* Initialize tty's */ +if (!(un->un_flags &UN_ISOPEN )) {/* Store important variables. */ un->un_tty = tty;
@@ -1055,13 +1044,11 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) ch->ch_flags &= ~(CH_OPENING );wake_up_interruptible (&ch->ch_flags_wait); -/* -* Initialize if neither terminal or printer is open. -*/ +/* Initialize if neither terminal or printer is open. */ +if (!((ch->ch_tun.un_flags | ch->ch_pun.un_flags) &UN_ISOPEN )) { -/* -* Flush input queues. -*/ +/* Flush input queues. */ + ch->ch_r_head =0 ; ch->ch_r_tail =0 ; ch->ch_e_head =0 ;
@@ -1097,16 +1084,13 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) brd->bd_ops->uart_init (ch); } -/* -* Run param in case we changed anything -*/ +/* Run param in case we changed anything */ + brd->bd_ops->param (tty);dgnc_carrier (ch); -/* -* follow protocol for opening port -*/ +/* follow protocol for opening port */ spin_unlock_irqrestore (&ch->ch_lock, flags);
@@ -1207,9 +1191,8 @@ static int dgnc_block_til_ready(struct tty_struct *tty,break ; } -/* -* Store the flags before we let go of channel lock -*/ +/* Store the flags before we let go of channel lock */ +if (sleep_on_un_flags) old_flags = ch->ch_tun.un_flags | ch->ch_pun.un_flags;else
@@ -1263,10 +1246,8 @@ static void dgnc_tty_hangup(struct tty_struct *tty)dgnc_tty_flush_buffer (tty); } -/* -* dgnc_tty_close() -* -*/ +/* dgnc_tty_close() */ +static void dgnc_tty_close (struct tty_struct *tty,struct file *file) {struct dgnc_board *bd;
@@ -1336,9 +1317,8 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) !(ch->ch_digi.digi_flags & DIGI_PRINTER)) { ch->ch_flags &= ~(CH_STOPI |CH_FORCED_STOPI ); -/* -* turn off print device when closing print device. -*/ +/* turn off print device when closing print device. */ +if ((un->un_type ==DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, (int )ch->ch_digi.digi_offlen);
@@ -1358,9 +1338,8 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) tty->closing =0 ; -/* -* If we have HUPCL set, lower DTR and RTS -*/ +/* If we have HUPCL set, lower DTR and RTS */ +if (ch->ch_c_cflag &HUPCL ) {/* Drop RTS/DTR */ ch->ch_mostat &= ~(UART_MCR_DTR |UART_MCR_RTS );
@@ -1383,9 +1362,8 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)/* Turn off UART interrupts for this port */ ch->ch_bd->bd_ops->uart_off (ch); }else { -/* -* turn off print device when closing print device. -*/ +/* turn off print device when closing print device. */ +if ((un->un_type ==DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, (int )ch->ch_digi.digi_offlen);
@@ -1557,9 +1535,8 @@ static int dgnc_tty_write_room(struct tty_struct *tty)*/ static int dgnc_tty_put_char (struct tty_struct *tty,unsigned char c) { -/* -* Simply call tty_write. -*/ +/* Simply call tty_write. */ +dgnc_tty_write (tty, &c,1 );return 1 ; }
@@ -1626,9 +1603,8 @@ static int dgnc_tty_write(struct tty_struct *tty,*/ count =min (count, bufcount); -/* -* Bail if no space left. -*/ +/* Bail if no space left. */ +if (count <=0 ) goto exit_retry;
@@ -1671,9 +1647,8 @@ static int dgnc_tty_write(struct tty_struct *tty, }if (n >0 ) { -/* -* Move rest of data. -*/ +/* Move rest of data. */ + remain = n;memcpy (ch->ch_wqueue + head, buf, remain); head += remain;
@@ -1708,9 +1683,7 @@ static int dgnc_tty_write(struct tty_struct *tty,return 0 ; } -/* -* Return modem signals to ld. -*/ +/* Return modem signals to ld. */ static int dgnc_tty_tiocmget (struct tty_struct *tty) {
@@ -1919,9 +1892,8 @@ static void dgnc_tty_send_xchar(struct tty_struct *tty, char c)dev_dbg (tty->dev,"dgnc_tty_send_xchar finish\n" ); } -/* -* Return modem signals to ld. -*/ +/* Return modem signals to ld. */ +static inline int dgnc_get_mstat (struct channel_t *ch) {unsigned char mstat;
@@ -1953,9 +1925,8 @@ static inline int dgnc_get_mstat(struct channel_t *ch)return result; } -/* -* Return modem signals to ld. -*/ +/* Return modem signals to ld. */ +static int dgnc_get_modem_info (struct channel_t *ch,unsigned int __user *value) {
@@ -2104,9 +2075,8 @@ static int dgnc_tty_digiseta(struct tty_struct *tty,spin_lock_irqsave (&ch->ch_lock, flags); -/* -* Handle transitions to and from RTS Toggle. -*/ +/* Handle transitions to and from RTS Toggle. */ +if (!(ch->ch_digi.digi_flags &DIGI_RTS_TOGGLE ) && (new_digi.digi_flags &DIGI_RTS_TOGGLE )) ch->ch_mostat &= ~(UART_MCR_RTS );
@@ -2114,9 +2084,8 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, !(new_digi.digi_flags & DIGI_RTS_TOGGLE)) ch->ch_mostat |= (UART_MCR_RTS); -/* -* Handle transitions to and from DTR Toggle. -*/ +/* Handle transitions to and from DTR Toggle. */ +if (!(ch->ch_digi.digi_flags &DIGI_DTR_TOGGLE ) && (new_digi.digi_flags &DIGI_DTR_TOGGLE )) ch->ch_mostat &= ~(UART_MCR_DTR );
@@ -2154,9 +2123,8 @@ static int dgnc_tty_digiseta(struct tty_struct *tty,return 0 ; } -/* -* dgnc_set_termios() -*/ +/* dgnc_set_termios() */ +static void dgnc_tty_set_termios (struct tty_struct *tty,struct ktermios *old_termios) {
@@ -2542,9 +2510,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,spin_unlock_irqrestore (&ch->ch_lock, flags);return dgnc_set_modem_info (ch, cmd, uarg); -/* -* Here are any additional ioctl's that we want to implement -*/ +/* Here are any additional ioctl's that we want to implement */ case TCFLSH :/*
@@ -2664,7 +2630,8 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,case DIGI_LOOPBACK : {uint loopback =0 ; -/* Let go of locks when accessing user space, +/* +* Let go of locks when accessing user space, * could sleep */ spin_unlock_irqrestore (&ch->ch_lock, flags);
@@ -2790,23 +2757,23 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,spin_unlock_irqrestore (&ch->ch_lock, flags); -/* -* Get data from user first. -*/ +/* Get data from user first. */ +if (copy_from_user (&buf, uarg,sizeof (buf)))return -EFAULT ;spin_lock_irqsave (&ch->ch_lock, flags); -/* -* Figure out how much data is in our RX and TX queues. -*/ +/* Figure out how much data is in our RX and TX queues. */ + buf.rxbuf = (ch->ch_r_head - ch->ch_r_tail) &RQUEUEMASK ; buf.txbuf = (ch->ch_w_head - ch->ch_w_tail) &WQUEUEMASK ;/* -* Is the UART empty? Add that value to whats in our TX queue. +*Is the UART empty? +*Add that value to whats in our TX queue. */ + count = buf.txbuf + ch_bd_ops->get_uart_bytes_left (ch);/*
@@ -2826,9 +2793,8 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,if (buf.txbuf > tdist) buf.txbuf = tdist; -/* -* Report whether our queue and UART TX are completely empty. -*/ +/* Report whether our queue and UART TX are completely empty. */ +if (count) buf.txdone =0 ;else
Signature · 1 line
2.1.4