Skip to content

modules: A collection of small fixes for loadable modules #9333

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
kv2019i merged 4 commits into from
Aug 5, 2024
Merged

modules: A collection of small fixes for loadable modules #9333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cdf1e1
iadk: lmdk: system_service: Add const modifier to system_service stru…
softwarecki Jul 22, 2024
3cf443e
iadk: Remove unused Logger class
softwarecki Jul 23, 2024
8bb3dc1
module: base: Fix include guard name
softwarecki Jul 25, 2024
4e0cb41
module: interface: Mark functions whose implementation is optional
softwarecki Jul 25, 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
1 change: 0 additions & 1 deletion src/audio/module_adapter/iadk/module_initial_settings_concrete.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include <adsp_stddef.h>
#include <module_initial_settings_concrete.h>
#include <logger.h>

extern "C" {
int memcpy_s(void * dst, size_t maxlen, const void * src, size_t len);
Expand Down
3 changes: 1 addition & 2 deletions src/audio/module_adapter/iadk/system_agent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <rtos/string.h>
#include <utilities/array.h>
#include <module/iadk/adsp_error_code.h>
#include <logger.h>
#include <native_system_service.h>
#include <system_agent_interface.h>
#include <module_initial_settings_concrete.h>
Expand Down Expand Up @@ -62,7 +61,7 @@ namespace system
{

/* Structure storing handles to system service operations */
AdspSystemService SystemAgent::system_service_ = {
const AdspSystemService SystemAgent::system_service_ = {
native_system_service_log_message,
native_system_service_safe_memcpy,
native_system_service_safe_memmove,
Expand Down
2 changes: 1 addition & 1 deletion src/audio/module_adapter/library/native_system_service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ AdspErrorCode native_system_service_get_interface(adsp_iface_id id, system_servi
return ADSP_NO_ERROR;
}

struct native_system_service_api native_system_service = {
const struct native_system_service_api native_system_service = {
.log_message = native_system_service_log_message,
.safe_memcpy = native_system_service_safe_memcpy,
.safe_memmove = native_system_service_safe_memmove,
Expand Down
6 changes: 3 additions & 3 deletions src/include/module/module/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* Adrian Warecki <adrian.warecki@intel.com>
*/

#ifndef __MODULE_MODULE_GENERIC__
#define __MODULE_MODULE_GENERIC__
#ifndef __MODULE_MODULE_BASE__
#define __MODULE_MODULE_BASE__

#include <stdint.h>
#include <stddef.h>
Expand Down Expand Up @@ -180,4 +180,4 @@ struct processing_module {
#endif /* SOF_MODULE_PRIVATE */
};

#endif /* __MODULE_MODULE_GENERIC__ */
#endif /* __MODULE_MODULE_BASE__ */
15 changes: 8 additions & 7 deletions src/include/module/module/interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ struct module_interface {
int num_output_buffers);

/**
* Set module configuration for the given configuration ID
* (optional) Set module configuration for the given configuration ID
*
* If the complete configuration message is greater than MAX_BLOB_SIZE bytes, the
* transmission will be split into several smaller fragments.
Expand All @@ -171,7 +171,7 @@ struct module_interface {
size_t response_size);

/**
* Get module runtime configuration for the given configuration ID
* (optional) Get module runtime configuration for the given configuration ID
*
* If the complete configuration message is greater than MAX_BLOB_SIZE bytes, the
* transmission will be split into several smaller fragments.
Expand All @@ -185,13 +185,13 @@ struct module_interface {
uint8_t *fragment, size_t fragment_size);

/**
* Set processing mode for the module
* (unused) Set processing mode for the module
*/
int (*set_processing_mode)(struct processing_module *mod,
enum module_processing_mode mode);

/**
* Get the current processing mode for the module
* (unused) Get the current processing mode for the module
*/
enum module_processing_mode (*get_processing_mode)(struct processing_module *mod);

Expand All @@ -207,16 +207,17 @@ struct module_interface {
*/
int (*free)(struct processing_module *mod);
/**
* Module specific bind procedure, called when modules are bound with each other
* (optional) Module specific bind procedure, called when modules are bound with each other
*/
int (*bind)(struct processing_module *mod, void *data);
/**
* Module specific unbind procedure, called when modules are disconnected from one another
* (optional) Module specific unbind procedure, called when modules are disconnected from
* one another
*/
int (*unbind)(struct processing_module *mod, void *data);

/**
* Module specific trigger procedure, called when modules are triggered
* (optional) Module specific trigger procedure, called when modules are triggered
*/
int (*trigger)(struct processing_module *mod, int cmd);

Expand Down
48 changes: 0 additions & 48 deletions src/include/sof/audio/module_adapter/iadk/logger.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/include/sof/audio/module_adapter/iadk/system_agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace system
}

private:
static AdspSystemService system_service_;
static const AdspSystemService system_service_;
uint32_t log_handle_;
uint32_t const core_id_;
uint32_t module_id_;
Expand Down
1 change: 0 additions & 1 deletion src/include/sof/audio/module_adapter/iadk/system_service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#ifndef _ADSP_SYSTEM_SERVICE_H_
#define _ADSP_SYSTEM_SERVICE_H_

#include "logger.h"
#include "adsp_stddef.h"
#include <module/iadk/adsp_error_code.h>
#include "native_system_service.h"
Expand Down
1 change: 0 additions & 1 deletion src/include/sof/audio/module_adapter/library/native_system_service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include <stdint.h>

#include "logger.h"
#include "adsp_stddef.h"
#include <module/iadk/adsp_error_code.h>

Expand Down