From patchwork Mon Nov 22 18:54:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 48009 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5CE1F3858438 for ; Mon, 22 Nov 2021 18:59:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CE1F3858438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637607567; bh=58UPkFEtvEB3RPhyhj7SHRGqE1cU0SC/Y4pr6nD0da4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=eBjcTZ24+2r3l9JaPtuQuICTyTbbmCkwAA+0d1+G2uRhkq5G4kuVWhfUlpFLlzNB8 kpEagcF9hWURNDKNPJb8DoKb+4NRq1aTXUUTiudo6e+EGoQSTUkEnQddq1V5Vfw6zO QxIEa8CdXf/E80QbzMJ609jxdQIUvVuhmMG1jWEk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x92c.google.com (mail-ua1-x92c.google.com [IPv6:2607:f8b0:4864:20::92c]) by sourceware.org (Postfix) with ESMTPS id D2743385840A for ; Mon, 22 Nov 2021 18:54:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D2743385840A Received: by mail-ua1-x92c.google.com with SMTP id p37so38587098uae.8 for ; Mon, 22 Nov 2021 10:54:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=58UPkFEtvEB3RPhyhj7SHRGqE1cU0SC/Y4pr6nD0da4=; b=oQAydzIvEtRyf0oNxRmn0+cC81HUR/0grIBf2rWPanYrT0qZTWdzgRAv1hbtLLtWhD 7vIogcYgUwiNxFDaSHxkXlz85YdBmnwy8GWKVGchk08mVi5NZ77x/WD/j5p3JYF8seza l/kYLITxbjytz6V5zALa9jgw9FZHPryVqBuPavyvcObAGctj3Z+0EE0Rszxr8KEoU/Rw 6dMa9Uo5L3UrvDJgp1felAVbL7Twb3EE8MPjWg7n4z0pczSqI/vPRvuNxEXHrOjXLgmz vX98TE8m0lqWBCEzHAS5KykAwbdef9sp59kJFpwml5ES3zaxPH/2ZiclSf70rh2zf3tt MyRg== X-Gm-Message-State: AOAM5314Zl/cc/qKxmhREoJ+/+DxQ3ckx4+y7G/WsOoA3OS9v7XDHhd7 JTNphfkUZUIxCNViJkc/5ECk8MdR5HraAw== X-Google-Smtp-Source: ABdhPJziu2VVuRjhvJLdglYdnaxIjYL7h2PWZ4RU7n5q1Uh40aTkDWrKHlvHvdpit3bTHXgSC7yk5g== X-Received: by 2002:a9f:30cf:: with SMTP id k15mr620864uab.21.1637607289709; Mon, 22 Nov 2021 10:54:49 -0800 (PST) Received: from birita.. ([2804:431:c7cb:e054:bce6:bc54:280c:f077]) by smtp.gmail.com with ESMTPSA id g187sm5197166vsc.10.2021.11.22.10.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 10:54:49 -0800 (PST) To: libc-alpha@sourceware.org, Stafford Horne Subject: [PATCH 6/6] linux: Add generic ioctl implementation Date: Mon, 22 Nov 2021 15:54:37 -0300 Message-Id: <20211122185437.1934590-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211122185437.1934590-1-adhemerval.zanella@linaro.org> References: <20211122185437.1934590-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The powerpc is refactor to use the default implementation. --- sysdeps/unix/sysv/linux/internal-ioctl.h | 25 +++++++ sysdeps/unix/sysv/linux/ioctl.c | 49 +++++++++++++ .../unix/sysv/linux/powerpc/internal-ioctl.h | 46 +++++++++++++ sysdeps/unix/sysv/linux/powerpc/ioctl.c | 68 ------------------- 4 files changed, 120 insertions(+), 68 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/internal-ioctl.h create mode 100644 sysdeps/unix/sysv/linux/ioctl.c create mode 100644 sysdeps/unix/sysv/linux/powerpc/internal-ioctl.h delete mode 100644 sysdeps/unix/sysv/linux/powerpc/ioctl.c diff --git a/sysdeps/unix/sysv/linux/internal-ioctl.h b/sysdeps/unix/sysv/linux/internal-ioctl.h new file mode 100644 index 0000000000..ecd48d5d6e --- /dev/null +++ b/sysdeps/unix/sysv/linux/internal-ioctl.h @@ -0,0 +1,25 @@ +/* Linux internal definitions for ioctl. + Copyright (C) 2021 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 + . */ + +/* Architecture ports may choose to override this default implementation + to provide architecture specific ioctl support. */ +static inline bool +__ioctl_arch (int *r, int fd, unsigned long request, void *arg) +{ + return false; +} diff --git a/sysdeps/unix/sysv/linux/ioctl.c b/sysdeps/unix/sysv/linux/ioctl.c new file mode 100644 index 0000000000..c4855d6302 --- /dev/null +++ b/sysdeps/unix/sysv/linux/ioctl.c @@ -0,0 +1,49 @@ +/* Control device. Linux generic implementation. + Copyright (C) 2021 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 + . */ + +#include +#include +#include +#include + +int +__ioctl (int fd, unsigned long int request, ...) +{ + va_list args; + va_start (args, request); + void *arg = va_arg (args, void *); + va_end (args); + + int r; + if (!__ioctl_arch (&r, fd, request, arg)) + { + r = INTERNAL_SYSCALL_CALL (ioctl, fd, request, arg); + if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (r))) + { + __set_errno (-r); + return -1; + } + } + return r; +} +libc_hidden_def (__ioctl) +weak_alias (__ioctl, ioctl) + +#if __TIMESIZE != 64 +strong_alias (__ioctl, __ioctl_time64) +#endif diff --git a/sysdeps/unix/sysv/linux/powerpc/internal-ioctl.h b/sysdeps/unix/sysv/linux/powerpc/internal-ioctl.h new file mode 100644 index 0000000000..3a2adce7c3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/internal-ioctl.h @@ -0,0 +1,46 @@ +/* Linux internal definitions for ioctl. + Copyright (C) 2021 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 + . */ + +#include + +static inline bool +__ioctl_arch (int *r, int fd, unsigned long request, void *arg) +{ + switch (request) + { + case TCGETS: + *r = __tcgetattr (fd, (struct termios *) arg); + break; + + case TCSETS: + *r = __tcsetattr (fd, TCSANOW, (struct termios *) arg); + break; + + case TCSETSW: + *r = __tcsetattr (fd, TCSADRAIN, (struct termios *) arg); + break; + + case TCSETSF: + *r = __tcsetattr (fd, TCSAFLUSH, (struct termios *) arg); + break; + + default: + return false; + } + return true; +} diff --git a/sysdeps/unix/sysv/linux/powerpc/ioctl.c b/sysdeps/unix/sysv/linux/powerpc/ioctl.c deleted file mode 100644 index a81c7ba54c..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/ioctl.c +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (C) 1998-2021 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 - . */ - -#include -#include -#include -#include -#include - -/* The user-visible size of struct termios has changed. Catch ioctl calls - using the new-style struct termios, and translate them to old-style. */ - -int -__ioctl (int fd, unsigned long int request, ...) -{ - void *arg; - va_list ap; - int result; - - va_start (ap, request); - arg = va_arg (ap, void *); - - switch (request) - { - case TCGETS: - result = __tcgetattr (fd, (struct termios *) arg); - break; - - case TCSETS: - result = __tcsetattr (fd, TCSANOW, (struct termios *) arg); - break; - - case TCSETSW: - result = __tcsetattr (fd, TCSADRAIN, (struct termios *) arg); - break; - - case TCSETSF: - result = __tcsetattr (fd, TCSAFLUSH, (struct termios *) arg); - break; - - default: - result = INLINE_SYSCALL (ioctl, 3, fd, request, arg); - break; - } - - va_end (ap); - - return result; -} -libc_hidden_def (__ioctl) -weak_alias (__ioctl, ioctl) -#if __TIMESIZE != 64 -weak_alias (__ioctl, __ioctl_time64) -#endif