summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2014-03-05 20:24:17 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2014-03-05 20:24:17 +0000
commit168862ac6bddb29c173a0e1f4436f7755a4449ad (patch)
tree882e66b74890362d2e2755450a81e2da21c85274
parentbe18ebc11b727ef464b775268631bd3bc8071b4d (diff)
remove unused "autostart" feature
-rw-r--r--usr.bin/sndiod/dev.c3
-rw-r--r--usr.bin/sndiod/dev.h3
-rw-r--r--usr.bin/sndiod/sndiod.c4
3 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/sndiod/dev.c b/usr.bin/sndiod/dev.c
index 7e48fcee3fb..7fdcecabecb 100644
--- a/usr.bin/sndiod/dev.c
+++ b/usr.bin/sndiod/dev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dev.c,v 1.10 2014/02/08 15:17:37 ratchov Exp $ */
+/* $OpenBSD: dev.c,v 1.11 2014/03/05 20:24:16 ratchov Exp $ */
/*
* Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
*
@@ -1047,7 +1047,6 @@ dev_new(char *path, struct aparams *par,
d->reqrate = rate;
d->hold = hold;
d->autovol = autovol;
- d->autostart = 0;
d->refcnt = 0;
d->pstate = DEV_CFG;
d->serial = 0;
diff --git a/usr.bin/sndiod/dev.h b/usr.bin/sndiod/dev.h
index 0f3bfbfef36..7a4030aa80e 100644
--- a/usr.bin/sndiod/dev.h
+++ b/usr.bin/sndiod/dev.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dev.h,v 1.3 2013/09/28 18:49:32 ratchov Exp $ */
+/* $OpenBSD: dev.h,v 1.4 2014/03/05 20:24:16 ratchov Exp $ */
/*
* Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
*
@@ -139,7 +139,6 @@ struct dev {
unsigned int reqrate; /* sample rate */
unsigned int hold; /* hold the device open ? */
unsigned int autovol; /* auto adjust playvol ? */
- unsigned int autostart; /* don't wait for MMC start */
unsigned int refcnt; /* number of openers */
#define DEV_NMAX 16 /* max number of devices */
unsigned int num; /* device serial number */
diff --git a/usr.bin/sndiod/sndiod.c b/usr.bin/sndiod/sndiod.c
index ce83b5199c3..6f9ec02e079 100644
--- a/usr.bin/sndiod/sndiod.c
+++ b/usr.bin/sndiod/sndiod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sndiod.c,v 1.5 2013/11/18 17:37:45 ratchov Exp $ */
+/* $OpenBSD: sndiod.c,v 1.6 2014/03/05 20:24:16 ratchov Exp $ */
/*
* Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
*
@@ -479,8 +479,6 @@ main(int argc, char **argv)
for (d = dev_list; d != NULL; d = d->next) {
if (!dev_init(d))
return 1;
- if (d->autostart && (d->mode & MODE_AUDIOMASK))
- dev_mmcstart(d);
}
for (l = listen_list; l != NULL; l = l->next) {
if (!listen_init(l))