37a7c30e09
- Backport upstream fixes: surround41/50 chmap fix, UCM documents, config string fix, PCM timestamp query API, replacement of list.h with LGPL: 0023-surround41-50.conf-Use-chmap-syntax-for-better-flexi.patch 0024-ucm-docs-fix-doxygen-exclude-patch-for-UCM-local-hea.patch 0025-ucm-docs-Fix-doxygen-formatting-for-UCM-main-page.patch 0026-docs-Add-UCM-link-to-main-doxygen-page.patch 0027-Replace-unsafe-characters-with-_-in-card-name.patch 0028-pcm-add-helper-functions-to-query-timestamping-capab.patch 0029-pcm-add-support-for-get-set_audio_htstamp_config.patch 0030-pcm-add-support-for-new-STATUS_EXT-ioctl.patch 0031-test-fix-audio_time-with-new-get-set-audio_tstamp_co.patch 0032-test-audio_time-show-report-validity-and-accuracy.patch 0033-pcm-restore-hw-params-on-set-latency-failed.patch 0034-Replace-list.h-with-its-own-version.patch - Backport topology API addition patches: 0035-topology-uapi-Add-UAPI-headers-for-topology-ABI.patch 0036-topology-Add-topology-core-parser.patch 0037-topology-Add-text-section-parser.patch 0038-topology-Add-PCM-parser.patch 0039-topology-Add-operations-parser.patch 0040-topology-Add-private-data-parser.patch 0041-topology-Add-DAPM-object-parser.patch 0042-topology-Add-CTL-parser.patch 0043-topology-Add-Channel-map-parser.patch 0044-topology-Add-binary-file-builder.patch 0045-topology-autotools-Add-build-support-for-topology-co.patch 0046-topology-doxygen-Add-doxygen-support-for-topology-co.patch 0047-conf-topology-Add-topology-file-for-broadwell-audio-.patch 0048-topology-Fix-missing-inclusion-of-ctype.h.patch OBS-URL: https://build.opensuse.org/request/show/320429 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=186
97 lines
3.8 KiB
Diff
97 lines
3.8 KiB
Diff
From 66ce9f9a1177de3b8e8304323b4d3a16d78ead32 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Thu, 30 Jul 2015 16:43:19 +0200
|
|
Subject: [PATCH 49/49] topology: Fix typos
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
include/topology.h | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/include/topology.h b/include/topology.h
|
|
index f604ed1450d3..0cb2d79e5574 100644
|
|
--- a/include/topology.h
|
|
+++ b/include/topology.h
|
|
@@ -48,7 +48,7 @@ extern "C" {
|
|
*
|
|
* The topology text format uses the standard ALSA configuration file format to
|
|
* describe each topology object type. This allows topology objects to include
|
|
- * other topology objects as part of thier definition. i.e. a TLV data object
|
|
+ * other topology objects as part of their definition. i.e. a TLV data object
|
|
* can be shared amongst many control objects that use the same TLV data.
|
|
*
|
|
*
|
|
@@ -174,7 +174,7 @@ extern "C" {
|
|
* words "0xaabbccdd,0x11223344,0x66aa77bb,0xefef1234"
|
|
* };
|
|
* </pre>
|
|
- * The file, bytes, shorts and words keywords are all mutulally exclusive as
|
|
+ * The file, bytes, shorts and words keywords are all mutually exclusive as
|
|
* the private data should only be taken from one source. The private data can
|
|
* either be read from a separate file or defined in the topology file using
|
|
* the bytes, shorts or words keywords.
|
|
@@ -247,7 +247,7 @@ extern "C" {
|
|
* can include channel mapping, callback operations, private data and
|
|
* text strings to represent the enumerated control options.<br>
|
|
*
|
|
- * The text strings for the enumerated controls are defined in a seperate
|
|
+ * The text strings for the enumerated controls are defined in a separate
|
|
* section as follows :-
|
|
*
|
|
* <pre>
|
|
@@ -306,7 +306,7 @@ extern "C" {
|
|
* graph with other graphs, it's not used by the kernel atm.
|
|
*
|
|
* <h4>DAPM Widgets</h4>
|
|
- * DAPM wigets are similar to controls in that they can include many other
|
|
+ * DAPM widgets are similar to controls in that they can include many other
|
|
* objects. Widgets can contain private data, mixer controls and enum controls.
|
|
*
|
|
* The following widget types are supported and match the driver types :-
|
|
@@ -367,13 +367,13 @@ extern "C" {
|
|
*
|
|
* formats "S24_LE,S16_LE" # Supported formats
|
|
* rate_min "48000" # Max supported sample rate
|
|
- * rate_max "48000" # Min suppoprted sample rate
|
|
+ * rate_max "48000" # Min supported sample rate
|
|
* channels_min "2" # Min number of channels
|
|
* channels_max "2" # max number of channels
|
|
* }
|
|
* </pre>
|
|
* The supported formats use the same naming convention as the driver macros.
|
|
- * The PCM capabilities name can be reffered to and included by BE, PCM and
|
|
+ * The PCM capabilities name can be referred to and included by BE, PCM and
|
|
* Codec <-> codec topology sections.
|
|
*
|
|
* <h4>PCM Configurations</h4>
|
|
@@ -400,7 +400,7 @@ extern "C" {
|
|
* </pre>
|
|
*
|
|
* The supported formats use the same naming convention as the driver macros.
|
|
- * The PCM configuration name can be reffered to and included by BE, PCM and
|
|
+ * The PCM configuration name can be referred to and included by BE, PCM and
|
|
* Codec <-> codec topology sections.
|
|
*
|
|
* <h4>PCM Configurations</h4>
|
|
@@ -434,7 +434,7 @@ extern "C" {
|
|
* id "0" # used for binding to the PCM
|
|
*
|
|
* pcm."playback" {
|
|
- * capabilities "capabilities1" # capbilities for playback
|
|
+ * capabilities "capabilities1" # capabilities for playback
|
|
*
|
|
* configs [ # supported configs for playback
|
|
* "config1"
|
|
@@ -476,7 +476,7 @@ void snd_tplg_free(snd_tplg_t *tplg);
|
|
* \param tplg Topology instance.
|
|
* \param infile Topology text input file to be parsed
|
|
* \param outfile Binary topology output file.
|
|
- * \return Zero on sucess, otherwise a negative error code
|
|
+ * \return Zero on success, otherwise a negative error code
|
|
*/
|
|
int snd_tplg_build_file(snd_tplg_t *tplg, const char *infile,
|
|
const char *outfile);
|
|
--
|
|
2.5.0
|
|
|