#
267654 |
|
19-Jun-2014 |
gjb |
Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
254306 |
|
13-Aug-2013 |
scottl |
Merge r254263:
Update PCI drivers to no longer look at the MEMIO-enabled bit in the PCI command register. The lazy BAR allocation code in FreeBSD sometimes disables this bit when it detects a range conflict, and will re-enable it on demand when a driver allocates the BAR. Thus, the bit is no longer a reliable indication of capability, and should not be checked. This results in the elimination of a lot of code from drivers, and also gives the opportunity to simplify a lot of drivers to use a helper API to set the busmaster enable bit.
This changes fixes some recent reports of disk controllers and their associated drives/enclosures disappearing during boot.
Candidate for 9.2
Submitted by: jhb Reviewed by: jfv, marius, adrian, achim
|
#
225736 |
|
22-Sep-2011 |
kensmith |
Copy head to stable/9 as part of 9.0-RELEASE release cycle.
Approved by: re (implicit)
|
#
193640 |
|
07-Jun-2009 |
ariff |
Sound Mega-commit. Expect further cleanup until code freeze.
For a slightly thorough explaination, please refer to [1] http://people.freebsd.org/~ariff/SOUND_4.TXT.html .
Summary of changes includes:
1 Volume Per-Channel (vpc). Provides private / standalone volume control unique per-stream pcm channel without touching master volume / pcm. Applications can directly use SNDCTL_DSP_[GET|SET][PLAY|REC]VOL, or for backwards compatibility, SOUND_MIXER_PCM through the opened dsp device instead of /dev/mixer. Special "bypass" mode is enabled through /dev/mixer which will automatically detect if the adjustment is made through /dev/mixer and forward its request to this private volume controller. Changes to this volume object will not interfere with other channels.
Requirements: - SNDCTL_DSP_[GET|SET][PLAY|REC]_VOL are newer ioctls (OSSv4) which require specific application modifications (preferred). - No modifications required for using bypass mode, so applications like mplayer or xmms should work out of the box.
Kernel hints: - hint.pcm.%d.vpc (0 = disable vpc).
Kernel sysctls: - hw.snd.vpc_mixer_bypass (default: 1). Enable or disable /dev/mixer bypass mode. - hw.snd.vpc_autoreset (default: 1). By default, closing/opening /dev/dsp will reset the volume back to 0 db gain/attenuation. Setting this to 0 will preserve its settings across device closing/opening. - hw.snd.vpc_reset (default: 0). Panic/reset button to reset all volume settings back to 0 db. - hw.snd.vpc_0db (default: 45). 0 db relative to linear mixer value.
2 High quality fixed-point Bandlimited SINC sampling rate converter, based on Julius O'Smith's Digital Audio Resampling - http://ccrma.stanford.edu/~jos/resample/. It includes a filter design script written in awk (the clumsiest joke I've ever written) - 100% 32bit fixed-point, 64bit accumulator. - Possibly among the fastest (if not fastest) of its kind. - Resampling quality is tunable, either runtime or during kernel compilation (FEEDER_RATE_PRESETS). - Quality can be further customized during kernel compilation by defining FEEDER_RATE_PRESETS in /etc/make.conf.
Kernel sysctls: - hw.snd.feeder_rate_quality. 0 - Zero-order Hold (ZOH). Fastest, bad quality. 1 - Linear Interpolation (LINEAR). Slightly slower than ZOH, better quality but still does not eliminate aliasing. 2 - (and above) - Sinc Interpolation(SINC). Best quality. SINC quality always start from 2 and above.
Rough quality comparisons: - http://people.freebsd.org/~ariff/z_comparison/
3 Bit-perfect mode. Bypasses all feeder/dsp effects. Pure sound will be directly fed into the hardware.
4 Parametric (compile time) Software Equalizer (Bass/Treble mixer). Can be customized by defining FEEDER_EQ_PRESETS in /etc/make.conf.
5 Transparent/Adaptive Virtual Channel. Now you don't have to disable vchans in order to make digital format pass through. It also makes vchans more dynamic by choosing a better format/rate among all the concurrent streams, which means that dev.pcm.X.play.vchanformat/rate becomes sort of optional.
6 Exclusive Stream, with special open() mode O_EXCL. This will "mute" other concurrent vchan streams and only allow a single channel with O_EXCL set to keep producing sound.
Other Changes: * most feeder_* stuffs are compilable in userland. Let's not speculate whether we should go all out for it (save that for FreeBSD 16.0-RELEASE). * kobj signature fixups, thanks to Andriy Gapon <avg@freebsd.org> * pull out channel mixing logic out of vchan.c and create its own feeder_mixer for world justice. * various refactoring here and there, for good or bad. * activation of few more OSSv4 ioctls() (see [1] above). * opt_snd.h for possible compile time configuration: (mostly for debugging purposes, don't try these at home) SND_DEBUG SND_DIAGNOSTIC SND_FEEDER_MULTIFORMAT SND_FEEDER_FULL_MULTIFORMAT SND_FEEDER_RATE_HP SND_PCM_64 SND_OLDSTEREO
Manual page updates are on the way.
Tested by: joel, Olivier SMEDTS <olivier at gid0 d org>, too many unsung / unnamed heroes.
|
#
188424 |
|
09-Feb-2009 |
cognet |
Hmm... "base? base : 0" and "base" should be equivalent.
Pointy hat to: cognet
MFC after: 3 days
|
#
170873 |
|
17-Jun-2007 |
ariff |
Flush remaining malloc() cleanups (M_NOWAIT -> M_WAITOK).
|
#
170521 |
|
10-Jun-2007 |
ariff |
Filter/compress the amount of channel trigger. This should reduce much of lock/unlock contentions within the interrupt handler. Most of these drivers only need PCMTRIG_START or STOP (ABORT).
Discussed with: scottl
|
#
168847 |
|
18-Apr-2007 |
ariff |
sndbuf_alloc() now accept dmaflags argument which will be forwarded to internal bus_dmammem_alloc() for greater flexibility on setting up DMA / page attributes.
|
#
167608 |
|
15-Mar-2007 |
ariff |
Fix severe out-of-bound mtx "type" pointer, causing WITNESS refcount confusions and panic provided that the following conditions are met:
1) WITNESS is enabled (watch/trace). 2) Using modules, instead of statically linked (Not a strict requirement, but easier to reproduce this way). 3) 2 or more modules share the same mtx type ("sound softc"). - They might share the same name (strcmp() == 0), but it always point to different address. 4) Repetitive kldunload/load on any module that shares the same mtx type (Not a strict requirement, but easier to reproduce this way).
Consider module A and module B: - From enroll() - subr_witness.c: * Load module A. Everything seems fine right now. wA-w_refcount == 1 ; wA-w_name = "sound softc" * Load module B. * w->w_name == description will always fail. ("sound softc" from A and B point to different address). * wA->w_refcount > 0 && strcmp(description, wA->w_name) == 0 * enroll() will return wA instead of returning (possibly unique) wB. wA->w_refcount++ , == 2. * Unload module A, mtx_destroy(), wA->w_name become invalid, but wA->w_refcount-- become 1 instead of 0. wA will not be removed from witness list. * Some other places call mtx_init(), iterating witness list, found wA, failed on wA->w_name == description * wA->w_refcount > 0 && strcmp(description, wA->w_name) * Panic on strcmp() since wA->w_name no longer point to valid address.
Note that this could happened in other places as well, not just sound (eg. consider lots of drivers that share simmilar MTX_NETWORK_LOCK).
Solutions (for sound case): 1) Provide unique mtx type string for each mutex creation (chosen) or 2) Put "sound softc" global variable somewhere and use it.
|
#
167285 |
|
07-Mar-2007 |
kevlo |
Use M_NOWAIT instead of M_WAITOK to cause malloc() to return NULL.
|
#
166919 |
|
23-Feb-2007 |
ariff |
- Revert arguments for several functions to pre bus_get_dma_tag() changes. Each softc contains information about their own device_t, use that instead. - bus_setup_intr() -> snd_setup_intr().
|
#
166904 |
|
23-Feb-2007 |
netchild |
MFp4 (114068): Use bus_get_dma_tag() to obtain the parent DMA tag to make the drivers a little bit more non-ia32/amd64 friendly.
There is no man page for bus_get_dma_tag, so this is modelled after rev. 1.62 of src/sys/dev/sound/pci/es137x.c by marius.
Inspired by: commit by marius
|
#
154494 |
|
17-Jan-2006 |
ariff |
Remove Giant / busdma_lock_mutex from busdma_tag_create().
|
#
154215 |
|
11-Jan-2006 |
ariff |
- Locking fixes. Release lock while chn_intr(). - Mark MPSAFE since most of the locking procedures already implemented. - Turn on inverted external amplifier sense flag for selected boards.
Tested by: bland MFC after: 1 week
|
#
142890 |
|
01-Mar-2005 |
imp |
Use BUS_PROBE_DEFAULT in preference to 0 and BUS_PROBE_LOW_PRIORITY in preference to some random negative number to allow other drivers a bite at the apple.
|
#
139749 |
|
05-Jan-2005 |
imp |
Start each of the license/copyright comments with /*-, minor shuffle of lines
|
#
136469 |
|
13-Oct-2004 |
yongari |
Audio drivers failed to detect failure condition and attempted to assign DMA address to the wrong address. It can cause system lockup or other mysterious errors. Since most sound cards requires low DMA address(BUS_SPACE_MAXADDR_24BIT) sndbuf_alloc() would fail when the audio driver is loaded after long running of operations.
Approved by: jake (mentor) Reviewed by: truckman, matk
|
#
132236 |
|
16-Jul-2004 |
tanimura |
Rename the sound device drivers:
- `sound' The generic sound driver, always required.
- `snd_*' Device-dependent drivers, named after the sound module names. Configure accordingly to your hardware.
In addition, rename the `snd_pcm' module to `sound' in order to sync with the driver names.
Suggested by: cg
|
#
128232 |
|
14-Apr-2004 |
green |
The newpcm headers currently #define away INTR_MPSAFE and INTR_TYPE_AV because they bogusly check for defined(INTR_MPSAFE) -- something which never was a #define. Correct the definitions.
This make INTR_TYPE_AV finally get used instead of the lower-priority INTR_TYPE_TTY, so it's quite possible some improvement will be had on sound driver performance. It would also make all the drivers marked INTR_MPSAFE actually run without Giant (which does seem to work for me), but: INTR_MPSAFE HAS BEEN REMOVED FROM EVERY SOUND DRIVER! It needs to be re-added on a case-by-case basis since there is no one who will vouch for which sound drivers, if any, willy actually operate correctly without Giant, since there hasn't been testing because of this bug disabling INTR_MPSAFE.
Found by: "Yuriy Tsibizov" <Yuriy.Tsibizov@gfk.ru>
|
#
127135 |
|
17-Mar-2004 |
njl |
Convert callers to the new bus_alloc_resource_any(9) API.
Submitted by: Mark Santcroos <marks@ripe.net> Reviewed by: imp, dfr, bde
|
#
126695 |
|
06-Mar-2004 |
matk |
Augment /dev/sndstat with the module names, if applicable.
Approved by: tanimura (mentor)
|
#
119690 |
|
02-Sep-2003 |
jhb |
Use PCIR_BAR(x) instead of PCIR_MAPS.
Glanced over by: imp, gibbs Tested by: i386 LINT
|
#
119362 |
|
23-Aug-2003 |
iedowse |
When calculating the block size to use for a particular sample rate, round the result up to a multiple of 4 bytes so that it will always be a multiple of the sample size. Also use the actual buffer size from sc->bufsz instead of the default DS1_BUFFSIZE.
This fixes panics and bad distortion I have seen on Yamaha DS-1 hardware, mainly when playing certain Real Audio media.
Reviewed by: orion (an earlier version of the patch)
|
#
119287 |
|
22-Aug-2003 |
imp |
Prefer new location of pci include files (which have only been in the tree for two or more years now), except in a few places where there's code to be compatible with older versions of FreeBSD.
|
#
117126 |
|
01-Jul-2003 |
scottl |
Mega busdma API commit.
Add two new arguments to bus_dma_tag_create(): lockfunc and lockfuncarg. Lockfunc allows a driver to provide a function for managing its locking semantics while using busdma. At the moment, this is used for the asynchronous busdma_swi and callback mechanism. Two lockfunc implementations are provided: busdma_lock_mutex() performs standard mutex operations on the mutex that is specified from lockfuncarg. dftl_lock() is a panic implementation and is defaulted to when NULL, NULL are passed to bus_dma_tag_create(). The only time that NULL, NULL should ever be used is when the driver ensures that bus_dmamap_load() will not be deferred. Drivers that do not provide their own locking can pass busdma_lock_mutex,&Giant args in order to preserve the former behaviour.
sparc64 and powerpc do not provide real busdma_swi functions, so this is largely a noop on those platforms. The busdma_swi on is64 is not properly locked yet, so warnings will be emitted on this platform when busdma callback deferrals happen.
If anyone gets panics or warnings from dflt_lock() being called, please let me know right away.
Reviewed by: tmm, gibbs
|
#
113546 |
|
16-Apr-2003 |
simokawa |
Fix bogus maxsegsz parameter for bus_dma_tag_create().
MFC: 1 week
|
#
111183 |
|
20-Feb-2003 |
cognet |
Implement a "sndbuf_getbufaddr" function and use it instead of vtophys().
Reviewed by: orion
|
#
111119 |
|
19-Feb-2003 |
imp |
Back out M_* changes, per decision of the TRB.
Approved by: trb
|
#
109623 |
|
21-Jan-2003 |
alfred |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0. Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
|
#
107285 |
|
26-Nov-2002 |
cg |
(hopefully) fix build breakage some people are seeing
Approved by: re
|
#
93816 |
|
04-Apr-2002 |
jhb |
Add lock type arguments to callers of snd_mtxcreate().
|
#
84659 |
|
08-Oct-2001 |
cg |
use pcm_getbuffersize() use seperate dma tags for buffers and control info
|
#
82180 |
|
23-Aug-2001 |
cg |
many changes:
* add new channels to the end of the list so channels used in order of addition
* de-globalise definition of struct snddev_info and provide accessor functions where necessary.
* move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging.
* allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
|
#
78362 |
|
16-Jun-2001 |
cg |
use a global devclass for all drivers - i'm not entirely sure why this worked before.
mixer, dsp and sndstat are seperate devices - give them their own cdevsws instead of demuxing requests sent to a single cdevsw.
use the si_drv1/si_drv2 fields in dev_t structures for holding information specific to an open instance of mixer/dsp.
nuke /dev/{dsp,dspW,audio}[0-9]* links - this functionality is now provided using cloning.
various locking fixes.
|
#
74763 |
|
24-Mar-2001 |
cg |
mega-commit.
this introduces a new buffering mechanism which results in dramatic simplification of the channel manager.
as several structures have changed, we take the opportunity to move their definitions into the source files where they are used, make them private and de-typedef them.
the sound drivers are updated to use snd_setup_intr instead of bus_setup_intr, and to comply with the de-typedefed structures.
the ac97, mixer and channel layers have been updated with finegrained locking, as have some drivers- not all though. the rest will follow soon.
|
#
71504 |
|
23-Jan-2001 |
cg |
fix blocksizing for playback, implement blocksizing for record
|
#
70343 |
|
24-Dec-2000 |
cg |
update to return correct blocksize- these chips have a fixed irq rate, so block size varies only with format and rate.
|
#
70291 |
|
23-Dec-2000 |
cg |
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.
|
#
70134 |
|
17-Dec-2000 |
cg |
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.
|
#
66012 |
|
17-Sep-2000 |
cg |
fix warnings
|
#
65647 |
|
09-Sep-2000 |
cg |
disable 16bit mono support- this will be handled by software conversion to stereo as hardware mono is very noisy
|
#
65644 |
|
09-Sep-2000 |
cg |
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
|
#
65490 |
|
05-Sep-2000 |
cg |
initial support for multiple ac97 codecs
|
#
65340 |
|
01-Sep-2000 |
cg |
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
|
#
65219 |
|
29-Aug-2000 |
cg |
remove stuff accidentally left in last commit
|
#
65218 |
|
29-Aug-2000 |
cg |
suspend/resume for ds1 driver
PR: misc/20891 Submitted by: Ira L. Cooper <ira@mit.edu>
|
#
65171 |
|
28-Aug-2000 |
dfr |
Fix disordered arguments to bus_space_barrier().
|
#
64881 |
|
20-Aug-2000 |
cg |
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.
|
#
64015 |
|
30-Jul-2000 |
cg |
do the ac97 init delay for all chips and increase it to 500ms
|
#
62483 |
|
03-Jul-2000 |
cg |
add module metadata. this is a hack, sound drivers will eventually present a bus to which pcm, mixer, etc will attach.
|
#
61476 |
|
10-Jun-2000 |
peter |
Unused includes: #include "pci.h", #include "pcm.h"
|
#
61456 |
|
09-Jun-2000 |
dan |
Increase delay from 10mu to 1000mu when reading play control size. This allows the YMF744 to initialize properly.
|
#
61346 |
|
06-Jun-2000 |
cg |
support recording
|
#
61146 |
|
01-Jun-2000 |
peter |
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.
|
#
61142 |
|
31-May-2000 |
cg |
if we get bad values for playctrlsize, the firmware may not have initialised yet so retry.
|
#
61133 |
|
31-May-2000 |
cg |
add a bit more diagnostic info for the bus_dmamap_load failure case
|
#
61108 |
|
31-May-2000 |
cg |
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.
|