Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Uses the ALSA internal PCM API to create streams purely used for internal
routing purposes.
Adds the 'try_complete' functions for both streams and routes in an
attempt to standardize the finalization of a stream or route object.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
- Add 'route' to snd_avirt_stream, remove from audio path
- Add route checking - ensure that source ap and ink ap have
compatible hw params
- Add private data support for both source and sink Audio
Paths, to ensure that the PCM can hold multiple private data(s).
- Add ability to use copy_kernel and exttriggers from AVIRT instead of from Audio Paths
- Reintroduce pcm_trigger and pcm_prepare, so that
they may be called appropriately from AVIRT, rather
than child Audio Paths.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
We do not need this wrapper function any longer,
can use snd_pcm_period_elapsed instead.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Configfs interface for adding 'routes' is added, and allows two audio paths to chain together particular inputs/outputs, allowing for multistage audio driver handling.
A particular use-case is that of an ADSP driver. We can feed in audio to it, and capture the processed, and/or mixed, audio at it's output, and direct to another audio path driver, such as the UNICENS audio driver.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Explicitly define callback type, refactor name
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
To ensure that a stream is able to change it's mapping (before card is sealed), we cannot create the stream PCM upon setting the mapping. This had to be reworked to allow multiple setting of the mapping if so required.
The PCM ops table for a given stream is now allocated and stored in the snd_avirt_stream struct, to allow retrieval and manipulation upon mapping change.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Clean up logging
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
We no longer need to wait until the card is sealed to create the PCM device. We can create it right away.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
We can achieve this using the snd_device_register function
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
ALSA requires a 'close' callback. It does not have any checks
internally to not call a NULL callback.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
This was not being checked, and resulted in kernel panic when null
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
We only want to call the snd_avirt_private_free callback if it
is set. Some Audio Paths may only set the private data, and not
the private free callback, so we need to accommodate for this.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
- Fix issues regarding PCM ops callbacks via AVIRT
- As PCMs are created, the PCM ops are set according to the Audio
Path's needs. A default PCM ops table is applied for all PCMs,
which includes callbacks such as open, and hw_free, since AVIRT
requires these for intermediate processing, whether or not a given
Audio Path may need them.
- Separate PCM ops into separate playback and capture ops tables
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Make void* audiopath a struct and_avirt_audiopath, standardize
naming in the struct
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
We only want to call the Audio Path 'configure' callback when there
is at least 1 stream mapped to that Audio Path.
Change the return of snd_avirt_streams_get to return the number of
mapped streams for a given Audio Path.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Expand upon the private data structure currently used by avirt
to allow audio paths to store own user data to PCM implementation.
Signed-off-by: James O'Shannessy <james.oshannessy@fiberdyne.com.au>
|
|
Like aloop, we need to be able to find AVIRT by-path as
platform-snd_avirt.0. The 4a-mixer uses this method to find cards.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
avirt_class can become avirt,
SND_AVIRTUAL_DRIVER becomes SND_AVIRT_DRIVER
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
When the configure() callback occurs for each audiopath, we only want
those streams that are mapped to the given audiopath to be exposed to
the audiopath. E.g. only streams mapped to loopback should be
propagated to loopback via configure() callback, rather than
all streams.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Since coreinfo only has version info, and this is not being used
at all, we can absorb the version info into the private
avirt_core structure.
We could in future implement a function to retrieve the version,
when, and if, it is required.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
This will aid the eventual migration the the upstream mainline Linux kernel
Fix some checkpatch warnings, and other compiler warnings
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Change include guards to reflect Linux sound driver format
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Added debug macros for Dummy AP
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
All license headers need to be uniform across AVIRT
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
These need to be in the format the Linux expects, and uniform across AVIRT
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
We don't want to return inside the macro call necessarily. Some PCM cbs require differing return values.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
When creating the PCMs we need information regarding the stream's mapping. For the loopback, we need to add both playback and capture substreams.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
This is no longer needed in AVIRT, since it is only actually used for the ADSP Audio Path.
Clean up white space, add function documentation, remove out of place debug prints
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Sanity guard the sound card string buffers with strncpy
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Sound card was not being free'd properly on module exit.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Add additional callbacks for audio path configuring, after card has been sealed.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Since playback and capture streams are not always assigned, we do not want to
error when one or the other is not present for free'ing.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
This makes for a more organized function/variable naming convention
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Remove unnecessary extra memory allocation with the old config structures. We can store the snd_pcm pointer, which contains lots of info already.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
We want to use a UID when registering APs, that must start with "ap_", and acts as a unique identifier for each AP.
To move forward with the adoption of routing PCMs to differing APs, we now store the AP in the PCM private data - set at pcm_open.
A fix to the helper macros now allows additional args to be passed in for inclusion to the debug string
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Remove leftover debug prints that are no longer needed.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Remove the avirt_alsa_driver
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Check for NULL pointers before free'ing memory on cleanup of AVIRT
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
This wasn't being initialised properly, and NULL audiopaths were not being detected.
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Loopback currently reads from dma_area but the initial copy from playback to capture has not been implemented.
Signed-off-by: James O'Shannessy <james.oshannessy@fiberdyne.com.au>
|
|
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
|
|
Follow readme for building in/out of tree for Ubuntu/AGL/etc.
Signed-off-by: James O'Shannessy <james.oshannessy@fiberdyne.com.au>
|