From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/9865 Path: news.gmane.org!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 00/16] sys/ioctl.h and termios.h cleanups Date: Sun, 10 Apr 2016 14:09:40 +0200 Message-ID: Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1460290204 21182 80.91.229.3 (10 Apr 2016 12:10:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 10 Apr 2016 12:10:04 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-9878-gllmg-musl=m.gmane.org@lists.openwall.com Sun Apr 10 14:10:03 2016 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1apEBm-00077I-8Z for gllmg-musl@m.gmane.org; Sun, 10 Apr 2016 14:10:02 +0200 Original-Received: (qmail 15802 invoked by uid 550); 10 Apr 2016 12:09:58 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 15755 invoked from network); 10 Apr 2016 12:09:52 -0000 Mail-Followup-To: musl@lists.openwall.com Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Xref: news.gmane.org gmane.linux.lib.musl.general:9865 Archived-At: the contents of sys/ioctl.h is linux specific and not defined by any standard, the defacto standard is whatever glibc sys/ioctl.h does. glibc includes asm/ioctl.h and asm/ioctls.h linux uapi headers and contains a copy of most linux/sockios.h, linux/tty.h and asm/termios.h definitions (does not seem to be updated regularly so some recent linux macros are missing) and also includes sys/ttydefaults.h. in musl the sys/ttydefaults.h include, struct termio and struct termios2 related definitions are omitted, otherwise glibc is followed. termios.h is defined by posix, but there are various extensions. glibc does not include linux uapi headers, but contains a copy of most asm/termbits.h definitions and includes sys/ttydefaults.h in non-standard mode. musl termios.h follows glibc except the sys/ttydefaults.h include, the termios struct definition and _HAVE_STRUCT_TERMIOS_C_{I,O}SPEED macros. these patches are not tested, but compared against preprocessed glibc headers on all targets. Szabolcs Nagy (16): use the generic ioctl.h for x86_64, x32 and aarch64 remove linux asm/sockios.h macros from ioctl.h remove ioctl macros that were removed from linux uapi add missing SIOCSIFNAME from linux/sockios.h to ioctl.h add missing TIOC* macros to ioctl.h remove mips and powerpc ioctls that are missing from linux uapi fix mips and mips64 TIOCM_* macros in ioctl.h fix TIOCMSET in mips ioctl.h remove termios2 related ioctls from sh ioctl.h fix FIOQSIZE in arm ioctl.h fix generic termios.h to be more consistent with glibc fix powerpc termios.h to be more consistent with glibc fix mips termios.h to be more consistent with glibc fix TCS* definitions in mips termios.h fix CBAUDEX in powerpc termios.h fix struct termios in mips termios.h arch/aarch64/bits/ioctl.h | 213 ------------------------------------------ arch/arm/bits/ioctl_fix.h | 2 + arch/generic/bits/ioctl.h | 22 ++--- arch/generic/bits/ioctl_fix.h | 0 arch/generic/bits/termios.h | 23 +++-- arch/mips/bits/ioctl.h | 55 +++++------ arch/mips/bits/termios.h | 40 ++++---- arch/mips64/bits/ioctl.h | 55 +++++------ arch/mips64/bits/termios.h | 35 ++++--- arch/powerpc/bits/ioctl.h | 26 +----- arch/powerpc/bits/termios.h | 26 +++--- arch/sh/bits/ioctl.h | 17 +--- arch/x32/bits/ioctl.h | 197 -------------------------------------- arch/x86_64/bits/ioctl.h | 197 -------------------------------------- 14 files changed, 130 insertions(+), 778 deletions(-) delete mode 100644 arch/aarch64/bits/ioctl.h create mode 100644 arch/arm/bits/ioctl_fix.h create mode 100644 arch/generic/bits/ioctl_fix.h delete mode 100644 arch/x32/bits/ioctl.h delete mode 100644 arch/x86_64/bits/ioctl.h -- 2.7.2