Skip to content

doxygen: subgroup dma_copy() to solve conflict with struct dma_copy {}#2773

Merged
lgirdwood merged 1 commit into
thesofproject:masterfrom
marc-hb:subgroup-dma-copy-func
Apr 16, 2020
Merged

doxygen: subgroup dma_copy() to solve conflict with struct dma_copy {}#2773
lgirdwood merged 1 commit into
thesofproject:masterfrom
marc-hb:subgroup-dma-copy-func

Conversation

@marc-hb

@marc-hb marc-hb commented Apr 15, 2020

Copy link
Copy Markdown
Collaborator

Name clash reported by sphinx/breathe:
sof-docs/api/dma-drivers-api.rst:6: WARNING: Duplicate declaration, dma_copy

Before this commit:

  • all "dma_copy" links in doxygen pointed to the struct, never to the
    function,
  • there was no "dma_copy" link of any kind in sphinx.

With this commit:

  • most "dma_copy" links in doxygen are disambiguited and fixed, see
    html/dma_8h_source.html for instance,
  • there are dma_copy links to the struct in sphinx.

Once this is a merged, a commit in sof-docs will add the new subgroup
and re-add the function to sof-docs/api/dma-drivers-api.rst

Fixes: fa8abe1 ("core: dma: Add DMA copy API.")

Reference:
http://www.doxygen.nl/manual/grouping.html

Signed-off-by: Marc Herbert marc.herbert@intel.com

Name clash reported by sphinx/breathe:
 sof-docs/api/dma-drivers-api.rst:6: WARNING: Duplicate declaration, dma_copy

Before this commit:

- all "dma_copy" links in doxygen pointed to the struct, never to the
  function,
- there was no "dma_copy" link of any kind in sphinx.

With this commit:

- most "dma_copy" links in doxygen are disambiguited and fixed, see
  html/dma_8h_source.html for instance,
- there are dma_copy links to the struct in sphinx.

Once this is a merged, a commit in sof-docs will add the new subgroup
and re-add the function to sof-docs/api/dma-drivers-api.rst

Fixes: fa8abe1 ("core: dma: Add DMA copy API.")

Reference:
  http://www.doxygen.nl/manual/grouping.html

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb marc-hb marked this pull request as ready for review April 15, 2020 19:24
@marc-hb

marc-hb commented Apr 15, 2020

Copy link
Copy Markdown
Collaborator Author

This is the very last sof-docs warning! Once this and two others https://github.com/thesofproject/sof-docs/pulls are merged I have a tested, one-line Makefile change that upgrades sphinx warnings into errors.

The only checkpatch WARNING is: line over 80 characters. I tried hard but I could really not wrap this line without making doxygen's output ugly.

Tagging @deb-intel

@intelkevinputnam

Copy link
Copy Markdown

Nice! 😊

@lgirdwood

Copy link
Copy Markdown
Member

CI known issues

@marc-hb

marc-hb commented Apr 16, 2020

Copy link
Copy Markdown
Collaborator Author

Once this is a merged, a commit in sof-docs will add the new subgroup and re-add the function to sof-docs/api/dma-drivers-api.rst

thesofproject/sof-docs#228

@marc-hb

marc-hb commented Apr 16, 2020

Copy link
Copy Markdown
Collaborator Author

This is the very last sof-docs warning! Once this and two others https://github.com/thesofproject/sof-docs/pulls are merged I have a tested, one-line Makefile change that upgrades sphinx warnings into errors.

thesofproject/sof-docs#229

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants