public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] blackfin: Enable arbitary speed serial setting
@ 2007-05-23 16:30 Alan Cox
  2007-05-24  3:23 ` Aubrey Li
  0 siblings, 1 reply; 3+ messages in thread
From: Alan Cox @ 2007-05-23 16:30 UTC (permalink / raw)
  To: aubrey.li, akpm, linux-kernel

Add the needed definitions to activate arbitary speed support on the
blackfin platform.

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-blackfin/ioctls.h linux-2.6.22-rc1-mm1/include/asm-blackfin/ioctls.h
--- linux.vanilla-2.6.22-rc1-mm1/include/asm-blackfin/ioctls.h	2007-05-18 16:22:03.000000000 +0100
+++ linux-2.6.22-rc1-mm1/include/asm-blackfin/ioctls.h	2007-05-23 16:27:40.720142616 +0100
@@ -47,6 +47,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-blackfin/termbits.h linux-2.6.22-rc1-mm1/include/asm-blackfin/termbits.h
--- linux.vanilla-2.6.22-rc1-mm1/include/asm-blackfin/termbits.h	2007-05-18 16:22:03.000000000 +0100
+++ linux-2.6.22-rc1-mm1/include/asm-blackfin/termbits.h	2007-05-23 16:27:23.293791824 +0100
@@ -129,6 +129,7 @@
 #define HUPCL	0002000
 #define CLOCAL	0004000
 #define CBAUDEX 0010000
+#define	   BOTHER 0010000
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -144,10 +145,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		/* Shift from CBAUD to CIBAUD */
+
 /* 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-blackfin/termios.h linux-2.6.22-rc1-mm1/include/asm-blackfin/termios.h
--- linux.vanilla-2.6.22-rc1-mm1/include/asm-blackfin/termios.h	2007-05-18 16:22:03.000000000 +0100
+++ linux-2.6.22-rc1-mm1/include/asm-blackfin/termios.h	2007-05-23 16:28:04.353549792 +0100
@@ -98,8 +98,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__ */
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] blackfin: Enable arbitary speed serial setting
  2007-05-23 16:30 [PATCH] blackfin: Enable arbitary speed serial setting Alan Cox
@ 2007-05-24  3:23 ` Aubrey Li
  2007-05-24  3:39   ` Bryan Wu
  0 siblings, 1 reply; 3+ messages in thread
From: Aubrey Li @ 2007-05-24  3:23 UTC (permalink / raw)
  To: Alan Cox; +Cc: aubrey.li, akpm, linux-kernel

Thanks.

Acked-by: Aubrey Li <aubrey.li@analog.com>

On 5/24/07, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> Add the needed definitions to activate arbitary speed support on the
> blackfin platform.
>
> 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-blackfin/ioctls.h linux-2.6.22-rc1-mm1/include/asm-blackfin/ioctls.h
> --- linux.vanilla-2.6.22-rc1-mm1/include/asm-blackfin/ioctls.h  2007-05-18 16:22:03.000000000 +0100
> +++ linux-2.6.22-rc1-mm1/include/asm-blackfin/ioctls.h  2007-05-23 16:27:40.720142616 +0100
> @@ -47,6 +47,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-blackfin/termbits.h linux-2.6.22-rc1-mm1/include/asm-blackfin/termbits.h
> --- linux.vanilla-2.6.22-rc1-mm1/include/asm-blackfin/termbits.h        2007-05-18 16:22:03.000000000 +0100
> +++ linux-2.6.22-rc1-mm1/include/asm-blackfin/termbits.h        2007-05-23 16:27:23.293791824 +0100
> @@ -129,6 +129,7 @@
>  #define HUPCL  0002000
>  #define CLOCAL 0004000
>  #define CBAUDEX 0010000
> +#define           BOTHER 0010000
>  #define    B57600 0010001
>  #define   B115200 0010002
>  #define   B230400 0010003
> @@ -144,10 +145,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              /* Shift from CBAUD to CIBAUD */
> +
>  /* 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-blackfin/termios.h linux-2.6.22-rc1-mm1/include/asm-blackfin/termios.h
> --- linux.vanilla-2.6.22-rc1-mm1/include/asm-blackfin/termios.h 2007-05-18 16:22:03.000000000 +0100
> +++ linux-2.6.22-rc1-mm1/include/asm-blackfin/termios.h 2007-05-23 16:28:04.353549792 +0100
> @@ -98,8 +98,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__ */
>
> -
> 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/
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] blackfin: Enable arbitary speed serial setting
  2007-05-24  3:23 ` Aubrey Li
@ 2007-05-24  3:39   ` Bryan Wu
  0 siblings, 0 replies; 3+ messages in thread
From: Bryan Wu @ 2007-05-24  3:39 UTC (permalink / raw)
  To: Aubrey Li; +Cc: Alan Cox, aubrey.li, akpm, linux-kernel

On Thu, 2007-05-24 at 11:23 +0800, Aubrey Li wrote:
> Thanks.
> 
> Acked-by: Aubrey Li <aubrey.li@analog.com>
> 
> On 5/24/07, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> > Add the needed definitions to activate arbitary speed support on the
> > blackfin platform.
> >
> > Signed-off-by: Alan Cox <alan@redhat.com>
> >

I noticed another patch from Alan "lots-of-architectures: enable
arbitary speed tty support" is added to -mm tree, which defined struct
termios2. That is required by this one.

So it should be tested together and merged together, although Aubrey
didn't received the
lots-of-architectures-enable-arbitary-speed-tty-support.patch from LKML.

Thanks a lot
-Bryan Wu

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2007-05-24  3:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-23 16:30 [PATCH] blackfin: Enable arbitary speed serial setting Alan Cox
2007-05-24  3:23 ` Aubrey Li
2007-05-24  3:39   ` Bryan Wu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox