From nobody Mon Dec 06 10:29:47 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D042E18B48AD; Mon, 6 Dec 2021 10:29:48 +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 4J706h2d9Wz4kTm; Mon, 6 Dec 2021 10:29:48 +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 BEEE7176E; Mon, 6 Dec 2021 10:29:47 +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 1B6ATlnX087407; Mon, 6 Dec 2021 10:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6ATlkp087406; Mon, 6 Dec 2021 10:29:47 GMT (envelope-from git) Date: Mon, 6 Dec 2021 10:29:47 GMT Message-Id: <202112061029.1B6ATlkp087406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b9d3b253e2f7 - main - fb: Remove unused cursors ioctls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9d3b253e2f7c4910bbd3844158a2a80f9a7ff4f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638786588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKMAl5s6A1RAMQ/cSJArCIPK9PB8aU9Kwz/KyZTgq7Q=; b=pn8KgtR3gKiEXb1GjQNbsK7BRf7KCCvgQhprhhX/faPQWRZuOnYfsx8nYePEDLASgj+o5X c5GVLsJl0IIWYCNE/fbMNt/SdGIjXb/0Qd4QZmBDIY6QBFbwGzkI9FWaLIhEaYGTmyOlM0 id61Gki3pV8+VGtYp4091+pJrCB0kzQp9mi/wUETR3UreFE8Eu170TNdf/jH35ZbxJJVro 9AZz3Ftple/cRyZjAD5Ve1ntf203NlQkPe3Ndwn4jkYEN9w5SG6YPHPEw4M8douPKv6k9G rA+Ckj/U1pDYjST1pdxSUwGxpLEWMYBeQKPsyt9jXDsqxEDyOWTjIsJoVeEGcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638786588; a=rsa-sha256; cv=none; b=lIwqm/rv9kgwOlQ6K/5OI34I3G6B52+eWBmMZEKblAIKe3tTlCjvN4DQJqeonhfE//H0rm kOC4/BXhZY7bfpvcPxh1Qj/MX4QSelp16eTOXjMHYzY0fPAtcD+eCkIbxuj+hatBSAHYqE 9jgvmVwGx6mzy4Z9Q9y3i2chUy1Eg/J4MHo4wJm7OVpuos+DdObW9JjYVDhqG0q3aB5U04 mJqo5/o4LEYkDNDFQXmcctp9W4htYAvG05SbsjPtswVVCBqi1umtuk1i7QJBmTbIepNiDP 1ElDrsZL7Y8f/hEr0Y3ny3jaomjVglYWkE2fsCbDADvOQYUKyuUYWql9FxenQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d3b253e2f7c4910bbd3844158a2a80f9a7ff4f commit b9d3b253e2f7c4910bbd3844158a2a80f9a7ff4f Author: Emmanuel Vadot AuthorDate: 2021-12-01 10:56:26 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-06 10:27:59 +0000 fb: Remove unused cursors ioctls The cursors related ioctls were added in 1994 with the 4.4 Lite import but were never implemented in either sc(4), fb(4) or vt(4). Remove it. Reviewed by: emaste, tsoome MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33217 --- sys/dev/fb/fb.c | 5 ----- sys/dev/syscons/scvidctl.c | 5 ----- sys/sys/fbio.h | 38 -------------------------------------- 3 files changed, 48 deletions(-) diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 8226c3317c6b..12423ad86f4f 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -738,11 +738,6 @@ fb_commonioctl(video_adapter_t *adp, u_long cmd, caddr_t arg) case FBIO_SETLINEWIDTH: /* set scan line width in pixel */ case FBIOGTYPE: - case FBIOSCURSOR: - case FBIOGCURSOR: - case FBIOSCURPOS: - case FBIOGCURPOS: - case FBIOGCURMAX: case FBIOMONINFO: case FBIOGXINFO: diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index c5881545f435..7c2b395d975b 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -614,11 +614,6 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case FBIOPUTCMAP: case FBIOGETCMAP: case FBIOGTYPE: - case FBIOSCURSOR: - case FBIOGCURSOR: - case FBIOSCURPOS: - case FBIOGCURPOS: - case FBIOGCURMAX: if (scp != scp->sc->cur_scp) return ENODEV; /* XXX */ return fb_ioctl(adp, cmd, data); diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index ff63c2f064b1..73315a37bbdd 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -195,44 +195,6 @@ struct fbcmap { #define FBIOPUTCMAP _IOW('F', 3, struct fbcmap) #define FBIOGETCMAP _IOW('F', 4, struct fbcmap) -/* - * Hardware cursor control (for, e.g., CG6). A rather complex and icky - * interface that smells like VMS, but there it is.... - */ -struct fbcurpos { - short x; - short y; -}; - -struct fbcursor { - short set; /* flags; see below */ - short enable; /* nonzero => cursor on, 0 => cursor off */ - struct fbcurpos pos; /* position on display */ - struct fbcurpos hot; /* hot-spot within cursor */ - struct fbcmap cmap; /* cursor color map */ - struct fbcurpos size; /* number of valid bits in image & mask */ - caddr_t image; /* cursor image bits */ - caddr_t mask; /* cursor mask bits */ -}; -#define FB_CUR_SETCUR 0x01 /* set on/off (i.e., obey fbcursor.enable) */ -#define FB_CUR_SETPOS 0x02 /* set position */ -#define FB_CUR_SETHOT 0x04 /* set hot-spot */ -#define FB_CUR_SETCMAP 0x08 /* set cursor color map */ -#define FB_CUR_SETSHAPE 0x10 /* set size & bits */ -#define FB_CUR_SETALL (FB_CUR_SETCUR | FB_CUR_SETPOS | FB_CUR_SETHOT | \ - FB_CUR_SETCMAP | FB_CUR_SETSHAPE) - -/* controls for cursor attributes & shape (including position) */ -#define FBIOSCURSOR _IOW('F', 24, struct fbcursor) -#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor) - -/* controls for cursor position only */ -#define FBIOSCURPOS _IOW('F', 26, struct fbcurpos) -#define FBIOGCURPOS _IOW('F', 27, struct fbcurpos) - -/* get maximum cursor size */ -#define FBIOGCURMAX _IOR('F', 28, struct fbcurpos) - /* * Video board information */