No point in keeping these. ok?
Index: sys/dev/usb/ugen.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/ugen.c,v
retrieving revision 1.93
diff -u -p -r1.93 ugen.c
--- sys/dev/usb/ugen.c 17 Mar 2016 21:36:48 -0000 1.93
+++ sys/dev/usb/ugen.c 23 May 2016 11:41:32 -0000
@@ -953,7 +953,6 @@ ugen_do_ioctl(struct ugen_softc *sc, int
struct usb_endpoint_desc *ed;
usb_endpoint_descriptor_t *edesc;
struct usb_alt_interface *ai;
- struct usb_string_desc *si;
u_int8_t conf, alt;
DPRINTFN(5, ("ugenioctl: cmd=%08lx\n", cmd));
@@ -1130,16 +1129,6 @@ ugen_do_ioctl(struct ugen_softc *sc, int
error = uiomove((void *)cdesc, len, &uio);
free(cdesc, M_TEMP, 0);
return (error);
- }
- case USB_GET_STRING_DESC:
- {
- int len;
- si = (struct usb_string_desc *)addr;
- err = usbd_get_string_desc(sc->sc_udev, si->usd_string_index,
- si->usd_language_id, &si->usd_desc, &len);
- if (err)
- return (EINVAL);
- break;
}
case USB_DO_REQUEST:
{
Index: sys/dev/usb/uhid.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uhid.c,v
retrieving revision 1.65
diff -u -p -r1.65 uhid.c
--- sys/dev/usb/uhid.c 3 Mar 2016 18:13:24 -0000 1.65
+++ sys/dev/usb/uhid.c 23 May 2016 11:41:20 -0000
@@ -357,8 +357,7 @@ int
uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
int flag, struct proc *p)
{
- usbd_status err;
- int rc, size;
+ int rc;
DPRINTFN(2, ("uhidioctl: cmd=%lx\n", cmd));
@@ -392,17 +391,6 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
usbd_fill_deviceinfo(sc->sc_hdev.sc_udev,
(struct usb_device_info *)addr, 1);
break;
-
- case USB_GET_STRING_DESC:
- {
- struct usb_string_desc *si = (struct usb_string_desc *)addr;
- err = usbd_get_string_desc(sc->sc_hdev.sc_udev,
- si->usd_string_index,
- si->usd_language_id, &si->usd_desc, &size);
- if (err)
- return (EINVAL);
- break;
- }
case USB_GET_REPORT_DESC:
case USB_GET_REPORT:
Index: sys/dev/usb/umodem.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/umodem.c,v
retrieving revision 1.59
diff -u -p -r1.59 umodem.c
--- sys/dev/usb/umodem.c 14 Mar 2015 03:38:50 -0000 1.59
+++ sys/dev/usb/umodem.c 23 May 2016 11:40:41 -0000
@@ -47,7 +47,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/file.h>
@@ -121,7 +120,6 @@ void umodem_rts(struct umodem_softc *, i
void umodem_break(struct umodem_softc *, int);
void umodem_set_line_state(struct umodem_softc *);
int umodem_param(void *, int, struct termios *);
-int umodem_ioctl(void *, int, u_long, caddr_t, int, struct proc *);
int umodem_open(void *, int portno);
void umodem_close(void *, int portno);
void umodem_intr(struct usbd_xfer *, void *, usbd_status);
@@ -130,7 +128,7 @@ struct ucom_methods umodem_methods = {
umodem_get_status,
umodem_set,
umodem_param,
- umodem_ioctl,
+ NULL,
umodem_open,
umodem_close,
NULL,
@@ -562,38 +560,6 @@ umodem_param(void *addr, int portno, str
return (1);
}
return (0);
-}
-
-int
-umodem_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
- struct proc *p)
-{
- struct umodem_softc *sc = addr;
- int error = 0;
-
- if (usbd_is_dying(sc->sc_udev))
- return (EIO);
-
- DPRINTF(("umodem_ioctl: cmd=0x%08lx\n", cmd));
-
- switch (cmd) {
- case USB_GET_CM_OVER_DATA:
- *(int *)data = sc->sc_cm_over_data;
- break;
-
- case USB_SET_CM_OVER_DATA:
- if (*(int *)data != sc->sc_cm_over_data) {
- /* XXX change it */
- }
- break;
-
- default:
- DPRINTF(("umodem_ioctl: unknown\n"));
- error = ENOTTY;
- break;
- }
-
- return (error);
}
void
Index: sys/dev/usb/uplcom.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uplcom.c,v
retrieving revision 1.66
diff -u -p -r1.66 uplcom.c
--- sys/dev/usb/uplcom.c 14 Mar 2015 03:38:50 -0000 1.66
+++ sys/dev/usb/uplcom.c 23 May 2016 11:39:55 -0000
@@ -119,9 +119,6 @@ void uplcom_rts(struct uplcom_softc *, i
void uplcom_break(struct uplcom_softc *, int);
void uplcom_set_line_state(struct uplcom_softc *);
void uplcom_get_status(void *, int portno, u_char *lsr, u_char *msr);
-#if TODO
-int uplcom_ioctl(void *, int, u_long, caddr_t, int, struct proc *);
-#endif
int uplcom_param(void *, int, struct termios *);
int uplcom_open(void *, int);
void uplcom_close(void *, int);
@@ -130,7 +127,7 @@ struct ucom_methods uplcom_methods = {
uplcom_get_status,
uplcom_set,
uplcom_param,
- NULL, /* uplcom_ioctl, TODO */
+ NULL,
uplcom_open,
uplcom_close,
NULL,
@@ -788,34 +785,3 @@ uplcom_get_status(void *addr, int portno
if (msr != NULL)
*msr = sc->sc_msr;
}
-
-#if TODO
-int
-uplcom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
- struct proc *p)
-{
- struct uplcom_softc *sc = addr;
- int error = 0;
-
- if (usbd_is_dying(sc->sc_udev))
- return (EIO);
-
- DPRINTF(("uplcom_ioctl: cmd=0x%08lx\n", cmd));
-
- switch (cmd) {
- case TIOCNOTTY:
- case TIOCMGET:
- case TIOCMSET:
- case USB_GET_CM_OVER_DATA:
- case USB_SET_CM_OVER_DATA:
- break;
-
- default:
- DPRINTF(("uplcom_ioctl: unknown\n"));
- error = ENOTTY;
- break;
- }
-
- return (error);
-}
-#endif
Index: sys/dev/usb/usb.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usb.h,v
retrieving revision 1.54
diff -u -p -r1.54 usb.h
--- sys/dev/usb/usb.h 28 Feb 2016 17:57:50 -0000 1.54
+++ sys/dev/usb/usb.h 23 May 2016 11:38:56 -0000
@@ -752,7 +752,6 @@ struct usb_device_stats {
/* USB controller */
#define USB_REQUEST _IOWR('U', 1, struct usb_ctl_request)
#define USB_SETDEBUG _IOW ('U', 2, unsigned int)
-#define USB_DISCOVER _IO ('U', 3)
#define USB_DEVICEINFO _IOWR('U', 4, struct usb_device_info)
#define USB_DEVICESTATS _IOR ('U', 5, struct usb_device_stats)
#define USB_DEVICE_GET_CDESC _IOWR('U', 6, struct usb_device_cdesc)
@@ -776,14 +775,9 @@ struct usb_device_stats {
#define USB_GET_INTERFACE_DESC _IOWR('U', 107, struct usb_interface_desc)
#define USB_GET_ENDPOINT_DESC _IOWR('U', 108, struct usb_endpoint_desc)
#define USB_GET_FULL_DESC _IOWR('U', 109, struct usb_full_desc)
-#define USB_GET_STRING_DESC _IOWR('U', 110, struct usb_string_desc)
#define USB_DO_REQUEST _IOWR('U', 111, struct usb_ctl_request)
#define USB_GET_DEVICEINFO _IOR ('U', 112, struct usb_device_info)
#define USB_SET_SHORT_XFER _IOW ('U', 113, int)
#define USB_SET_TIMEOUT _IOW ('U', 114, int)
-
-/* Modem device */
-#define USB_GET_CM_OVER_DATA _IOR ('U', 130, int)
-#define USB_SET_CM_OVER_DATA _IOW ('U', 131, int)
#endif /* _USB_H_ */
Index: sys/dev/usb/uticom.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uticom.c,v
retrieving revision 1.29
diff -u -p -r1.29 uticom.c
--- sys/dev/usb/uticom.c 8 Jan 2016 15:54:14 -0000 1.29
+++ sys/dev/usb/uticom.c 23 May 2016 11:40:18 -0000
@@ -147,9 +147,6 @@ static void uticom_dtr(struct uticom_sof
static void uticom_rts(struct uticom_softc *, int);
static void uticom_break(struct uticom_softc *, int);
static void uticom_get_status(void *, int, u_char *, u_char *);
-#if 0 /* TODO */
-static int uticom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr);
-#endif
static int uticom_param(void *, int, struct termios *);
static int uticom_open(void *, int);
static void uticom_close(void *, int);
@@ -163,7 +160,7 @@ struct ucom_methods uticom_methods = {
uticom_get_status,
uticom_set,
uticom_param,
- NULL, /* uticom_ioctl, TODO */
+ NULL,
uticom_open,
uticom_close,
NULL,
@@ -841,37 +838,6 @@ uticom_get_status(void *addr, int portno
#endif
return;
}
-
-#if 0 /* TODO */
-static int
-uticom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
- usb_proc_ptr p)
-{
- struct uticom_softc *sc = addr;
- int error = 0;
-
- if (usbd_is_dying(sc->sc_udev))
- return (EIO);
-
- DPRINTF(("uticom_ioctl: cmd = 0x%08lx\n", cmd));
-
- switch (cmd) {
- case TIOCNOTTY:
- case TIOCMGET:
- case TIOCMSET:
- case USB_GET_CM_OVER_DATA:
- case USB_SET_CM_OVER_DATA:
- break;
-
- default:
- DPRINTF(("uticom_ioctl: unknown\n"));
- error = ENOTTY;
- break;
- }
-
- return (error);
-}
-#endif
static int
uticom_download_fw(struct uticom_softc *sc, int pipeno,
Index: share/man/man4/ugen.4
===================================================================
RCS file: /cvs/src/share/man/man4/ugen.4,v
retrieving revision 1.16
diff -u -p -r1.16 ugen.4
--- share/man/man4/ugen.4 16 Feb 2015 16:38:54 -0000 1.16
+++ share/man/man4/ugen.4 23 May 2016 12:14:40 -0000
@@ -216,17 +216,6 @@ and inspecting the
.Fa wTotalLength
field.
.Pp
-.It Dv USB_GET_STRING_DESC (struct usb_string_desc)
-Get a string descriptor for the given language id and
-string index.
-.Bd -literal
-struct usb_string_desc {
- int usd_string_index;
- int usd_language_id;
- usb_string_descriptor_t usd_desc;
-};
-.Ed
-.Pp
.It Dv USB_DO_REQUEST
Send a USB request to the device on the control endpoint.
Any data sent to/from the device is located at
Index: share/man/man4/usb.4
===================================================================
RCS file: /cvs/src/share/man/man4/usb.4,v
retrieving revision 1.173
diff -u -p -r1.173 usb.4
--- share/man/man4/usb.4 2 Feb 2016 17:06:31 -0000 1.173
+++ share/man/man4/usb.4 23 May 2016 12:15:18 -0000
@@ -411,11 +411,6 @@ The following
.Xr ioctl 2
commands are supported on the controller device:
.Bl -tag -width xxxxxx
-.\" .It Dv USB_DISCOVER
-.\" This command will cause a complete bus discovery to be initiated.
-.\" If any devices attached or detached from the bus they will be
-.\" processed during this command.
-.\" This is the only way that new devices are found on the bus.
.It Dv USB_DEVICEINFO (struct usb_device_info *)
This command can be used to retrieve some information about a device
on the bus.
