From 8051b6fbb7b6f9b7a3927a285a2d49f4ee6a064a Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 24 Oct 2017 09:36:14 +0000 Subject: remove defines for ioctls the kernel doesn't recognise ok mpi@ --- sbin/wsconsctl/mouse.c | 8 +------- share/man/man4/bridge.4 | 5 ++--- share/man/man4/switch.4 | 17 ++--------------- sys/arch/octeon/dev/amdcf.c | 29 +---------------------------- sys/arch/octeon/dev/octcf.c | 29 +---------------------------- sys/dev/ata/wd.c | 29 +---------------------------- sys/dev/wscons/wsconsio.h | 11 +---------- sys/net/if_ppp.h | 6 +----- sys/net80211/ieee80211_ioctl.h | 11 +---------- sys/netinet6/in6_var.h | 6 +----- sys/sys/cdio.h | 3 +-- sys/sys/disklabel.h | 14 +------------- sys/sys/dkio.h | 9 +-------- sys/sys/sockio.h | 14 +------------- usr.sbin/wsmoused/wsmoused.c | 4 +--- 15 files changed, 17 insertions(+), 178 deletions(-) diff --git a/sbin/wsconsctl/mouse.c b/sbin/wsconsctl/mouse.c index 62584639fdb..5d196698b36 100644 --- a/sbin/wsconsctl/mouse.c +++ b/sbin/wsconsctl/mouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mouse.c,v 1.15 2017/08/01 23:23:44 bru Exp $ */ +/* $OpenBSD: mouse.c,v 1.16 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: mouse.c,v 1.3 1999/11/15 13:47:30 ad Exp $ */ /*- @@ -144,12 +144,6 @@ mouse_put_values(int fd) return 1; } } - if (field_by_value(mouse_field_tab, &samplerate)->flags & FLG_SET) { - if (ioctl(fd, WSMOUSEIO_SRATE, &samplerate) < 0) { - warn("WSMOUSEIO_SRATE"); - return 1; - } - } if (field_by_value(mouse_field_tab, &rawmode)->flags & FLG_SET) { wmcoords.samplelen = rawmode; if (ioctl(fd, WSMOUSEIO_SCALIBCOORDS, &wmcoords) < 0) { diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 index 3fdfaddea7c..cb67c4e4a6b 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bridge.4,v 1.75 2016/09/04 18:55:08 jmc Exp $ +.\" $OpenBSD: bridge.4,v 1.76 2017/10/24 09:36:13 jsg Exp $ .\" .\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net) .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 4 2016 $ +.Dd $Mdocdate: October 24 2017 $ .Dt BRIDGE 4 .Os .Sh NAME @@ -510,7 +510,6 @@ struct ifbrlconf { #define ifbrl_req ifbrl_ifbrlu.ifbrlu_req }; .Ed -.\" .It Dv SIOCBRDGGSIFS Fa "struct ifbreq *" .It Dv SIOCBRDGGPRI Fa "struct ifbrparam *" Retrieve the Spanning Tree Protocol (STP) priority parameter of the bridge into the diff --git a/share/man/man4/switch.4 b/share/man/man4/switch.4 index 1e1c8e28335..161e7589e6e 100644 --- a/share/man/man4/switch.4 +++ b/share/man/man4/switch.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: switch.4,v 1.7 2016/11/28 11:46:26 jmc Exp $ +.\" $OpenBSD: switch.4,v 1.8 2017/10/24 09:36:13 jsg Exp $ .\" .\" Copyright (c) 2016 YASUOKA Masahiko .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 28 2016 $ +.Dd $Mdocdate: October 24 2017 $ .Dt SWITCH 4 .Os .Sh NAME @@ -130,12 +130,6 @@ of the switch named in into the .Va ifbrp_maxflow field. -.It Dv SIOCSWSMAXFLOW Fa "struct ifbrparam" -Set the maximum number of flows in the OpenFlow protocol of the switch named in -.Va ifbrp_name -to the value in the -.Va ifbrpu_maxflow -field. .It Dv SIOCSWGMAXGROUP Fa "struct ifbrparam" Retrieve the maximum number of groups in the OpenFlow protocol of the switch named @@ -144,13 +138,6 @@ in into the .Va ifbrpu_maxgroup field. -.It Dv SIOCSWSMAXGROUP Fa "struct ifbrparam" -Set the maximum number of groups in the OpenFlow protocol -of the switch named in -.Va ifbrp_name -to the value in the -.Va ifbrpu_maxgroup -field. .It Dv SIOCSWSPORTNO Fa "struct ifbreq" Set the port_no in the OpenFlow protocol of the port named in .Va ifbr_ifsname diff --git a/sys/arch/octeon/dev/amdcf.c b/sys/arch/octeon/dev/amdcf.c index d5609781c20..c964dbac71a 100644 --- a/sys/arch/octeon/dev/amdcf.c +++ b/sys/arch/octeon/dev/amdcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdcf.c,v 1.3 2017/05/04 22:47:27 deraadt Exp $ */ +/* $OpenBSD: amdcf.c,v 1.4 2017/10/24 09:36:13 jsg Exp $ */ /* * Copyright (c) 2007, Juniper Networks, Inc. @@ -533,33 +533,6 @@ amdcfioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct proc *p) disk_unlock(&sc->sc_dk); goto exit; -#ifdef notyet - case DIOCWFORMAT: - if ((flag & FWRITE) == 0) - return EBADF; - { - struct format_op *fop; - struct iovec aiov; - struct uio auio; - - fop = (struct format_op *)addr; - aiov.iov_base = fop->df_buf; - aiov.iov_len = fop->df_count; - auio.uio_iov = &aiov; - auio.uio_iovcnt = 1; - auio.uio_resid = fop->df_count; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_offset = - fop->df_startblk * sc->sc_dk.dk_label->d_secsize; - auio.uio_procp = p; - error = physio(scformat, dev, B_WRITE, minphys, &auio); - fop->df_count -= auio.uio_resid; - fop->df_reg[0] = scc->sc_status; - fop->df_reg[1] = scc->sc_error; - goto exit; - } -#endif - default: error = ENOTTY; goto exit; diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c index 42beab06c46..70b032fcf83 100644 --- a/sys/arch/octeon/dev/octcf.c +++ b/sys/arch/octeon/dev/octcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octcf.c,v 1.29 2017/05/04 22:47:27 deraadt Exp $ */ +/* $OpenBSD: octcf.c,v 1.30 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -601,33 +601,6 @@ octcfioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct proc *p) disk_unlock(&wd->sc_dk); goto exit; -#ifdef notyet - case DIOCWFORMAT: - if ((flag & FWRITE) == 0) - return EBADF; - { - struct format_op *fop; - struct iovec aiov; - struct uio auio; - - fop = (struct format_op *)addr; - aiov.iov_base = fop->df_buf; - aiov.iov_len = fop->df_count; - auio.uio_iov = &aiov; - auio.uio_iovcnt = 1; - auio.uio_resid = fop->df_count; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_offset = - fop->df_startblk * wd->sc_dk.dk_label->d_secsize; - auio.uio_procp = p; - error = physio(wdformat, dev, B_WRITE, minphys, &auio); - fop->df_count -= auio.uio_resid; - fop->df_reg[0] = wdc->sc_status; - fop->df_reg[1] = wdc->sc_error; - goto exit; - } -#endif - default: error = ENOTTY; goto exit; diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index a6dc2c5fcb9..84941e552bf 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.122 2017/05/29 14:05:31 sf Exp $ */ +/* $OpenBSD: wd.c,v 1.123 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -821,33 +821,6 @@ wdioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct proc *p) disk_unlock(&wd->sc_dk); goto exit; -#ifdef notyet - case DIOCWFORMAT: - if ((flag & FWRITE) == 0) - return EBADF; - { - struct format_op *fop; - struct iovec aiov; - struct uio auio; - - fop = (struct format_op *)addr; - aiov.iov_base = fop->df_buf; - aiov.iov_len = fop->df_count; - auio.uio_iov = &aiov; - auio.uio_iovcnt = 1; - auio.uio_resid = fop->df_count; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_offset = - fop->df_startblk * wd->sc_dk.dk_label->d_secsize; - auio.uio_procp = p; - error = physio(wdformat, dev, B_WRITE, minphys, &auio); - fop->df_count -= auio.uio_resid; - fop->df_reg[0] = wdc->sc_status; - fop->df_reg[1] = wdc->sc_error; - goto exit; - } -#endif - case DIOCCACHESYNC: if ((flag & FWRITE) == 0) { error = EBADF; diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index 6b4169830eb..75f91af8ba4 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.85 2017/08/18 21:29:59 deraadt Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.86 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */ /* @@ -245,15 +245,6 @@ struct wskbd_encoding_data { #define WSMOUSE_RES_DEFAULT 75 #define WSMOUSE_RES_MAX 100 -/* Set scale factor (num / den). Not applicable to all mouse types. */ -#define WSMOUSEIO_SSCALE _IOW('W', 34, u_int[2]) - -/* Set sample rate. Not applicable to all mouse types. */ -#define WSMOUSEIO_SRATE _IOW('W', 35, u_int) -#define WSMOUSE_RATE_MIN 0 -#define WSMOUSE_RATE_DEFAULT 50 -#define WSMOUSE_RATE_MAX 100 - /* Set/get sample coordinates for calibration */ #define WSMOUSE_CALIBCOORDS_MAX 16 #define WSMOUSE_CALIBCOORDS_RESET -1 diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h index e671af8604e..eb13a36f2c0 100644 --- a/sys/net/if_ppp.h +++ b/sys/net/if_ppp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.h,v 1.8 2002/07/01 19:31:34 deraadt Exp $ */ +/* $OpenBSD: if_ppp.h,v 1.9 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: if_ppp.h,v 1.11 1996/03/15 02:28:05 paulus Exp $ */ /* @@ -138,10 +138,6 @@ struct ifpppcstatsreq { #define PPPIOCSPASS _IOW('t', 71, struct bpf_program) /* set pass filter */ #define PPPIOCSACTIVE _IOW('t', 70, struct bpf_program) /* set active filt */ -/* PPPIOC[GS]MTU are alternatives to SIOC[GS]IFMTU, used under Ultrix */ -#define PPPIOCGMTU _IOR('t', 73, int) /* get interface MTU */ -#define PPPIOCSMTU _IOW('t', 72, int) /* set interface MTU */ - /* * These two are interface ioctls so that pppstats can do them on * a socket without having to open the serial device. diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h index 56629a4cac5..03332685619 100644 --- a/sys/net80211/ieee80211_ioctl.h +++ b/sys/net80211/ieee80211_ioctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_ioctl.h,v 1.29 2017/07/19 22:04:46 stsp Exp $ */ +/* $OpenBSD: ieee80211_ioctl.h,v 1.30 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: ieee80211_ioctl.h,v 1.7 2004/04/30 22:51:04 dyoung Exp $ */ /*- @@ -151,19 +151,10 @@ struct ieee80211_power { #define SIOCS80211POWER _IOW('i', 234, struct ieee80211_power) #define SIOCG80211POWER _IOWR('i', 235, struct ieee80211_power) -/* authentication type */ -struct ieee80211_auth { - char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */ - int i_authtype; -}; - #define IEEE80211_AUTH_NONE 0 #define IEEE80211_AUTH_OPEN 1 #define IEEE80211_AUTH_SHARED 2 -#define SIOCS80211AUTH _IOW('i', 236, struct ieee80211_auth) -#define SIOCG80211AUTH _IOWR('i', 237, struct ieee80211_auth) - /* channel request */ struct ieee80211chanreq { char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */ diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 857dfcc3b2a..2432502ca31 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_var.h,v 1.69 2017/08/15 06:08:52 florian Exp $ */ +/* $OpenBSD: in6_var.h,v 1.70 2017/10/24 09:36:13 jsg Exp $ */ /* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */ /* @@ -294,10 +294,6 @@ struct in6_aliasreq { #define SIOCDIFADDR_IN6 _IOW('i', 25, struct in6_ifreq) #define SIOCAIFADDR_IN6 _IOW('i', 26, struct in6_aliasreq) -#define SIOCSIFPHYADDR_IN6 _IOW('i', 70, struct in6_aliasreq) -#define SIOCGIFPSRCADDR_IN6 _IOWR('i', 71, struct in6_ifreq) -#define SIOCGIFPDSTADDR_IN6 _IOWR('i', 72, struct in6_ifreq) - #define SIOCGIFAFLAG_IN6 _IOWR('i', 73, struct in6_ifreq) #define SIOCGIFINFO_IN6 _IOWR('i', 108, struct in6_ndireq) diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h index fcae3f3d117..02069c4539d 100644 --- a/sys/sys/cdio.h +++ b/sys/sys/cdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cdio.h,v 1.16 2006/12/23 17:35:35 krw Exp $ */ +/* $OpenBSD: cdio.h,v 1.17 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: cdio.h,v 1.11 1996/02/19 18:29:04 scottr Exp $ */ #ifndef _SYS_CDIO_H_ @@ -218,7 +218,6 @@ struct ioc_vol { #define CDIOCALLOW _IO('c', 25) #define CDIOCPREVENT _IO('c', 26) #define CDIOCCLOSE _IO('c', 27) -#define CDIOCSETCDDA _IOW('c', 28, int) /* (re)set CDDA reading mode */ struct ioc_play_msf { u_char start_m; diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 1a10275c192..70c6cfe2410 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.74 2015/11/03 13:59:07 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.75 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */ /* @@ -345,18 +345,6 @@ static char *fstypesnames[] = { #define d_blind d_drivedata[0] #ifndef _LOCORE -/* - * Structure used to perform a format or other raw operation, returning - * data and/or register values. Register identification and format - * are device- and driver-dependent. - */ -struct format_op { - char *df_buf; - int df_count; /* value-result */ - daddr_t df_startblk; - int df_reg[8]; /* result */ -}; - /* * Structure used internally to retrieve information about a partition * on a disk. diff --git a/sys/sys/dkio.h b/sys/sys/dkio.h index b4a377753d8..94d56ecd88b 100644 --- a/sys/sys/dkio.h +++ b/sys/sys/dkio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dkio.h,v 1.11 2017/07/29 08:50:42 zhuk Exp $ */ +/* $OpenBSD: dkio.h,v 1.12 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: dkio.h,v 1.1 1996/01/30 18:21:48 thorpej Exp $ */ /* @@ -44,13 +44,6 @@ #define DIOCWDINFO _IOW('d', 103, struct disklabel)/* set, update disk */ #define DIOCGPART _IOW('d', 104, struct partinfo) /* get partition */ -/* do format operation, read or write */ -#define DIOCRFORMAT _IOWR('d', 105, struct format_op) -#define DIOCWFORMAT _IOWR('d', 106, struct format_op) - -#define DIOCSSTEP _IOW('d', 107, int) /* set step rate */ -#define DIOCSRETRIES _IOW('d', 108, int) /* set # of retries */ - #define DIOCEJECT _IO('d', 112) /* eject removable disk */ #define DIOCLOCK _IOW('d', 113, int) /* lock/unlock pack */ diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index 044f4d00f4c..4d630796c44 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sockio.h,v 1.71 2017/10/24 08:57:10 mpi Exp $ */ +/* $OpenBSD: sockio.h,v 1.72 2017/10/24 09:36:13 jsg Exp $ */ /* $NetBSD: sockio.h,v 1.5 1995/08/23 00:40:47 thorpej Exp $ */ /*- @@ -38,10 +38,6 @@ #include /* Socket ioctl's. */ -#define SIOCSHIWAT _IOW('s', 0, int) /* set high watermark */ -#define SIOCGHIWAT _IOR('s', 1, int) /* get high watermark */ -#define SIOCSLOWAT _IOW('s', 2, int) /* set low watermark */ -#define SIOCGLOWAT _IOR('s', 3, int) /* get low watermark */ #define SIOCATMARK _IOR('s', 7, int) /* at oob mark? */ #define SIOCSPGRP _IOW('s', 8, int) /* set process group */ #define SIOCGPGRP _IOR('s', 9, int) /* get process group */ @@ -73,15 +69,11 @@ #define SIOCSIFMEDIA _IOWR('i', 55, struct ifreq) /* set net media */ #define SIOCGIFMEDIA _IOWR('i', 56, struct ifmediareq) /* get net media */ -#define SIOCSIFPHYADDR _IOW('i', 70, struct ifaliasreq) /* set gif address */ -#define SIOCGIFPSRCADDR _IOWR('i', 71, struct ifreq) /* get gif psrc addr */ -#define SIOCGIFPDSTADDR _IOWR('i', 72, struct ifreq) /* get gif pdst addr */ #define SIOCDIFPHYADDR _IOW('i', 73, struct ifreq) /* delete gif addrs */ #define SIOCSLIFPHYADDR _IOW('i', 74, struct if_laddrreq) /* set gif addrs */ #define SIOCGLIFPHYADDR _IOWR('i', 75, struct if_laddrreq) /* get gif addrs */ #define SIOCBRDGADD _IOW('i', 60, struct ifbreq) /* add bridge ifs */ -#define SIOCBRDGGSIFS _IOWR('i', 60, struct ifbreq) /* get span ifs */ #define SIOCBRDGDEL _IOW('i', 61, struct ifbreq) /* del bridge ifs */ #define SIOCBRDGGIFFLGS _IOWR('i', 62, struct ifbreq) /* get brdg if flags */ #define SIOCBRDGSIFFLGS _IOW('i', 63, struct ifbreq) /* set brdg if flags */ @@ -120,15 +112,11 @@ #define SIOCSWGDPID _IOWR('i', 91, struct ifbrparam)/* set datapath id */ #define SIOCSWSDPID _IOW('i', 92, struct ifbrparam)/* get datapath id */ #define SIOCSWGMAXGROUP _IOWR('i', 93, struct ifbrparam)/* get max groups */ -#define SIOCSWSMAXGROUP _IOW('i', 94, struct ifbrparam)/* set max groups */ #define SIOCSWSPORTNO _IOWR('i', 95, struct ifbreq) /* set port number */ #define SIOCSWGMAXFLOW _IOWR('i', 96, struct ifbrparam)/* get max flow per table */ -#define SIOCSWSMAXFLOW _IOW('i', 97, struct ifbrparam)/* set max flow per table */ #define SIOCSIFMTU _IOW('i', 127, struct ifreq) /* set ifnet mtu */ #define SIOCGIFMTU _IOWR('i', 126, struct ifreq) /* get ifnet mtu */ -#define SIOCSIFASYNCMAP _IOW('i', 125, struct ifreq) /* set ppp asyncmap */ -#define SIOCGIFASYNCMAP _IOWR('i', 124, struct ifreq) /* get ppp asyncmap */ #define SIOCIFCREATE _IOW('i', 122, struct ifreq) /* create clone if */ #define SIOCIFDESTROY _IOW('i', 121, struct ifreq) /* destroy clone if */ diff --git a/usr.sbin/wsmoused/wsmoused.c b/usr.sbin/wsmoused/wsmoused.c index 8e0c849901f..12637a3181f 100644 --- a/usr.sbin/wsmoused/wsmoused.c +++ b/usr.sbin/wsmoused/wsmoused.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmoused.c,v 1.36 2015/10/26 09:58:18 deraadt Exp $ */ +/* $OpenBSD: wsmoused.c,v 1.37 2017/10/24 09:36:13 jsg Exp $ */ /* * Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon @@ -157,10 +157,8 @@ void wsmouse_init(void) { unsigned int res = WSMOUSE_RES_MIN; - unsigned int rate = WSMOUSE_RATE_DEFAULT; ioctl(mouse.mfd, WSMOUSEIO_SRES, &res); - ioctl(mouse.mfd, WSMOUSEIO_SRATE, &rate); } /* -- cgit v1.2.3