CVS log for src/sys/dev/pci/emuxki.c

Up to [cvs.NetBSD.org] / src / sys / dev / pci

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

s/amound/amount/ in comment.

Remove unnecessary <sys/malloc.h>.

emuxki(4): Use config_detach_children.

emuxki(4): import a list of board definitions

This is inspired by the cxdtv(4) driver.

Tested on NetBSD/amd64 with a Sound Blaster Live! Value (CT4870, PCI)
and with a Sound Blaster Audigy Rx 7.1 (SB1550, PCIe).

Additional sound cards sponsored by the NetBSD Foundation; thanks!

emuxki(4): place struct emuxki_softc into its own file

NFCI

emuxki(4): restrict DMA memory within the first 2GB

As implemented in the driver, the EMU10K1 chip can only address memory
up to 31-bit addresses.

Tested on NetBSD/amd64 with a Sound Blaster Live! Value (CT4870, PCI)
and with a Sound Blaster Audigy Rx 7.1 (SB1550, PCIe).

Additional sound cards sponsored by the NetBSD Foundation; thanks!

emuxki(4): allow building as a module

Tested on NetBSD/amd64 with a Sound Blaster Live! Value (CT4870)

Note that this required setting outputs.master to the maximum value
allowed (255) to get sound out, and then cranking the volume pretty
high.

Additional sound cards sponsored by the NetBSD Foundation; thanks!

emuxki(4): add support for the Sound Blaster Audigy Rx

This is as per kern/56980. Confirmed working on one out of two different
computers, albeit with a strong hissing noise (same card, different
mainboard). The mixer settings seem to be irrelevant or not supported
though.

Original support inspired by the Linux driver, and confirmed with the
OpenBSD driver, itself originally from NetBSD.

Tested on NetBSD/amd64.

Sync with HEAD.

Remove debug messages which are no longer necessary.

Sync with HEAD

Clean get_props().
- Make get_props() return AUDIO_PROP_{PLAYBACK,CAPTURE} properly.
  This eliminates need for audio.c to take care of such (old)
  drivers which don't return both of PLAYBACK and CAPTURE.
- All get_props() doesn't need to return AUDIO_PROP_MMAP.
  It is handled in the audio layer now.

Fix build error on i386.  These were only needed during development.
Reported by msaitoh@.

Merge isaki-audio2 branch, the overhaul of audio subsystem.
- Interrupt-oriented system rather than thread-oriented.
- Improve stability, quality and performance.
- Split playback and record cleanly.  Improve halfduplex support.
- Many bugs are fixed including deadlocks, resource leaks, abuses, etc.
- Simplify audio filter mechanism.  The encoding/channels/frequency
  conversions are completely handled in the upper layer.  So the hard-
  ware driver only converts its hardware encoding (if necessary).
- audio_hw_if changes:
  - Obsoletes query_encoding and add query_format instead.
  - Obsoletes set_params and add set_format instead.
  - Remove drain, setfd, mappage.
  - The call sequences are changed.
- ioctl AUDIO_GETFD/SETFD, AUDIO_GETCHAN/SETCHAN are obsoleted.
- ioctl AUDIO_{QUERY,GET,SET}FORMAT are introduced.
- cleanup config attributes: au*conv and mulaw.
- All hardware drivers should follow it (I've done as much as possible).

Some file paths are changed:
- dev/audio.c         -> dev/audio/audio.c (rewritten)
- dev/audiovar.h      -> dev/audio/audiovar.h
- dev/audio_dai.h     -> dev/audio/audio_dai.h
- dev/audio_if.h      -> dev/audio/audio_if.h
- dev/audiobell.c     -> dev/audio/audiobell.c
- dev/audiobellvar.h  -> dev/audio/audiobellvar.h
- dev/mulaw.[ch]      -> dev/audio/mulaw.[ch] + dev/audio/alaw.c

Move dev/audio_if.h -> dev/audio/audio_if.h

Remove unnecessary header file.

Use __nothing macro.

Reimplement emuxki driver.
- Use single voice per playback and per recording.
- Use fixed format, 2ch/48kHz, to simplify.
- Fix several problems in previous driver.
  And now it works even on alpha!
The driver is written by Y.Sugahara.  Thanks!

Adapt to audio2.
- XXX New set_format is not implemented at this point.
  This implementation can not adapt to audio2 (and it also has not
  worked since netbsd-8).
  The driver supports multiple hardware stream which is named 'voice'.
  This voice was allocated at open() and was deallocated at close().
  However, in order to support mixing, some interfaces such as
  set_params() (or set_format in audio2) has to be called before open().

Make it compilable (on this branch).
flags here is F(READ|WRITE), not AUOPEN_(READ|WRITE).

Use C99 style struct initializer to audio_format.

Use C99 style struct initializer to audio_hw_if.

Sync with HEAD, resolve a few conflicts

use pci_intr_establish_xname() everywhere

update from HEAD

Sync with HEAD

remove checks for failure after memory allocation calls that cannot fail:

  kmem_alloc() with KM_SLEEP
  kmem_zalloc() with KM_SLEEP
  percpu_alloc()
  pserialize_create()
  psref_class_create()

all of these paths include an assertion that the allocation has not failed,
so callers should not assert that again.

Sync with HEAD

KNF. Remove extra spaces. No functional change.

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

make pci_intr_string and eisa_intr_string take a buffer and a length
instead of relying in local static storage.

sync with head

merge to -current.

Use pci_aprint_devinfo(9) instead of pci_devinfo+aprint_{normal,naive}
where it looks straightforward, and pci_aprint_devinfo_fancy in a few
others where drivers want to supply their own device names instead
of the pcidevs generated one. More complicated cases, where names
are composed at runtime, are left alone for now. It certainly makes
sense to simplify the drivers here rather than inventing a catch-all API.
This should serve as as example for new drivers, and also ensure
consistent output in the AB_QUIET ("boot -q") case. Also, it avoids
excessive stack usage where drivers attach child devices because the
buffer for the device name is not kept on the local stack anymore.

put back IPL_AUDIO and splaudio(), at the request of rmind.  they are
aliases and now we can easily revert audio to IPL_VM if necessary,
without having to revert the whole branch.

Merge jmcneill-audiomp3 branch, which is derived from ad-audiomp2. From
the original ad-audiomp branch notes:

  Add MP locking to the audio drivers.

  Making the audio drivers MP safe is necessary before efforts
  can be made to make the VM system MP safe.

  The are two locks per device instance, an ISR lock and
  a character device lock. The ISR lock replaces calls to
  splaudio()/splx(), and will be held across calls to device
  methods which were called at splaudio() before (e.g.
  trigger_output). The character device lock is held across
  calls to nearly all of the methods, excluding some only
  used for initialization, e.g. get_locks.

Welcome to 5.99.57.

get rid of unused 'powerstate' callback in audio_hw_if

Make emuxki(4) work w/ audiomp changes.

adapt to audiomp api changes

port ad-audiomp2 branch changes to 5.99.56
todo:
 - port ad-audiomp2 pcppi changes
 - these drivers need to be fixed:
   - emuxki
   - gcscaudio
   - hdafg
   - uaudio
   - umidi
   - MD audio drivers

sync with head

Cleanup interrupt establish error messages. Do not mix
aprint_error/aprint_normal/printf calls for a single line.

Sync with HEAD.

sync with head

Split device_t/softc.

Tested on:
emuxki0 at pci2 dev 7 function 0: Creative Labs SBLive! EMU 10000
(audio multimedia, revision 0x05)

sync with head

Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.

use device_private().
"looks good" ad@
XXX for the device_t/softc split, please check the driver that no cases have been missed.

struct device * -> device_t, no functional changes intended.

struct cfdata * -> cfdata_t, no functional changes intended.

sync with head.

Fix locking for ac97.

Checkpoint work in progress.

Checkpoint work in progress.

Sync with HEAD.

Sync with HEAD.

Sync with wrstuden-revivesa-base-2.

Backout unintended change.

Use One exit point to avoid unreachable code.

Sync with HEAD.

sync with head.

sync with head.

Remove clause 3 and 4 from TNF licenses

use aprint_*_dev and device_xname

sync with head.

Sync with HEAD.

Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.

Add MP locking for audio drivers.

sync with head.

sync with head.

Sync with head.

__unused removal on arguments; approved by core.

sync with head

- sprinkle __unused on function decls.
- fix a couple of unused bugs
- no more -Wno-unused for i386

Print "interrupt at irq <foo>" message immediately after we establish the
interrupt. Patch from PR# 33567.

sync with head

sync with head.

- fix incomplete initializer
- remove unsigned comparison < 0

Merge from HEAD.

sync with head.

Merge 2006-05-24 NetBSD-current into the "peter-altq" branch.

sync with head.

Sync with head.

sync with head.

Coverity CID 1537: Make it clear to coverity that there is no overflow.

Coverity CID 1538: Avoid array overrun.

merge ktrace-lwp.

Sync with HEAD. Here we go again...

put back joystick enabling code, lost in Audigy support merge

sync with -current

Pull up revision 1.34 (requested by tsutsui in ticket #1071):
Add some byteswap ops around DMA descriptors for big endian machines.
Tested on macppc by matthew green.
XXX This driver completely lacks bus_dmamap_sync(9) ops.

sync with head.  xen and whitespace.  xen part is not finished.

Sync with HEAD.

Hi Perry!

nuke trailing whitespace

Sync with HEAD.

ansify and KNF

merge kent-audio1 branch, which introduces audio filter pipeline to the MI
audio framework


Summary of changes:

* struct audio_params
  - remove sw_code, factor, factor_denom, hw_sample_rate,
hw_encoding ,hw_precision, and hw_channels.  Conversion information
is conveyed by stream_filter_list_t.
  - change the type of sample_rate: u_long -> u_int
  - add `validbits,' which represents the valid data size in
precision bits.  It is required in order to distinguish 24/32bit
from 24/24bit or 32/32bit.

* audio_hw_if
 - add two parameters to set_params()
	stream_filter_list_t *pfil, stream_filter_list *rfil
   A HW driver should set filter recipes for requested formats
 - constify audio_params parameters of trigger_output() and
trigger_input().  They represent audio formats for the hardware.
 - make open() and close() optional
 - add int (AUMODE_PLAY or AUMODE_RECORD) and audio_params_t parameters
 to round_blocksize()

* sw_code is replaced with stream_filter_t.
  stream_filer_t converts audio data in an input buffer and writes
into another output buffer unlike sw_code, which converts data in
single buffer.
  converters in dev/auconv.c, dev/mulaw.c, dev/aurateconv.c,
dev/tc/bba.c, dev/ic/msm6258.c, and arch/arm/iomd/vidcaudio.c are
reimplemented as stream_filter_t

* MI audio
 - audiosetinfo() builds filter pipelines from stream_filter_list_t
filled by audio_hw_if::set_params()
 - audiosetinfo() returns with EINVAL if mmapped and set_params()
requests filters
 - audio_write(), audio_pint(), and audio_rint() invoke a filter
pipeline.
 - ioctl() for FIONREAD, AUDIO_WSEEK, AUDIO_GETIOFFS,
AUDIO_GETOOFFS, and audio_prinfo::{seek,samples} for
AUDIO_GETINFO handle values for a buffer nearest to userland.

* add `struct device *' parameter to ac97_attach()

* all of audio HW drivers follow audio_hw_if and ac97 changes

audio_hw_if change
 * make open() and close() optional
 * add int (AUMODE_PLAY or AUMODE_RECORD) and audio_params_t parameters
 to round_blocksize()

* adopt the filter pipeline framework
* follow ac97_attach() change

Sync with HEAD.

constify audio_hw_if, midi_hw_if, and radio_hw_if.

Sync with HEAD

Corrected a scattering of typos in comments

Sync with HEAD.

Pullup rev 1.36 (requested by kent in ticket #867)

ac97_host_if::reset() returns non-zero value if codec reset fails, and
ac97 is not attached in that case. PR#26973

ac97_host_if::reset() returns non-zero value if codec reset fails, and
ac97 is not attached in that case.

PR: kern/26973

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

PR/25731: Adam K kirchhoff: Audigy support with the emuxki driver.

Add some byteswap ops around DMA descriptors for big endian machines.
Tested on macppc by matthew green.

XXX This driver completely lacks bus_dmamap_sync(9) ops.

pass string length (= boundary info) to pci_devinfo so that we do not run over
the end of memory region

Pull up revision 1.32 (requested by martti in ticket #54):
Added another SB Live! 5.1 soundcard and joystick version

Added another SB Live! 5.1 soundcard and joystick version

Spell address with two d's. Inspired by similar changes in OpenBSD,
originating from Jonathon Gray and forwarded by jmc@openbsd.

Complete last commit: Remove assigned-to but otherwise unused variable.

Remove some assigned-to but otherwise unused variables.

Fix uninitialized variable warnings.

Fix uninitialized variable warnings

DMA, not dma nor Dma.

Management, not managment. Mostly from jmc@openbsd.

Fix a memory leak in emuxki_voice_new.
Pointed out by Izumi Tsutsui in the current-users mailing list.

Make emuxki_voice_set_audioparms return EINVAL if invalid sample rate
is passed.

Fix recording with formats other than 16 bit slinear_le, based on the
patch submitted as kern/20620.

Remove a couple of false comments, as pointed out in kern/20620.

The intrmasks array is only used in if 0-ed code, so if 0 it as well.

Add recording support for emuxki(4).  The patch is basically the same
as I submitted in PR kern/18093.  Some of the patch needs refinement.
Also, only the ADC recording source is supported, because the other
sources are probably much less useful and the implementation isn't
trivial.

hz -> Hz

s/intial/initial/, from jmc in .pl in PR 20414.

Add extensible malloc types, adapted from FreeBSD.  This turns
malloc types into a structure, a pointer to which is passed around,
instead of an int constant.  Allow the limit to be adjusted when the
malloc type is defined, or with a function call, as suggested by
Jonathan Stone.

Use aprint_*().

Pull up revisions 1.13-1.14 (requested by tron in ticket #1056)
 Use bus_space_write_2() to write the 16 bit register EMU_TIMER which
 should fix PR kern/15663. Patch supplied by Yorick Hardy via GNATS.

Sync with HEAD.

Use bus_space_write_2() to write the 16 bit register "EMU_TIMER" which
should fix PR kern/15663. Patch supplied by Yorick Hardy via GNATS.

Sync with HEAD.

emuxki_intr(): return 1 if interrupt was for us, 0 if not
this appear to fix occassional sample repeats on my dual CPU i386

Catch up to -current.

sync kqueue with -current; this includes merge of gehenna-devsw branch,
merge of i386 MP branch, and part of autoconf rototil work

Add trailing ; to CFATTACH_DECL.

Use CFATTACH_DECL().

Declare all cfattach structures const.

Catch up to -current.

Sync w/ -current.

Pull up revision 1.8 (requested by jdolecek):
  Do not try to set parameters if the appropriate ``voice'' is not
  initialized.  Fixes PR#15394.

enable the joystick port on attach, too

emuxki_set_params(): don't try to set parameters if the appropriate
'voice' is not initialized
This fixes kern/15394 by Onno van der Linden.

Code fragment to trigger the bug:

	AUDIO_INITINFO(&info);
	info.mode = AUMODE_PLAY;
	info.play.channels = 2;
	fd = open("/dev/audioctl0", O_RDWR);
	(void)ioctl(fd, AUDIO_SETINFO, &info);

emuxki_voice_set_audioparms(): g/c check for voice == NULL, this is
never called with null voice
some minor style changes in emuxki_open()/emuxki_close()

Pull up revisions 1.1-1.7 (new, via patch, requested by he):
  Add driver for Creative Labs SBLive! EMU10000 and (probably) PCI512.
  Fixes PR#15260.

Sync kqueue branch with -current.

Catch up to -current.

file emuxki.c was added on branch netbsd-1-5 on 2002-01-19 21:55:09 +0000

file emuxki.c was added on branch kqueue on 2002-01-10 19:56:32 +0000

Merge in changes sent by Michael Shalayeff, from OpenBSD port of this driver:
- use better default for DAC level (previous produced distorted output)
- preserve DAC setting in between openings

Add the AC97_HOST_SWAPPED_CHANNELS quirk for emuxki, and do some
whitespace cleanup. Streight from Yannick Montulet.

don't need <sys/types.h> when including <sys/param.h>

Catch up to -current.

add RCSID

Catch up to -current.

file emuxki.c was added on branch nathanw_sa on 2001-10-22 20:41:23 +0000

De-__P()ify. Suggested by Lennart Augustsson.

Fix obviously wrong printf() format in pci_intr_establish() failure case.
Pointed out by Chuck Silvers.
XXX This has compiled without a warning for me - what's up?

Add sc->sc_dev.dv_xname in another failure printf()

Add driver for Creative Labs SBLive! EMU10000, possibly also PCI512.
Written by Yannick Montulet (thanks!), with only couple minor touches by me.