From owner-dev-commits-src-main@freebsd.org Sat Jan 16 22:53:49 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA6384EDC5F; Sat, 16 Jan 2021 22:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJCyg3wszz3Cwn; Sat, 16 Jan 2021 22:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E11E1719F; Sat, 16 Jan 2021 22:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10GMrjfx053342; Sat, 16 Jan 2021 22:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10GMrjt1053341; Sat, 16 Jan 2021 22:53:45 GMT (envelope-from git) Date: Sat, 16 Jan 2021 22:53:45 GMT Message-Id: <202101162253.10GMrjt1053341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: daad26e5fc25 - main - openpromio(4): remove obsolete pseudo device driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daad26e5fc256767d6b97f07a519e765f1664f69 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2021 22:53:50 -0000 The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=daad26e5fc256767d6b97f07a519e765f1664f69 commit daad26e5fc256767d6b97f07a519e765f1664f69 Author: Marius Strobl AuthorDate: 2021-01-16 11:49:47 +0000 Commit: Marius Strobl CommitDate: 2021-01-16 22:53:13 +0000 openpromio(4): remove obsolete pseudo device driver It's unused since 58aa35d42975c298ca0adba705c042596303c9f5 and r357455 respectively and should have gone along with these. --- sys/dev/ofw/openpromio.c | 237 ----------------------------------------------- sys/dev/ofw/openpromio.h | 48 ---------- 2 files changed, 285 deletions(-) diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c deleted file mode 100644 index 5f1a6c51cd2a..000000000000 --- a/sys/dev/ofw/openpromio.c +++ /dev/null @@ -1,237 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2003 Jake Burkholder. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -/* - * This provides a Solaris compatible character device interface to - * Open Firmware. It exists entirely for compatibility with software - * like X11, and only the features that are actually needed for that - * are implemented. The interface sucks too much to actually use, - * new code should use the /dev/openfirm device. - */ - -static d_open_t openprom_open; -static d_close_t openprom_close; -static d_ioctl_t openprom_ioctl; - -static int openprom_modevent(module_t mode, int type, void *data); -static int openprom_node_valid(phandle_t node); -static int openprom_node_search(phandle_t root, phandle_t node); - -static struct cdevsw openprom_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, - .d_open = openprom_open, - .d_close = openprom_close, - .d_ioctl = openprom_ioctl, - .d_name = "openprom", -}; - -static int openprom_is_open; -static struct cdev *openprom_dev; -static phandle_t openprom_node; - -static int -openprom_open(struct cdev *dev, int oflags, int devtype, struct thread *td) -{ - - if (openprom_is_open != 0) - return (EBUSY); - openprom_is_open = 1; - return (0); -} - -static int -openprom_close(struct cdev *dev, int fflag, int devtype, struct thread *td) -{ - - openprom_is_open = 0; - return (0); -} - -static int -openprom_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, - struct thread *td) -{ - struct openpromio *oprom; - phandle_t node; - uint32_t len; - size_t done; - int proplen; - char *prop; - char *buf; - int error; - - if ((flags & FREAD) == 0) - return (EPERM); - - prop = buf = NULL; - error = 0; - switch (cmd) { - case OPROMCHILD: - case OPROMNEXT: - if (data == NULL || *(void **)data == NULL) - return (EINVAL); - oprom = *(void **)data; - error = copyin(&oprom->oprom_size, &len, sizeof(len)); - if (error != 0) - break; - if (len != sizeof(node)) { - error = EINVAL; - break; - } - error = copyin(&oprom->oprom_array, &node, sizeof(node)); - if (error != 0) - break; - error = openprom_node_valid(node); - if (error != 0) - break; - switch (cmd) { - case OPROMCHILD: - node = OF_child(node); - break; - case OPROMNEXT: - node = OF_peer(node); - break; - } - error = copyout(&node, &oprom->oprom_array, sizeof(node)); - if (error != 0) - break; - openprom_node = node; - break; - case OPROMGETPROP: - case OPROMNXTPROP: - if (data == NULL || *(void **)data == NULL) - return (EINVAL); - oprom = *(void **)data; - error = copyin(&oprom->oprom_size, &len, sizeof(len)); - if (error != 0) - break; - if (len > OPROMMAXPARAM) { - error = EINVAL; - break; - } - prop = malloc(len, M_TEMP, M_WAITOK | M_ZERO); - error = copyinstr(&oprom->oprom_array, prop, len, &done); - if (error != 0) - break; - buf = malloc(OPROMMAXPARAM, M_TEMP, M_WAITOK | M_ZERO); - node = openprom_node; - switch (cmd) { - case OPROMGETPROP: - proplen = OF_getproplen(node, prop); - if (proplen > OPROMMAXPARAM) { - error = EINVAL; - break; - } - error = OF_getprop(node, prop, buf, proplen); - break; - case OPROMNXTPROP: - error = OF_nextprop(node, prop, buf, OPROMMAXPARAM); - proplen = strlen(buf); - break; - } - if (error != -1) { - error = copyout(&proplen, &oprom->oprom_size, - sizeof(proplen)); - if (error == 0) - error = copyout(buf, &oprom->oprom_array, - proplen + 1); - } else - error = EINVAL; - break; - default: - error = ENOIOCTL; - break; - } - - if (prop != NULL) - free(prop, M_TEMP); - if (buf != NULL) - free(buf, M_TEMP); - - return (error); -} - -static int -openprom_node_valid(phandle_t node) -{ - - if (node == 0) - return (0); - return (openprom_node_search(OF_peer(0), node)); -} - -static int -openprom_node_search(phandle_t root, phandle_t node) -{ - phandle_t child; - - if (root == node) - return (0); - for (child = OF_child(root); child != 0 && child != -1; - child = OF_peer(child)) - if (openprom_node_search(child, node) == 0) - return (0); - return (EINVAL); -} - -static int -openprom_modevent(module_t mode, int type, void *data) -{ - - switch (type) { - case MOD_LOAD: - openprom_dev = make_dev(&openprom_cdevsw, 0, UID_ROOT, - GID_WHEEL, 0600, "openprom"); - return (0); - case MOD_UNLOAD: - destroy_dev(openprom_dev); - return (0); - default: - return (EOPNOTSUPP); - } -} - -DEV_MODULE(openprom, openprom_modevent, NULL); diff --git a/sys/dev/ofw/openpromio.h b/sys/dev/ofw/openpromio.h deleted file mode 100644 index 9b52d377f0eb..000000000000 --- a/sys/dev/ofw/openpromio.h +++ /dev/null @@ -1,48 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2003 Jake Burkholder. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _DEV_OFW_OPENPROMIO_H_ -#define _DEV_OFW_OPENPROMIO_H_ - -#include - -struct openpromio { - uint32_t oprom_size; - char oprom_array[]; -}; - -#define OPROMNEXT _IO('O', 1) -#define OPROMCHILD _IO('O', 2) -#define OPROMGETPROP _IO('O', 3) -#define OPROMNXTPROP _IO('O', 4) - -#define OPROMMAXPARAM 4096 - -#endif