lkml.org 
[lkml]   [2008]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/70] tty.h: clean up
    Date
    From: Alan Cox <alan@redhat.com>

    Coding style clean up and white space tidy

    Signed-off-by: Alan Cox <alan@redhat.com>
    ---

    include/linux/tty.h | 165 ++++++++++++++++++++++++++-------------------------
    1 files changed, 85 insertions(+), 80 deletions(-)


    diff --git a/include/linux/tty.h b/include/linux/tty.h
    index d7c695b..46008e8 100644
    --- a/include/linux/tty.h
    +++ b/include/linux/tty.h
    @@ -71,7 +71,8 @@ struct tty_bufhead {
    struct tty_buffer *head; /* Queue head */
    struct tty_buffer *tail; /* Active buffer */
    struct tty_buffer *free; /* Free queue head */
    - int memory_used; /* Buffer space used excluding free queue */
    + int memory_used; /* Buffer space used excluding
    + free queue */
    };
    /*
    * When a break, frame error, or parity error happens, these codes are
    @@ -101,68 +102,68 @@ struct tty_bufhead {
    #define LNEXT_CHAR(tty) ((tty)->termios->c_cc[VLNEXT])
    #define EOL2_CHAR(tty) ((tty)->termios->c_cc[VEOL2])

    -#define _I_FLAG(tty,f) ((tty)->termios->c_iflag & (f))
    -#define _O_FLAG(tty,f) ((tty)->termios->c_oflag & (f))
    -#define _C_FLAG(tty,f) ((tty)->termios->c_cflag & (f))
    -#define _L_FLAG(tty,f) ((tty)->termios->c_lflag & (f))
    -
    -#define I_IGNBRK(tty) _I_FLAG((tty),IGNBRK)
    -#define I_BRKINT(tty) _I_FLAG((tty),BRKINT)
    -#define I_IGNPAR(tty) _I_FLAG((tty),IGNPAR)
    -#define I_PARMRK(tty) _I_FLAG((tty),PARMRK)
    -#define I_INPCK(tty) _I_FLAG((tty),INPCK)
    -#define I_ISTRIP(tty) _I_FLAG((tty),ISTRIP)
    -#define I_INLCR(tty) _I_FLAG((tty),INLCR)
    -#define I_IGNCR(tty) _I_FLAG((tty),IGNCR)
    -#define I_ICRNL(tty) _I_FLAG((tty),ICRNL)
    -#define I_IUCLC(tty) _I_FLAG((tty),IUCLC)
    -#define I_IXON(tty) _I_FLAG((tty),IXON)
    -#define I_IXANY(tty) _I_FLAG((tty),IXANY)
    -#define I_IXOFF(tty) _I_FLAG((tty),IXOFF)
    -#define I_IMAXBEL(tty) _I_FLAG((tty),IMAXBEL)
    -#define I_IUTF8(tty) _I_FLAG((tty),IUTF8)
    -
    -#define O_OPOST(tty) _O_FLAG((tty),OPOST)
    -#define O_OLCUC(tty) _O_FLAG((tty),OLCUC)
    -#define O_ONLCR(tty) _O_FLAG((tty),ONLCR)
    -#define O_OCRNL(tty) _O_FLAG((tty),OCRNL)
    -#define O_ONOCR(tty) _O_FLAG((tty),ONOCR)
    -#define O_ONLRET(tty) _O_FLAG((tty),ONLRET)
    -#define O_OFILL(tty) _O_FLAG((tty),OFILL)
    -#define O_OFDEL(tty) _O_FLAG((tty),OFDEL)
    -#define O_NLDLY(tty) _O_FLAG((tty),NLDLY)
    -#define O_CRDLY(tty) _O_FLAG((tty),CRDLY)
    -#define O_TABDLY(tty) _O_FLAG((tty),TABDLY)
    -#define O_BSDLY(tty) _O_FLAG((tty),BSDLY)
    -#define O_VTDLY(tty) _O_FLAG((tty),VTDLY)
    -#define O_FFDLY(tty) _O_FLAG((tty),FFDLY)
    -
    -#define C_BAUD(tty) _C_FLAG((tty),CBAUD)
    -#define C_CSIZE(tty) _C_FLAG((tty),CSIZE)
    -#define C_CSTOPB(tty) _C_FLAG((tty),CSTOPB)
    -#define C_CREAD(tty) _C_FLAG((tty),CREAD)
    -#define C_PARENB(tty) _C_FLAG((tty),PARENB)
    -#define C_PARODD(tty) _C_FLAG((tty),PARODD)
    -#define C_HUPCL(tty) _C_FLAG((tty),HUPCL)
    -#define C_CLOCAL(tty) _C_FLAG((tty),CLOCAL)
    -#define C_CIBAUD(tty) _C_FLAG((tty),CIBAUD)
    -#define C_CRTSCTS(tty) _C_FLAG((tty),CRTSCTS)
    -
    -#define L_ISIG(tty) _L_FLAG((tty),ISIG)
    -#define L_ICANON(tty) _L_FLAG((tty),ICANON)
    -#define L_XCASE(tty) _L_FLAG((tty),XCASE)
    -#define L_ECHO(tty) _L_FLAG((tty),ECHO)
    -#define L_ECHOE(tty) _L_FLAG((tty),ECHOE)
    -#define L_ECHOK(tty) _L_FLAG((tty),ECHOK)
    -#define L_ECHONL(tty) _L_FLAG((tty),ECHONL)
    -#define L_NOFLSH(tty) _L_FLAG((tty),NOFLSH)
    -#define L_TOSTOP(tty) _L_FLAG((tty),TOSTOP)
    -#define L_ECHOCTL(tty) _L_FLAG((tty),ECHOCTL)
    -#define L_ECHOPRT(tty) _L_FLAG((tty),ECHOPRT)
    -#define L_ECHOKE(tty) _L_FLAG((tty),ECHOKE)
    -#define L_FLUSHO(tty) _L_FLAG((tty),FLUSHO)
    -#define L_PENDIN(tty) _L_FLAG((tty),PENDIN)
    -#define L_IEXTEN(tty) _L_FLAG((tty),IEXTEN)
    +#define _I_FLAG(tty, f) ((tty)->termios->c_iflag & (f))
    +#define _O_FLAG(tty, f) ((tty)->termios->c_oflag & (f))
    +#define _C_FLAG(tty, f) ((tty)->termios->c_cflag & (f))
    +#define _L_FLAG(tty, f) ((tty)->termios->c_lflag & (f))
    +
    +#define I_IGNBRK(tty) _I_FLAG((tty), IGNBRK)
    +#define I_BRKINT(tty) _I_FLAG((tty), BRKINT)
    +#define I_IGNPAR(tty) _I_FLAG((tty), IGNPAR)
    +#define I_PARMRK(tty) _I_FLAG((tty), PARMRK)
    +#define I_INPCK(tty) _I_FLAG((tty), INPCK)
    +#define I_ISTRIP(tty) _I_FLAG((tty), ISTRIP)
    +#define I_INLCR(tty) _I_FLAG((tty), INLCR)
    +#define I_IGNCR(tty) _I_FLAG((tty), IGNCR)
    +#define I_ICRNL(tty) _I_FLAG((tty), ICRNL)
    +#define I_IUCLC(tty) _I_FLAG((tty), IUCLC)
    +#define I_IXON(tty) _I_FLAG((tty), IXON)
    +#define I_IXANY(tty) _I_FLAG((tty), IXANY)
    +#define I_IXOFF(tty) _I_FLAG((tty), IXOFF)
    +#define I_IMAXBEL(tty) _I_FLAG((tty), IMAXBEL)
    +#define I_IUTF8(tty) _I_FLAG((tty), IUTF8)
    +
    +#define O_OPOST(tty) _O_FLAG((tty), OPOST)
    +#define O_OLCUC(tty) _O_FLAG((tty), OLCUC)
    +#define O_ONLCR(tty) _O_FLAG((tty), ONLCR)
    +#define O_OCRNL(tty) _O_FLAG((tty), OCRNL)
    +#define O_ONOCR(tty) _O_FLAG((tty), ONOCR)
    +#define O_ONLRET(tty) _O_FLAG((tty), ONLRET)
    +#define O_OFILL(tty) _O_FLAG((tty), OFILL)
    +#define O_OFDEL(tty) _O_FLAG((tty), OFDEL)
    +#define O_NLDLY(tty) _O_FLAG((tty), NLDLY)
    +#define O_CRDLY(tty) _O_FLAG((tty), CRDLY)
    +#define O_TABDLY(tty) _O_FLAG((tty), TABDLY)
    +#define O_BSDLY(tty) _O_FLAG((tty), BSDLY)
    +#define O_VTDLY(tty) _O_FLAG((tty), VTDLY)
    +#define O_FFDLY(tty) _O_FLAG((tty), FFDLY)
    +
    +#define C_BAUD(tty) _C_FLAG((tty), CBAUD)
    +#define C_CSIZE(tty) _C_FLAG((tty), CSIZE)
    +#define C_CSTOPB(tty) _C_FLAG((tty), CSTOPB)
    +#define C_CREAD(tty) _C_FLAG((tty), CREAD)
    +#define C_PARENB(tty) _C_FLAG((tty), PARENB)
    +#define C_PARODD(tty) _C_FLAG((tty), PARODD)
    +#define C_HUPCL(tty) _C_FLAG((tty), HUPCL)
    +#define C_CLOCAL(tty) _C_FLAG((tty), CLOCAL)
    +#define C_CIBAUD(tty) _C_FLAG((tty), CIBAUD)
    +#define C_CRTSCTS(tty) _C_FLAG((tty), CRTSCTS)
    +
    +#define L_ISIG(tty) _L_FLAG((tty), ISIG)
    +#define L_ICANON(tty) _L_FLAG((tty), ICANON)
    +#define L_XCASE(tty) _L_FLAG((tty), XCASE)
    +#define L_ECHO(tty) _L_FLAG((tty), ECHO)
    +#define L_ECHOE(tty) _L_FLAG((tty), ECHOE)
    +#define L_ECHOK(tty) _L_FLAG((tty), ECHOK)
    +#define L_ECHONL(tty) _L_FLAG((tty), ECHONL)
    +#define L_NOFLSH(tty) _L_FLAG((tty), NOFLSH)
    +#define L_TOSTOP(tty) _L_FLAG((tty), TOSTOP)
    +#define L_ECHOCTL(tty) _L_FLAG((tty), ECHOCTL)
    +#define L_ECHOPRT(tty) _L_FLAG((tty), ECHOPRT)
    +#define L_ECHOKE(tty) _L_FLAG((tty), ECHOKE)
    +#define L_FLUSHO(tty) _L_FLAG((tty), FLUSHO)
    +#define L_PENDIN(tty) _L_FLAG((tty), PENDIN)
    +#define L_IEXTEN(tty) _L_FLAG((tty), IEXTEN)

    struct device;
    struct signal_struct;
    @@ -177,7 +178,7 @@ struct signal_struct;
    * of the tty object but in many cases port -> tty mappings are valid only
    * until a hangup so don't use the wrong path.
    */
    -
    +
    struct tty_port {
    struct tty_struct *tty; /* Back pointer */
    int blocked_open; /* Waiting to open */
    @@ -273,14 +274,14 @@ struct tty_struct {

    /*
    * These bits are used in the flags field of the tty structure.
    - *
    + *
    * So that interrupts won't be able to mess up the queues,
    * copy_to_cooked must be atomic with respect to itself, as must
    * tty->write. Thus, you must use the inline functions set_bit() and
    * clear_bit() to make things atomic.
    */
    #define TTY_THROTTLED 0 /* Call unthrottle() at threshold min */
    -#define TTY_IO_ERROR 1 /* Canse an I/O error (may be no ldisc too) */
    +#define TTY_IO_ERROR 1 /* Cause an I/O error (may be no ldisc too) */
    #define TTY_OTHER_CLOSED 2 /* Other side (if any) has closed */
    #define TTY_EXCLUSIVE 3 /* Exclusive open mode */
    #define TTY_DEBUG 4 /* Debugging */
    @@ -310,10 +311,10 @@ extern int vcs_init(void);
    extern int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
    const char *routine);
    extern char *tty_name(struct tty_struct *tty, char *buf);
    -extern void tty_wait_until_sent(struct tty_struct * tty, long timeout);
    -extern int tty_check_change(struct tty_struct * tty);
    -extern void stop_tty(struct tty_struct * tty);
    -extern void start_tty(struct tty_struct * tty);
    +extern void tty_wait_until_sent(struct tty_struct *tty, long timeout);
    +extern int tty_check_change(struct tty_struct *tty);
    +extern void stop_tty(struct tty_struct *tty);
    +extern void start_tty(struct tty_struct *tty);
    extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
    extern int tty_unregister_ldisc(int disc);
    extern int tty_register_driver(struct tty_driver *driver);
    @@ -335,10 +336,10 @@ extern int is_current_pgrp_orphaned(void);
    extern struct pid *tty_get_pgrp(struct tty_struct *tty);
    extern int is_ignored(int sig);
    extern int tty_signal(int sig, struct tty_struct *tty);
    -extern void tty_hangup(struct tty_struct * tty);
    -extern void tty_vhangup(struct tty_struct * tty);
    +extern void tty_hangup(struct tty_struct *tty);
    +extern void tty_vhangup(struct tty_struct *tty);
    extern void tty_unhangup(struct file *filp);
    -extern int tty_hung_up_p(struct file * filp);
    +extern int tty_hung_up_p(struct file *filp);
    extern void do_SAK(struct tty_struct *tty);
    extern void __do_SAK(struct tty_struct *tty);
    extern void disassociate_ctty(int priv);
    @@ -347,8 +348,10 @@ extern void tty_flip_buffer_push(struct tty_struct *tty);
    extern speed_t tty_get_baud_rate(struct tty_struct *tty);
    extern speed_t tty_termios_baud_rate(struct ktermios *termios);
    extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);
    -extern void tty_termios_encode_baud_rate(struct ktermios *termios, speed_t ibaud, speed_t obaud);
    -extern void tty_encode_baud_rate(struct tty_struct *tty, speed_t ibaud, speed_t obaud);
    +extern void tty_termios_encode_baud_rate(struct ktermios *termios,
    + speed_t ibaud, speed_t obaud);
    +extern void tty_encode_baud_rate(struct tty_struct *tty,
    + speed_t ibaud, speed_t obaud);
    extern void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old);
    extern int tty_termios_hw_change(struct ktermios *a, struct ktermios *b);

    @@ -390,7 +393,8 @@ extern void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
    extern void tty_audit_exit(void);
    extern void tty_audit_fork(struct signal_struct *sig);
    extern void tty_audit_push(struct tty_struct *tty);
    -extern void tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid);
    +extern void tty_audit_push_task(struct task_struct *tsk,
    + uid_t loginuid, u32 sessionid);
    #else
    static inline void tty_audit_add_data(struct tty_struct *tty,
    unsigned char *data, size_t size)
    @@ -405,19 +409,20 @@ static inline void tty_audit_fork(struct signal_struct *sig)
    static inline void tty_audit_push(struct tty_struct *tty)
    {
    }
    -static inline void tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid)
    +static inline void tty_audit_push_task(struct task_struct *tsk,
    + uid_t loginuid, u32 sessionid)
    {
    }
    #endif

    /* tty_ioctl.c */
    -extern int n_tty_ioctl(struct tty_struct * tty, struct file * file,
    +extern int n_tty_ioctl(struct tty_struct *tty, struct file *file,
    unsigned int cmd, unsigned long arg);

    /* serial.c */

    extern void serial_console_init(void);
    -
    +
    /* pcxx.c */

    extern int pcxe_open(struct tty_struct *tty, struct file *filp);
    @@ -428,7 +433,7 @@ extern void console_print(const char *);

    /* vt.c */

    -extern int vt_ioctl(struct tty_struct *tty, struct file * file,
    +extern int vt_ioctl(struct tty_struct *tty, struct file *file,
    unsigned int cmd, unsigned long arg);

    #endif /* __KERNEL__ */


    \
     
     \ /
      Last update: 2008-06-20 22:21    [W:0.046 / U:2.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site