Delete unused ioctls and associated macros. Move macros that are still

used internally by low-level drivers from sys/audioio.h to
dev/audio_if.h instead of deleting them.

4 files changed, 40 insertions, 325 deletions

diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 167a45e3714..a6590c069d4 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.150 2016/06/21 06:38:28 ratchov Exp $	*/
+/*	$OpenBSD: audio.c,v 1.151 2016/08/31 07:22:43 ratchov Exp $	*/
 /*
  * Copyright (c) 2015 Alexandre Ratchov <alex@caoua.org>
  *
@@ -858,180 +858,6 @@ audio_setpar(struct audio_softc *sc)
 }
 
 int
-audio_setinfo(struct audio_softc *sc, struct audio_info *ai)
-{
-	struct audio_prinfo *r = &ai->record, *p = &ai->play;
-	int error;
-	int set;
-
-	/*
-	 * stop the device if requested to stop
-	 */
-	if (sc->mode != 0) {
-		if (sc->mode & AUMODE_PLAY) {
-			if (p->pause != (unsigned char)~0)
-				sc->pause = p->pause;
-		}
-		if (sc->mode & AUMODE_RECORD) {
-			if (r->pause != (unsigned char)~0)
-				sc->pause = r->pause;
-		}
-		if (sc->pause) {
-			if (sc->active)
-				audio_stop(sc);
-		}
-	}
-
-	/*
-	 * copy parameters into the softc structure
-	 */
-	set = 0;
-	if (ai->play.encoding != ~0) {
-		sc->sw_enc = ai->play.encoding;
-		set = 1;
-	}
-	if (ai->play.precision != ~0) {
-		sc->bits = ai->play.precision;
-		set = 1;
-	}
-	if (ai->play.bps != ~0) {
-		sc->bps = ai->play.bps;
-		set = 1;
-	}
-	if (ai->play.msb != ~0) {
-		sc->msb = ai->play.msb;
-		set = 1;
-	}
-	if (ai->play.sample_rate != ~0) {
-		sc->rate = ai->play.sample_rate;
-		set = 1;
-	}
-	if (ai->play.channels != ~0) {
-		sc->pchan = ai->play.channels;
-		set = 1;
-	}
-	if (ai->play.block_size != ~0) {
-		sc->round = ai->play.block_size /
-		    (sc->bps * sc->pchan);
-		set = 1;
-	}
-	if (ai->hiwat != ~0) {
-		sc->nblks = ai->hiwat;
-		set = 1;
-	}
-	if (ai->record.encoding != ~0) {
-		sc->sw_enc = ai->record.encoding;
-		set = 1;
-	}
-	if (ai->record.precision != ~0) {
-		sc->bits = ai->record.precision;
-		set = 1;
-	}
-	if (ai->record.bps != ~0) {
-		sc->bps = ai->record.bps;
-		set = 1;
-	}
-	if (ai->record.msb != ~0) {
-		sc->msb = ai->record.msb;
-		set = 1;
-	}
-	if (ai->record.sample_rate != ~0) {
-		sc->rate = ai->record.sample_rate;
-		set = 1;
-	}
-	if (ai->record.channels != ~0) {
-		sc->rchan = ai->record.channels;
-		set = 1;
-	}
-	if (ai->record.block_size != ~0) {
-		sc->round = ai->record.block_size /
-		    (sc->bps * sc->rchan);
-		set = 1;
-	}
-
-	DPRINTF("%s: setinfo: set = %d, mode = %d, pause = %d\n",
-	    DEVNAME(sc), set, sc->mode, sc->pause);
-
-	/*
-	 * if the device not opened, we're done, don't touch the hardware
-	 */
-	if (sc->mode == 0)
-		return 0;
-
-	/*
-	 * change parameters and recalculate buffer sizes
-	 */
-	if (set) {
-		if (sc->active) {
-			DPRINTF("%s: can't change params during dma\n",
-			    DEVNAME(sc));
-			return EBUSY;
-		}
-		error = audio_setpar(sc);
-		if (error)
-			return error;
-		audio_clear(sc);
-		if ((sc->mode & AUMODE_PLAY) && sc->ops->init_output) {
-			error = sc->ops->init_output(sc->arg,
-			    sc->play.data, sc->play.len);
-			if (error)
-				return error;
-		}
-		if ((sc->mode & AUMODE_RECORD) && sc->ops->init_input) {
-			error = sc->ops->init_input(sc->arg,
-			    sc->rec.data, sc->rec.len);
-			if (error)
-				return error;
-		}
-	}
-
-	/*
-	 * if unpaused, start
-	 */
-	if (!sc->pause && !sc->active) {
-		error = audio_start(sc);
-		if (error)
-			return error;
-	}
-	return 0;
-}
-
-int
-audio_getinfo(struct audio_softc *sc, struct audio_info *ai)
-{
-	ai->play.sample_rate = ai->record.sample_rate = sc->rate;
-	ai->play.encoding = ai->record.encoding = sc->sw_enc;
-	ai->play.precision = ai->record.precision = sc->bits;
-	ai->play.bps = ai->record.bps = sc->bps;
-	ai->play.msb = ai->record.msb = sc->msb;
-	ai->play.channels = sc->pchan;
-	ai->record.channels = sc->rchan;
-
-	/*
-	 * XXX: this is used only to display counters through audioctl
-	 * and the pos counters are more useful
-	 */
-	mtx_enter(&audio_lock);
-	ai->play.samples = sc->play.pos - sc->play.xrun;
-	ai->record.samples = sc->rec.pos - sc->rec.xrun;
-	mtx_leave(&audio_lock);
-
-	ai->play.pause = ai->record.pause = sc->pause;
-	ai->play.active = ai->record.active = sc->active;
-
-	ai->play.buffer_size = sc->play.datalen;
-	ai->record.buffer_size = sc->rec.datalen;
-
-	ai->play.block_size =  sc->round * sc->bps * sc->pchan;
-	ai->record.block_size = sc->round * sc->bps * sc->rchan;
-
-	ai->hiwat = sc->nblks;
-	ai->lowat = sc->nblks;
-	ai->mode = sc->mode;
-	return 0;
-}
-
-int
 audio_ioc_start(struct audio_softc *sc)
 {
 	if (!sc->pause) {
@@ -1699,9 +1525,8 @@ audio_getdev(struct audio_softc *sc, struct audio_device *adev)
 int
 audio_ioctl(struct audio_softc *sc, unsigned long cmd, void *addr)
 {
-	struct audio_offset *ao;
 	struct audio_pos *ap;
-	int error = 0, fd;
+	int error = 0;
 
 	/* block if quiesced */
 	while (sc->quiesce)
@@ -1711,28 +1536,6 @@ audio_ioctl(struct audio_softc *sc, unsigned long cmd, void *addr)
 	case FIONBIO:
 		/* All handled in the upper FS layer. */
 		break;
-	case AUDIO_PERROR:
-		mtx_enter(&audio_lock);
-		*(int *)addr = sc->play.xrun / (sc->pchan * sc->bps);
-		mtx_leave(&audio_lock);
-		break;
-	case AUDIO_RERROR:
-		mtx_enter(&audio_lock);
-		*(int *)addr = sc->rec.xrun / (sc->rchan * sc->bps);
-		mtx_leave(&audio_lock);
-		break;
-	case AUDIO_GETOOFFS:
-		mtx_enter(&audio_lock);
-		ao = (struct audio_offset *)addr;
-		ao->samples = sc->play.pos;
-		mtx_leave(&audio_lock);
-		break;
-	case AUDIO_GETIOFFS:
-		mtx_enter(&audio_lock);
-		ao = (struct audio_offset *)addr;
-		ao->samples = sc->rec.pos;
-		mtx_leave(&audio_lock);
-		break;
 	case AUDIO_GETPOS:
 		mtx_enter(&audio_lock);
 		ap = (struct audio_pos *)addr;
@@ -1755,32 +1558,9 @@ audio_ioctl(struct audio_softc *sc, unsigned long cmd, void *addr)
 	case AUDIO_GETSTATUS:
 		error = audio_ioc_getstatus(sc, (struct audio_status *)addr);
 		break;
-	case AUDIO_SETINFO:
-		error = audio_setinfo(sc, (struct audio_info *)addr);
-		break;
-	case AUDIO_GETINFO:
-		error = audio_getinfo(sc, (struct audio_info *)addr);
-		break;
 	case AUDIO_GETDEV:
 		error = audio_getdev(sc, (struct audio_device *)addr);
 		break;
-	case AUDIO_GETENC:
-		error = sc->ops->query_encoding(sc->arg,
-		    (struct audio_encoding *)addr);
-		break;
-	case AUDIO_GETFD:
-		*(int *)addr = (sc->mode & (AUMODE_PLAY | AUMODE_RECORD)) ==
-		    (AUMODE_PLAY | AUMODE_RECORD);
-		break;
-	case AUDIO_SETFD:
-		fd = *(int *)addr;
-		if ((sc->mode & (AUMODE_PLAY | AUMODE_RECORD)) !=
-		    (AUMODE_PLAY | AUMODE_RECORD) || !fd)
-			return EINVAL;
-		break;
-	case AUDIO_GETPROPS:
-		*(int *)addr = sc->ops->get_props(sc->arg);
-		break;
 	default:
 		DPRINTF("%s: unknown ioctl 0x%lx\n", DEVNAME(sc), cmd);
 		error = ENOTTY;
@@ -1959,10 +1739,6 @@ audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 		error = audio_ioctl(sc, cmd, addr);
 		break;
 	case AUDIO_DEV_AUDIOCTL:
-		if (cmd == AUDIO_SETINFO && sc->mode != 0) {
-			error = EBUSY;
-			break;
-		}
 		if (cmd == AUDIO_SETPAR && sc->mode != 0) {
 			error = EBUSY;
 			break;
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index 788ef0b5eba..35a01d07bf1 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio_if.h,v 1.30 2015/06/25 06:43:46 ratchov Exp $	*/
+/*	$OpenBSD: audio_if.h,v 1.31 2016/08/31 07:22:43 ratchov Exp $	*/
 /*	$NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $	*/
 
 /*
@@ -40,6 +40,13 @@
 
 #include <sys/mutex.h>
 
+/*
+ * get_props
+ */
+#define AUDIO_PROP_FULLDUPLEX	0x01
+#define AUDIO_PROP_MMAP		0x02
+#define AUDIO_PROP_INDEPENDENT	0x04
+
 #define AUDIO_BPS(bits)		(bits) <= 8 ? 1 : ((bits) <= 16 ? 2 : 4)
 
 /*
@@ -60,6 +67,31 @@ struct audio_params {
 	u_int	channels;			/* mono(1), stereo(2) */
 };
 
+/*
+ * query_encoding argument
+ */
+typedef struct audio_encoding {
+	int	index;
+#define MAX_AUDIO_DEV_LEN		16
+	char	name[MAX_AUDIO_DEV_LEN];
+#define	AUDIO_ENCODING_NONE		0 /* no encoding assigned */
+#define	AUDIO_ENCODING_ULAW		1 /* ITU G.711 mu-law */
+#define	AUDIO_ENCODING_ALAW		2 /* ITU G.711 A-law */
+#define	AUDIO_ENCODING_ADPCM		5 /* adaptive differential PCM */
+#define AUDIO_ENCODING_SLINEAR_LE	6
+#define AUDIO_ENCODING_SLINEAR_BE	7
+#define AUDIO_ENCODING_ULINEAR_LE	8
+#define AUDIO_ENCODING_ULINEAR_BE	9
+#define AUDIO_ENCODING_SLINEAR		10
+#define AUDIO_ENCODING_ULINEAR		11
+	int	encoding;
+	int	precision;
+	int	bps;
+	int	msb;
+	int	flags;
+#define AUDIO_ENCODINGFLAG_EMULATED 1 /* software emulation mode */
+} audio_encoding_t;
+
 struct audio_hw_if {
 	int	(*open)(void *, int);	/* open hardware */
 	void	(*close)(void *);		/* close hardware */
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 32c26be7df6..207970b1ed4 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_pledge.c,v 1.180 2016/07/28 12:12:16 mikeb Exp $	*/
+/*	$OpenBSD: kern_pledge.c,v 1.181 2016/08/31 07:22:43 ratchov Exp $	*/
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -1177,11 +1177,6 @@ pledge_ioctl(struct proc *p, long com, struct file *fp)
 		case AUDIO_SETPAR:
 		case AUDIO_START:
 		case AUDIO_STOP:
-		case AUDIO_SETINFO:
-		case AUDIO_GETINFO:
-		case AUDIO_GETENC:
-		case AUDIO_SETFD:
-		case AUDIO_GETPROPS:
 			if (fp->f_type == DTYPE_VNODE &&
 			    vp->v_type == VCHR &&
 			    cdevsw[major(vp->v_rdev)].d_open == audioopen)
diff --git a/sys/sys/audioio.h b/sys/sys/audioio.h
index e145904a2ec..1d9aee36a1c 100644
--- a/sys/sys/audioio.h
+++ b/sys/sys/audioio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audioio.h,v 1.25 2016/06/18 07:59:30 ratchov Exp $	*/
+/*	$OpenBSD: audioio.h,v 1.26 2016/08/31 07:22:43 ratchov Exp $	*/
 /*	$NetBSD: audioio.h,v 1.24 1998/08/13 06:28:41 mrg Exp $	*/
 
 /*
@@ -38,6 +38,9 @@
 #ifndef _SYS_AUDIOIO_H_
 #define _SYS_AUDIOIO_H_
 
+#define AUMODE_PLAY	0x01
+#define AUMODE_RECORD	0x02
+
 #define AUDIO_INITPAR(p) \
 	(void)memset((void *)(p), 0xff, sizeof(struct audio_swpar))
 
@@ -69,44 +72,6 @@ struct audio_status {
 };
 
 /*
- * Audio device
- */
-struct audio_prinfo {
-	u_int	sample_rate;	/* sample rate in bit/s */
-	u_int	channels;	/* number of channels, usually 1 or 2 */
-	u_int	precision;	/* number of bits/sample */
-	u_int	bps;		/* number of bytes/sample */
-	u_int	msb;		/* data alignment */
-	u_int	encoding;	/* data encoding (AUDIO_ENCODING_* below) */
-	u_int	ispare2[4];
-	u_int	buffer_size;	/* total size audio buffer */
-	u_int	block_size;	/* size a block */
-	/* Current state of device: */
-	u_int	samples;	/* number of samples */
-	u_int	ispare[1];
-	u_char	pause;		/* non-zero if paused, zero to resume */
-	u_char	cspare2[6];
-	u_char	active;		/* non-zero if I/O is currently active */
-};
-typedef struct audio_prinfo audio_prinfo_t;
-
-struct audio_info {
-	struct	audio_prinfo play;	/* Info for play (output) side */
-	struct	audio_prinfo record;	/* Info for record (input) side */
-	u_int	ispare[2];	/* H/W read/write block size */
-	u_int	hiwat;		/* output high water mark */
-	u_int	lowat;		/* output low water mark */
-	u_char	cspare[4];
-	u_int	mode;		/* current device mode */
-#define AUMODE_PLAY	0x01
-#define AUMODE_RECORD	0x02
-};
-typedef struct audio_info audio_info_t;
-
-#define AUDIO_INITINFO(p) \
-	(void)memset((void *)(p), 0xff, sizeof(struct audio_info))
-
-/*
  * Parameter for the AUDIO_GETDEV ioctl to determine current
  * audio devices.
  */
@@ -117,11 +82,6 @@ typedef struct audio_device {
 	char config[MAX_AUDIO_DEV_LEN];
 } audio_device_t;
 
-typedef struct audio_offset {
-	u_int	samples;	/* Total number of bytes transferred */
-	u_int	unused[2];
-} audio_offset_t;
-
 struct audio_pos {
 	unsigned int play_pos;	/* total bytes played */
 	unsigned int play_xrun;	/* bytes of silence inserted */
@@ -130,63 +90,15 @@ struct audio_pos {
 };
 
 /*
- * Supported audio encodings
- */
-/* Encoding ID's */
-#define	AUDIO_ENCODING_NONE		0 /* no encoding assigned */
-#define	AUDIO_ENCODING_ULAW		1 /* ITU G.711 mu-law */
-#define	AUDIO_ENCODING_ALAW		2 /* ITU G.711 A-law */
-#define	AUDIO_ENCODING_ADPCM		5 /* adaptive differential PCM */
-#define AUDIO_ENCODING_SLINEAR_LE	6
-#define AUDIO_ENCODING_SLINEAR_BE	7
-#define AUDIO_ENCODING_ULINEAR_LE	8
-#define AUDIO_ENCODING_ULINEAR_BE	9
-#define AUDIO_ENCODING_SLINEAR		10
-#define AUDIO_ENCODING_ULINEAR		11
-
-typedef struct audio_encoding {
-	int	index;
-	char	name[MAX_AUDIO_DEV_LEN];
-	int	encoding;
-	int	precision;
-	int	bps;
-	int	msb;
-	int	flags;
-#define AUDIO_ENCODINGFLAG_EMULATED 1 /* software emulation mode */
-} audio_encoding_t;
-
-/*
- * Balance settings.
- */
-#define	AUDIO_LEFT_BALANCE	0	/* left channel only	*/
-#define	AUDIO_MID_BALANCE	32	/* equal left/right channel */
-#define	AUDIO_RIGHT_BALANCE	64	/* right channel only	*/
-#define	AUDIO_BALANCE_SHIFT	3
-
-/*
  * Audio device operations
  */
-#define AUDIO_GETINFO	_IOR('A', 21, struct audio_info)
-#define AUDIO_SETINFO	_IOWR('A', 22, struct audio_info)
-#define AUDIO_DRAIN	_IO('A', 23)
-#define AUDIO_RERROR	_IOR('A', 26, int)
 #define AUDIO_GETDEV	_IOR('A', 27, struct audio_device)
-#define AUDIO_GETENC	_IOWR('A', 28, struct audio_encoding)
-#define AUDIO_GETFD	_IOR('A', 29, int)
-#define AUDIO_SETFD	_IOWR('A', 30, int)
-#define AUDIO_PERROR	_IOR('A', 31, int)
-#define AUDIO_GETIOFFS	_IOR('A', 32, struct audio_offset)
-#define AUDIO_GETOOFFS	_IOR('A', 33, struct audio_offset)
-#define AUDIO_GETPROPS	_IOR('A', 34, int)
 #define AUDIO_GETPOS	_IOR('A', 35, struct audio_pos)
 #define AUDIO_GETPAR	_IOR('A', 36, struct audio_swpar)
 #define AUDIO_SETPAR	_IOWR('A', 37, struct audio_swpar)
 #define AUDIO_START	_IO('A', 38)
 #define AUDIO_STOP	_IO('A', 39)
 #define AUDIO_GETSTATUS	_IOR('A', 40, struct audio_status)
-#define  AUDIO_PROP_FULLDUPLEX	0x01
-#define  AUDIO_PROP_MMAP	0x02
-#define  AUDIO_PROP_INDEPENDENT	0x04
 
 /*
  * Mixer device