Deleted Added
full compact
ess.c (74763) ess.c (75326)
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * Copyright 1997,1998 Luigi Rizzo.
4 *
5 * Derived from files in the Voxware 3.5 distribution,
6 * Copyright by Hannu Savolainen 1994, under the same copyright
7 * conditions.
8 * All rights reserved.

--- 14 unchanged lines hidden (view full) ---

23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * Copyright 1997,1998 Luigi Rizzo.
4 *
5 * Derived from files in the Voxware 3.5 distribution,
6 * Copyright by Hannu Savolainen 1994, under the same copyright
7 * conditions.
8 * All rights reserved.

--- 14 unchanged lines hidden (view full) ---

23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
31 * $FreeBSD: head/sys/dev/sound/isa/ess.c 74763 2001-03-24 23:10:29Z cg $
31 * $FreeBSD: head/sys/dev/sound/isa/ess.c 75326 2001-04-08 23:02:06Z greid $
32 */
33
34#include <dev/sound/pcm/sound.h>
35
36#include <dev/sound/isa/sb.h>
37#include <dev/sound/chip.h>
38
39#include "mixer_if.h"

--- 845 unchanged lines hidden (view full) ---

885 if (r)
886 return r;
887
888 sc = pcm_getdevinfo(dev);
889 ess_release_resources(sc, dev);
890 return 0;
891}
892
32 */
33
34#include <dev/sound/pcm/sound.h>
35
36#include <dev/sound/isa/sb.h>
37#include <dev/sound/chip.h>
38
39#include "mixer_if.h"

--- 845 unchanged lines hidden (view full) ---

885 if (r)
886 return r;
887
888 sc = pcm_getdevinfo(dev);
889 ess_release_resources(sc, dev);
890 return 0;
891}
892
893static int
894ess_resume(device_t dev)
895{
896 struct ess_info *sc;
897
898 sc = pcm_getdevinfo(dev);
899
900 if (ess_reset_dsp(sc)) {
901 device_printf(dev, "unable to reset DSP at resume\n");
902 return ENXIO;
903 }
904
905 if (mixer_reinit(dev)) {
906 device_printf(dev, "unable to reinitialize mixer at resume\n");
907 return ENXIO;
908 }
909
910 return 0;
911}
912
893static device_method_t ess_methods[] = {
894 /* Device interface */
895 DEVMETHOD(device_probe, ess_probe),
896 DEVMETHOD(device_attach, ess_attach),
897 DEVMETHOD(device_detach, ess_detach),
913static device_method_t ess_methods[] = {
914 /* Device interface */
915 DEVMETHOD(device_probe, ess_probe),
916 DEVMETHOD(device_attach, ess_attach),
917 DEVMETHOD(device_detach, ess_detach),
918 DEVMETHOD(device_resume, ess_resume),
898
899 { 0, 0 }
900};
901
902static driver_t ess_driver = {
903 "pcm",
904 ess_methods,
905 sizeof(struct snddev_info),

--- 76 unchanged lines hidden ---
919
920 { 0, 0 }
921};
922
923static driver_t ess_driver = {
924 "pcm",
925 ess_methods,
926 sizeof(struct snddev_info),

--- 76 unchanged lines hidden ---