CVS log for src/sys/dev/ic/opl.c

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

opl(4): Use config_detach_children.

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

update from HEAD

Sync with HEAD

- Use aprint*() more in xxx_attach().
- Add missing aprint_naive("\n").
- Remove extra spaces and tabs.
- KNF.

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")

avoid undefined behavior
http://m00nbsd.net/ae123a9bae03f7dde5c6d654412daf5a.html

sync to latest -current.

sync with head

Tidy up a little, the way that midi attachment code works

- change midi_attach() to omit the 'parent' arg (there are
  only two callers of this and it is not used)

- change midisyn_attach() to midisyn_init(), so not needing a midi_softc,
  and fix the midi_pcppi driver to set hw_if and hw_hdl directly in
  its midi_softc before calling midi_attach()

- add a device_t to opl_softc structure, change opl drivers to store
  the device 'self' in opl_softc and fix opl_attach() to use this
  opl_softc->dev field directly rather than a field in an otherwise
  unused midi_softc

- remove unnecessary midi_softc from opl and cms drivers (child device
  provides that)

reviewed by mrg

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.

XXX: don't KASSERT() if sc->lock is NULL, this is going to happen
XXX: during autoconfig match() where we've faked up a sc anyway.

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

aprint-ify

Sync with HEAD.

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

sync with head.

Sync with HEAD.

ANSIfy another 1261 function definitions.
The only ones left in sys are beyond by sed script!
(or in sys/dist or sys/external)
Mostly they have function pointer parameters.

Change about 4500 of the K&R function definitions to ANSI ones.
There are still about 1600 left, but they have ',' or /* ... */
in the actual variable definitions - which my awk script doesn't handle.
There are also many that need () -> (void).
(The script does handle misordered arguments.)

Checkpoint work on MIDI.

Sync with HEAD.

sync with head.

sync with head.

Remove clause 3 and 4 from TNF licenses

Sync with HEAD.

sync with head.

sync with HEAD

sync with head.

Split device_t/softc for midi(4), and other related cosmetic changes.

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

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 initializers

sync with head.

Fix all the -D*DEBUG* code that it was rotting away and did not even compile.
Mostly from Arnaud Lacombe, many thanks!

Pull up following revision(s) (requested by nakayama in ticket #16):
	sys/dev/ic/opl.c: revision 1.27
Avoid gcc4 warnings; voice is unsigned so no need to check "voice < 0".

Avoid gcc4 warnings; voice is unsigned so no need to check "voice < 0".

sync with head

Merge from HEAD.

Ankh-Morpork, we have a MIDI driver....

Merge from chap-midi branch, after
~month for review
Comments by thorpej@ drochner@ and Alexandre Ratchov

Incorporated: points by thorpej@ drochner@; preliminary support for
a stats-collecting ioctl suggested by martin@ from comments by A.R.

PR kern/32441 kern/32442 kern/32567 kern/32588 kern/32694 kern/33590
kern/33614 and one instance of kern/32651

ok martin@

sync with head.

sync with head.

Sync with head.

Add relevelv and repitchv methods to opl: it now responds to channel volume
and expression controls, and changes to them are applied in real time to
voices already sounding, so dynamics sound right. This by itself makes a
remarkable difference in listenability. Pitch bend and tuning changes are
not applied to voices already sounding--even though I tried; for now they
apply only to subsequently played notes. I don't know if there is a way
to make this chip change frequency without stopping and rearticulating the
voice; the documentation has no detail on that point, and my attempt at
just writing the freq registers while it is sounding has no effect. So, I
do not know this chip well enough to finish making pitch controls work on
sounding notes, but if there is a way to do it then somebody who knows how
should have a very easy time adding that detail.

The opl device I tested on does play sharp, offering an easy test for the
new channel tuning support. :) Setting RPN 1 to 45:0 gets it right on the
money. Of course it's reset on close, which doesn't make it easy to send
a tuning adjustment and then run a favorite player program. It might be
that a sysctl (per midisyn instance) to set an initial tuning default
would be useful for that case.

stack police: Introduce an opl_match function that uses malloc instead of
allocating ~2K of softc on the stack.

Bit of housecleaning.

"miditune" wasn't a good name for the pitch representation (even if it
did come from the MIDI Tuning Specification) because for too many people
a 'tune' is a little ditty, not a single pitch. Changed the name to
midipitch and added a typedef midipitch_t; renamed the associated macros
consistently.

The type and operations on it are now in <sys/midiio.h> because they could
show up in userland for manipulation of the MIDI Tuning messages that
RP-012 defines. The macro MIDIPITCH_TO_HZ18 expands in userland to
ordinary libm calls, and in-kernel to the no-floating-point version in
midisyn. A few more operations are defined in userland where libm is
available.

At the same time, made midipitch_t signed. It has the bits to spare,
and such manipulations as adding several corrections and clamping the
result will be simpler with it signed.

Missed a couple details for opl on the first try.

The opl device I tested plays slightly but noticeably sharp. I double-
checked the coefficients in the manual and also compared to a kernel
from before my changes: also sharp. So I don't think I did it. I don't
know what the usual tolerances are for inexpensive soundcards. There
will at any rate be a general workaround as soon as midisyn groks
master-tuning.

This leaves only cms untested with the midisyn changes; I don't have
access to a cms device, but confidence is high.

Rototill of midisyn <-> synth driver i/f.

The DOALLOC and FREQXLATE flags are on the way out. Whether a driver wants
allocation service is deducible from whether it provides an allocv method, and
anyway none does. As for freq, they all get a miditune and can convert it
whichever way they want.

Controller handling with midictl is hooked in but few controllers watched yet.

Some macros for manipulating the miditune type are currently in midisynvar.h
but should perhaps be exported in midiio.h.

opl no longer has its own master volume state (there was no setter for it
anyway, it never changed); soon that will be handled centrally in midisyn.

Builds a kernel. Not all functionality tested yet.

Done pruning unused and ill-defined methods. Several bits of code that
actually did nothing have been replaced with comments explaining what
ought to be done there someday. This is actually progress. Everything
should still work, save PAN for opl, the only preexisting functionality
that's actually gone at this point, but it will be back soon.

The midisyn clients now use designated initializers so the method
structure can evolve. Only opl currently provides any methods beyond
open/close/note-on/note-off. Only cms takes a note number; the others
want a frequency. This is good because it is much easier that way to
put a common handler for tuning/pitchbend/portamento in midisyn itself.

Next up, axe most methods nobody implements. Split note-on into two
methods, one with a frequency, one with a note number, of which a driver
provides one or the other. So far all of the clients delegate voice
allocation to midisyn, so clarify that the method is getting an actual
voice number for the device and not a MIDI channel. If a device that can
do its own allocation is later to be supported, let appropriate different
methods be added then.

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 -current

sync with head.

Sync with HEAD.

de-__P

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

sprintf -> snprintf

netbsd.org -> NetBSD.org

This was the last commit of this kind to src/sys, which is now totally
"NetBSD.org clean".  Thanks for the patiance, and sorry for all the commits.

Fix some typos. From Tom Cosgrove via jmc@openbsd.

- init panpot at reset
- whitespace police

Sync kqueue branch with -current.

Catch up to -current.

add/cleanup RCSID

Sync the thorpej-mips-cache branch with -current.

Introduce "flags 1", which causes left and right channels swapped.

Make it compile with debug on.

Support panpot on OPL3.  Now this device is a stereo instrument.

Catch up to -current.

Catch up with -current.

Add a detach function (from Jared D. McNeill).

Sync with HEAD.

constify

Update thorpej_scsipi to -current as of a month ago
A i386 GENERIC kernel compiles without the siop, ahc and bha drivers
(will be updated later). i386 IDE/ATAPI and ncr work, as well as
sparc/esp_sbus. alpha should work as well (untested yet).
siop, ahc and bha will be updated once I've updated the branch to current
-current, as well as machine-dependant code.

Fix spelling in comment.

Add power control hooks.

Implement program change.  From Martin Cernohorsky <cerno@ics.muni.cz>.

Sync w/ -current.

Update doc URL.

Make the OPL information string more informative.

Make the copyright header conform to the NetBSD template.

Make sure all voices are deallocated on close.

Do some renaming of registers and make sure we get sound in both
channels on OPL3.

Make the OPL driver turn on the sound on sound cards that require it.
That makes it much more likely that we get any sound.  DUH!

Change debug output.

* 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.