Skip to content

rtos: branch out dma.h for Zephyr and XTOS #9560

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

Merged
lgirdwood merged 2 commits into from
Oct 16, 2024
Merged

rtos: branch out dma.h for Zephyr and XTOS #9560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea814bf
rtos: branch out dma.h for Zephyr and XTOS
kv2019i Oct 8, 2024
816b143
zephyr: sof/lib/dma: add inline documentation to dma.h
kv2019i Oct 9, 2024
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
14 changes: 1 addition & 13 deletions xtos/include/sof/lib/dma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
#include <stdint.h>

#ifdef __ZEPHYR__
#include <zephyr/device.h>
#include <zephyr/drivers/dma.h>
#error "Please use zephyr/include/sof/lib/dma.h instead"
#endif

struct comp_buffer;
Expand Down Expand Up @@ -106,16 +105,11 @@ enum dma_irq_cmd {
#define DMA_CHAN_INVALID 0xFFFFFFFF
#define DMA_CORE_INVALID 0xFFFFFFFF

/* Attributes have been ported to Zephyr. This condition is necessary until full support of
* CONFIG_SOF_ZEPHYR_STRICT_HEADERS.
*/
#ifndef CONFIG_ZEPHYR_NATIVE_DRIVERS
/* DMA attributes */
#define DMA_ATTR_BUFFER_ALIGNMENT 0
#define DMA_ATTR_COPY_ALIGNMENT 1
#define DMA_ATTR_BUFFER_ADDRESS_ALIGNMENT 2
#define DMA_ATTR_BUFFER_PERIOD_COUNT 3
#endif

struct dma;

Expand Down Expand Up @@ -215,9 +209,6 @@ struct dma_plat_data {
const char *irq_name;
uint32_t chan_size;
const void *drv_plat_data;
#ifdef __ZEPHYR__
uint32_t period_count;
#endif
};

struct dma {
Expand All @@ -227,9 +218,6 @@ struct dma {
const struct dma_ops *ops;
atomic_t num_channels_busy; /* number of busy channels */
struct dma_chan_data *chan; /* channels array */
#ifdef __ZEPHYR__
const struct device *z_dev; /* Zephyr driver */
#endif
void *priv_data;
};

Expand Down
Loading