mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-22 11:17:19 +00:00
Code Issues Releases Activity
72,197 Commits 339 Branches 3,553 Tags 2.1 GiB
8d6c171c25
Commit Graph

534 Commits

Author SHA1 Message Date
Cameron Grant
40765b397d add a format feeder for conversion from alaw to ulaw and vice versa. 
Submitted by:   Orion Hodson <O.Hodson@cs.ucl.ac.uk>
 2001-02-13 22:00:57 +00:00
Cameron Grant
7ec3c4620e make attempts to set unsupported speeds or formats non-sticky. this should 
fix problems with apps that probe for a variety of settings.

Submitted by:	Orion Hodson <O.Hodson@cs.ucl.ac.uk>
 2001-02-13 21:57:34 +00:00
Cameron Grant
9725922ed9 add power management support. 
Submitted by:	Orion Hodson <O.Hodson@cs.ucl.ac.uk>
 2001-02-13 21:00:22 +00:00
Cameron Grant
d55a14469f back out rev 1.49, looks like i committed it from the wrong tree. 
include the changes 1.49 was supposed to have.

Noticed by:	peter
 2001-02-07 20:45:40 +00:00
Cameron Grant
9d7227e565 conditionalize "hwptr went backwards" messages 
modify default buffer size heuristic to not max out at 4k.  mpg123 should now
behave better under load.
 2001-02-07 06:48:28 +00:00
Cameron Grant
17e401f8a9 add driver for CS4281 sound chips 
Submitted by:   Orion Hodson <O.Hodson@cs.ucl.ac.uk>
 2001-02-04 19:23:35 +00:00
Cameron Grant
ebbb717721 add driver for CMedia CMI8338/CMI8738 sound chips 
Submitted by:   Orion Hodson <O.Hodson@cs.ucl.ac.uk>
 2001-02-04 19:13:40 +00:00
Cameron Grant
d60a6a8e0c quieten the esscontrol device 2001-02-02 16:41:06 +00:00
Scott Long
a5108eaebf Driver for the ESS Maestro3 and Allegro sound chips. Note that due to the 
amount of GPL'd firmware in the driver, it will only be built as a module.

Approved by:	cg
 2001-02-01 20:29:16 +00:00
Cameron Grant
1a8de399e7 don't grope around inside snd_dbuf structures as they will change in future 2001-01-24 01:36:15 +00:00
Cameron Grant
2707da0758 fix certain cards failing to attach 
Submitted by:	Russell Cattelan <cattelan@thebarn.com>
 2001-01-24 01:27:31 +00:00
Cameron Grant
03d18442f6 fix blocksizing for playback, implement blocksizing for record 2001-01-24 01:22:53 +00:00
Cameron Grant
7ed9700b1f some cosmetics, changed channel setup and revamped irq handling - ignore 
repeated interrupts
 2001-01-24 01:20:04 +00:00
Cameron Grant
6e64c174bd prevent excessively small buffer sizes resulting in hundreds of irqs per 
second
 2001-01-24 01:15:50 +00:00
John Baldwin
399fde35e8 Tag unused functions with __unused. 2001-01-23 22:18:41 +00:00
John Baldwin
e97abfe751 Catch up to the name changes in the hwvol API. 2001-01-11 23:26:38 +00:00
John Baldwin
4fb369f815 - Move all of the hwvol functions into a mixer_hwvol_* namespace, and make 
all of the hwvol members of struct snd_mixer live in a hwvol_* namespace.
- When changing the mixer device via the hwvol_mixer sysctl, reset the
  muted state so that a mute operation on a new device won't try to
  unmute the new device with the old device's saved volume.
- When the volume is muted, if a down or up volume request is received,
  first restore the saved volume level and then adjust it.

Reviewed by:	cg
 2001-01-11 23:26:16 +00:00
John Baldwin
a3e893e04f Woops, use the SYSCTL_STATIC_CHILDREN() macro instead of manually 
expanding it for _hw_snd.
 2001-01-11 23:22:33 +00:00
John Baldwin
0f32b57ac4 Call mixer_hwinit() when attaching. 2001-01-05 07:07:48 +00:00
John Baldwin
cc486d8061 - Make the 'hwvol_mixer' and 'hwvol_step' variables be specific to a 
specific snd_mixer device rather than global across all mixers.
- Add per-mixer mute status and saved mute_level so that the mixer_hwmute()
  function can now toggle the mute state when the mute button is pressed.
- Create a dynamic sysctl tree hw.snd.pcmX when a pcm device is registered.
- Move the hw.snd.hwvol_* sysctl's to hw.snd.pcmX.hwvol_* so that they
  are now properly device-specific.  Eventually when the mixers become
  their own devices these sysctl's will move to live under a mixerX tree.
- Change the interface of the hwvol_mixer sysctl so that it reports the
  name of the current mixer device instead of the number and is settable
  with the name instead of the number.
- Add a new function mixer_hwinit() used to setup the dynamic sysctl's
  needed for the hwvol support that can be called by drivers that support
  hwvol.

Reviewed by:	cg
 2001-01-05 07:07:03 +00:00
John Baldwin
6d97297a6a The 'maxchans' count is one more than the number of channels, so 
'chancount' never got up to equaling 'maxchans'.  As a result,
pcm_makelinks() was never called, and one always had to set the sysctl to
get the /dev/mixer and other symlinks generated in the DEVFS case.  Instead,
change the test in pcm_addchan() to call pcm_makelinks() after the first
channel is initialized, since the aliases are linked to channel 0.

Reviewed by:	cg
 2001-01-04 23:49:00 +00:00
Warner Losh
94648ce60d Add the ES1681, as found in my Digital HiNote UltraII. It works with 
the ES18xx DSP code and is now my MP3 juke box engine.

Reviewed by:	cg
 2001-01-04 17:12:57 +00:00
John Baldwin
fa465e99e0 Rename the loader tunable from hw.sndunit to hw.snd.unit. 
Submitted by:	cg
 2001-01-03 02:09:31 +00:00
John Baldwin
1b40801722 - When acknowledging interrupts, write the value 0xff to the interrupt 
status register rather than 0.  Without this, a single hardware volume
  event triggers an interrupt storm.
- Implement hardware volume control for the Maestro chips.  This version
  only handles the case where both channels are adjusted at the same time.

Reviewed by:	cg
 2001-01-03 01:32:57 +00:00
John Baldwin
d0d4e34743 Add a new API for soundcards that have hardware volume control: 
- The mixer_hwmute() function can be called when a soundcard receives a
  mute request.
- The mixer_hwstep() function can be used to adjust the volume of one or
  both channels.
- The 'hw.snd.hwvol_step' sysctl determines the amount that mixer_hwstep()
  adjusts the volume by on each call.
- The 'hw.snd.hwvol_mixer' sysctl specifies the mixer device to adjust the
  volume on for both functions.  The values used correspond to the
  SOUNDCARD_MIXER_* constants.
 2001-01-03 01:29:47 +00:00
John Baldwin
b3b7ccfe38 Create a new sysctl node 'hw.snd' and move 'hw.sndunit' to 
'hw.snd.unit'.

Reviewed by:	cg
 2001-01-03 01:25:26 +00:00
Cameron Grant
826737698c change irq handler slightly, get rid of superflous messages 2000-12-27 04:04:36 +00:00
Cameron Grant
b87eb3b531 move parametric defines and structure definitions from .h to .c 2000-12-25 02:49:28 +00:00
Cameron Grant
a6b5683876 indent debugging printfs, change a couple of messages slightly 2000-12-25 02:21:16 +00:00
Cameron Grant
6a2e12e0dd update to return correct blocksize- these chips have a fixed irq rate, so 
block size varies only with format and rate.
 2000-12-25 01:42:13 +00:00
Cameron Grant
f0fb042e84 fairly substantial rewrite- seperate out play/record code, implement 
setblocksize, simplify resource allocation
 2000-12-24 03:56:41 +00:00
Cameron Grant
6a6ee5bb35 compensate for broken codecs that return 0xffff on unimplemented registers 
instead of 0.
 2000-12-24 03:33:21 +00:00
Cameron Grant
ac083c91f8 implement setblocksize properly 2000-12-23 22:24:43 +00:00
Cameron Grant
f4084c4526 fix a panic if the requested blocksize was greater than the data rate, 
resulting in a divide by 0.
 2000-12-23 06:09:43 +00:00
Cameron Grant
e246070f8a kill a warning 2000-12-23 05:19:32 +00:00
Cameron Grant
b4f8389d56 fix a typo 2000-12-23 05:16:39 +00:00
Cameron Grant
350a5fafb1 update code dealing with snd_dbuf objects to do so using a functional interface 
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use.  it will aim for a power of two size small
enough to generate block sizes of at most 20ms.  it will also set the
hard-blocksize taking into account rate/format conversions in use.

update drivers to implement setblocksize  correctly:
updated, tested: 	sb16, emu10k1, maestro, solo
updated, untested: 	ad1816, ess, mss, sb8, csa
not updated: 		ds1, es137x, fm801, neomagic, t4dwave, via82c686

i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
 2000-12-23 03:16:13 +00:00
Cameron Grant
688ca063da fix a debugging leftover (min speed=48khz) 2000-12-20 05:21:17 +00:00
Cameron Grant
0f55ac6c1a kobjify. 
this gives us several benefits, including:

* easier extensibility- new optional methods can be added to
  ac97/mixer/channel classes without having to fixup every driver.

* forward compatibility for drivers, provided no new mandatory methods are
  added.
 2000-12-18 01:36:41 +00:00
Julian Elischer
07076ce1f7 Bump the buffersize from 0x1000 to 0x4000. 
0x1000 gets underflows on my dell 7500 whenever I moved the mouse.
(reported as "hwptr went backwards...", with jumpy sound)
Sounds great now....
 2000-11-21 12:22:11 +00:00
Cameron Grant
612276f48c do not blindly assume 8khz is supported on open(). try for 8khz but respect 
minspeed/maxspeed specified by the hw driver.

Submitted by:	Andrew Gordon <arg@arg1.demon.co.uk>
 2000-11-18 03:43:04 +00:00
Cameron Grant
ab3978871b adjust dma channels for vibra16x; recording should now work. full duplex does 
not work on vibra16x, so is disabled.
 2000-11-07 00:38:59 +00:00
Cameron Grant
d19811446d slight mods to isa dma and channel flushing code 2000-11-07 00:32:35 +00:00
Cameron Grant
41b3c72639 if a channel dies, rejuvenate it on close() 2000-11-07 00:29:24 +00:00
Cameron Grant
4e2e565cbd add AFMT_8BIT for easier determination of formats 2000-11-06 22:22:52 +00:00
Cameron Grant
e258e032ac fix paste-o in mixer code - actually set right channel volume instead of 
doing the left channel twice.
 2000-11-06 02:47:43 +00:00
Cameron Grant
b7d3143b0d fix es1370 mixer by adding reinit function to it's mixer function list. 2000-11-06 02:37:28 +00:00
Cameron Grant
b15e2b4bee kill old sb driver 2000-11-01 00:56:52 +00:00
Cameron Grant
6093b91dea switch over to new sb8/sb16 code 2000-11-01 00:53:16 +00:00
Cameron Grant
5bc2a29c8c add commented-out dependancies on the new sb8 and sb16 drivers 2000-10-28 19:35:54 +00:00
Cameron Grant
eadd0f839e split up sb16 and sb/sbpro drivers 
we do not support sb versions <2.00, and the sb8 driver has not been tested
yet.

these drivers are not yet enabled by default.
 2000-10-28 19:20:03 +00:00
Cameron Grant
d16b567379 implement SNDCTL_DSP_POST 2000-10-27 22:20:45 +00:00
Poul-Henning Kamp
46aa3347cb Convert all users of fldoff() to offsetof(). fldoff() is bad 
because it only takes a struct tag which makes it impossible to
use unions, typedefs etc.

Define __offsetof() in <machine/ansi.h>

Define offsetof() in terms of __offsetof() in <stddef.h> and <sys/types.h>

Remove myriad of local offsetof() definitions.

Remove includes of <stddef.h> in kernel code.

NB: Kernelcode should *never* include from /usr/include !

Make <sys/queue.h> include <machine/ansi.h> to avoid polluting the API.

Deprecate <struct.h> with a warning.  The warning turns into an error on
01-12-2000 and the file gets removed entirely on 01-01-2001.

Paritials reviews by:   various.
Significant brucifications by:  bde
 2000-10-27 11:45:49 +00:00
Cameron Grant
9ec437a334 add reinit functions to mixers 
unstaticize chn_start()
add reset/resetdone functions to channels
 2000-10-26 20:46:58 +00:00
Cameron Grant
badd7dc127 do not attach to soundblaster 1.x - they are unsupported 2000-10-26 20:31:16 +00:00
Cameron Grant
c0960a5e91 handle AFMT_QUERY right 2000-10-26 01:34:54 +00:00
Poul-Henning Kamp
db7e3af111 Remove unneeded #include <machine/clock.h> 2000-10-15 14:19:01 +00:00
Maxim Sobolev
6e3c38712b Reduce buffer size from 64K to 4K. 
Approved by:	cg
 2000-10-09 14:54:32 +00:00
Nick Sayer
04c24efdc1 Add suspend/resume hooks. 
Submitted by: sean@stat.duke.edu
 2000-09-28 14:02:49 +00:00
Cameron Grant
c9c6ba09e4 prepare for adding a rate conversion feeder. 
move format conversion feeders to feeder_fmt.c - no pertinent history so no
repo-copy.
 2000-09-23 22:11:32 +00:00
Cameron Grant
33c878f034 only probe mandatory channels on known bad codecs 2000-09-23 22:00:09 +00:00
John Baldwin
1204fd85a4 Enable the snd_maestro module and have the snd_driver module depend on it. 
Approved by:	cg
 2000-09-23 17:35:37 +00:00
Seigo Tanimura
c74c29ca6b Since the unit number of a midi/sequencer device is expressed in 4 
bits, we can configure only up to 16 units.
 2000-09-18 10:17:38 +00:00
Cameron Grant
341f16cc60 dynamify- probe codec for supported channels 
add channel mappings for mixer
 2000-09-17 23:51:00 +00:00
Cameron Grant
7dfc932548 fix warnings 2000-09-17 23:46:32 +00:00
Cameron Grant
0a1fe8922f disable 16bit mono support- this will be handled by software conversion to 
stereo as hardware mono is very noisy
 2000-09-09 21:31:06 +00:00
Cameron Grant
58359dc594 add 16bit mono/stereo conversion feeder 
prefer feeder chains of length 1 over length 2
 2000-09-09 21:24:03 +00:00
Cameron Grant
306f91b60b detach support 
remove un-needed setdir functions
add bus_teardown_intr calls where necessary
destroy our dma tags where necessary
destroy ac97 before releasing resources
 2000-09-09 19:21:04 +00:00
Cameron Grant
7d60928719 ess maestro driver - not enabled by default 
Submitted by:   Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
 2000-09-06 20:10:55 +00:00
Cameron Grant
cd2c103ae0 initial support for multiple ac97 codecs 2000-09-05 21:08:01 +00:00
Cameron Grant
c02f3f7aee add detach support 2000-09-05 21:06:11 +00:00
Cameron Grant
85a6a5dce4 allow a null setdir implementation 2000-09-05 21:00:45 +00:00
Cameron Grant
c9b53085be be more verbose about failed unload attempts 2000-09-05 20:58:51 +00:00
Cameron Grant
37ab02c0ed tidy up a little, add a mask for 32bit formats 2000-09-05 20:56:31 +00:00
Peter Wemm
8ac2d635c4 Fix warnings by moving static functions before they are used. 2000-09-03 05:32:09 +00:00
Cameron Grant
f776b5abb8 update for phk's last devfs commit 2000-09-02 23:14:46 +00:00
Poul-Henning Kamp
db90128160 Avoid the modules madness I inadvertently introduced by making the 
cloning infrastructure standard in kern_conf.  Modules are now
the same with or without devfs support.

If you need to detect if devfs is present, in modules or elsewhere,
check the integer variable "devfs_present".

This happily removes an ugly hack from kern/vfs_conf.c.

This forces a rename of the eventhandler and the standard clone
helper function.

Include <sys/eventhandler.h> in <sys/conf.h>: it's a helper #include
like <sys/queue.h>

Remove all #includes of opt_devfs.h they no longer matter.
 2000-09-02 19:17:34 +00:00
Cameron Grant
f3dcf66158 add a missing return statement, doh. 2000-09-02 18:55:01 +00:00
Cameron Grant
33dbf14a17 change mixer api slightly 
change channel interface - kobj implementation coming soonish
make pcm_makelinks not panic if modular
add pcm_unregister()

these changes support newpcm kld unloading, but this is only implemented
by ds1.c
 2000-09-01 20:09:24 +00:00
Cameron Grant
f2d00399d1 remove stuff accidentally left in last commit 2000-08-29 20:53:56 +00:00
Cameron Grant
1088e98b00 suspend/resume for ds1 driver 
PR:		misc/20891
Submitted by:	Ira L. Cooper <ira@mit.edu>
 2000-08-29 20:50:42 +00:00
Cameron Grant
c07a337569 make the test for hwptr going backwards more picky- now it only triggers if 
15/16 of the buffer is skipped or we go backwards by < 1/16 of buffer size.
 2000-08-29 16:32:26 +00:00
Cameron Grant
7c438dbe9c add devfs support. when devfs is enabled, sysctl hw.sndunit is used to set 
which sound unit the /dev/{dsp,mixer,dspW,audio} links point at.  this can
also be set from the loader.
 2000-08-29 16:21:33 +00:00
Cameron Grant
dacda62ff2 add driver for forte-media fm801 
PR:             conf/20698
Submitted by:   dimmy the wild <diwil@dataart.com>
 2000-08-29 16:12:28 +00:00
Doug Rabson
e6171135a7 Fix disordered arguments to bus_space_barrier(). 2000-08-28 21:02:18 +00:00
Cameron Grant
513693be6c rework feeder sytem to allow feeders in klds 
modify driver capability reporting format to list every audio format
seperately- required for above and because we could not previously indicate
that mono was unsupported.

there should be no functional impact.
 2000-08-20 22:18:56 +00:00
Cameron Grant
fa06efc7e6 fix SNDCTL_DSP_GETODELAY 
PR:		kern/20340
Submitted by:	Takashi SHIRAI <shirai@nintendo.co.jp>
 2000-08-19 18:29:46 +00:00
Cameron Grant
4e77c04865 don't complain about bad irqs if using a shared irq 2000-08-19 18:22:20 +00:00
Cameron Grant
becc0678b7 Recognize ESS 1888 in Dell Latitude XPi 
PR:		kern/18714
Submitted by:	Sean O'Connell <sean@stat.Duke.EDU>
 2000-08-19 18:17:15 +00:00
Nick Sayer
6ba60b3c4a This patch appears to solve the problems with recording resulting 
in bogus hwptr warnings. Further comments sought on -hackers
were not forthcoming. I can only hope that calling DELAY() like
this doesn't cause any heartburn.
 2000-08-13 19:20:02 +00:00
Nick Sayer
fc35953a16 Missed a step when activating the solo driver. 2000-08-09 20:28:19 +00:00
Cameron Grant
4873b46dc7 change irq handling slightly 
add another non-ac97 256av
 2000-08-09 18:51:27 +00:00
Cameron Grant
071280d442 MFS: module macro changes 2000-08-09 18:46:48 +00:00
Nick Sayer
0edeb3dc90 A couple of cosmetic fixes, plus a biggie: When checking the DMA 
position, channel 1's dma position register must be quiescent. So
the driver will spl, pause the DMA, delay a bit and hold as still as
possible while snapping the picture.

I'm sure there HAS to be a better way to do this, but if there is, it's
not documented.

So far as I can tell, this fixes recording, which means the Solo is open
for business.
 2000-08-09 07:14:56 +00:00
Cameron Grant
1874ec255c MFS: sync with peter's isadma fixup 2000-08-09 01:22:09 +00:00
Cameron Grant
ba90ebe703 activate via82c686 audio driver 2000-08-09 01:08:59 +00:00
Cameron Grant
fb9f118e6f new driver: via 82c686 chipset audio 
not personally tested, but i'm assured it works

Submitted by:	David Jones <dej@ox.org>
PR:		kern/20161
 2000-08-09 00:55:55 +00:00
Cameron Grant
5fd7b0878e warn if hwptr goes backwards 2000-08-09 00:42:00 +00:00
Cameron Grant
6c1146c0b8 fix the staticy sound issue 
use timer instead of per-channel interrupts

do playback like the linux driver - may fix nmi-with-ecc issue
 2000-08-06 18:10:05 +00:00
Nick Sayer
05a1fdb459 Simplex devices will always report EBUSY on 2nd (and subsequent) 
opens if the reference count is not decremented on close.

Note that this may result in the reference count being corrupted
on full duplex devices (due to mismatching opens/closes), but the
code doesn't use the reference count for anything on full duplex
devices.
 2000-08-02 22:47:44 +00:00
Nick Sayer
3ac1ca3363 1. Increase the size of the DMA buffer. 
2. Offer half duplex with both playback and record on channel 1 or
full duplex with playback always on channel 2 as a compile-time option.

3. 16 bit record output is byte swapped for some dumb reason. Report the _BE
AFMTs for recording.
 2000-08-02 22:45:57 +00:00
Nick Sayer
a7e1150660 Undo some of my own damage. With this patch, it appears that both 
recording and playback now work correctly.
 2000-08-02 19:37:43 +00:00
Nick Sayer
bb7f26c3d9 Fix channel 1 playback the rest of the way. There are a couple of 
hiccups, but playback now proceeds mostly normally using both channel 1
and 2.
 2000-08-02 15:09:39 +00:00
Nick Sayer
19a0702e86 Get playback on channel 1 closer to working. 8 bit samples work. 
16 bit samples have some sort of choppiness, the nature of which
is not completely clear, but it clearly has something to do with
dma buffer synchronization. But at least channel 1 makes noise now.
 2000-08-02 08:01:00 +00:00
Nick Sayer
8eb3acc9be Fix channel 1, sort of. recording now generates IRQs and the output 
appears to be the correct length, but quality of output has not yet
been tested. Also, full duplex audio (that is, playback on channel 1)
does not yet work. Two constants and I am there!

Obtained from:	major hints from ALSA
 2000-08-02 06:36:55 +00:00
Nick Sayer
80a8e065eb Reverse the sense of the signed/unsigned formatting bit. 
This dramatically cleans up playback quality, at least with mxaudio.
 2000-08-01 04:18:15 +00:00
Cameron Grant
fd1aaeccce almost-there ess solo-1 driver, committed so people can tell me why it 
doesn't generate irqs.
 2000-07-31 16:17:40 +00:00
Cameron Grant
5151584d21 add suspend/resume for yamaha chips 
Submitted by:	Ira L Cooper <ira@MIT.EDU>
 2000-07-30 21:15:35 +00:00
Cameron Grant
1c60ef3f3c fix a potential local DoS attack 2000-07-30 19:38:26 +00:00
Cameron Grant
e04387c95a fix a bug where opening /dev/dsp twice resulted in it being busy until reboot 2000-07-30 19:36:13 +00:00
Cameron Grant
3c1b957d66 do the ac97 init delay for all chips and increase it to 500ms 2000-07-30 02:33:37 +00:00
Cameron Grant
d98c7b9a99 make this file suitable for 4-stable as well as 5-current 2000-07-18 21:23:48 +00:00
Richard Seaman Jr.
307754cbe2 PR:19945 
Reviewed by:tanimura
Fix boot panic introduced by newmidi code.
 2000-07-18 20:18:16 +00:00
Seigo Tanimura
fb0ef52838 Finally merge newmidi. 
(I had been busy for my own research activity until the last weekend)

Supported devices:

SB Midi Port			(sbc + midi)
SB OPL3				(sbc + midi)
16550 UART			(midi, needs a trick in your hint)
CS461x Midi Port		(csa + midi)

OSS-compatible sequencer	(seq)

Supported playing software:

playmidi			(We definitely need more)

Notes:

/dev/midistat now reports installed midi drivers. /dev/sndstat reports
only pcm drivers. We need the new name(pcmstat?).

EMU8000(SB AWE) does not sound yet but does get probed so that the OPL3
synth on an AWE card works.

TODO:

MSS/PCI bridge drivers
Midi-tty interface to support general serial devices
Modules
 2000-07-11 11:49:33 +00:00
Cameron Grant
e71eb9c328 do-nothing module that depends on all sound drivers 2000-07-03 21:00:44 +00:00
Cameron Grant
f314f3dad2 add module metadata. this is a hack, sound drivers will eventually present a 
bus to which pcm, mixer, etc will attach.
 2000-07-03 20:52:27 +00:00
Ollivier Robert
c790e2240e This is the patch to make my soundcard, a Creative Ensoniq AudioPCI (an 
es1371 chip, device id 0x58801274 rev 0x02).

Submitted by:	Kenneth Wayne Culver <culverk@wam.umd.edu>
 2000-07-02 14:17:41 +00:00
Cameron Grant
946e608646 add record channel irq timeouts too 2000-06-20 23:42:08 +00:00
Cameron Grant
e4d5b2502d fix a bug where opening for write would not fail if channel allocation failed 
when playing, if we stall for 1s with no data advancing, abort and mark the
channel dead - fail all future operations
 2000-06-20 23:27:12 +00:00
Cameron Grant
03cab0581f make mixer reads return the value written instead of the value set 
people seem to want this even though it breaks oss spec compliance
 2000-06-19 20:31:58 +00:00
Cameron Grant
fa5e422d98 replace a line erroneously removed in 1.28, should fix xmms 
make buf_clear handle unaligned lengths
 2000-06-17 19:29:40 +00:00
Cameron Grant
70776a9c0b add alpha-quality recording code and handle pci error interrupts - this may 
prevent the card generating an nmi on ecc systems.  for now a message is
printed on every pci error and it seems every time we start playng we get one
 2000-06-13 23:24:40 +00:00
Cameron Grant
20a874f116 handle closing differently - should fix the end-of-sample cutoff bug 2000-06-13 23:18:43 +00:00
Brian Somers
a54185c7ba Add (another) PnP entry for the ESS ES1869 (Compaq OEM) 
Submitted by:	mdharnois@home.com
PR:		19206
 2000-06-12 09:09:37 +00:00
Peter Wemm
a99bef94ed Untangle some #include between gusc.c/mss.c - gusc.c could create 
an attachment node for something that may not have been compiled in.
 2000-06-10 07:20:54 +00:00
Peter Wemm
cb73359d42 Unused include: #include "sbc.h" 2000-06-10 07:17:29 +00:00
Peter Wemm
83fc8b6d34 Unused includes: #include "pci.h", #include "pcm.h" 2000-06-10 07:15:15 +00:00
Dan Moschuk
7bf9834a55 Increase delay from 10mu to 1000mu when reading play control size. This 
allows the YMF744 to initialize properly.
 2000-06-09 16:44:30 +00:00
Cameron Grant
1a50bd2e37 handle duplex properly in the AIOGCAP ioctl - this may (partially?) fix rat 2000-06-07 11:51:30 +00:00
Cameron Grant
2f9aa04e7f this driver does not support the cs4281 and probably never will, different code 
will be required
 2000-06-06 22:42:57 +00:00
Cameron Grant
dafad92c7d support recording 2000-06-06 22:34:09 +00:00
Cameron Grant
20cdda004b improve recording 2000-06-06 22:30:22 +00:00
Cameron Grant
9c3268206d don't panic if we try to add a channel we said we wouldn't 2000-06-06 22:24:53 +00:00
Peter Wemm
3e0f102e57 With this evil hack the DS1 driver works on our Intel desktop 
motherboards that use YMF740's.  It has a strange subvendor and subdevice
ID and requires a disturbingly long delay after the ac97 codec init.
Cameron hasn't had this driver tested on another 740 yet, so we don't know
if this is a quirk of all 740's, or if its just something about the codec
that Intel used.
 2000-06-01 03:58:27 +00:00
Cameron Grant
17dbf67736 if a device has no play or no record channels, set its simplex flag. 2000-06-01 01:32:30 +00:00
Cameron Grant
e05327ee1b if we get bad values for playctrlsize, the firmware may not have initialised 
yet so retry.
 2000-06-01 01:29:05 +00:00
Cameron Grant
2176a9588a add a bit more diagnostic info for the bus_dmamap_load failure case 2000-05-31 19:04:12 +00:00
Cameron Grant
bd68ce8be9 yamaha ds1/ds1e pci sound driver - work in progress, mixer and playback only. 
tested on ymf724f only.

conf/files entry is commented out, enable it manually to test this code and
let me know results.
 2000-05-31 03:21:36 +00:00
Jun Kuriyama
81c0587fa1 Add more ESS1869 PnP Sound Card PnPid. 
Submitted by:	MIHIRA Yoshiro
PR:		kern/17349
 2000-05-29 07:43:51 +00:00
Peter Wemm
4cbef178df Use the correct name for a mapping register, not the old FreeBSD 2.x 
compatability name.
 2000-05-28 15:15:14 +00:00
Cameron Grant
94e3845ccd fix the return value of the SOUND_PCM_WRITE_CHANNELS ioctl 
re-enable old pcm ioctls
 2000-05-27 14:40:17 +00:00
Cameron Grant
d28089a10d move various fields from pcm_channel to snd_dbuf 
improve chn_read code- don't stop/restart on overrun, just dump data

more error checking on ioctls
 2000-05-26 21:55:13 +00:00
Cameron Grant
04553e63a5 if we have a codec init routine, fail the attach if init fails 2000-05-26 21:42:50 +00:00
Cameron Grant
35f9e4a1db handle emulated dma reads 
don't try to get sample size from snd_dbuf
 2000-05-26 21:15:47 +00:00
Jake Burkholder
e39756439c Back out the previous change to the queue(3) interface. 
It was not discussed and should probably not happen.

Requested by:		msmith and others
 2000-05-26 02:09:24 +00:00
Jake Burkholder
740a1973a6 Change the way that the queue(3) structures are declared; don't assume that 
the type argument to *_HEAD and *_ENTRY is a struct.

Suggested by:	phk
Reviewed by:	phk
Approved by:	mdodd
 2000-05-23 20:41:01 +00:00
Yoshihiro Takahashi
d2fce85dba Oops, rman_get_bushandle() should be converted to rman_get_virtual() 
if resources are mapped to memory.
 2000-05-20 16:15:50 +00:00
Yoshihiro Takahashi
7c14268dbd Supported the mss on PC-98 and Sound Blaster 98. 
Submitted by:	"T.Yamaoka" <taka@windows.squares.net>
 2000-05-19 15:41:52 +00:00
Cameron Grant
942aeab734 fix a speed bug that nobody noticed 2000-05-15 02:10:27 +00:00
Poul-Henning Kamp
9626b608de Separate the struct bio related stuff out of <sys/buf.h> into 
<sys/bio.h>.

<sys/bio.h> is now a prerequisite for <sys/buf.h> but it shall
not be made a nested include according to bdes teachings on the
subject of nested includes.

Diskdrivers and similar stuff below specfs::strategy() should no
longer need to include <sys/buf.> unless they need caching of data.

Still a few bogus uses of struct buf to track down.

Repocopy by:    peter
 2000-05-05 09:59:14 +00:00
Cameron Grant
52064e0a88 fix the 100% cpu in xmms issue 2000-05-04 19:06:34 +00:00
Poul-Henning Kamp
eb95c536ad Remove unneeded #include <sys/kernel.h> 2000-04-29 15:36:14 +00:00
Cameron Grant
a618cffeb8 duh, i forgot to change a bitmask, sorry alexander 
Submitted by:	Alexander Matey <matey@cis.ohio-state.edu>
 2000-04-26 23:08:12 +00:00
Cameron Grant
dd1863690a fix minor numbers for multi-channel devices 
Submitted by:	Alexander Matey <matey@cis.ohio-state.edu>
 2000-04-26 20:06:52 +00:00
Cameron Grant
35d9c60d76 repo-copied to sys/gnu/dev/sound/pci/emu10k1.h 2000-04-26 19:53:46 +00:00
Cameron Grant
0ffbc64fe6 update for new location of emu10k1.h under sys/gnu 2000-04-26 19:51:19 +00:00
Cameron Grant
a0e22dd8db implement settrigger according to spec 
fixes for non-blocking mode
 2000-04-23 18:09:18 +00:00
Cameron Grant
f23598ec2c maybe make cmi8330 work - no feedback yet 
implement bass/treble for yamaha opl-sax chips
 2000-04-23 17:57:35 +00:00
Cameron Grant
19b6ac092e try the fix from creative bugzilla for nmi problem 
Obtained from:	creative labs bugzilla
 2000-04-18 19:11:38 +00:00
Cameron Grant
8ae4c159aa more mmap fixes 2000-04-17 17:06:47 +00:00
Cameron Grant
674c45bd04 make drivers start at beginning of buffer when triggered - improves mmap. 
not all tested.

not sure about aureal.c or csapcm.c
 2000-04-17 16:57:12 +00:00
Cameron Grant
603ddb6d5d make mmap sort-of work. there seem to be interactions with certain hw 
drivers, so still work in progress.

do various mmap-related ioctls right.

improve blocksize control.

bits of cleanup.
 2000-04-15 05:04:12 +00:00
Cameron Grant
7c7f2a4a81 make poll() dtrt, previously when playing it would trigger if there was less 
than 1 byte ready to play instead of room for at least 1 byte to be written.
similarly for recording.
 2000-04-05 05:54:02 +00:00
Cameron Grant
2d3ce9d56e decrease buffer size to 4k 
use a seperate channel for generating irqs so we get a buffer-half-empty
interrupt, prevents repeating on underflow
 2000-04-05 02:14:26 +00:00
Cameron Grant
bd18f33408 allow /dev/dsp to be opened seperately for reading and writing. 2000-04-05 01:13:42 +00:00
Cameron Grant
119a24a450 try increasing 2ndbuffer size to 64k 2000-04-05 00:56:02 +00:00
Cameron Grant
8b455f8d05 move buffer size definition to .c file for consistency, and reduce it to 4k 2000-04-05 00:38:00 +00:00
Cameron Grant
97b3c9d804 make the click on starting output go away 2000-04-04 02:16:15 +00:00
Cameron Grant
8046c76306 fix missing defines and prototype for emu_vdump() 2000-04-03 00:28:43 +00:00
Cameron Grant
c067afaa06 unfinished sblive driver, playback/mixer only for now - not enabled in 
conf/files

i don't seem to be clearing the cache right resulting in a short initial
burst of noise, despite doing the same as creative and alsa.  i'm committing
now so more eyes can pore over the code.
 2000-04-02 07:41:17 +00:00
Cameron Grant
e620d95952 fail in attach if we seem to have no ac97 codec 2000-04-01 22:24:03 +00:00
Cameron Grant
0a3eb835c2 bump the buffer size from 4k to 16k. should improve performance under load. 2000-04-01 21:28:09 +00:00
Cameron Grant
57376530f0 split up ess and sb code 
rewrite ess mixer to use native registers
rewrite play/rec code to use more accurate timer when available
add code to use audio2 for playback, but disable it as no irqs are generated
 2000-03-28 18:31:01 +00:00
Cameron Grant
6b4b88f7a2 don't check extended features on codecs known to hang. should fix neomagic 
problems.
 2000-03-24 03:14:35 +00:00
Cameron Grant
87374c3d7a toast warnings on i386 2000-03-20 15:50:08 +00:00
Cameron Grant
3252a47be9 make als120 cards which report dsp version 3.x whilst only supporting 4.x 
and *not* 3.x commands work
 2000-03-20 15:34:27 +00:00
Cameron Grant
39004e693d update the ac97 layer: 
* add a callback for initialising the mixer interface
* support ac97 2.1 variable rate audio feature

fix ac97-using drivers for the above

add suspend/resume support for neomagic
 2000-03-20 15:30:50 +00:00
Cameron Grant
a0b4946276 add a function to reinitialize the mixer, to be called by drivers on 
resuming after suspend
 2000-03-20 15:21:50 +00:00
Nick Hibma
efb572af98 Spelling mistake 2000-03-15 22:11:00 +00:00
Poul-Henning Kamp
d8b47cbb70 Stop isadma from abusing the B_READ, B_RAW and B_WRITE flags. 
Define ISADMA_{READ,WRITE,RAW} macros with the same numeric
values as the B_{READ,WRITE,RAW} and use them instead throughout.
 2000-03-13 10:19:32 +00:00
Seigo Tanimura
ca6da1de5e Add the logical ID of Avance Logic ALS100. The vendor ID is also 
checked, which was introduced in 1.18.

PR:		kern/16487
Submitted by:	Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de>
Approved by:	jkh
 2000-03-09 02:13:21 +00:00
Cameron Grant
1a7d73a130 Partial fix: the following patch correctly configures the card for dual 
channel DMA. The problem was that the SDC bit (0x04) can only be set in
the MCE state.

PR:		kern/16587
Submitted by:	Matthew Reimer <mreimer@vpop.net>
Approved by:	jkh (in person)
 2000-03-05 15:51:09 +00:00
Cameron Grant
73bd6f4aab fix ess end-of-buffer repeating 
Submitted by:	nhibma
Approved by:	jkh
 2000-02-14 23:37:02 +00:00
Peter Wemm
5775b1a2b6 Tidy up stray or bogus #if NFOO > 0 and #include "foo.h". 2000-01-29 18:48:30 +00:00
Peter Wemm
96e00123b4 Remove a rather bizzare set of #ifdefs and #defines that all worked out 
to be a NO-OP.
 2000-01-29 18:44:01 +00:00
Cameron Grant
a05382d9ae differentiate cmi8330 and als100 pnp cards based on their vendor id. this 
is a kludge for 4.0
 2000-01-29 00:18:29 +00:00
Andrew Gallatin
de6d75328e Add support for detection of the ESS 1688 found on my Dell Latitude LM 2000-01-28 04:28:11 +00:00
Cameron Grant
45248baa3c handle simplex devices right 2000-01-26 20:27:45 +00:00
Peter Wemm
a3a2b1e1b2 Note the PnP id's for the NMX2210 next to the id's where they are used. 
The pnpbios doesn't supply a description in the case we've seen so
supply one.
 2000-01-23 13:17:03 +00:00
Seigo Tanimura
8f7076b8ff The pointer of the serial FIFO in the DSP seems to make an error 
upon starting/stopping the DSP. Correct the pointer in addition
to clearing the FIFO.
 2000-01-23 07:04:02 +00:00
Cameron Grant
f2410ff244 kludge to fix the end-of-sample repeating bug. i don't know why it happens; 
none of my hw does it, but this should fix it for now.

Tested by:	wpaul
 2000-01-18 18:59:03 +00:00
Cameron Grant
03a00905d3 update ac97 layer to use device_printf when printing messages 2000-01-18 17:13:43 +00:00
Peter Wemm
615407b5a0 Some SB128's (ES1371) have a different PCI vendor id. Vendor == 0x3274 
instead of the normal 0x1274.

Tested by:	des
 2000-01-17 07:54:00 +00:00
Cameron Grant
9bc502089a fix missing \n in sndstat output 2000-01-16 12:52:22 +00:00
Cameron Grant
0a12fe07e7 oops, best play format was set to unsigned 16 bit instead of signed 16 bit 
stereo.  remenant from testing.
 2000-01-16 12:05:07 +00:00
Cameron Grant
724efc44ec attach to non-ac97 neomagic chips and hope that ac97 ones do not have the 
same pnpbios id
 2000-01-13 06:11:32 +00:00
Cameron Grant
5b4c3f3ca0 be less verbose 2000-01-13 06:00:57 +00:00
Daniel Eischen
d404cb51ee Add support for detection of the ESS 1878 chip. 2000-01-12 11:16:23 +00:00
Cameron Grant
e7fb32964c exclude chips with subdevices specified on a list of non-ac97 chips 2000-01-11 10:37:16 +00:00
Cameron Grant
898cb2af53 make dsp_read() assert that it has a read channel, not a write channel 
Submitted by:	green
 2000-01-10 07:05:15 +00:00
Cameron Grant
10b23f4c02 don't complain about bad intrs unless we get 1000 of them consecutively 
whilst we are playing or recording.  since we should irq ~20 times/sec when
active, this should never trigger.  in theory.  if it never does trigger,
the check will be removed.
 2000-01-10 06:19:20 +00:00
Cameron Grant
9090c22ce7 general tidyup 2000-01-10 03:22:28 +00:00
Cameron Grant
4ee074718b return the sample rate set instead of 0. oops. mpg123 should now work. 2000-01-10 01:59:12 +00:00
Cameron Grant
147d35e8b3 fix the premature termination of playback 2000-01-09 08:32:49 +00:00
Cameron Grant
d5fa8408e6 driver for neomagic 256av and 256zx 
Obtained from:	anonymous author, heavily derived
 2000-01-09 08:14:11 +00:00
Cameron Grant
bf8ca271a3 modify sndstat output 2000-01-09 08:07:46 +00:00
Cameron Grant
833f702348 allow mixer-only devices - ie, devices with no play/rec channels 2000-01-06 04:11:36 +00:00
Cameron Grant
bbb5bf3d69 don't panic if channel init fails, report and fail gracefully 2000-01-05 20:44:41 +00:00
Cameron Grant
2abc85f0c0 argh, forgot the bus_dma_tag_creates. 
also, panic if channel init fails instead of derefing null.
 2000-01-05 04:01:34 +00:00
Cameron Grant
ebb0b1f9bb set up the pci regs properly for busmastering. this makes the card work on 
my smp box.
 2000-01-05 02:03:55 +00:00
Cameron Grant
9d1671b8c2 allocate isa bounce buffers of the right size for ess/mss cards, fixes 
panics reported
 2000-01-05 00:39:20 +00:00
Seigo Tanimura
769309aaf2 Do not start/stop DMA transfer if it is already started/stopped. 2000-01-03 05:26:12 +00:00
Seigo Tanimura
f259d7eed5 - Handle an interrupt for csa primarily in the bridge driver, 
then invoke the children. As the value of HISR can be read
  only once, pass the HISR to the children via struct
  csa_bridgeinfo, stored in the ivars of them.
- Clear the contents of serial FIFO upon stopping the DMA for
  playing. This may eliminate buzz on playing. Experimental.
 2000-01-03 02:51:16 +00:00
Cameron Grant
43607766d6 revert buffer size to 64k 2000-01-01 21:50:20 +00:00
Seigo Tanimura
f7e00c54d1 Correct the delay durations as in the sample sources provided by Crystal Semiconductor. 2000-01-01 09:07:03 +00:00
Peter Wemm
32ef0d3eb6 Attach the CS4610 PCI / CS4239 setup in isa compatability mode as CSC0100. 
The PCI component is non-AC97 apparently.

PR:		15632
Submitted by:	gibbs
 1999-12-30 20:04:11 +00:00
Cameron Grant
69cbc772d9 make ess cards use a 64k buffer again, by implementing esschan_init() 1999-12-30 04:04:43 +00:00
Cameron Grant
2635fee807 make es1373 chips with ac97 2.1 work on troublesome motherboards 
Submitted by:	Russell Cattelan <cattelan@thebarn.com>
 1999-12-29 05:44:17 +00:00
Peter Wemm
664a31e496 Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL" 
is an application space macro and the applications are supposed to be free
to use it as they please (but cannot).  This is consistant with the other
BSD's who made this change quite some time ago.  More commits to come.
 1999-12-29 04:46:21 +00:00
Cameron Grant
a0b57fb738 - latest 2ndbuffer patch 
- make chn_setdir work for rec on isa cards
- note: es1371 does not irq in smp

Submitted by:	tanimura
 1999-12-29 03:46:54 +00:00
Peter Wemm
7c361b70c5 Fix a mistake in the PNP EISA-encoding of the Avance ALS120 id. 
Submitted by:	Bryan Liesner <bleez@netaxs.com>
 1999-12-26 10:51:47 +00:00
Doug Rabson
7e864cbf08 Don't pass u_int32_t pointers to BUS_READ_IVAR since it tends to make 
alphas panic.
 1999-12-24 16:22:45 +00:00
Peter Wemm
2996751a32 Collapse a bunch of unused MD_CS42nn tags into a single one. This saves 
going to a lot of trouble to identify it and set the tag and then not use
it.  Convert the pnp id matching to the preferred table based system.
@@@0001 (CMI8330 ldn 0) is a mss, not a SB.
 1999-12-21 14:09:19 +00:00
Peter Wemm
93111ff410 Tidy up a few loose ends, including adding the pnp tags in comments. 
Remove @@@0001 - it's an MSS, not a SB, at least according to the
original pre-sbc code and according to a pnpinfo report that Cameron has.
 1999-12-21 14:04:14 +00:00
Peter Wemm
e9feccdcb4 Remove #if NISA > 0 - this is best done by the configuration process. 
It had a heap of unreferenced stuff if there was no isa configured in the
system.
 1999-12-21 13:55:46 +00:00
Cameron Grant
9035ec00a0 minor cleanup 
Parts Submitted by:	Ville-Pertti Keinonen <will@ztango.com>
 1999-12-21 08:43:28 +00:00
Cameron Grant
637e117737 don't use the sbpro mic vol register during init on ess cards; it causes 
feedback and we use the native one elsewhere.
 1999-12-21 06:18:03 +00:00
Cameron Grant
a451ce1dad minor cosmetics 1999-12-20 14:57:46 +00:00
Cameron Grant
71f78e06c6 make marcel's onboard ess1888 work 
Submitted by:	marcel
 1999-12-20 14:55:56 +00:00
Cameron Grant
1ad869dbc6 allow (broken) apps to use mixer ioctls on dsp devices. eg: vmware 
Submitted by:	"Vladimir N. Silyaev" <vsilyaev@mindspring.com>
 1999-12-20 00:56:51 +00:00
Cameron Grant
529863cb71 stop playing if we underrun; if there is more data to come, the next write 
will restart
 1999-12-19 22:32:55 +00:00
Cameron Grant
34c18c4fc5 note to self: vibra16c is not vibra16x 1999-12-19 22:28:31 +00:00
Cameron Grant
ff00068cce fix for ess cards to use auto-init dma mode, so they work 1999-12-19 22:25:26 +00:00
Cameron Grant
09eb10434a remove unused mixer stuff 1999-12-19 18:18:55 +00:00
Cameron Grant
d37a380ddb general tidyup 1999-12-19 17:51:32 +00:00
Cameron Grant
7207eca657 move make_dev operations for audio channels to pcm_addchan(). in theory, 
with modifications to MAKEDEV this will allow use of multiple output streams
on cards supporting it, eg trident 4dwave.
 1999-12-19 15:27:24 +00:00
Cameron Grant
5c9abff13d fix a bug in sndstat output, tidy up a few bits 1999-12-19 15:07:56 +00:00
Cameron Grant
df74837fd9 generalise the code a bit, and add an irq handler so that the child devices 
can share the irq
 1999-12-19 14:44:08 +00:00
Cameron Grant
71dde75288 remove the restriction limiting the vibra16x to 8 bit 
Noticed By:	Clive Lin <clive@CirX.ORG>
 1999-12-19 14:21:38 +00:00
Cameron Grant
e53ad03a80 make vibra16x cards announce what they are in /dev/sndstat 1999-12-18 22:47:23 +00:00
Cameron Grant
f4a31ab806 fix the buffer repetition on ^c problem 1999-12-18 22:24:50 +00:00
Cameron Grant
354398891a make the vibra16x work for playback at least, record is untested 1999-12-18 22:21:47 +00:00
Seigo Tanimura
cf4f3dda81 Correct the logical ID of Avance Asound 110. 
Submitted by:	Bryan Liesner <bleez@netaxs.com>
 1999-12-18 12:17:02 +00:00
Cameron Grant
5f070b6772 more dma underrun fixes, using a per-channel 2nd buffer 
Submitted by:	tanimura
 1999-12-13 03:29:09 +00:00
Cameron Grant
d4a72b067c make sb dependant on sbc 
add support for non-pnp cards to sbc
move card identification to sbc
channel-swapping code is in sb now instead of dsp
vibra16x support is still broken, but will be fixed soon

note: sbc is now compulsory for sb cards

for pnp cards use:
device sbc0

for non-pnp cards eg:
device sbc0 at isa? port 0x240 irq 5 drq 3 flags 0x15
(hints as oldpcm)

both in addition to:
device pcm0

Reviewed by:	tanimura,dfr
Said he liked it: peter
 1999-12-12 02:30:19 +00:00
Cameron Grant
0927bf4365 move channel-swapping support to the hardware driver since it knows the card 
state best
 1999-12-12 02:18:58 +00:00
Cameron Grant
dedf4424a0 increase buffer size, reduce number of channels allocated since we only use 
1 at the moment
 1999-12-12 02:16:14 +00:00
Seigo Tanimura
7012990a73 Make the origins clear. 
Pointed out by:	Tatoku Ogaito <tacha@trap.fukui-med.ac.jp>
 1999-12-10 01:20:08 +00:00
Bill Fumerola
953fbebedd Reckognize the 'Avance Asound 100' 
Submitted by:	Oliver Fromme <olli@dorifer.heim3.tu-clausthal.de>
 1999-12-07 01:53:24 +00:00
Peter Wemm
c2af6f650c Update for pnp adjustments regarding NPNP. 
Also, optimize out a mess of #if's that were duplicating work already
done by config(8).  For example, if a file is marked as
"dev/sound/pci/foo.c optional pcm pci" then it's only added if pcm *and*
pci are present, so #if NPCM > 0 and #if NPCI > 0 are totally redundant.
A bit more work is still needed.

Discussed with: cg (a few weeks ago)
 1999-12-06 18:26:33 +00:00