From b43d915e71deda2d9245af4953c8633b8db83f14 Mon Sep 17 00:00:00 2001 From: hackerman-kl Date: Wed, 3 Dec 2025 09:11:17 +0100 Subject: [PATCH] module-avb: milan: make lock state as part of the generic entity state structure --- src/modules/module-avb/aecp-aem-cmds-resps/cmd-available.c | 2 +- src/modules/module-avb/aecp-aem-cmds-resps/cmd-lock-entity.c | 2 +- src/modules/module-avb/aecp-aem-state.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/module-avb/aecp-aem-cmds-resps/cmd-available.c b/src/modules/module-avb/aecp-aem-cmds-resps/cmd-available.c index 32fd0cb7f..fd3576cfd 100644 --- a/src/modules/module-avb/aecp-aem-cmds-resps/cmd-available.c +++ b/src/modules/module-avb/aecp-aem-cmds-resps/cmd-available.c @@ -47,7 +47,7 @@ int handle_cmd_entity_available_milan_v12(struct aecp *aecp, int64_t now, const } entity_state = desc->ptr; - lock = &entity_state->lock_state; + lock = &entity_state->state.lock_state; /* Forge the response for the entity that is locking the device */ memcpy(buf, m, len); diff --git a/src/modules/module-avb/aecp-aem-cmds-resps/cmd-lock-entity.c b/src/modules/module-avb/aecp-aem-cmds-resps/cmd-lock-entity.c index 5fb93e47f..f75d32fb6 100644 --- a/src/modules/module-avb/aecp-aem-cmds-resps/cmd-lock-entity.c +++ b/src/modules/module-avb/aecp-aem-cmds-resps/cmd-lock-entity.c @@ -49,7 +49,7 @@ int handle_cmd_lock_entity_milan_v12(struct aecp *aecp, int64_t now, const void return reply_status(aecp, AVB_AECP_AEM_STATUS_NO_SUCH_DESCRIPTOR, p, len); entity_state = desc->ptr; - lock = &entity_state->lock_state; + lock = &entity_state->state.lock_state; if (desc_type != AVB_AEM_DESC_ENTITY || desc_id != 0) { /* diff --git a/src/modules/module-avb/aecp-aem-state.h b/src/modules/module-avb/aecp-aem-state.h index 911a02286..d887da1a0 100644 --- a/src/modules/module-avb/aecp-aem-state.h +++ b/src/modules/module-avb/aecp-aem-state.h @@ -115,6 +115,7 @@ struct aecp_aem_lock_state { */ struct aecp_aem_entity_state { struct avb_aem_desc_entity desc; + struct aecp_aem_lock_state lock_state; }; /** @@ -122,7 +123,6 @@ struct aecp_aem_entity_state { */ struct aecp_aem_entity_milan_state { struct aecp_aem_entity_state state; - struct aecp_aem_lock_state lock_state; struct aecp_aem_unsol_notification_state unsol_notif_state[AECP_AEM_MILAN_MAX_CONTROLLER]; };