summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2002-10-04 01:51:46 +0000
committerJason Wright <jason@cvs.openbsd.org>2002-10-04 01:51:46 +0000
commit98b88a9bfabf1a6571ff9f2d67d666fdc4228062 (patch)
tree3df911574c4bd65f6102df1fc94ff8c3c5f33060 /sys/dev
parent0ed3640a4b2d88757a7e41af92b5217e613071f1 (diff)
simplify format setup
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sbus/cs4231.c9
-rw-r--r--sys/dev/sbus/cs4231var.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c
index 6987f989132..88d8b47c1ff 100644
--- a/sys/dev/sbus/cs4231.c
+++ b/sys/dev/sbus/cs4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231.c,v 1.14 2002/09/10 05:43:31 jason Exp $ */
+/* $OpenBSD: cs4231.c,v 1.15 2002/10/04 01:51:45 jason Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -228,8 +228,6 @@ cs4231_attach(parent, self, aux)
node = sa->sa_node;
- sc->sc_last_format = 0xffffffff;
-
/* Pass on the bus tags */
sc->sc_bustag = sa->sa_bustag;
sc->sc_dmatag = sa->sa_dmatag;
@@ -698,11 +696,6 @@ cs4231_commit_settings(addr)
if (sc->sc_channels == 2)
fs |= FMT_STEREO;
- if (sc->sc_last_format == fs) {
- sc->sc_need_commit = 0;
- return (0);
- }
-
s = splaudio();
r = cs4231_read(sc, SP_INTERFACE_CONFIG) | AUTO_CAL_ENABLE;
diff --git a/sys/dev/sbus/cs4231var.h b/sys/dev/sbus/cs4231var.h
index 1c6783e4f1a..fe73419a5c9 100644
--- a/sys/dev/sbus/cs4231var.h
+++ b/sys/dev/sbus/cs4231var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231var.h,v 1.5 2002/09/09 20:25:17 jason Exp $ */
+/* $OpenBSD: cs4231var.h,v 1.6 2002/10/04 01:51:45 jason Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -91,6 +91,5 @@ struct cs4231_softc {
int sc_precision;
int sc_need_commit;
int sc_channels;
- u_int sc_last_format;
struct cs_dma *sc_dmas; /* dma list */
};