michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib: open-amp: add support for an empty resource table

Browse source 
This allows a resource table to be included even if neither virtIO nor the
RAM console are used.

Signed-off-by: Matthias Fend <matthias.fend@emfend.at>
This commit is contained in:
Matthias Fend 2022-02-03 08:51:20 +01:00 • committed by Carles Cufí
commit fc4055852e
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/open-amp/resource_table.c
View file

@ -33,8 +33,6 @@ extern char ram_console[];
#define __resource Z_GENERIC_SECTION(.resource_table) #define __resource Z_GENERIC_SECTION(.resource_table)
#if (CONFIG_OPENAMP_RSC_TABLE_NUM_RPMSG_BUFF > 0) || defined(CONFIG_RAM_CONSOLE)
static struct fw_resource_table __resource resource_table = { static struct fw_resource_table __resource resource_table = {
.ver = 1, .ver = 1,
.num = RSC_TABLE_NUM_ENTRY, .num = RSC_TABLE_NUM_ENTRY,
@ -79,4 +77,3 @@ void rsc_table_get(void **table_ptr, int *length)
*table_ptr = (void *)&resource_table; *table_ptr = (void *)&resource_table;
*length = sizeof(resource_table); *length = sizeof(resource_table);
} }
#endif

6
lib/open-amp/resource_table.h
View file

@ -42,9 +42,11 @@ struct fw_resource_table {
unsigned int reserved[2]; unsigned int reserved[2];
unsigned int offset[RSC_TABLE_NUM_ENTRY]; unsigned int offset[RSC_TABLE_NUM_ENTRY];
#if (CONFIG_OPENAMP_RSC_TABLE_NUM_RPMSG_BUFF > 0)
struct fw_rsc_vdev vdev; struct fw_rsc_vdev vdev;
struct fw_rsc_vdev_vring vring0; struct fw_rsc_vdev_vring vring0;
struct fw_rsc_vdev_vring vring1; struct fw_rsc_vdev_vring vring1;
#endif
#if defined(CONFIG_RAM_CONSOLE) #if defined(CONFIG_RAM_CONSOLE)
/* rpmsg trace entry */ /* rpmsg trace entry */
@ -54,6 +56,8 @@ struct fw_resource_table {
void rsc_table_get(void **table_ptr, int *length); void rsc_table_get(void **table_ptr, int *length);
#if (CONFIG_OPENAMP_RSC_TABLE_NUM_RPMSG_BUFF > 0)
inline struct fw_rsc_vdev *rsc_table_to_vdev(void *rsc_table) inline struct fw_rsc_vdev *rsc_table_to_vdev(void *rsc_table)
{ {
return &((struct fw_resource_table *)rsc_table)->vdev; return &((struct fw_resource_table *)rsc_table)->vdev;
@ -70,3 +74,5 @@ inline struct fw_rsc_vdev_vring *rsc_table_get_vring1(void *rsc_table)
} }
#endif #endif
#endif