From: jsg <jsg@openbsd.org>
Date: Mon, 30 Sep 2024 01:41:49 +0000 (+0000)
Subject: remove WSDISPLAYIO_OGINFO compat ioctl, planned for after 7.3
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=db233230d58f53489ed5a8808d5a8244e5b5cca0;p=openbsd

remove WSDISPLAYIO_OGINFO compat ioctl, planned for after 7.3
ok miod@
---

diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index 332b650cff2..7893d60a926 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsio.h,v 1.101 2024/01/19 17:51:15 kettenis Exp $ */
+/* $OpenBSD: wsconsio.h,v 1.102 2024/09/30 01:41:49 jsg Exp $ */
 /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */
 
 /*
@@ -476,15 +476,6 @@ struct wsdisplay_fbinfo {
 };
 #define	WSDISPLAYIO_GINFO	_IOR('W', 65, struct wsdisplay_fbinfo)
 
-/* Backwards compat; remove after OpenBSD 7.3 is released. */
-struct wsdisplay_ofbinfo {
-	u_int	height;				/* height in pixels */
-	u_int	width;				/* width in pixels */
-	u_int	depth;				/* bits per pixel */
-	u_int	cmsize;				/* color map size (entries) */
-};
-#define	WSDISPLAYIO_OGINFO	_IOR('W', 65, struct wsdisplay_ofbinfo)
-
 /* Colormap operations.  Not applicable to all display types. */
 struct wsdisplay_cmap {
 	u_int	index;				/* first element (0 origin) */
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index a0a3fd25717..58eb734ea21 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.152 2023/01/10 16:33:18 tobhe Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.153 2024/09/30 01:41:49 jsg Exp $ */
 /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -1315,25 +1315,6 @@ wsdisplay_driver_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
 {
 	int error;
 
-#if defined(OpenBSD7_1) || defined(OpenBSD7_2) || defined(OpenBSD7_3)
-	if (cmd == WSDISPLAYIO_OGINFO) {
-		struct wsdisplay_ofbinfo *oinfo =
-			(struct wsdisplay_ofbinfo *)data;
-		struct wsdisplay_fbinfo info;
-
-		error = (*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
-		    WSDISPLAYIO_GINFO, (caddr_t)&info, flag, p);
-		if (error)
-			return error;
-
-		oinfo->height = info.height;
-		oinfo->width = info.width;
-		oinfo->depth = info.depth;
-		oinfo->cmsize = info.cmsize;
-		return (0);
-	}
-#endif
-
 	error = ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
 	    flag, p));
 	/* Do not report parameters with empty ranges to userland. */