From patchwork Fri Dec 28 01:10:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 154594 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp7510322ljp; Thu, 27 Dec 2018 17:12:02 -0800 (PST) X-Google-Smtp-Source: ALg8bN4J/csdH1c4uE0dS3zF5iSaHjFFRwtjyIVbCsKS9myB3wsfIu/ho5qIAtIRBWpiZtkQGY+0 X-Received: by 2002:a17:902:24d:: with SMTP id 71mr24949337plc.225.1545959522476; Thu, 27 Dec 2018 17:12:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545959522; cv=none; d=google.com; s=arc-20160816; b=vu+EKLZ734/MWrAB0pjDd7oLVGz2zyqmrvoet4pRWYYXJ2icvr13IeronI4jxKUixJ Tho8/0EE+2JsxPiDGfUqkty+wgJz4vKT33d56uUKnHP8GQUL82yygpU8XbB18xQp1tYP stB4ajKpwrwAaPl5Wc1KIFDQDN6ZTGoeSQDgO5ldK7xiO7+AJfjmOs2nwDc1nhg7u7Mc WGXRvCC49b8L+3gZ1hE9r0jRlljXnOk5AHr5IjQFJN3LP/iGu2+gDSlI1jr+65hzOBQV 3V73E8QTXZ8cX7Bdo5OB0TPNRL9wlqwVYzjdemqAUwvBGRFuFWScNycl4+vW59YvDM4+ PMUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=DACdLqZoqNeefqkLkB1HflqBbHm23apiGQa3wAqT74I=; b=c3xoaMWzi10nm0iLMVhrS09gcoBNSAwqX9ZOt2lCddOwNO4g7S3+Og0T8/690LeUU2 hFAW81m90HkTLd+Fz/ElF5qnZr2TPtdTxbp4lXWmQgn3xsf8qE5WxPmkOV2DolZ7U+kW f4UiStPbw1AjUsxGYQxiYS1BbIfOEtrAbcLNjLnjHAQNGA4xL2hBNMmfT7b0lTeh43wD hPmBlqcHNahlJiPsGxz1xboo8gJMSNIUNCWhJfrffzOpgMGdzMREBHaK8GTrbM7RkgDf NjuyVqVSzC1ykoE+yZECehZOrB3/+DxkdXiqSokHvIh+KxeGqtdYMf9mPtho2kFna5cR niSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=VKF2p6Yp; dkim=pass header.i=@linaro.org header.s=google header.b=QU6iZRz+; spf=pass (google.com: domain of libc-alpha-return-98830-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-98830-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id z14si19375178pgj.73.2018.12.27.17.12.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Dec 2018 17:12:02 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-98830-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=VKF2p6Yp; dkim=pass header.i=@linaro.org header.s=google header.b=QU6iZRz+; spf=pass (google.com: domain of libc-alpha-return-98830-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-98830-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=Potx75jk3LXmDjWYDGXTp2SNZwSZqpF 3V5aYZvsFCskgizjSqczkubl2ACK9PtKuSqqtL4OY2NVUWhqHn7oHprkcVI15TMC 1rz//XCnx73IJupKcqZTigaW8/cUHyNO4SIypMSCtw/iF7nnezVcP2dRTDSzeVn2 WN0aWneCj4x4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=opgoxuAV7y6dAUR3RyzMANw4kGw=; b=VKF2p 6YpsN0fYS9PYegYGp4WD83T9Wh0dtsPofEH8IyiSYXIJkODB9G8WXXiCQNGYuA+k qf183hiCA/5UdD5AWbtITkiwGCWekx5sX6EsqUYslYGht8wmzqlotHrarhEpgRQu ASpHuohg4i4VyV0/MyR3tu6mJ6+52/8bsfkp78= Received: (qmail 51382 invoked by alias); 28 Dec 2018 01:10:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50884 invoked by uid 89); 28 Dec 2018 01:10:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=terminal X-HELO: mail-qk1-f193.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=DACdLqZoqNeefqkLkB1HflqBbHm23apiGQa3wAqT74I=; b=QU6iZRz+5GRgWnqM9Zdlr663vhxqEnEKdMg2vpgx3Rez8bSlhLi+XicZofwKviW5yi L3aPdsXqhTaBZZgSQ5uWJ/xZn2bbBuf2PKkTMxEKn0CgCFo05+d/UK/nSoF0PVmlJwBh 2uclciqYXmEn7mpWwKDm1P2triDkG3jvHhtQI= Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 11/12] termios: Add powerpc termios-misc Date: Thu, 27 Dec 2018 23:10:00 -0200 Message-Id: <20181228011001.22260-12-adhemerval.zanella@linaro.org> In-Reply-To: <20181228011001.22260-1-adhemerval.zanella@linaro.org> References: <20181228011001.22260-1-adhemerval.zanella@linaro.org> PowerPC termios.h header contains additional BSD terminal mode definitions (sgttyb, tchars, ltchars, and associated TIOCPKT_* symbolic constants). This patch moves all powerpc termios specific definition to its own header. No semantic change is expected, checked on a build against a powerpc64le-linux-gnu build. * sysdeps/unix/sysv/linux/powerpc/bits/termios-misc.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC] (struct sgtty, struct tchars, struct ltchars, TIOCPKT_DATA, TIOCPKT_FLUSHREAD, TIOCPKT_FLUSHWRITE, TIOCPKT_STOP, TIOCPKT_START, TIOCPKT_NOSTOP, TIOCPKT_DOSTOP, _VINTR, _VQUIT, _VERASE, _VKILL, _VEOF, _VMIN, _VEOL, _VTIME, _VEOL2, _VSWTC): Move to termios-misc.h. * sysdeps/unix/sysv/linux/powerpc/Makefile [$subdir == misc] (sysdep_headers): Add termios-misc.h. --- sysdeps/unix/sysv/linux/powerpc/Makefile | 2 +- .../sysv/linux/powerpc/bits/termios-misc.h | 72 +++++++++++++++++++ .../unix/sysv/linux/powerpc/bits/termios.h | 50 +------------ 3 files changed, 74 insertions(+), 50 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/powerpc/bits/termios-misc.h -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile index 19ac59d862..7712428e10 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Makefile +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -23,7 +23,7 @@ LDFLAGS-tst-tlsmod2.so += -Wl,--no-tls-get-addr-optimize endif ifeq ($(subdir),misc) -sysdep_headers += bits/ppc.h +sysdep_headers += bits/ppc.h bits/termios-misc.h sysdep_routines += get_timebase_freq tests += test-gettimebasefreq tests += test-powerpc-linux-sysconf diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios-misc.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios-misc.h new file mode 100644 index 0000000000..2e7fc2f7ae --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios-misc.h @@ -0,0 +1,72 @@ +/* termios baud platform specific definitions. Linux/powerpc version. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#ifndef _TERMIOS_H +# error "Never include directly; use instead." +#endif + +#ifdef __USE_MISC + +struct sgttyb { + char sg_ispeed; + char sg_ospeed; + char sg_erase; + char sg_kill; + short sg_flags; +}; + +struct tchars { + char t_intrc; + char t_quitc; + char t_startc; + char t_stopc; + char t_eofc; + char t_brkc; +}; + +struct ltchars { + char t_suspc; + char t_dsuspc; + char t_rprntc; + char t_flushc; + char t_werasc; + char t_lnextc; +}; + +/* Used for packet mode */ +#define TIOCPKT_DATA 0 +#define TIOCPKT_FLUSHREAD 1 +#define TIOCPKT_FLUSHWRITE 2 +#define TIOCPKT_STOP 4 +#define TIOCPKT_START 8 +#define TIOCPKT_NOSTOP 16 +#define TIOCPKT_DOSTOP 32 + +/* c_cc characters */ +#define _VINTR 0 +#define _VQUIT 1 +#define _VERASE 2 +#define _VKILL 3 +#define _VEOF 4 +#define _VMIN 5 +#define _VEOL 6 +#define _VTIME 7 +#define _VEOL2 8 +#define _VSWTC 9 + +#endif /* __USE_MISC */ diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h index 885bf952bd..4f00b4fe0c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h @@ -67,58 +67,10 @@ typedef unsigned int tcflag_t; #include -#ifdef __USE_MISC - -struct sgttyb { - char sg_ispeed; - char sg_ospeed; - char sg_erase; - char sg_kill; - short sg_flags; -}; - -struct tchars { - char t_intrc; - char t_quitc; - char t_startc; - char t_stopc; - char t_eofc; - char t_brkc; -}; - -struct ltchars { - char t_suspc; - char t_dsuspc; - char t_rprntc; - char t_flushc; - char t_werasc; - char t_lnextc; -}; - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 - -/* c_cc characters */ -#define _VINTR 0 -#define _VQUIT 1 -#define _VERASE 2 -#define _VKILL 3 -#define _VEOF 4 -#define _VMIN 5 -#define _VEOL 6 -#define _VTIME 7 -#define _VEOL2 8 -#define _VSWTC 9 +#include #ifdef __USE_MISC /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ # define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ #endif -#endif /* __USE_MISC */