module-avb: milan: make lock state as part of the generic entity state structure

This commit is contained in:
hackerman-kl 2025-12-03 09:11:17 +01:00 committed by Wim Taymans
parent 4f8f7980f0
commit b43d915e71
3 changed files with 3 additions and 3 deletions

View file

@ -47,7 +47,7 @@ int handle_cmd_entity_available_milan_v12(struct aecp *aecp, int64_t now, const
} }
entity_state = desc->ptr; 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 */ /* Forge the response for the entity that is locking the device */
memcpy(buf, m, len); memcpy(buf, m, len);

View file

@ -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); return reply_status(aecp, AVB_AECP_AEM_STATUS_NO_SUCH_DESCRIPTOR, p, len);
entity_state = desc->ptr; 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) { if (desc_type != AVB_AEM_DESC_ENTITY || desc_id != 0) {
/* /*

View file

@ -115,6 +115,7 @@ struct aecp_aem_lock_state {
*/ */
struct aecp_aem_entity_state { struct aecp_aem_entity_state {
struct avb_aem_desc_entity desc; 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_milan_state {
struct aecp_aem_entity_state 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]; struct aecp_aem_unsol_notification_state unsol_notif_state[AECP_AEM_MILAN_MAX_CONTROLLER];
}; };