[PATCH] xfree86: fix not reached code in tty code
Peter Hutterer
peter.hutterer at who-t.net
Tue Apr 20 15:19:07 PDT 2010
On Tue, Apr 20, 2010 at 04:30:20PM +0300, Tiago Vignatti wrote:
> CLEARRTS_SUPPORT cannot be triggered at all. Notice thta mouse driver manual
> page states the support for it though.
>
> Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
> ---
>
> hw/xfree86/os-support/shared/posix_tty.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
> index 4ba8599..da57939 100644
> --- a/hw/xfree86/os-support/shared/posix_tty.c
> +++ b/hw/xfree86/os-support/shared/posix_tty.c
> @@ -340,14 +340,9 @@ xf86SetSerial (int fd, pointer options)
>
> if ((xf86SetBoolOption (options, "ClearRTS", FALSE)))
> {
> -#ifdef CLEARRTS_SUPPORT
> - val = TIOCM_RTS;
> - SYSCALL (ioctl(fd, TIOCMBIC, &val));
> -#else
> xf86Msg (X_WARNING,
> "Option ClearRTS not supported on this OS\n");
> return (-1);
> -#endif
> xf86MarkOptionUsedByName (options, "ClearRTS");
> }
>
> --
> 1.6.0.4
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
> Okay, what now Peter?
stack the reviewed patches into a for-keith branch, push them to your $HOME
on people.freedesktop.org and then send Keith a pull request.
what I usually do is
'git request-pull master git://people.freedesktop.org/~whot/xserver.git for-keith > pull-req'
and then 'mutt -H pull-req'
note that this requires master to be something close-ish to upstream, if
you've diverged in other ways just insert the last sha1 instead of "master".
in my case, master is usually origin/master from where I started
development, so origin/master may have moved on since.
given that you already have the patches in a tree, it's faster to do this
than to wait for Keith to apply and push them, he has pull requests on
precedence AFAICT.
Cheers,
Peter
More information about the xorg-devel
mailing list