lkml.org 
[lkml]   [2007]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] ARM/ARM26: Enable arbitary speed tty ioctls and split input/output speed
    On Wed, May 23, 2007 at 05:27:39PM +0100, Alan Cox wrote:
    > Add the ioctls and values needed for this to the ARM26/ARM32 ports. The
    > actual code has been in the base kernel for a while and automatically
    > turns on when a port sets the required defines.
    >
    > Signed-off-by: Alan Cox <alan@redhat.com>
    >
    > diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc1-mm1/include/asm-arm/ioctls.h linux-2.6.22-rc1-mm1/include/asm-arm/ioctls.h
    > --- linux.vanilla-2.6.22-rc1-mm1/include/asm-arm/ioctls.h 2007-04-30 10:48:14.000000000 +0100
    > +++ linux-2.6.22-rc1-mm1/include/asm-arm/ioctls.h 2007-05-23 16:19:48.010005480 +0100
    > @@ -46,6 +46,10 @@
    > #define TIOCSBRK 0x5427 /* BSD compatibility */
    > #define TIOCCBRK 0x5428 /* BSD compatibility */
    > #define TIOCGSID 0x5429 /* Return the session ID of FD */
    > +#define TCGETS2 _IOR('T',0x2A, struct termios2)
    > +#define TCSETS2 _IOW('T',0x2B, struct termios2)
    > +#define TCSETSW2 _IOW('T',0x2C, struct termios2)
    > +#define TCSETSF2 _IOW('T',0x2D, struct termios2)
    > #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
    > #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
    >
    > diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc1-mm1/include/asm-arm/termbits.h linux-2.6.22-rc1-mm1/include/asm-arm/termbits.h
    > --- linux.vanilla-2.6.22-rc1-mm1/include/asm-arm/termbits.h 2007-04-30 10:48:14.000000000 +0100
    > +++ linux-2.6.22-rc1-mm1/include/asm-arm/termbits.h 2007-05-23 16:23:05.765942008 +0100
    > @@ -128,6 +128,7 @@
    > #define HUPCL 0002000
    > #define CLOCAL 0004000
    > #define CBAUDEX 0010000
    > +#define BOTHER 0010000
    > #define B57600 0010001
    > #define B115200 0010002
    > #define B230400 0010003
    > @@ -143,10 +144,12 @@
    > #define B3000000 0010015
    > #define B3500000 0010016
    > #define B4000000 0010017
    > -#define CIBAUD 002003600000 /* input baud rate (not used) */
    > +#define CIBAUD 002003600000 /* input baud rate */
    > #define CMSPAR 010000000000 /* mark or space (stick) parity */
    > #define CRTSCTS 020000000000 /* flow control */
    >
    > +#define IBSHIFT 16
    > +
    > /* c_lflag bits */
    > #define ISIG 0000001
    > #define ICANON 0000002
    > diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc1-mm1/include/asm-arm/termios.h linux-2.6.22-rc1-mm1/include/asm-arm/termios.h
    > --- linux.vanilla-2.6.22-rc1-mm1/include/asm-arm/termios.h 2007-04-30 11:00:07.000000000 +0100
    > +++ linux-2.6.22-rc1-mm1/include/asm-arm/termios.h 2007-05-23 16:21:34.535811096 +0100
    > @@ -82,8 +82,10 @@
    > copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
    > })
    >
    > -#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
    > -#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
    > +#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
    > +#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
    > +#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
    > +#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
    >
    > #endif /* __KERNEL__ */
    >

    Alan, thanks for this.

    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

    for the above. The ARM26 stuff needs acking by Ian Molton, <spyro@f2s.com>

    --
    Russell King
    Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
    maintainer of:
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-05-23 18:29    [W:0.030 / U:29.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site