CVS log for src/sys/dev/isa/wss.c

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Merge thorpej-cfargs2.

Adapt to CFARGS().

Sync with HEAD.

Be explicit about using the "wss" interface attribute when attaching
the "opl" instance.

Merge thorpej-cfargs branch:

Simplify and make extensible the config_search() / config_found() /
config_attach() interfaces: rather than having different variants for
which arguments you want pass along, just have a single call that
takes a variadic list of tag-value arguments.

Adjust all call sites:
- Simplify wherever possible; don't pass along arguments that aren't
  actually needed.
- Don't be explicit about what interface attribute is attaching if
  the device only has one.  (More simplification.)
- Add a config_probe() function to be used in indirect configuiration
  situations, making is visibly easier to see when indirect config is
  in play, and allowing for future change in semantics.  (As of now,
  this is just a wrapper around config_match(), but that is an
  implementation detail.)

Remove unnecessary or redundant interface attributes where they're not
needed.

There are currently 5 "cfargs" defined:
- CFARG_SUBMATCH (submatch function for direct config)
- CFARG_SEARCH (search function for indirect config)
- CFARG_IATTR (interface attribte)
- CFARG_LOCATORS (locators array)
- CFARG_DEVHANDLE (devhandle_t - wraps OFW, ACPI, etc. handles)

...and a sentinel value CFARG_EOL.

Add some extra sanity checking to ensure that interface attributes
aren't ambiguous.

Use CFARG_DEVHANDLE in MI FDT, OFW, and ACPI code, and macppc and shark
ports to associate those device handles with device_t instance.  This
will trickle trough to more places over time (need back-end for pre-OFW
Sun OBP; any others?).

Give config_found() the same variadic arguments treatment as
config_search().  This commit only adds the CFARG_EOL sentinel
to the existing config_found() calls.  Conversion of config_found_sm_loc()
and config_found_ia() call sites will be in subsequent commits.

Merge changes from current as of 20200406

Sync with head.

Remove rounding by 4 bytes on round_blocksize().
For drivers which supports only 16bit * 2channels sampling,
rounding by 4 bytes no longer meaningful.

Sync with HEAD

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 obsoleted methods in audio_hw_if.
- drain: is handled in audio upper layer now.
- mappage: is handled in audio upper layer now.
- setfd: no one uses and it's meaningless now.

Adapt ad1848/cs4231 families to audio2.

Use C99 style struct initializer to audio_hw_if.

sync with head

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.

Hold the intr lock for the duration of ad1848_isa_intr().

get rid of unused 'powerstate' callback in audio_hw_if

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

Catchup with rmind-uvmplock merge.

sync with head

Sync with HEAD.

fix compile failure.

Checkpoint work in progress.

Checkpoint work in progress.

sync with HEAD

sync with head.

Sync with HEAD.

Follow the merge of pmap.c on i386 and amd64 and move
pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup
code to restore CR4 before jumping back into kernel space as the large
page option might cover that.

Sync with HEAD.

Sync with head.

machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h

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

sync with head.

sync with head

add missing initializer

sync with head.

Sync with head.

sync with head.

sync with head.

Merge 2006-03-31 NetBSD-current into the "peter-altq" branch.

Use device_cfdata().

merge ktrace-lwp.

Sync with HEAD.

ansify and KNF

Sync with HEAD.

constify audio_hw_if, midi_hw_if, and radio_hw_if.

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

remove trailing \n in panic().  approved perry.

Sync kqueue branch with -current.

Catch up to -current.

add RCSID

Catch up with -current. Fix some bogons in the sparc64 kbd/ms
attach code. cd18xx conversion provided by mrg.

Catch up to -current.

Add a new optional method, dev_ioctl, to the audio hardware driver interface.
It is called when an unrecognized ioctl() is performed on a device,
thus allowing ioctl()s that frob the hardware driver (like loading
microcode).

Add separate halt_input and halt_output methods in ad1848_isa, which disable
the DMA channel.

Use the trigger interface, and clean up a pile of cruft.

Pass the direction to the allocm and round_buffersize methods.
Some drivers need this to properly allocate DMAable memory.

Make the OPL information string more informative.

work around a problem that could cause the wss driver to panic during
attach when a DRQ gets allocated twice.  Done differently in -current.
(augustss)

Use `ad1848_isa_{open|close}' (Ezra Story; PR#6108).

Split the AD1848 driver into MI (dev/ic/ad1848.c) and ISA parts.

* Redo the way the way the MIDI driver attaches to audio devices.
* Improve the midisyn layer a little.
* Add a driver for the Yamaha OPL[23] FM synths.
  The opl driver is not finished yet; it sounds pretty awful.

For some strange reason I cannot get any FM sound from my SB64 cards,
but a regular SB16 works fine.

Don't print chip name in attach, the ad1848 attach already does.

Nuke unused variable.

Add a monitor mute.  The mixer here really needs more work for the
Crystal chips.

Adjust for changes to the ISA DMA API.

KNF.

Add a Yamaha OPL3-SA3 driver and clean up all AD1848 drivers.
Submitted by Constantine Sapuntzakis <csapuntz@reeducation-labor.lcs.mit.edu>
and originally written for OpenBSD.

Update probing for GUS a little.  From soren@t.dk,
closes PR kern/5148.

-make compile without BROKEN_INDIRECT_CONFIG
-don't include <machine/pio.h>

Split out the ISA part of the WSS driver to allow PnP attachment.
Make the AD1848 driver a little more readable with some macros.

Update for config changes.

fix inconsistent declaration in non-"__BROKEN_INDIRECT_CONFIG" case

Make the audio API (almost) SunOS compatible.
The changes is to allow some limited mixer manipulation through
the audio device (instead of the mixer device).
This rendered 4 methods in audio_hw_if unused so garbage collect these.

Update marc-pcmcia branch from trunk.

AudioC[A-Z] -> AudioC[a-z]

Update marc-pcmcia branch from trunk.

Zap drq2 if unused.

Update marc-pcmcia branch from trunk.

XXX Add a drq2 locator for the ISA bus.  Many sound cards need
two DMA channels to do e.g. full-duplex.  This allows
a way of specifying the second channel in a sane way.
THIS IS TEMPORARY.  The drq2 locator will go away when
the locator system has been changed to allow multiple
values per locator.

Fix the "non-broken" indirect configuration so it might actually work.

Improve error message.

Update marc-pcmcia branch from trunk.

Convert WSS driver to use non-broken indirect configuration.

Change the MI audio driver so it attaches to the MD driver in the
normal way.  This requires adding a line to the config files to
get audio to work again.

Implement a function to test if a drq is taken and use it
in two drivers.  There are still many drivers left to fix...

Audio changes:
	- Change the way attach and open works to allow multiple audio
	  devices.
	- Split the mulaw.c file into two to avoid dragging in mulaw
	  convertsion when they are not needed.  Add 16 bit alaw/mulaw tables.
	- Change the way audio properties are gotten.
	- Recognize more versions os SoundBlaster.

Audio: Remove the machine dependant code I put in audio.c by mistake.
This adds another method to audio_hw_if.  Also remove a field from
audio_hw_if that was not read-only.

audio: Simplify handling of AUDIO_SETFD and committing of encoding mode.

Changes to the sudio system:
  - It is now possible to handle devices that want "looping" DMA,
    e.g. the SoundBlaster correctly.  The WSS and SB drivers use this.
    To do this several new methods were introduced in audio_hw_if.
  - Different silence handling (forced by previous change).
  - The audio driver can now be mmap()-ed, but due to problems in
    the VM system only for writing for now.
  - The OSS (Linux) audio emulation takes advantage of some of the
    new features.

Pull thorpej-bus-dma branch into mainline.

Adapt to new software interface to the on-board ISA DMA controller.

Change the interface between high and lowlevel audio drivers again:
Set the encoding parameters slightly differently.
Remove the SW encoding/decodinf functions from this interface
and move them to the audio_parameter struct; this is both more efficient
and flexible.

Convert to new orthogonal audio encoding scheme and implement
some of the new encodings.  The change to ioctl AUDIO_GETENC is
NOT backwards compatible.

Change the interface between the high and low level audio drivers
so that all audio encoding parameters are set at once.  This simplifies
the interface and make error checking easier.

Make sure the bus tag is set where we need it.

Add support for MAD16 based audio cards.
XXX Change the way we determine to probe for it when
    multiple I/O ranges are available.

Busify the WSS driver.

Combine set_encoding and set_precision into a single set_format interface.

normalize off-by-four ad1848 register offsets.
also silence probe unless debugging is enabled.

Don't share the silence block between devices.  Make silence filling work for
more encodings, and make it device-independent.  From Lennart Augustsson, in
PR kern/3305.

return proper output port.  Fixes PR kern/2014.

backout kprintf changes

printf -> kprintf, sprintf -> ksprintf

Use intr.h.

Prototype fixes

update for addition of a machine-dependent cookie as the first argument
to isa_intr_{,dis}establish().

New device attachment scheme:

	- split softc size and match/attach out from cfdriver into
	  a new struct cfattach.

	- new "attach" directive for files.*.  May specify the name of
	  the cfattach structure, so that devices may be easily attached
	  to parents with different autoconfiguration semantics.

Prototype the probe and attach functions.

The IST_* and IPL_* constants are not bus-specific; don't treat them as such.
Change splimp -> splnet in Ethernet, ARCnet, and FDDI drivers.

Convert IRQ, DRQ, and port numbers to int.

Setup irq correctly (PR#1179)

Remove  strings

update for new locations

clean up several ISA device interfaces: autoconfiguration, header
inclusion, and interrupt configuration.  more work still needs to be done,
but it's getting better...

Use void* rather than caddr_t in many places.

Driver for Windows sound system; not extensively tested