Skip to content

Introducing Topology 2.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ranj063 wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Introducing Topology 2.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
81247bb
topology: channel: expose lookup_channel()
ranj063 Mar 21, 2021
6b90521
topology: pcm: expose functions for parsing hw_config
ranj063 Mar 21, 2021
4a3f22c
topology: pcm: expose functions for parsing PCM params
ranj063 Mar 21, 2021
4dfb31f
topology: dapm: expose lookup_widget()
ranj063 Mar 21, 2021
b49954a
topology: ctl: expose functions for parsing controls
ranj063 Mar 21, 2021
0681817
topology: data: expose some functions to parse private data
ranj063 Nov 22, 2020
a3543e6
topology: dapm: expose function to parse widget params
ranj063 Mar 21, 2021
6eab4f6
topology: modify struct tplg_tuple_set
ranj063 Nov 22, 2020
db68302
topology: replace references to object with element
ranj063 Mar 10, 2021
ae7c8c3
topology: Introduce new class keyword
ranj063 Mar 12, 2021
612200d
topology: class: Add token_ref field
ranj063 Mar 12, 2021
eae59fa
topology: class: add constraints for attributes
ranj063 Mar 12, 2021
2c818c8
topology: class: parse default value
ranj063 Mar 12, 2021
33c54b7
topology: class: categorize attributes
ranj063 Mar 12, 2021
1de6037
topology: Introduce the new object keyword
ranj063 Mar 12, 2021
d09eda0
topology: class: parse child objects
ranj063 Mar 12, 2021
4a6d170
topology: object: copy child objects from class
ranj063 Mar 12, 2021
ebe2a08
topology: object: create child objects within a parent object
ranj063 Mar 23, 2021
360f782
topology: add some helper functions
ranj063 Mar 23, 2021
6a446a7
topology: object: Inherit attributes from parent object
ranj063 Mar 12, 2021
ffe15a2
topology: object: build topology elements for all objects
ranj063 Mar 12, 2021
2f6777f
topology: object: add support for building private data
ranj063 Mar 12, 2021
67bbc68
topology: class: Introduce pre-defined types of classes
ranj063 Mar 12, 2021
6d5a2fc
topology: object: Add support for DAPM widget type objects
ranj063 Mar 12, 2021
7d1f0aa
topology2: dapm-object: add support for controls
ranj063 Mar 22, 2021
51a628e
topology2: add support for PCM group objects
ranj063 Mar 22, 2021
68d42ca
topology2: add BE DAI object build support
ranj063 Mar 22, 2021
c53b81e
topology: object: add support for pipeline type objects
ranj063 Mar 12, 2021
d17cf5d
topology2: add support for building DAPM routes
ranj063 Mar 22, 2021
b6a034d
topology2: update automatic attributes for host class
ranj063 Mar 22, 2021
7183715
topology2: update automatic attributes for buffer class
ranj063 Mar 23, 2021
a95ea5e
topology: update automatic attribute for endpoint class
ranj063 Mar 23, 2021
e1091b6
topology: update automatic attributes for connection class
ranj063 Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions include/topology.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,8 @@ enum snd_tplg_type {
SND_TPLG_TYPE_LINK, /*!< Physical DAI link */
SND_TPLG_TYPE_HW_CONFIG, /*!< Link HW config */
SND_TPLG_TYPE_DAI, /*!< Physical DAI */
SND_TPLG_TYPE_CLASS, /*!< Class */
Copy link
Member

@lgirdwood lgirdwood Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is class sent as a ABI object ? I think this is for ABI types only ?

Copy link
Member

@lgirdwood lgirdwood Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also my be worth an example class def in your commit message.

SND_TPLG_TYPE_OBJECT, /*!< Object */
};

/** Fit for all user cases */
Expand Down Expand Up @@ -1102,12 +1104,12 @@ typedef struct snd_tplg_obj_template {
} snd_tplg_obj_template_t;

/**
* \brief Register topology template object.
* \brief Register topology template element.
* \param tplg Topology instance.
* \param t Template object.
* \param t Template element.
* \return Zero on success, otherwise a negative error code
*/
int snd_tplg_add_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);
int snd_tplg_add_element(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);

/**
* \brief Build all registered topology data into binary file.
Expand Down
10 changes: 8 additions & 2 deletions src/topology/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,14 @@ libatopology_la_SOURCES =\
elem.c \
save.c \
decoder.c \
log.c
log.c \
class.c \
object.c \
dapm-object.c \
pcm-object.c \
dai-object.c \
custom-object.c

noinst_HEADERS = tplg_local.h
noinst_HEADERS = tplg_local.h tplg2_local.h

AM_CPPFLAGS=-I$(top_srcdir)/include
2 changes: 1 addition & 1 deletion src/topology/channel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static const struct map_elem channel_map[] = {
};


static int lookup_channel(const char *c)
int lookup_channel(const char *c)
{
unsigned int i;

Expand Down
Loading