Deleted Added
full compact
maestro3.c (119690) maestro3.c (126695)
1/*-
2 * Copyright (c) 2001 Scott Long <scottl@freebsd.org>
3 * Copyright (c) 2001 Darrell Anderson <anderson@cs.duke.edu>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

56#include <dev/sound/pcm/ac97.h>
57
58#include <dev/pci/pcireg.h>
59#include <dev/pci/pcivar.h>
60
61#include <gnu/dev/sound/pci/maestro3_reg.h>
62#include <gnu/dev/sound/pci/maestro3_dsp.h>
63
1/*-
2 * Copyright (c) 2001 Scott Long <scottl@freebsd.org>
3 * Copyright (c) 2001 Darrell Anderson <anderson@cs.duke.edu>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

56#include <dev/sound/pcm/ac97.h>
57
58#include <dev/pci/pcireg.h>
59#include <dev/pci/pcivar.h>
60
61#include <gnu/dev/sound/pci/maestro3_reg.h>
62#include <gnu/dev/sound/pci/maestro3_dsp.h>
63
64SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro3.c 119690 2003-09-02 17:30:40Z jhb $");
64SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/maestro3.c 126695 2004-03-06 15:52:42Z matk $");
65
66/* -------------------------------------------------------------------- */
67
68enum {CHANGE=0, CALL=1, INTR=2, BORING=3, NONE=-1};
69#ifndef M3_DEBUG_LEVEL
70#define M3_DEBUG_LEVEL NONE
71#endif
72#define M3_DEBUG(level, _msg) {if ((level) <= M3_DEBUG_LEVEL) {printf _msg;}}

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

1184 }
1185 }
1186 for (i=0 ; i<M3_RCHANS ; i++) {
1187 if (pcm_addchan(dev, PCMDIR_REC, &m3_rch_class, sc)) {
1188 device_printf(dev, "pcm_addchan (rec) error\n");
1189 goto bad;
1190 }
1191 }
65
66/* -------------------------------------------------------------------- */
67
68enum {CHANGE=0, CALL=1, INTR=2, BORING=3, NONE=-1};
69#ifndef M3_DEBUG_LEVEL
70#define M3_DEBUG_LEVEL NONE
71#endif
72#define M3_DEBUG(level, _msg) {if ((level) <= M3_DEBUG_LEVEL) {printf _msg;}}

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

1184 }
1185 }
1186 for (i=0 ; i<M3_RCHANS ; i++) {
1187 if (pcm_addchan(dev, PCMDIR_REC, &m3_rch_class, sc)) {
1188 device_printf(dev, "pcm_addchan (rec) error\n");
1189 goto bad;
1190 }
1191 }
1192 snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
1192 snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
1193 (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
1193 (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
1194 rman_get_start(sc->reg), rman_get_start(sc->irq));
1194 rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_maestro3));
1195 if (pcm_setstatus(dev, status)) {
1196 device_printf(dev, "attach: pcm_setstatus error\n");
1197 goto bad;
1198 }
1199
1200 mixer_hwvol_init(dev);
1201
1202 /* Create the buffer for saving the card state during suspend */

--- 325 unchanged lines hidden ---
1195 if (pcm_setstatus(dev, status)) {
1196 device_printf(dev, "attach: pcm_setstatus error\n");
1197 goto bad;
1198 }
1199
1200 mixer_hwvol_init(dev);
1201
1202 /* Create the buffer for saving the card state during suspend */

--- 325 unchanged lines hidden ---